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-flexray.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-flexray.h')
| -rw-r--r-- | epan/dissectors/packet-flexray.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-flexray.h b/epan/dissectors/packet-flexray.h index 8c0d631d..9c91a6d5 100644 --- a/epan/dissectors/packet-flexray.h +++ b/epan/dissectors/packet-flexray.h @@ -12,10 +12,10 @@ /* Structure that gets passed between dissectors (containing of frame id, counter cycle and channel). */ typedef struct flexray_info { - guint16 id; - guint8 cc; - guint8 ch; - guint16 bus_id; + uint16_t id; + uint8_t cc; + uint8_t ch; + uint16_t bus_id; } flexray_info_t; #define FLEXRAY_ID_CYCLE_MASK 0x000000FF @@ -23,10 +23,10 @@ typedef struct flexray_info { #define FLEXRAY_ID_CHANNEL_MASK 0x0F000000 #define FLEXRAY_ID_BUS_ID_MASK 0xF0000000 -guint32 flexray_calc_flexrayid(guint16 bus_id, guint8 channel, guint16 frame_id, guint8 cycle); -guint32 flexray_flexrayinfo_to_flexrayid(flexray_info_t *flexray_info); -gboolean flexray_call_subdissectors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, flexray_info_t *flexray_info, const gboolean use_heuristics_first); -gboolean flexray_set_source_and_destination_columns(packet_info* pinfo, flexray_info_t *flexray_info); +uint32_t flexray_calc_flexrayid(uint16_t bus_id, uint8_t channel, uint16_t frame_id, uint8_t cycle); +uint32_t flexray_flexrayinfo_to_flexrayid(flexray_info_t *flexray_info); +bool flexray_call_subdissectors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, flexray_info_t *flexray_info, const bool use_heuristics_first); +bool flexray_set_source_and_destination_columns(packet_info* pinfo, flexray_info_t *flexray_info); #endif /* __PACKET_FLEXRAY_H__ */ |