summaryrefslogtreecommitdiffstats
path: root/src/shared/libosmocore/include
diff options
context:
space:
mode:
authorHarald Welte2010-03-25 05:18:14 +0100
committerHarald Welte2010-03-25 05:18:14 +0100
commit692df15c8194cd98cbb4d89465ae707ba30bb9b6 (patch)
treee5de2221ffddfbe5b1b0bf5abab4ae7d803b8228 /src/shared/libosmocore/include
parentMerge commit 'cbc8062ef8ba10690aa64b433d0efdccb46f496a' (diff)
parentreplace rsl_rlm_cause_strs with rsl_rlm_cause_name() (diff)
downloadosmocom-692df15c8194cd98cbb4d89465ae707ba30bb9b6.tar.gz
osmocom-692df15c8194cd98cbb4d89465ae707ba30bb9b6.tar.xz
osmocom-692df15c8194cd98cbb4d89465ae707ba30bb9b6.zip
Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab'
Conflicts: src/shared/libosmocore/src/utils.c
Diffstat (limited to 'src/shared/libosmocore/include')
-rw-r--r--src/shared/libosmocore/include/osmocore/gsm48.h4
-rw-r--r--src/shared/libosmocore/include/osmocore/msgb.h1
-rw-r--r--src/shared/libosmocore/include/osmocore/rsl.h3
3 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/libosmocore/include/osmocore/gsm48.h b/src/shared/libosmocore/include/osmocore/gsm48.h
index 787cdd0..1e96357 100644
--- a/src/shared/libosmocore/include/osmocore/gsm48.h
+++ b/src/shared/libosmocore/include/osmocore/gsm48.h
@@ -5,8 +5,8 @@
#include <osmocore/gsm48_ie.h>
extern const struct tlv_definition gsm48_att_tlvdef;
-extern const char *cc_state_names[32];
-extern const char *gsm48_cc_msg_names[0x40];
+const char *gsm48_cc_state_name(uint8_t state);
+const char *gsm48_cc_msg_name(uint8_t msgtype);
const char *rr_cause_name(uint8_t cause);
void gsm48_generate_lai(struct gsm48_loc_area_id *lai48, uint16_t mcc,
diff --git a/src/shared/libosmocore/include/osmocore/msgb.h b/src/shared/libosmocore/include/osmocore/msgb.h
index 754918e..31db719 100644
--- a/src/shared/libosmocore/include/osmocore/msgb.h
+++ b/src/shared/libosmocore/include/osmocore/msgb.h
@@ -46,6 +46,7 @@ struct msgb {
union {
unsigned char *smsh;
unsigned char *llch;
+ unsigned char *l4h;
};
/* the layer 5 header, GPRS: GMM header */
diff --git a/src/shared/libosmocore/include/osmocore/rsl.h b/src/shared/libosmocore/include/osmocore/rsl.h
index c108081..99b90d6 100644
--- a/src/shared/libosmocore/include/osmocore/rsl.h
+++ b/src/shared/libosmocore/include/osmocore/rsl.h
@@ -16,9 +16,8 @@ uint8_t rsl_enc_chan_nr(uint8_t type, uint8_t subch, uint8_t timeslot);
/* decode channel number as per Section 9.3.1 */
int rsl_dec_chan_nr(uint8_t chan_nr, uint8_t *type, uint8_t *subch, uint8_t *timeslot);
-extern const struct value_string rsl_rlm_cause_strs[];
-
const char *rsl_err_name(uint8_t err);
+const char *rsl_rlm_cause_name(uint8_t err);
/* Section 3.3.2.3 TS 05.02. I think this looks like a table */
int rsl_ccch_conf_to_bs_cc_chans(int ccch_conf);