diff options
| author | Harald Welte <laforge@gnumonks.org> | 2008-12-26 10:20:07 +0000 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2008-12-26 10:20:07 +0000 |
| commit | ad38464728cf1503258288ee9d64600c8adf38ba (patch) | |
| tree | 742ed21134377c5175a6aeb49acf08688038ad95 /include | |
| parent | 3633a6daf9b95c868512b963575c42290bfaa4b5 (diff) | |
this is the first version that actually talks to the BTS
* initialize OML and RSL based on TEI establish (ACTIVATE_IND) events
* fix abis_nm_raw_msg() to not overwrite the OML header with payload
* fix debug print statements
* fix msgb_dequeue: actually dequeue it from the list ;)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openbsc/debug.h | 6 | ||||
| -rw-r--r-- | include/openbsc/gsm_data.h | 10 | ||||
| -rw-r--r-- | include/openbsc/msgb.h | 8 |
3 files changed, 17 insertions, 7 deletions
diff --git a/include/openbsc/debug.h b/include/openbsc/debug.h index 41953a362..02ae699c4 100644 --- a/include/openbsc/debug.h +++ b/include/openbsc/debug.h @@ -12,9 +12,11 @@ #define DMI 0x1000 #ifdef DEBUG -#define DEBUGP(ss, args...) debugp(ss, __FILE__, __LINE__, ## args) +#define DEBUGP(ss, fmt, args...) debugp(ss, __FILE__, __LINE__, fmt, ## args) #else -#define DEBUGP(xss, args, ...) +#define DEBUGP(xss, fmt, args...) #endif +void debugp(int subsys, char *file, int line, const char *format, ...); + #endif /* _DEBUG_H */ diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h index 8bb219a11..75de2e72f 100644 --- a/include/openbsc/gsm_data.h +++ b/include/openbsc/gsm_data.h @@ -126,5 +126,13 @@ struct gsm_call { /* the 'local' subscriber */ struct gsm_subscriber *subscr; }; - + +enum gsm_e1_event { + EVT_E1_NONE, + EVT_E1_OML_UP, + EVT_E1_RSL_UP, + EVT_E1_OML_DN, + EVT_E1_RSL_DN, +}; + #endif diff --git a/include/openbsc/msgb.h b/include/openbsc/msgb.h index 13631e7bc..cfb912135 100644 --- a/include/openbsc/msgb.h +++ b/include/openbsc/msgb.h @@ -34,8 +34,8 @@ struct msgb { struct gsm_bts_trx *trx; struct gsm_lchan *lchan; - u_int8_t l2_off; - u_int8_t l3_off; + unsigned char *l2h; + unsigned char *l3h; u_int16_t data_len; u_int16_t len; @@ -51,8 +51,8 @@ extern void msgb_free(struct msgb *m); extern void msgb_enqueue(struct llist_head *queue, struct msgb *msg); extern struct msgb *msgb_dequeue(struct llist_head *queue); -#define msgb_l2(m) ((void *)(m->data + m->l2_off)) -#define msgb_l3(m) ((void *)(m->data + m->l3_off)) +#define msgb_l2(m) ((void *)(m->l2h)) +#define msgb_l3(m) ((void *)(m->l3h)) static inline unsigned int msgb_headlen(const struct msgb *msgb) { |