[libosmocore] 02/03: merge patched into master

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository libosmocore.

commit ddf2a471e8ad993a9121166a38cc38f8775b08c6
Merge: 601baa0 30016f2
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Dec 7 19:34:43 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...tched-struct-for-big-endian-architectures.patch | 80 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 include/osmocom/gsm/protocol/gsm_03_41.h           | 27 ++++++++
 4 files changed, 110 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 49cbe90,0000000..c0e26ba
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- efc194155b243dd6e16d7ad7a75e5447cfbf8d92
- efc194155b243dd6e16d7ad7a75e5447cfbf8d92
++30016f26b881ccc05561206adb69c7a7eab562a1
++30016f26b881ccc05561206adb69c7a7eab562a1
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +libosmocore_0.9.0.orig.tar.gz
 +705eca7a77d295fcaf08ed4c3d0feb8b696fe914
 +574737
diff --cc debian/patches/0004-Patched-struct-for-big-endian-architectures.patch
index 0000000,0000000..ce9dfa1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Patched-struct-for-big-endian-architectures.patch
@@@ -1,0 -1,0 +1,80 @@@
++From 30016f26b881ccc05561206adb69c7a7eab562a1 Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Mon, 7 Dec 2015 19:34:28 +0100
++Subject: Patched struct for big-endian architectures
++
++---
++ include/osmocom/gsm/protocol/gsm_03_41.h | 27 +++++++++++++++++++++++++++
++ 1 file changed, 27 insertions(+)
++
++diff --git a/include/osmocom/gsm/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h
++index 0ece6cc..f007cc1 100644
++--- a/include/osmocom/gsm/protocol/gsm_03_41.h
+++++ b/include/osmocom/gsm/protocol/gsm_03_41.h
++@@ -2,6 +2,7 @@
++ 
++ #include <stdint.h>
++ 
+++#include <osmocom/core/endian.h>
++ #include <osmocom/gsm/protocol/gsm_04_12.h>
++ 
++ /* GSM TS 03.41 definitions also TS 23.041*/
++@@ -13,19 +14,36 @@
++ /* Chapter 9.3.2 */
++ struct gsm341_ms_message {
++ 	struct {
+++#ifdef OSMO_IS_LITTLE_ENDIAN
++ 		uint8_t code_hi:6;
++ 		uint8_t gs:2;
++ 		uint8_t update:4;
++ 		uint8_t code_lo:4;
+++#else
+++		uint8_t code_lo:4;
+++		uint8_t update:4;
+++		uint8_t gs:2;
+++		uint8_t code_hi:6;
+++#endif
++ 	} serial;
++ 	uint16_t msg_id;
++ 	struct {
+++#ifdef OSMO_IS_LITTLE_ENDIAN
++ 		uint8_t language:4;
++ 		uint8_t group:4;
+++#else
+++		uint8_t group:4;
+++		uint8_t language:4;
+++#endif
++ 	} dcs;
++ 	struct {
+++#ifdef OSMO_IS_LITTLE_ENDIAN
++ 		uint8_t total:4;
++ 		uint8_t current:4;
+++#else
+++		uint8_t current:4;
+++		uint8_t total:4;
+++#endif
++ 	} page;
++ 	uint8_t data[0];
++ } __attribute__((packed));
++@@ -33,12 +51,21 @@ struct gsm341_ms_message {
++ /* Chapter 9.4.1.3 */
++ struct gsm341_etws_message {
++ 	struct {
+++#ifdef OSMO_IS_LITTLE_ENDIAN
++ 		uint8_t code_hi:4;
++ 		uint8_t popup:1;
++ 		uint8_t alert:1;
++ 		uint8_t gs:2;
++ 		uint8_t update:4;
++ 		uint8_t code_lo:4;
+++#else
+++		uint8_t code_lo:4;
+++		uint8_t update:4;
+++		uint8_t gs:2;
+++		uint8_t alert:1;
+++		uint8_t popup:1;
+++		uint8_t code_hi:4;
+++#endif
++ 	} serial;
++ 	uint16_t msg_id;
++ 	uint16_t warning_type;
diff --cc debian/patches/series
index f67bb89,0ca407b..a0d32c4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,1 +1,4 @@@
 -debian-changes-0.1.17-1
 +0001-Removed-illegal-pkg-config-directive.patch
 +0002-Some-spelling-errors-corrected.patch
 +0003-Setting-library-version-explicitly.patch
++0004-Patched-struct-for-big-endian-architectures.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libosmocore.git