diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2013-12-20 14:58:43 +0000 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2013-12-20 14:58:43 +0000 |
| commit | cf3276b1fc60b2bd6419f54892f06e8a75352183 (patch) | |
| tree | 7b3ae6dc2b231203e1aeedeb9bda29d7975bc841 /epan/dvb_chartbl.h | |
| parent | c38424311f573b631b4015ff587c8423ceaef57f (diff) | |
simplify the defines for DVB chartables
there's no need for their values to match the values in the DVB-SI spec
we can summarize basic and extended table definitions
svn path=/trunk/; revision=54297
Diffstat (limited to 'epan/dvb_chartbl.h')
| -rw-r--r-- | epan/dvb_chartbl.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/epan/dvb_chartbl.h b/epan/dvb_chartbl.h index bb83fedd4c..cc33d79123 100644 --- a/epan/dvb_chartbl.h +++ b/epan/dvb_chartbl.h @@ -38,6 +38,12 @@ extern "C" { typedef enum { DVB_ENCODING_LATIN = 0, + /* these defines don't have to match with the values + from the DVB-SI specification */ + DVB_ENCODING_ISO_8859_1, + DVB_ENCODING_ISO_8859_2, + DVB_ENCODING_ISO_8859_3, + DVB_ENCODING_ISO_8859_4, DVB_ENCODING_ISO_8859_5, DVB_ENCODING_ISO_8859_6, DVB_ENCODING_ISO_8859_7, @@ -45,30 +51,12 @@ typedef enum { DVB_ENCODING_ISO_8859_9, DVB_ENCODING_ISO_8859_10, DVB_ENCODING_ISO_8859_11, - /* 0x08 is reserved */ - DVB_ENCODING_ISO_8859_13 = 9, + DVB_ENCODING_ISO_8859_13, DVB_ENCODING_ISO_8859_14, DVB_ENCODING_ISO_8859_15, /* TODO: 0x11...0x15 */ - DVB_ENCODING_EXT_BASE = 0x100000, - DVB_ENCODING_EXT_ISO_8859_1 = DVB_ENCODING_EXT_BASE | 1, - DVB_ENCODING_EXT_ISO_8859_2 = DVB_ENCODING_EXT_BASE | 2, - DVB_ENCODING_EXT_ISO_8859_3 = DVB_ENCODING_EXT_BASE | 3, - DVB_ENCODING_EXT_ISO_8859_4 = DVB_ENCODING_EXT_BASE | 4, - DVB_ENCODING_EXT_ISO_8859_5 = DVB_ENCODING_EXT_BASE | 5, - DVB_ENCODING_EXT_ISO_8859_6 = DVB_ENCODING_EXT_BASE | 6, - DVB_ENCODING_EXT_ISO_8859_7 = DVB_ENCODING_EXT_BASE | 7, - DVB_ENCODING_EXT_ISO_8859_8 = DVB_ENCODING_EXT_BASE | 8, - DVB_ENCODING_EXT_ISO_8859_9 = DVB_ENCODING_EXT_BASE | 9, - DVB_ENCODING_EXT_ISO_8859_10 = DVB_ENCODING_EXT_BASE | 10, - DVB_ENCODING_EXT_ISO_8859_11 = DVB_ENCODING_EXT_BASE | 11, - /* DVB_ENCODING_ISO_8859_12 = DVB_ENCODING_EXT_BASE | 12 */ - DVB_ENCODING_EXT_ISO_8859_13 = DVB_ENCODING_EXT_BASE | 13, - DVB_ENCODING_EXT_ISO_8859_14 = DVB_ENCODING_EXT_BASE | 14, - DVB_ENCODING_EXT_ISO_8859_15 = DVB_ENCODING_EXT_BASE | 15, - DVB_ENCODING_INVALID = G_MAXUINT32-3, /* length invalid */ DVB_ENCODING_RESERVED = G_MAXUINT32-2, /* reserved by spec */ DVB_ENCODING_UNKNOWN = G_MAXUINT32-1, /* not defined by spec */ |