summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-10-08 14:35:51 +0200
committerHarald Welte <laforge@gnumonks.org>2011-10-08 14:40:09 +0200
commitfae779ac5419ad7621a0bc858329066ffc9cc719 (patch)
tree9eb8a317be5302912e4f79d16a4a9cc22c414f4d
parenta4463fd23bf9fcf3ede094f5c15f4ecfb558c2de (diff)
GSMTAP: Import changes from Wireshark
There have been some changes in the wireshark source code that have never been submitted to gsmtap.h GSMTAP_CHANNEL_PACCH has been defined in an incompatible way in mainline wirshark :(
-rw-r--r--include/osmocom/core/gsmtap.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h
index ffcd3a4b..bc99bcb7 100644
--- a/include/osmocom/core/gsmtap.h
+++ b/include/osmocom/core/gsmtap.h
@@ -22,6 +22,9 @@
#define GSMTAP_TYPE_SIM 0x04
#define GSMTAP_TYPE_TETRA_I1 0x05 /* tetra air interface */
#define GSMTAP_TYPE_TETRA_I1_BURST 0x06 /* tetra air interface */
+#define GSMTAP_TYPE_WMX_BURST 0x07 /* WiMAX burst */
+#define GSMTAP_TYPE_GB_LLC 0x08 /* GPRS Gb interface: LLC */
+#define GSMTAP_TYPE_GB_SNDCP 0x09 /* GPRS Gb interface: SNDCP */
/* sub-types for TYPE_UM_BURST */
#define GSMTAP_BURST_UNKNOWN 0x00
@@ -34,6 +37,13 @@
#define GSMTAP_BURST_DUMMY 0x07
#define GSMTAP_BURST_ACCESS 0x08
#define GSMTAP_BURST_NONE 0x09
+/* WiMAX bursts */
+#define GSMTAP_BURST_CDMA_CODE 0x10 /* WiMAX CDMA Code Attribute burst */
+#define GSMTAP_BURST_FCH 0x11 /* WiMAX FCH burst */
+#define GSMTAP_BURST_FFB 0x12 /* WiMAX Fast Feedback burst */
+#define GSMTAP_BURST_PDU 0x13 /* WiMAX PDU burst */
+#define GSMTAP_BURST_HACK 0x14 /* WiMAX HARQ ACK burst */
+#define GSMTAP_BURST_PHY_ATTRIBUTES 0x15 /* WiMAX PHY Attributes burst */
/* sub-types for TYPE_UM */
#define GSMTAP_CHANNEL_UNKNOWN 0x00
@@ -51,6 +61,7 @@
#define GSMTAP_CHANNEL_CBCH52 0x0c
#define GSMTAP_CHANNEL_PDCH 0x0d
#define GSMTAP_CHANNEL_PTCCH 0x0e
+#define GSMTAP_CHANNEL_PACCH 0x0f
#define GSMTAP_CHANNEL_ACCH 0x80
/* sub-types for TYPE_TETRA_AIR */