[libosmocore] 03/04: merge patched into master
Ruben Undheim
rubund-guest at moszumanska.debian.org
Tue May 10 20:06:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository libosmocore.
commit 88d713b51fd8bd598e51c4b47d71c411291b8761
Merge: eb1d10a 2801711
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Tue May 10 22:03:28 2016 +0200
merge patched into master
debian/.git-dpm | 4 +-
...tched-struct-for-big-endian-architectures.patch | 86 ------
...ched-structs-for-big-endian-architectures.patch | 299 +++++++++++++++++++++
...IMESTAMP-to-NO-to-make-build-reproducible.patch | 2 +-
debian/patches/series | 2 +-
include/osmocom/gsm/protocol/gsm_04_08.h | 160 +++++++++++
6 files changed, 463 insertions(+), 90 deletions(-)
diff --cc debian/.git-dpm
index 0e9f9c6,0000000..821425a
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
- 4185a3125a296c55a4e8b5dbb0153233a0cecb4c
- 4185a3125a296c55a4e8b5dbb0153233a0cecb4c
++28017114dd63502dc7e87d07bd45d473ed3178b9
++28017114dd63502dc7e87d07bd45d473ed3178b9
+16ca4aeb70817af9c2739dc58e910ac67e9b0864
+16ca4aeb70817af9c2739dc58e910ac67e9b0864
+libosmocore_0.9.0.orig.tar.gz
+705eca7a77d295fcaf08ed4c3d0feb8b696fe914
+574737
diff --cc debian/patches/0004-Patched-structs-for-big-endian-architectures.patch
index 0000000,0000000..6bf7d02
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Patched-structs-for-big-endian-architectures.patch
@@@ -1,0 -1,0 +1,299 @@@
++From 6fd2f6cbeaca30bb18b640d71cefad6ce8072ac5 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 structs for big-endian architectures
++
++---
++ include/osmocom/gsm/protocol/gsm_03_41.h | 31 ++++++
++ include/osmocom/gsm/protocol/gsm_04_08.h | 160 +++++++++++++++++++++++++++++++
++ 2 files changed, 191 insertions(+)
++
++diff --git a/include/osmocom/gsm/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h
++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 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 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 --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h
++index 9fcdddc..15f6e29 100644
++--- a/include/osmocom/gsm/protocol/gsm_04_08.h
+++++ b/include/osmocom/gsm/protocol/gsm_04_08.h
++@@ -1,6 +1,8 @@
++ #pragma once
++
++ #include <stdint.h>
+++#include <osmocom/core/endian.h>
+++
++
++ /* GSM TS 04.08 definitions */
++ struct gsm_lchan;
++@@ -39,6 +41,7 @@ struct gsm48_classmark2 {
++ } __attribute__ ((packed));
++
++ /* Chapter 10.5.2.1b.3 */
+++#if OSMO_IS_LITTLE_ENDIAN == 1
++ struct gsm48_range_1024 {
++ uint8_t w1_hi:2,
++ f0:1,
++@@ -72,8 +75,44 @@ struct gsm48_range_1024 {
++ uint8_t w16:6,
++ w15_lo:2;
++ } __attribute__ ((packed));
+++#else
+++struct gsm48_range_1024 {
+++ uint8_t form_id:5,
+++ f0:1,
+++ w1_hi:2;
+++ uint8_t w1_lo;
+++ uint8_t w2_hi;
+++ uint8_t w2_lo:1,
+++ w3_hi:7;
+++ uint8_t w3_lo:2,
+++ w4_hi:6;
+++ uint8_t w4_lo:2,
+++ w5_hi:6;
+++ uint8_t w5_lo:2,
+++ w6_hi:6;
+++ uint8_t w6_lo:2,
+++ w7_hi:6;
+++ uint8_t w7_lo:2,
+++ w8_hi:6;
+++ uint8_t w8_lo:1,
+++ w9:7;
+++ uint8_t w10:7,
+++ w11_hi:1;
+++ uint8_t w11_lo:6,
+++ w12_hi:2;
+++ uint8_t w12_lo:5,
+++ w13_hi:3;
+++ uint8_t w13_lo:4,
+++ w14_hi:4;
+++ uint8_t w14_lo:3,
+++ w15_hi:5;
+++ uint8_t w15_lo:2,
+++ w16:6;
+++} __attribute__ ((packed));
+++#endif
++
++ /* Chapter 10.5.2.1b.4 */
+++#if OSMO_IS_LITTLE_ENDIAN == 1
++ struct gsm48_range_512 {
++ uint8_t orig_arfcn_hi:1,
++ form_id:7;
++@@ -107,8 +146,44 @@ struct gsm48_range_512 {
++ uint8_t w17:5,
++ w16_lo:3;
++ } __attribute__ ((packed));
+++#else
+++struct gsm48_range_512 {
+++ uint8_t form_id:7,
+++ orig_arfcn_hi:1;
+++ uint8_t orig_arfcn_mid;
+++ uint8_t orig_arfcn_lo:1,
+++ w1_hi:7;
+++ uint8_t w1_lo:2,
+++ w2_hi:6;
+++ uint8_t w2_lo:2,
+++ w3_hi:6;
+++ uint8_t w3_lo:2,
+++ w4_hi:6;
+++ uint8_t w4_lo:1,
+++ w5:7;
+++ uint8_t w6:7,
+++ w7_hi:1;
+++ uint8_t w7_lo:6,
+++ w8_hi:2;
+++ uint8_t w8_lo:4,
+++ w9_hi:4;
+++ uint8_t w9_lo:2,
+++ w10:6;
+++ uint8_t w11:6,
+++ w12_hi:2;
+++ uint8_t w12_lo:4,
+++ w13_hi:4;
+++ uint8_t w13_lo:2,
+++ w14:6;
+++ uint8_t w15:6,
+++ w16_hi:2;
+++ uint8_t w16_lo:3,
+++ w17:5;
+++} __attribute__ ((packed));
+++#endif
++
++ /* Chapter 10.5.2.1b.5 */
+++#if OSMO_IS_LITTLE_ENDIAN == 1
++ struct gsm48_range_256 {
++ uint8_t orig_arfcn_hi:1,
++ form_id:7;
++@@ -148,8 +223,50 @@ struct gsm48_range_256 {
++ w21:4,
++ w20_lo:3;
++ } __attribute__ ((packed));
+++#else
+++struct gsm48_range_256 {
+++ uint8_t form_id:7,
+++ orig_arfcn_hi:1;
+++ uint8_t orig_arfcn_mid;
+++ uint8_t orig_arfcn_lo:1,
+++ w1_hi:7;
+++ uint8_t w1_lo:1,
+++ w2:7;
+++ uint8_t w3:7,
+++ w4_hi:1;
+++ uint8_t w4_lo:5,
+++ w5_hi:3;
+++ uint8_t w5_lo:3,
+++ w6_hi:5;
+++ uint8_t w6_lo:1,
+++ w7:6,
+++ w8_hi:1;
+++ uint8_t w8_lo:4,
+++ w9_hi:4;
+++ uint8_t w9_lo:1,
+++ w10:5,
+++ w11_hi:2;
+++ uint8_t w11_lo:3,
+++ w12:5;
+++ uint8_t w13:5,
+++ w14_hi:3;
+++ uint8_t w14_lo:2,
+++ w15:5,
+++ w16_hi:1;
+++ uint8_t w16_lo:3,
+++ w17:4,
+++ w18_hi:1;
+++ uint8_t w18_lo:3,
+++ w19:4,
+++ w20_hi:1;
+++ uint8_t w20_lo:3,
+++ w21:4,
+++ spare:1;
+++} __attribute__ ((packed));
+++#endif
++
++ /* Chapter 10.5.2.1b.6 */
+++#if OSMO_IS_LITTLE_ENDIAN == 1
++ struct gsm48_range_128 {
++ uint8_t orig_arfcn_hi:1,
++ form_id:7;
++@@ -191,6 +308,49 @@ struct gsm48_range_128 {
++ w27:3,
++ w26_lo:1;
++ } __attribute__ ((packed));
+++#else
+++struct gsm48_range_128 {
+++ uint8_t form_id:7,
+++ orig_arfcn_hi:1;
+++ uint8_t orig_arfcn_mid;
+++ uint8_t orig_arfcn_lo:1,
+++ w1:7;
+++ uint8_t w2:6,
+++ w3_hi:2;
+++ uint8_t w3_lo:4,
+++ w4_hi:4;
+++ uint8_t w4_lo:1,
+++ w5:5,
+++ w6_hi:2;
+++ uint8_t w6_lo:3,
+++ w7:5;
+++ uint8_t w8:4,
+++ w9:4;
+++ uint8_t w10:4,
+++ w11:4;
+++ uint8_t w12:4,
+++ w13:4;
+++ uint8_t w14:4,
+++ w15:4;
+++ uint8_t w16:3,
+++ w17:3,
+++ w18_hi:2;
+++ uint8_t w18_lo:1,
+++ w19:3,
+++ w20:3,
+++ w21_hi:1;
+++ uint8_t w21_lo:2,
+++ w22:3,
+++ w23:3;
+++ uint8_t w24:3,
+++ w25:3,
+++ w26_hi:2;
+++ uint8_t w26_lo:1,
+++ w27:3,
+++ w28:3,
+++ spare:1;
+++} __attribute__ ((packed));
+++#endif
++
++ /* Chapter 10.5.2.1b.7 */
++ struct gsm48_var_bit {
diff --cc debian/patches/0005-Set-HTML_TIMESTAMP-to-NO-to-make-build-reproducible.patch
index dbf5ec6,0000000..de124d2
mode 100644,000000..100644
--- a/debian/patches/0005-Set-HTML_TIMESTAMP-to-NO-to-make-build-reproducible.patch
+++ b/debian/patches/0005-Set-HTML_TIMESTAMP-to-NO-to-make-build-reproducible.patch
@@@ -1,64 -1,0 +1,64 @@@
- From 4185a3125a296c55a4e8b5dbb0153233a0cecb4c Mon Sep 17 00:00:00 2001
++From 28017114dd63502dc7e87d07bd45d473ed3178b9 Mon Sep 17 00:00:00 2001
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Wed, 10 Feb 2016 20:34:39 +0100
+Subject: Set HTML_TIMESTAMP to NO to make build reproducible
+
+---
+ Doxyfile.codec.in | 2 +-
+ Doxyfile.core.in | 2 +-
+ Doxyfile.gsm.in | 2 +-
+ Doxyfile.vty.in | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Doxyfile.codec.in b/Doxyfile.codec.in
+index 4f539c7..fd1e6b3 100644
+--- a/Doxyfile.codec.in
++++ b/Doxyfile.codec.in
+@@ -891,7 +891,7 @@ HTML_COLORSTYLE_GAMMA = 80
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+
+-HTML_TIMESTAMP = YES
++HTML_TIMESTAMP = NO
+
+ # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+ # files or namespaces will be aligned in HTML using tables. If set to
+diff --git a/Doxyfile.core.in b/Doxyfile.core.in
+index 71843cc..ebe2058 100644
+--- a/Doxyfile.core.in
++++ b/Doxyfile.core.in
+@@ -891,7 +891,7 @@ HTML_COLORSTYLE_GAMMA = 80
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+
+-HTML_TIMESTAMP = YES
++HTML_TIMESTAMP = NO
+
+ # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+ # files or namespaces will be aligned in HTML using tables. If set to
+diff --git a/Doxyfile.gsm.in b/Doxyfile.gsm.in
+index c4a837f..6c4e2e9 100644
+--- a/Doxyfile.gsm.in
++++ b/Doxyfile.gsm.in
+@@ -891,7 +891,7 @@ HTML_COLORSTYLE_GAMMA = 80
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+
+-HTML_TIMESTAMP = YES
++HTML_TIMESTAMP = NO
+
+ # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+ # files or namespaces will be aligned in HTML using tables. If set to
+diff --git a/Doxyfile.vty.in b/Doxyfile.vty.in
+index 5f7a158..ddda629 100644
+--- a/Doxyfile.vty.in
++++ b/Doxyfile.vty.in
+@@ -891,7 +891,7 @@ HTML_COLORSTYLE_GAMMA = 80
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+
+-HTML_TIMESTAMP = YES
++HTML_TIMESTAMP = NO
+
+ # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+ # files or namespaces will be aligned in HTML using tables. If set to
diff --cc debian/patches/series
index d59e22f,0ca407b..7ed4cf3
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,1 +1,5 @@@
-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
++0004-Patched-structs-for-big-endian-architectures.patch
+0005-Set-HTML_TIMESTAMP-to-NO-to-make-build-reproducible.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libosmocore.git
More information about the debian-science-commits
mailing list