Add new 'rate counter' implementation to libosmocore

[osmocom-bb.git] / include / osmocore / msgb.h

diff --git a/include/osmocore/msgb.h b/include/osmocore/msgb.h
index 131f920..2841dc5 100644 (file)
--- a/include/osmocore/msgb.h
+++ b/include/osmocore/msgb.h
@@ -23,21 +23,25 @@
 #include <stdint.h>
 #include "linuxlist.h"
 
-struct bts_link;
-
 struct msgb {
        struct llist_head list;
 
-       /* ptr to the physical E1 link to the BTS(s) */
-       struct gsm_bts_link *bts_link;
-
        /* Part of which TRX logical channel we were received / transmitted */
+       /* FIXME: move them into the control buffer */
        struct gsm_bts_trx *trx;
        struct gsm_lchan *lchan;
 
+       /* the Layer1 header (if any) */
+       unsigned char *l1h;
+       /* the A-bis layer 2 header: OML, RSL(RLL), NS */
        unsigned char *l2h;
+       /* the layer 3 header. For OML: FOM; RSL: 04.08; GPRS: BSSGP */
        unsigned char *l3h;
-       unsigned char *smsh;
+       /* the layer 4 header */
+       unsigned char *l4h;
+
+       /* the 'control buffer', large enough to contain 5 pointers */
+       unsigned long cb[5];
 
        uint16_t data_len;
        uint16_t len;
@@ -54,9 +58,15 @@ extern void msgb_enqueue(struct llist_head *queue, struct msgb *msg);
 extern struct msgb *msgb_dequeue(struct llist_head *queue);
 extern void msgb_reset(struct msgb *m);
 
+#define msgb_l1(m)     ((void *)(m->l1h))
 #define msgb_l2(m)     ((void *)(m->l2h))
 #define msgb_l3(m)     ((void *)(m->l3h))
-#define msgb_sms(m)    ((void *)(m->smsh))
+#define msgb_sms(m)    ((void *)(m->l4h))
+
+static inline unsigned int msgb_l1len(const struct msgb *msgb)
+{
+       return msgb->tail - (uint8_t *)msgb_l1(msgb);
+}
 
 static inline unsigned int msgb_l2len(const struct msgb *msgb)
 {
@@ -79,6 +89,47 @@ static inline unsigned char *msgb_put(struct msgb *msgb, unsigned int len)
        msgb->len += len;
        return tmp;
 }
+static inline void msgb_put_u8(struct msgb *msgb, uint8_t word)
+{
+       uint8_t *space = msgb_put(msgb, 1);
+       space[0] = word & 0xFF;
+}
+static inline void msgb_put_u16(struct msgb *msgb, uint16_t word)
+{
+       uint8_t *space = msgb_put(msgb, 2);
+       space[0] = word >> 8 & 0xFF;
+       space[1] = word & 0xFF;
+}
+static inline void msgb_put_u32(struct msgb *msgb, uint32_t word)
+{
+       uint8_t *space = msgb_put(msgb, 4);
+       space[0] = word >> 24 & 0xFF;
+       space[1] = word >> 16 & 0xFF;
+       space[2] = word >> 8 & 0xFF;
+       space[3] = word & 0xFF;
+}
+static inline unsigned char *msgb_get(struct msgb *msgb, unsigned int len)
+{
+       unsigned char *tmp = msgb->data;
+       msgb->data += len;
+       msgb->len -= len;
+       return tmp;
+}
+static inline uint8_t msgb_get_u8(struct msgb *msgb)
+{
+       uint8_t *space = msgb_get(msgb, 1);
+       return space[0];
+}
+static inline uint16_t msgb_get_u16(struct msgb *msgb)
+{
+       uint8_t *space = msgb_get(msgb, 2);
+       return space[0] << 8 | space[1];
+}
+static inline uint32_t msgb_get_u32(struct msgb *msgb)
+{
+       uint8_t *space = msgb_get(msgb, 4);
+       return space[0] << 24 | space[1] << 16 | space[2] << 8 | space[3];
+}
 static inline unsigned char *msgb_push(struct msgb *msgb, unsigned int len)
 {
        msgb->data -= len;
@@ -92,7 +143,7 @@ static inline unsigned char *msgb_pull(struct msgb *msgb, unsigned int len)
 }
 static inline int msgb_tailroom(const struct msgb *msgb)
 {
-       return (msgb->data + msgb->data_len) - msgb->tail;
+       return (msgb->head + msgb->data_len) - msgb->tail;
 }
 
 /* increase the headroom of an empty msgb, reducing the tailroom */