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-ftdi-ft.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-ftdi-ft.h')
| -rw-r--r-- | epan/dissectors/packet-ftdi-ft.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ftdi-ft.h b/epan/dissectors/packet-ftdi-ft.h index f5830c11..c6f29d1c 100644 --- a/epan/dissectors/packet-ftdi-ft.h +++ b/epan/dissectors/packet-ftdi-ft.h @@ -13,8 +13,6 @@ #ifndef __PACKET_FTDI_FT_H__ #define __PACKET_FTDI_FT_H__ -#include <glib.h> - typedef enum { FTDI_CHIP_UNKNOWN, FTDI_CHIP_FT8U232AM, @@ -36,11 +34,11 @@ typedef enum { } FTDI_INTERFACE; typedef struct _ftdi_mpsse_info_t { - guint32 bus_id; - guint32 device_address; + uint32_t bus_id; + uint32_t device_address; FTDI_CHIP chip; FTDI_INTERFACE iface; - gboolean mcu_mode; + bool mcu_mode; } ftdi_mpsse_info_t; #endif /* __PACKET_FTDI_FT_H__ */ |