diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2011-12-30 11:07:04 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2011-12-30 11:07:04 +0000 |
| commit | b524ad6f88eeb37c3938f8a3fe71ddf2ab4b46f2 (patch) | |
| tree | 13e1a83b6466b721306e8f5f352039de98a86291 /epan/dissectors/packet-zbee.h | |
| parent | 8acc256afe1746e821d6dca2836250cff77f9187 (diff) | |
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6698
Updates for newest profile identifier database, ZigBee 053298r19
Corrects error in Samsung manufacturer code in r18.
svn path=/trunk/; revision=40344
Diffstat (limited to 'epan/dissectors/packet-zbee.h')
| -rw-r--r-- | epan/dissectors/packet-zbee.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h index 5c601467bf..22acdd34f0 100644 --- a/epan/dissectors/packet-zbee.h +++ b/epan/dissectors/packet-zbee.h @@ -54,7 +54,7 @@ #define ZBEE_HAS_2007(x) ((x) >= ZBEE_VERSION_2007) /* ZigBee Application Profile IDs */ -/* Per: 053298r18, November 2011 */ +/* Per: 053298r19, December 2011 */ #define ZBEE_DEVICE_PROFILE 0x0000 #define ZBEE_PROFILE_IPM 0x0101 @@ -399,6 +399,9 @@ #define ZBEE_ZCL_FCF_CLUSTER_SPEC 0x01 /* Manufacturer Codes */ +/* Codes less than 0x1000 were issued for RF4CE */ +#define ZBEE_MFG_CODE_SAMSUNG 0x0003 +/**/ #define ZBEE_MFG_CODE_CIRRONET 0x1000 #define ZBEE_MFG_CODE_CHIPCON 0x1001 #define ZBEE_MFG_CODE_EMBER 0x1002 @@ -568,10 +571,7 @@ #define ZBEE_MFG_CODE_G4S_JUSTICE 0x10c6 /**/ #define ZBEE_MFG_CODE_ELECTROLUX 0x10c8 -/* We surmise this Samsung code, because it's - * listed as "0009" in r18, which is obviously - * wrong */ -#define ZBEE_MFG_CODE_SAMSUNG 0x10c9 +/**/ /**/ #define ZBEE_MFG_CODE_MAINSTREAM 0x10cc /**/ |