[libosmocore] 02/02: 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 2179fb6cbf29bd8d57b6af3cada2ca2b3cf25817
Merge: 74126bb 6c61dd2
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Dec 8 21:20:07 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...tched-struct-for-big-endian-architectures.patch | 12 +++----
 ...rd-attempt-of-fixing-the-big-endian-issue.patch | 41 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 8 insertions(+), 50 deletions(-)

diff --cc debian/.git-dpm
index 4c697aa,0000000..09bc9e3
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
- 22c488b367a2c931bd1df8f1f3152308bf1e1805
- 22c488b367a2c931bd1df8f1f3152308bf1e1805
++6c61dd2448f6209ea260bdc6f6cb43cdf12c779d
++6c61dd2448f6209ea260bdc6f6cb43cdf12c779d
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +libosmocore_0.9.0.orig.tar.gz
 +705eca7a77d295fcaf08ed4c3d0feb8b696fe914
 +574737
diff --cc debian/patches/0004-Patched-struct-for-big-endian-architectures.patch
index 2adf9ba,0000000..0ea640f
mode 100644,000000..100644
--- a/debian/patches/0004-Patched-struct-for-big-endian-architectures.patch
+++ b/debian/patches/0004-Patched-struct-for-big-endian-architectures.patch
@@@ -1,86 -1,0 +1,86 @@@
- From 15f0458fb78be796007243b1967f3ae0ee903507 Mon Sep 17 00:00:00 2001
++From 6c61dd2448f6209ea260bdc6f6cb43cdf12c779d 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 | 31 +++++++++++++++++++++++++++++++
 + 1 file changed, 31 insertions(+)
 +
 +diff --git a/include/osmocom/gsm/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h
- index 0ece6cc..e4c077c 100644
++index 0ece6cc..40051cd 100644
 +--- a/include/osmocom/gsm/protocol/gsm_03_41.h
 ++++ b/include/osmocom/gsm/protocol/gsm_03_41.h
 +@@ -2,8 +2,13 @@
 + 
 + #include <stdint.h>
 + 
 ++#include <osmocom/core/endian.h>
 + #include <osmocom/gsm/protocol/gsm_04_12.h>
 + 
 ++#ifndef OSMO_IS_LITTLE_ENDIAN
 ++ #define OSMO_IS_LITTLE_ENDIAN 0
 ++#endif
 ++
 + /* GSM TS 03.41 definitions also TS 23.041*/
 + 
 + #define GSM341_MAX_PAYLOAD	(GSM412_MSG_LEN-sizeof(struct gsm341_ms_message))
 +@@ -13,19 +18,36 @@
 + /* Chapter 9.3.2 */
 + struct gsm341_ms_message {
 + 	struct {
 ++#if OSMO_IS_LITTLE_ENDIAN == 1
 + 		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;
+++		uint8_t code_lo:4;
+++		uint8_t update:4;
 ++#endif
 + 	} serial;
 + 	uint16_t msg_id;
 + 	struct {
 ++#if OSMO_IS_LITTLE_ENDIAN == 1
 + 		uint8_t language:4;
 + 		uint8_t group:4;
 ++#else
 ++		uint8_t group:4;
 ++		uint8_t language:4;
 ++#endif
 + 	} dcs;
 + 	struct {
 ++#if OSMO_IS_LITTLE_ENDIAN == 1
 + 		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 +55,21 @@ struct gsm341_ms_message {
 + /* Chapter 9.4.1.3 */
 + struct gsm341_etws_message {
 + 	struct {
 ++#if OSMO_IS_LITTLE_ENDIAN == 1
 + 		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;
+++		uint8_t code_lo:4;
+++		uint8_t update:4;
 ++#endif
 + 	} serial;
 + 	uint16_t msg_id;
 + 	uint16_t warning_type;
diff --cc debian/patches/series
index 9d2aac4,0ca407b..a0d32c4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -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
- 0005-Third-attempt-of-fixing-the-big-endian-issue.patch

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