diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-zbee.h | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-zbee.h')
| -rw-r--r-- | epan/dissectors/packet-zbee.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h index e40de7bb..9a81045a 100644 --- a/epan/dissectors/packet-zbee.h +++ b/epan/dissectors/packet-zbee.h @@ -1376,7 +1376,7 @@ #define ZBEE_MFG_POLY_CONTROL "Poly-Control APS" #define ZBEE_MFG_EASTFIELD_LIGHT "Eastfield Lighting Co., Ltd Shenzhen" #define ZBEE_MFG_IP_DATATEL "IP Datatel, Inc." -#define ZBEE_MFG_LUMI_UNITED_TECH "Lumi United Techology, Ltd Shenzhen" +#define ZBEE_MFG_LUMI_UNITED_TECH "Lumi United Technology, Ltd Shenzhen" #define ZBEE_MFG_SENGLED_OPTOELEC "Sengled Optoelectronics Corp" #define ZBEE_MFG_REMOTE_SOLUTION "Remote Solution Co., Ltd." #define ZBEE_MFG_ABB_GENWAY_XIAMEN "ABB Genway Xiamen Electrical Equipment Co., Ltd." @@ -1691,6 +1691,7 @@ #define ZBEE_PROTOABBREV_ZCL_SUB_GHZ "zbee_zcl_se.sub_ghz" #define ZBEE_PROTOABBREV_ZCL_SHADE_CONFIG "zbee_zcl_closures.shade_config" #define ZBEE_PROTOABBREV_ZCL_DOOR_LOCK "zbee_zcl_closures.door_lock" +#define ZBEE_PROTOABBREV_ZCL_WINDOW_COVERING "zbee_zcl_closures.window_covering" #define ZBEE_PROTOABBREV_ZCL_COLOR_CONTROL "zbee_zcl_lighting.color_ctrl" #define ZBEE_PROTOABBREV_ZCL_BALLAST_CONFIG "zbee_zcl_lighting.ballast_ctrl" #define ZBEE_PROTOABBREV_ZCL_TOUCHLINK "zbee_zcl_general.touchlink" @@ -1751,7 +1752,7 @@ /* Helper Functions */ /* Helper Functions */ -extern guint zbee_get_bit_field(guint input, guint mask); +extern unsigned zbee_get_bit_field(unsigned input, unsigned mask); #endif /* PACKET_ZBEE_H */ |