From cf3276b1fc60b2bd6419f54892f06e8a75352183 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Fri, 20 Dec 2013 14:58:43 +0000 Subject: [PATCH] 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 --- epan/dvb_chartbl.c | 57 ++++++++++++++++++---------------------------- epan/dvb_chartbl.h | 26 ++++++--------------- 2 files changed, 29 insertions(+), 54 deletions(-) diff --git a/epan/dvb_chartbl.c b/epan/dvb_chartbl.c index 2ced16203b..24de102025 100644 --- a/epan/dvb_chartbl.c +++ b/epan/dvb_chartbl.c @@ -40,6 +40,10 @@ static const value_string dvb_string_encoding_vals[] = { { DVB_ENCODING_LATIN, "Latin (default table)" }, + { DVB_ENCODING_ISO_8859_1, "ISO/IEC 8859-1 (West European)" }, + { DVB_ENCODING_ISO_8859_2, "ISO/IEC 8859-2 (East European)" }, + { DVB_ENCODING_ISO_8859_3, "ISO/IEC 8859-3 (South European)" }, + { DVB_ENCODING_ISO_8859_4, "ISO/IEC 8859-4 (North and North-East European)" }, { DVB_ENCODING_ISO_8859_5, "ISO/IEC 8859-5 (Latin/Cyrillic)" }, { DVB_ENCODING_ISO_8859_6, "ISO/IEC 8859-6 (Latin/Arabic)" }, { DVB_ENCODING_ISO_8859_7, "ISO/IEC 8859-7 (Latin/Greek)" }, @@ -51,21 +55,6 @@ static const value_string dvb_string_encoding_vals[] = { { DVB_ENCODING_ISO_8859_14, "ISO/IEC 8859-14 (Celtic)" }, { DVB_ENCODING_ISO_8859_15, "ISO/IEC 8859-15 (West European)" }, - { DVB_ENCODING_EXT_ISO_8859_1, "ISO/IEC 8859-1 (West European)" }, - { DVB_ENCODING_EXT_ISO_8859_2, "ISO/IEC 8859-2 (East European)" }, - { DVB_ENCODING_EXT_ISO_8859_3, "ISO/IEC 8859-3 (South European)" }, - { DVB_ENCODING_EXT_ISO_8859_4, "ISO/IEC 8859-4 (North and North-East European)" }, - { DVB_ENCODING_EXT_ISO_8859_5, "ISO/IEC 8859-5 (Latin/Cyrillic)" }, - { DVB_ENCODING_EXT_ISO_8859_6, "ISO/IEC 8859-6 (Latin/Arabic)" }, - { DVB_ENCODING_EXT_ISO_8859_7, "ISO/IEC 8859-7 (Latin/Greek)" }, - { DVB_ENCODING_EXT_ISO_8859_8, "ISO/IEC 8859-8 (Latin/Hebrew)" }, - { DVB_ENCODING_EXT_ISO_8859_9, "ISO/IEC 8859-9 (West European & Turkish)" }, - { DVB_ENCODING_EXT_ISO_8859_10, "ISO/IEC 8859-10 (North European)" }, - { DVB_ENCODING_EXT_ISO_8859_11, "ISO/IEC 8859-11 (Thai)" }, - { DVB_ENCODING_EXT_ISO_8859_13, "ISO/IEC 8859-13 (Baltic)" }, - { DVB_ENCODING_EXT_ISO_8859_14, "ISO/IEC 8859-14 (Celtic)" }, - { DVB_ENCODING_EXT_ISO_8859_15, "ISO/IEC 8859-15 (West European)" }, - { 0, NULL } }; @@ -90,11 +79,11 @@ dvb_analyze_string_charset0(guint8 byte0) return DVB_ENCODING_ISO_8859_11; case 0x08: return DVB_ENCODING_RESERVED; /* was reserved for ISO-8859-12 */ - case 0x09: /* 0x09 */ + case 0x09: return DVB_ENCODING_ISO_8859_13; - case 0x0A: /* 0x0A */ + case 0x0A: return DVB_ENCODING_ISO_8859_14; - case 0x0B: /* 0x0B */ + case 0x0B: return DVB_ENCODING_ISO_8859_15; /* XXX 0x11 ... 0x15 */ @@ -112,35 +101,35 @@ dvb_analyze_string_charset0_10(guint16 byte12) case 0x0000: return DVB_ENCODING_RESERVED; case 0x0001: - return DVB_ENCODING_EXT_ISO_8859_1; + return DVB_ENCODING_ISO_8859_1; case 0x0002: - return DVB_ENCODING_EXT_ISO_8859_2; + return DVB_ENCODING_ISO_8859_2; case 0x0003: - return DVB_ENCODING_EXT_ISO_8859_3; + return DVB_ENCODING_ISO_8859_3; case 0x0004: - return DVB_ENCODING_EXT_ISO_8859_4; + return DVB_ENCODING_ISO_8859_4; case 0x0005: - return DVB_ENCODING_EXT_ISO_8859_5; + return DVB_ENCODING_ISO_8859_5; case 0x0006: - return DVB_ENCODING_EXT_ISO_8859_6; + return DVB_ENCODING_ISO_8859_6; case 0x0007: - return DVB_ENCODING_EXT_ISO_8859_7; + return DVB_ENCODING_ISO_8859_7; case 0x0008: - return DVB_ENCODING_EXT_ISO_8859_8; + return DVB_ENCODING_ISO_8859_8; case 0x0009: - return DVB_ENCODING_EXT_ISO_8859_9; + return DVB_ENCODING_ISO_8859_9; case 0x000A: - return DVB_ENCODING_EXT_ISO_8859_10; + return DVB_ENCODING_ISO_8859_10; case 0x000B: - return DVB_ENCODING_EXT_ISO_8859_11; + return DVB_ENCODING_ISO_8859_11; case 0x000C: return DVB_ENCODING_RESERVED; case 0x000D: - return DVB_ENCODING_EXT_ISO_8859_13; + return DVB_ENCODING_ISO_8859_13; case 0x000E: - return DVB_ENCODING_EXT_ISO_8859_14; + return DVB_ENCODING_ISO_8859_14; case 0x000F: - return DVB_ENCODING_EXT_ISO_8859_15; + return DVB_ENCODING_ISO_8859_15; default: /* 0x10 XX XX */ return DVB_ENCODING_UNKNOWN; @@ -225,15 +214,13 @@ dvb_enc_to_item_enc(dvb_encoding_e encoding) e.g. 0x86 - turn emphasis on ; 0x87 - turn emphasis off */ switch (encoding) { - case DVB_ENCODING_EXT_ISO_8859_2: + case DVB_ENCODING_ISO_8859_2: return ENC_ISO_8859_2 | ENC_NA; case DVB_ENCODING_ISO_8859_5: - case DVB_ENCODING_EXT_ISO_8859_5: return ENC_ISO_8859_5 | ENC_NA; case DVB_ENCODING_ISO_8859_9: - case DVB_ENCODING_EXT_ISO_8859_9: return ENC_ISO_8859_9 | ENC_NA; default: /* not supported */ 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 */