diff options
author | Harald Welte <laforge@gnumonks.org> | 2013-06-30 13:12:24 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2013-10-06 11:54:38 +0200 |
commit | d331f862dc5d0217a836c8826790c45e86b77ec3 (patch) | |
tree | b4368e817877ef483f7df1d24479f6c295706d32 | |
parent | ef13269e071ebfb0eb301c0b1d12072218f25cb0 (diff) |
Remove duplication between libosmocore ipaccess.h and libosmoabis ipaccess.h
-rw-r--r-- | include/osmocom/abis/ipaccess.h | 94 |
1 files changed, 4 insertions, 90 deletions
diff --git a/include/osmocom/abis/ipaccess.h b/include/osmocom/abis/ipaccess.h index 3b43a69..1992807 100644 --- a/include/osmocom/abis/ipaccess.h +++ b/include/osmocom/abis/ipaccess.h @@ -1,94 +1,8 @@ -#ifndef _OSMO_PROTO_IPACCESS_H -#define _OSMO_PROTO_IPACCESS_H +#ifndef _OSMO_ABIS_IPACCESS_H +#define _OSMO_ABIS_IPACCESS_H #include <stdint.h> - -#define IPA_TCP_PORT_OML 3002 -#define IPA_TCP_PORT_RSL 3003 - -struct ipaccess_head { - uint16_t len; /* network byte order */ - uint8_t proto; - uint8_t data[0]; -} __attribute__ ((packed)); - -struct ipaccess_head_ext { - uint8_t proto; - uint8_t data[0]; -} __attribute__ ((packed)); - -enum ipaccess_proto { - IPAC_PROTO_RSL = 0x00, - IPAC_PROTO_IPACCESS = 0xfe, - IPAC_PROTO_SCCP = 0xfd, - IPAC_PROTO_OML = 0xff, - - - /* OpenBSC extensions */ - IPAC_PROTO_OSMO = 0xee, - IPAC_PROTO_MGCP_OLD = 0xfc, -}; - -enum ipaccess_proto_ext { - IPAC_PROTO_EXT_CTRL = 0x00, - IPAC_PROTO_EXT_MGCP = 0x01, - IPAC_PROTO_EXT_LAC = 0x02, -}; - -enum ipaccess_msgtype { - IPAC_MSGT_PING = 0x00, - IPAC_MSGT_PONG = 0x01, - IPAC_MSGT_ID_GET = 0x04, - IPAC_MSGT_ID_RESP = 0x05, - IPAC_MSGT_ID_ACK = 0x06, - - /* OpenBSC extension */ - IPAC_MSGT_SCCP_OLD = 0xff, -}; - -enum ipaccess_id_tags { - IPAC_IDTAG_SERNR = 0x00, - IPAC_IDTAG_UNITNAME = 0x01, - IPAC_IDTAG_LOCATION1 = 0x02, - IPAC_IDTAG_LOCATION2 = 0x03, - IPAC_IDTAG_EQUIPVERS = 0x04, - IPAC_IDTAG_SWVERSION = 0x05, - IPAC_IDTAG_IPADDR = 0x06, - IPAC_IDTAG_MACADDR = 0x07, - IPAC_IDTAG_UNIT = 0x08, -}; - -/* - * Firmware specific header - */ -struct sdp_firmware { - char magic[4]; - char more_magic[2]; - uint16_t more_more_magic; - uint32_t header_length; - uint32_t file_length; - char sw_part[20]; - char text1[64]; - char time[12]; - char date[14]; - char text2[10]; - char version[20]; - uint16_t table_offset; - /* stuff i don't know */ -} __attribute__((packed)); - -struct sdp_header_entry { - uint16_t something1; - char text1[64]; - char time[12]; - char date[14]; - char text2[10]; - char version[20]; - uint32_t length; - uint32_t addr1; - uint32_t addr2; - uint32_t start; -} __attribute__((packed)); +#include <osmocom/gsm/protocol/ipaccess.h> struct ipaccess_unit { uint16_t site_id; @@ -106,4 +20,4 @@ struct ipaccess_unit { /* quick solution to get openBSC's ipaccess tools working. */ extern int ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what); -#endif /* _OSMO_PROTO_IPACCESS_H */ +#endif /* _OSMO_ABIS_IPACCESS_H */ |