diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-10-24 15:22:44 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-10-24 15:22:44 +0000 |
| commit | b1e852cf709bb12a9c9ab7ab644ad44f4ad0d6ef (patch) | |
| tree | 832c465309fc75ee99488fba577f28b775f18dcb /epan/dissectors/packet-zbee.h | |
| parent | 2ccfd848fe511fb8315d6049b9b11cf224cd13d3 (diff) | |
Back out 34627 and friends again.
svn path=/trunk/; revision=34633
Diffstat (limited to 'epan/dissectors/packet-zbee.h')
| -rw-r--r-- | epan/dissectors/packet-zbee.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h index e7aded465f..2e0f11af79 100644 --- a/epan/dissectors/packet-zbee.h +++ b/epan/dissectors/packet-zbee.h @@ -27,7 +27,7 @@ #define PACKET_ZBEE_H /* IEEE 802.15.4 definitions. */ -#include "packet-ieee802154.h" +#include <epan/dissectors/packet-ieee802154.h> /* The ZigBee Broadcast Address */ #define ZBEE_BCAST_ALL 0xffff @@ -576,12 +576,10 @@ #define ZBEE_MFG_KAGA "Kaga Electronics" #define ZBEE_MFG_4_NOKS "4-noks s.r.l." -/* Protocol Abbreviations */ -#define ZBEE_PROTOABBREV_NWK "zbee.nwk" -#define ZBEE_PROTOABBREV_APS "zbee.aps" -#define ZBEE_PROTOABBREV_APF "zbee.apf" - /* Helper Functions */ +extern proto_item *proto_tree_add_eui64(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, + gint length, gint64 value); extern guint zbee_get_bit_field(guint input, guint mask); #endif /* PACKET_ZBEE_H */ + |