aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2008-12-28 23:42:04 +0000
committerHarald Welte <laforge@gnumonks.org>2008-12-28 23:42:04 +0000
commitb84e2f4f1b6c4f9d902ed2d23fe340b304b21fbd (patch)
tree783243ad0e3cba3afcd36a36623c36da86f46808 /include
parentbde361064ae41d35b10ee44abf38ce867c858725 (diff)
* use 16bit for network and country code
* use aligned attribute for more data structures * add command line arguments for operator/country code
Diffstat (limited to 'include')
-rw-r--r--include/openbsc/gsm_04_08.h6
-rw-r--r--include/openbsc/gsm_data.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/include/openbsc/gsm_04_08.h b/include/openbsc/gsm_04_08.h
index 1513aded0..920d84c91 100644
--- a/include/openbsc/gsm_04_08.h
+++ b/include/openbsc/gsm_04_08.h
@@ -22,7 +22,7 @@ struct gsm48_chan_desc {
u_int8_t arfcn_low;
} h0;
};
-};
+} __attribute__ ((packed));
/* Chapter 10.5.2.30 */
struct gsm48_req_ref {
@@ -31,7 +31,7 @@ struct gsm48_req_ref {
t1_:5;
u_int8_t t2:5,
t3_low:3;
-};
+} __attribute__ ((packed));
/* Chapter 9.1.18 */
struct gsm48_imm_ass {
@@ -44,7 +44,7 @@ struct gsm48_imm_ass {
u_int8_t timing_advance;
u_int8_t mob_alloc_len;
u_int8_t mob_alloc[0];
-};
+} __attribute__ ((packed));
/* Chapter 10.5.1.3 */
struct gsm48_loc_area_id {
diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h
index 2d0c3c53b..c0c431eda 100644
--- a/include/openbsc/gsm_data.h
+++ b/include/openbsc/gsm_data.h
@@ -126,8 +126,8 @@ struct gsm_ms {
struct gsm_network {
/* global parameters */
- u_int8_t country_code;
- u_int8_t network_code;
+ u_int16_t country_code;
+ u_int16_t network_code;
unsigned int num_bts;
/* private lists */
@@ -136,8 +136,8 @@ struct gsm_network {
struct gsm_subscriber *subscriber;
};
-struct gsm_network *gsm_network_init(unsigned int num_bts, u_int8_t country_code,
- u_int8_t network_code);
+struct gsm_network *gsm_network_init(unsigned int num_bts, u_int16_t country_code,
+ u_int16_t network_code);
enum gsm_e1_event {
EVT_E1_NONE,