diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-28 12:13:06 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-28 12:13:08 +0200 |
commit | d87d6f177837c848381e362d3880509ba275cac8 (patch) | |
tree | 041bd5a4a67608e4e9299584d36f6911268f96ed /include | |
parent | 1f48b939998755ee26aa1d4ebeb621cd26de63f3 (diff) |
gsm_04_06.h: Remove repeated egprs header struct definitions
Each struct already contains different definition based on endianess, so
there's no reason to re-define all of them again based on endianess.
Probably at some point somebody run the script
./contrib/struct_endianess.py on those structures but forgot to remove
the old way of supporting differnet endianess.
Change-Id: Ibd002e52979950e09013767fa643b2a3c52dfea9
Diffstat (limited to 'include')
-rw-r--r-- | include/osmocom/gprs/protocol/gsm_04_60.h | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/include/osmocom/gprs/protocol/gsm_04_60.h b/include/osmocom/gprs/protocol/gsm_04_60.h index f592b14f..05728f49 100644 --- a/include/osmocom/gprs/protocol/gsm_04_60.h +++ b/include/osmocom/gprs/protocol/gsm_04_60.h @@ -9,7 +9,6 @@ #include <stdint.h> #include <osmocom/core/endian.h> -#if OSMO_IS_LITTLE_ENDIAN == 1 /* TS 04.60 10.3a.4.1.1 */ struct gprs_rlc_ul_header_egprs_1 { #if OSMO_IS_LITTLE_ENDIAN @@ -160,158 +159,6 @@ struct gprs_rlc_dl_header_egprs_3 { uint8_t dummy:1, spb:2, cps:4, bsn1_lo:1; #endif } __attribute__ ((packed)); -#else -/* TS 04.60 10.3a.4.1.1 */ -struct gprs_rlc_ul_header_egprs_1 { -#if OSMO_IS_LITTLE_ENDIAN - uint8_t tfi_hi:2, - cv:4, - si:1, - r:1; - uint8_t bsn1_hi:5, - tfi_lo:3; - uint8_t bsn2_hi:2, - bsn1_lo:6; - uint8_t bsn2_lo:8; - uint8_t spare_hi:1, - pi:1, - rsb:1, - cps:5; - uint8_t dummy:2, - spare_lo:6; -#elif OSMO_IS_BIG_ENDIAN -/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint8_t r:1, si:1, cv:4, tfi_hi:2; - uint8_t tfi_lo:3, bsn1_hi:5; - uint8_t bsn1_lo:6, bsn2_hi:2; - uint8_t bsn2_lo:8; - uint8_t cps:5, rsb:1, pi:1, spare_hi:1; - uint8_t spare_lo:6, dummy:2; -#endif -} __attribute__ ((packed)); - -/* TS 04.60 10.3a.4.2.1 */ -struct gprs_rlc_ul_header_egprs_2 { -#if OSMO_IS_LITTLE_ENDIAN - uint8_t tfi_hi:2, - cv:4, - si:1, - r:1; - uint8_t bsn1_hi:5, - tfi_lo:3; - uint8_t cps_hi:2, - bsn1_lo:6; - uint8_t spare_hi:5, - pi:1, - rsb:1, - cps_lo:1; - uint8_t dummy:3, - spare_lo:5; -#elif OSMO_IS_BIG_ENDIAN -/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint8_t r:1, si:1, cv:4, tfi_hi:2; - uint8_t tfi_lo:3, bsn1_hi:5; - uint8_t bsn1_lo:6, cps_hi:2; - uint8_t cps_lo:1, rsb:1, pi:1, spare_hi:5; - uint8_t spare_lo:5, dummy:3; -#endif -} __attribute__ ((packed)); - -/* TS 04.60 10.3a.4.3.1 */ -struct gprs_rlc_ul_header_egprs_3 { -#if OSMO_IS_LITTLE_ENDIAN - uint8_t tfi_hi:2, - cv:4, - si:1, - r:1; - uint8_t bsn1_hi:5, - tfi_lo:3; - uint8_t cps_hi:2, - bsn1_lo:6; - uint8_t dummy:1, - spare:1, - pi:1, - rsb:1, - spb:2, - cps_lo:2; -#elif OSMO_IS_BIG_ENDIAN -/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint8_t r:1, si:1, cv:4, tfi_hi:2; - uint8_t tfi_lo:3, bsn1_hi:5; - uint8_t bsn1_lo:6, cps_hi:2; - uint8_t cps_lo:2, spb:2, rsb:1, pi:1, spare:1, dummy:1; -#endif -} __attribute__ ((packed)); - -struct gprs_rlc_dl_header_egprs_1 { -#if OSMO_IS_LITTLE_ENDIAN - uint8_t tfi_hi:1, - rrbp:2, - es_p:2, - usf:3; - uint8_t bsn1_hi:2, - pr:2, - tfi_lo:4; - uint8_t bsn1_mid:8; - uint8_t bsn2_hi:7, - bsn1_lo:1; - uint8_t cps:5, - bsn2_lo:3; -#elif OSMO_IS_BIG_ENDIAN -/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; - uint8_t tfi_lo:4, pr:2, bsn1_hi:2; - uint8_t bsn1_mid:8; - uint8_t bsn1_lo:1, bsn2_hi:7; - uint8_t bsn2_lo:3, cps:5; -#endif -} __attribute__ ((packed)); - -struct gprs_rlc_dl_header_egprs_2 { -#if OSMO_IS_LITTLE_ENDIAN - uint8_t tfi_hi:1, - rrbp:2, - es_p:2, - usf:3; - uint8_t bsn1_hi:2, - pr:2, - tfi_lo:4; - uint8_t bsn1_mid:8; - uint8_t dummy:4, - cps:3, - bsn1_lo:1; -#elif OSMO_IS_BIG_ENDIAN -/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; - uint8_t tfi_lo:4, pr:2, bsn1_hi:2; - uint8_t bsn1_mid:8; - uint8_t bsn1_lo:1, cps:3, dummy:4; -#endif -} __attribute__ ((packed)); - -struct gprs_rlc_dl_header_egprs_3 { -#if OSMO_IS_LITTLE_ENDIAN - uint8_t tfi_hi:1, - rrbp:2, - es_p:2, - usf:3; - uint8_t bsn1_hi:2, - pr:2, - tfi_lo:4; - uint8_t bsn1_mid:8; - uint8_t dummy:1, - spb:2, - cps:4, - bsn1_lo:1; -#elif OSMO_IS_BIG_ENDIAN -/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; - uint8_t tfi_lo:4, pr:2, bsn1_hi:2; - uint8_t bsn1_mid:8; - uint8_t bsn1_lo:1, cps:4, spb:2, dummy:1; -#endif -} __attribute__ ((packed)); -#endif /* TS 03.60 Chapter 6.3.3.1: Network Mode of Operation */ enum osmo_gprs_nmo { |