diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-10 12:47:20 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-11 13:43:50 +0000 |
| commit | 0bab05723b3486cd199f6053450b6666cc099bb3 (patch) | |
| tree | eaf08caf38c5df5b51428bbbebcd5cbb623095bc /asn1 | |
| parent | 6fde7da633e0309b83dc945c1f24fb32553166a8 (diff) | |
NBAP: fix ‘lchId_rlc_map’ defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: I39ca2510d01a7ba3318dfcf9e380eab637994b08
Reviewed-on: https://code.wireshark.org/review/13880
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/nbap/packet-nbap-template.c | 22 | ||||
| -rw-r--r-- | asn1/nbap/packet-nbap-template.h | 19 |
2 files changed, 23 insertions, 18 deletions
diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 7838181e67..213005e686 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -238,6 +238,28 @@ guint8 lchId_type_table[]= { MAC_CONTENT_PS_DTCH, /* 14 Interactive PS => DTCH*/ MAC_CONTENT_CCCH /* This is CCCH? */ }; + +/* Mapping logicalchannel id to RLC_MODE */ +guint8 lchId_rlc_map[] = { + 0, + RLC_UM, /* Logical channel id = 1 is SRB1 which uses RLC_UM*/ + RLC_AM, + RLC_AM, + RLC_AM, + RLC_TM, /*5 to 7 Conv CS Speech*/ + RLC_TM, + RLC_TM, /*...*/ + RLC_AM, + RLC_AM, + RLC_AM, + RLC_AM, + RLC_AM, + RLC_AM, + RLC_AM, + RLC_AM, /* This is CCCH which is UM?, probably not */ +}; + + /* Preference variables */ /* Array with preference variables for easy looping, TODO: merge this with * lchId_type_table[] */ diff --git a/asn1/nbap/packet-nbap-template.h b/asn1/nbap/packet-nbap-template.h index a4fd456af8..b3cc1a74a2 100644 --- a/asn1/nbap/packet-nbap-template.h +++ b/asn1/nbap/packet-nbap-template.h @@ -35,24 +35,7 @@ extern guint8 lchId_type_table[]; /* Mapping logicalchannel id to RLC_MODE */ -static const guint8 lchId_rlc_map[] = { - 0, - RLC_UM, /* Logical channel id = 1 is SRB1 which uses RLC_UM*/ - RLC_AM, - RLC_AM, - RLC_AM, - RLC_TM, /*5 to 7 Conv CS Speech*/ - RLC_TM, - RLC_TM, /*...*/ - RLC_AM, - RLC_AM, - RLC_AM, - RLC_AM, - RLC_AM, - RLC_AM, - RLC_AM, - RLC_AM, /* This is CCCH which is UM?, probably not */ - }; +extern guint8 lchId_rlc_map[]; /* 1 to 8*/ static const guint8 hsdsch_macdflow_id_rlc_map[] = { |