From aed7826c8f77b0e7f24fa6006ac20f742740a67d Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 27 Nov 2019 11:19:05 +0000 Subject: [PATCH] trivial: Properly namespace the defines in the exported header --- libfwupdplugin/fu-usb-device.h | 12 +++++------ plugins/csr/fu-csr-device.c | 20 +++++++++---------- plugins/dell-dock/fu-dell-dock-hid.c | 4 ++-- .../fu-logitech-hidpp-bootloader.c | 2 +- plugins/rts54hid/fu-rts54hid-common.h | 2 +- plugins/rts54hid/fu-rts54hid-device.c | 16 +++++++-------- plugins/rts54hid/fu-rts54hid-module.c | 4 ++-- .../fu-synaptics-cxaudio-device.c | 8 ++++---- plugins/wacom-usb/fu-wac-device.c | 8 ++++---- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/libfwupdplugin/fu-usb-device.h b/libfwupdplugin/fu-usb-device.h index a5a738afe..6f3dc09ef 100644 --- a/libfwupdplugin/fu-usb-device.h +++ b/libfwupdplugin/fu-usb-device.h @@ -16,14 +16,14 @@ G_DECLARE_DERIVABLE_TYPE (FuUsbDevice, fu_usb_device, FU, USB_DEVICE, FuDevice) /* HID */ -#define HID_REPORT_GET 0x01 -#define HID_REPORT_SET 0x09 +#define FU_HID_REPORT_GET 0x01 +#define FU_HID_REPORT_SET 0x09 -#define HID_REPORT_TYPE_INPUT 0x01 -#define HID_REPORT_TYPE_OUTPUT 0x02 -#define HID_REPORT_TYPE_FEATURE 0x03 +#define FU_HID_REPORT_TYPE_INPUT 0x01 +#define FU_HID_REPORT_TYPE_OUTPUT 0x02 +#define FU_HID_REPORT_TYPE_FEATURE 0x03 -#define HID_FEATURE 0x0300 +#define FU_HID_FEATURE 0x0300 struct _FuUsbDeviceClass { diff --git a/plugins/csr/fu-csr-device.c b/plugins/csr/fu-csr-device.c index 4d9ac5cbf..ea76a062f 100644 --- a/plugins/csr/fu-csr-device.c +++ b/plugins/csr/fu-csr-device.c @@ -80,8 +80,8 @@ fu_csr_device_attach (FuDevice *device, GError **error) G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_SET, /* bRequest */ - HID_FEATURE | FU_CSR_REPORT_ID_CONTROL, /* wValue */ + FU_HID_REPORT_SET, /* bRequest */ + FU_HID_FEATURE | FU_CSR_REPORT_ID_CONTROL, /* wValue */ 0x0000, /* wIndex */ buf, sizeof(buf), &sz, FU_CSR_DEVICE_TIMEOUT, /* timeout */ @@ -115,8 +115,8 @@ fu_csr_device_get_status (FuCsrDevice *self, GError **error) G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_GET, /* bRequest */ - HID_FEATURE | FU_CSR_REPORT_ID_STATUS, /* wValue */ + FU_HID_REPORT_GET, /* bRequest */ + FU_HID_FEATURE | FU_CSR_REPORT_ID_STATUS, /* wValue */ 0x0000, /* wIndex */ buf, sizeof(buf), &sz, FU_CSR_DEVICE_TIMEOUT, @@ -175,8 +175,8 @@ fu_csr_device_clear_status (FuCsrDevice *self, GError **error) G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_SET, /* bRequest */ - HID_FEATURE | FU_CSR_REPORT_ID_CONTROL, /* wValue */ + FU_HID_REPORT_SET, /* bRequest */ + FU_HID_FEATURE | FU_CSR_REPORT_ID_CONTROL, /* wValue */ 0x0000, /* wIndex */ buf, sizeof(buf), &sz, FU_CSR_DEVICE_TIMEOUT, @@ -212,8 +212,8 @@ fu_csr_device_upload_chunk (FuCsrDevice *self, GError **error) G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_GET, /* bRequest */ - HID_FEATURE | FU_CSR_REPORT_ID_COMMAND, /* wValue */ + FU_HID_REPORT_GET, /* bRequest */ + FU_HID_FEATURE | FU_CSR_REPORT_ID_COMMAND, /* wValue */ 0x0000, /* wIndex */ buf, sizeof(buf), &sz, FU_CSR_DEVICE_TIMEOUT, @@ -365,8 +365,8 @@ fu_csr_device_download_chunk (FuCsrDevice *self, guint16 idx, GBytes *chunk, GEr G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_SET, /* bRequest */ - HID_FEATURE | FU_CSR_REPORT_ID_COMMAND, /* wValue */ + FU_HID_REPORT_SET, /* bRequest */ + FU_HID_FEATURE | FU_CSR_REPORT_ID_COMMAND, /* wValue */ 0x0000, /* wIndex */ buf, sizeof(buf), diff --git a/plugins/dell-dock/fu-dell-dock-hid.c b/plugins/dell-dock/fu-dell-dock-hid.c index 214069b9f..267b3725d 100644 --- a/plugins/dell-dock/fu-dell-dock-hid.c +++ b/plugins/dell-dock/fu-dell-dock-hid.c @@ -89,7 +89,7 @@ fu_dell_dock_hid_set_report (FuDevice *self, ret = g_usb_device_control_transfer ( usb_device, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, - G_USB_DEVICE_RECIPIENT_INTERFACE, HID_REPORT_SET, 0x0200, + G_USB_DEVICE_RECIPIENT_INTERFACE, FU_HID_REPORT_SET, 0x0200, 0x0000, outbuffer, 192, &actual_len, HIDI2C_TRANSACTION_TIMEOUT, NULL, &error_local); if (ret) @@ -129,7 +129,7 @@ fu_dell_dock_hid_get_report (FuDevice *self, ret = g_usb_device_control_transfer ( usb_device, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_REQUEST_TYPE_CLASS, - G_USB_DEVICE_RECIPIENT_INTERFACE, HID_REPORT_GET, 0x0100, + G_USB_DEVICE_RECIPIENT_INTERFACE, FU_HID_REPORT_GET, 0x0100, 0x0000, inbuffer, 192, &actual_len, HIDI2C_TRANSACTION_TIMEOUT, NULL, &error_local); if (ret) diff --git a/plugins/logitech-hidpp/fu-logitech-hidpp-bootloader.c b/plugins/logitech-hidpp/fu-logitech-hidpp-bootloader.c index 11a33bcf7..1fed336fe 100644 --- a/plugins/logitech-hidpp/fu-logitech-hidpp-bootloader.c +++ b/plugins/logitech-hidpp/fu-logitech-hidpp-bootloader.c @@ -346,7 +346,7 @@ fu_logitech_hidpp_bootloader_request (FuLogitechHidPpBootloader *self, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_SET, + FU_HID_REPORT_SET, 0x0200, 0x0000, buf_request, sizeof (buf_request), diff --git a/plugins/rts54hid/fu-rts54hid-common.h b/plugins/rts54hid/fu-rts54hid-common.h index 069b0c301..d62e7d26a 100644 --- a/plugins/rts54hid/fu-rts54hid-common.h +++ b/plugins/rts54hid/fu-rts54hid-common.h @@ -9,7 +9,7 @@ #pragma once #define FU_RTS54HID_TRANSFER_BLOCK_SIZE 0x80 -#define FU_RTS54HID_REPORT_LENGTH 0xc0 +#define FU_RTS54FU_HID_REPORT_LENGTH 0xc0 /* [vendor-cmd:64] [data-payload:128] */ #define FU_RTS54HID_CMD_BUFFER_OFFSET_DATA 0x40 diff --git a/plugins/rts54hid/fu-rts54hid-device.c b/plugins/rts54hid/fu-rts54hid-device.c index 118bc7535..42563514b 100644 --- a/plugins/rts54hid/fu-rts54hid-device.c +++ b/plugins/rts54hid/fu-rts54hid-device.c @@ -41,7 +41,7 @@ fu_rts54hid_device_set_report (FuRts54HidDevice *self, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_SET, + FU_HID_REPORT_SET, 0x0200, 0x0000, buf, buf_sz, &actual_len, @@ -69,7 +69,7 @@ fu_rts54hid_device_get_report (FuRts54HidDevice *self, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_GET, + FU_HID_REPORT_GET, 0x0100, 0x0000, buf, buf_sz, &actual_len, /* actual length */ @@ -99,7 +99,7 @@ fu_rts54hid_device_set_clock_mode (FuRts54HidDevice *self, gboolean enable, GErr .bufferlen = 0, .parameters = 0, }; - guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; + guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 }; memcpy (buf, &cmd_buffer, sizeof(cmd_buffer)); if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) { g_prefix_error (error, "failed to set clock-mode=%i: ", enable); @@ -118,7 +118,7 @@ fu_rts54hid_device_reset_to_flash (FuRts54HidDevice *self, GError **error) .bufferlen = 0, .parameters = 0, }; - guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; + guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 }; memcpy (buf, &cmd_buffer, sizeof(cmd_buffer)); if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) { g_prefix_error (error, "failed to soft reset: "); @@ -141,7 +141,7 @@ fu_rts54hid_device_write_flash (FuRts54HidDevice *self, .bufferlen = GUINT16_TO_LE (data_sz), .parameters = 0, }; - guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; + guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 }; g_return_val_if_fail (data_sz <= 128, FALSE); g_return_val_if_fail (data != NULL, FALSE); @@ -172,7 +172,7 @@ fu_rts54hid_device_verify_update_fw (FuRts54HidDevice *self, GError **error) .bufferlen = GUINT16_TO_LE (1), .parameters = 0, }; - guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; + guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 }; /* set then get */ memcpy (buf, &cmd_buffer, sizeof(cmd_buffer)); @@ -208,7 +208,7 @@ fu_rts54hid_device_erase_spare_bank (FuRts54HidDevice *self, GError **error) .bufferlen = 0, .parameters = 0, }; - guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; + guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 }; memcpy (buf, &cmd_buffer, sizeof(cmd_buffer)); if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) { g_prefix_error (error, "failed to erase spare bank: "); @@ -230,7 +230,7 @@ fu_rts54hid_device_ensure_status (FuRts54HidDevice *self, GError **error) .bufferlen = GUINT16_TO_LE (32), .parameters = 0, }; - guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; + guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 }; g_autofree gchar *version = NULL; /* set then get */ diff --git a/plugins/rts54hid/fu-rts54hid-module.c b/plugins/rts54hid/fu-rts54hid-module.c index 6d8606ac5..c761e7b09 100644 --- a/plugins/rts54hid/fu-rts54hid-module.c +++ b/plugins/rts54hid/fu-rts54hid-module.c @@ -61,7 +61,7 @@ fu_rts54hid_module_i2c_write (FuRts54HidModule *self, .data_sz = self->register_addr_len, .speed = self->i2c_speed | 0x80}, }; - guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; + guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 }; g_return_val_if_fail (data_sz <= 128, FALSE); g_return_val_if_fail (data != NULL, FALSE); @@ -101,7 +101,7 @@ fu_rts54hid_module_i2c_read (FuRts54HidModule *self, .data_sz = self->register_addr_len, .speed = self->i2c_speed | 0x80}, }; - guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; + guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 }; g_return_val_if_fail (data_sz <= 192, FALSE); g_return_val_if_fail (data != NULL, FALSE); diff --git a/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.c b/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.c index 7b2839e5b..9823fc97c 100644 --- a/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.c +++ b/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.c @@ -94,8 +94,8 @@ fu_synaptics_cxaudio_device_output_report (FuSynapticsCxaudioDevice *self, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_SET, - (HID_REPORT_TYPE_OUTPUT << 8) | report_number, + FU_HID_REPORT_SET, + (FU_HID_REPORT_TYPE_OUTPUT << 8) | report_number, FU_SYNAPTICS_CXAUDIO_HID_INTERFACE, buf, bufsz, &actual_length, FU_SYNAPTICS_CXAUDIO_USB_TIMEOUT, NULL, error)) { @@ -132,8 +132,8 @@ fu_synaptics_cxaudio_device_input_report (FuSynapticsCxaudioDevice *self, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_GET, - (HID_REPORT_TYPE_INPUT << 8) | ReportID, + FU_HID_REPORT_GET, + (FU_HID_REPORT_TYPE_INPUT << 8) | ReportID, FU_SYNAPTICS_CXAUDIO_HID_INTERFACE, buf, bufsz, &actual_length, FU_SYNAPTICS_CXAUDIO_USB_TIMEOUT, NULL, error)) { diff --git a/plugins/wacom-usb/fu-wac-device.c b/plugins/wacom-usb/fu-wac-device.c index 29ad61bfd..50b6e6fc6 100644 --- a/plugins/wacom-usb/fu-wac-device.c +++ b/plugins/wacom-usb/fu-wac-device.c @@ -149,8 +149,8 @@ fu_wac_device_get_feature_report (FuWacDevice *self, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_GET, /* bRequest */ - HID_FEATURE | cmd, /* wValue */ + FU_HID_REPORT_GET, /* bRequest */ + FU_HID_FEATURE | cmd, /* wValue */ 0x0000, /* wIndex */ buf, bufsz, &sz, FU_WAC_DEVICE_TIMEOUT, @@ -200,8 +200,8 @@ fu_wac_device_set_feature_report (FuWacDevice *self, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, - HID_REPORT_SET, /* bRequest */ - HID_FEATURE | cmd, /* wValue */ + FU_HID_REPORT_SET, /* bRequest */ + FU_HID_FEATURE | cmd, /* wValue */ 0x0000, /* wIndex */ buf, bufsz, &sz, FU_WAC_DEVICE_TIMEOUT,