diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 1 | ||||
| -rw-r--r-- | include/osmocom/core/isdnhdlc.h | 48 |
2 files changed, 26 insertions, 23 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index f82012f3..27a40908 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -26,6 +26,7 @@ nobase_include_HEADERS = \ osmocom/core/fsm.h \ osmocom/core/gsmtap.h \ osmocom/core/gsmtap_util.h \ + osmocom/core/isdnhdlc.h \ osmocom/core/linuxlist.h \ osmocom/core/linuxrbtree.h \ osmocom/core/logging.h \ diff --git a/include/osmocom/core/isdnhdlc.h b/include/osmocom/core/isdnhdlc.h index 96521370..56369bfd 100644 --- a/include/osmocom/core/isdnhdlc.h +++ b/include/osmocom/core/isdnhdlc.h @@ -1,5 +1,5 @@ /* - * hdlc.h -- General purpose ISDN HDLC decoder. + * isdnhdlc.h -- General purpose ISDN HDLC decoder. * * Implementation of a HDLC decoder/encoder in software. * Necessary because some ISDN devices don't have HDLC @@ -29,7 +29,9 @@ #ifndef __ISDNHDLC_H__ #define __ISDNHDLC_H__ -struct isdnhdlc_vars { +#include <stdint.h> + +struct osmo_isdnhdlc_vars { int bit_shift; int hdlc_bits1; int data_bits; @@ -37,46 +39,46 @@ struct isdnhdlc_vars { int state; int dstpos; - u16 crc; + uint16_t crc; - u8 cbin; - u8 shift_reg; - u8 ffvalue; + uint8_t cbin; + uint8_t shift_reg; + uint8_t ffvalue; /* set if transferring data */ - u32 data_received:1; + uint32_t data_received:1; /* set if D channel (send idle instead of flags) */ - u32 dchannel:1; + uint32_t dchannel:1; /* set if 56K adaptation */ - u32 do_adapt56:1; + uint32_t do_adapt56:1; /* set if in closing phase (need to send CRC + flag) */ - u32 do_closing:1; + uint32_t do_closing:1; /* set if data is bitreverse */ - u32 do_bitreverse:1; + uint32_t do_bitreverse:1; }; /* Feature Flags */ -#define HDLC_56KBIT 0x01 -#define HDLC_DCHANNEL 0x02 -#define HDLC_BITREVERSE 0x04 +#define OSMO_HDLC_F_56KBIT 0x01 +#define OSMO_HDLC_F_DCHANNEL 0x02 +#define OSMO_HDLC_F_BITREVERSE 0x04 /* The return value from isdnhdlc_decode is the frame length, 0 if no complete frame was decoded, or a negative error number */ -#define HDLC_FRAMING_ERROR 1 -#define HDLC_CRC_ERROR 2 -#define HDLC_LENGTH_ERROR 3 +#define OSMO_HDLC_FRAMING_ERROR 1 +#define OSMO_HDLC_CRC_ERROR 2 +#define OSMO_HDLC_LENGTH_ERROR 3 -extern void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features); +extern void osmo_isdnhdlc_rcv_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features); -extern int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, - int slen, int *count, u8 *dst, int dsize); +extern int osmo_isdnhdlc_decode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, + int slen, int *count, uint8_t *dst, int dsize); -extern void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features); +extern void osmo_isdnhdlc_out_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features); -extern int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, - u16 slen, int *count, u8 *dst, int dsize); +extern int osmo_isdnhdlc_encode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, + uint16_t slen, int *count, uint8_t *dst, int dsize); #endif /* __ISDNHDLC_H__ */ |