proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-11 16:04:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Properly namespace the defines in the exported header

Browse Source
This commit is contained in:
Richard Hughes 2019-11-27 11:19:05 +00:00
parent 11503c23ee
commit aed7826c8f
9 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfwupdplugin/fu-usb-device.h
View File

@ -16,14 +16,14 @@
G_DECLARE_DERIVABLE_TYPE (FuUsbDevice, fu_usb_device, FU, USB_DEVICE, FuDevice) G_DECLARE_DERIVABLE_TYPE (FuUsbDevice, fu_usb_device, FU, USB_DEVICE, FuDevice)
/* HID */ /* HID */
#define HID_REPORT_GET 0x01 #define FU_HID_REPORT_GET 0x01
#define HID_REPORT_SET 0x09 #define FU_HID_REPORT_SET 0x09
#define HID_REPORT_TYPE_INPUT 0x01 #define FU_HID_REPORT_TYPE_INPUT 0x01
#define HID_REPORT_TYPE_OUTPUT 0x02 #define FU_HID_REPORT_TYPE_OUTPUT 0x02
#define HID_REPORT_TYPE_FEATURE 0x03 #define FU_HID_REPORT_TYPE_FEATURE 0x03
#define HID_FEATURE 0x0300 #define FU_HID_FEATURE 0x0300
struct _FuUsbDeviceClass struct _FuUsbDeviceClass
{ {

20
plugins/csr/fu-csr-device.c
View File

@ -80,8 +80,8 @@ fu_csr_device_attach (FuDevice *device, GError **error)
G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_SET, /* bRequest */ FU_HID_REPORT_SET, /* bRequest */
HID_FEATURE | FU_CSR_REPORT_ID_CONTROL, /* wValue */ FU_HID_FEATURE | FU_CSR_REPORT_ID_CONTROL, /* wValue */
0x0000, /* wIndex */ 0x0000, /* wIndex */
buf, sizeof(buf), &sz, buf, sizeof(buf), &sz,
FU_CSR_DEVICE_TIMEOUT, /* timeout */ 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_DIRECTION_DEVICE_TO_HOST,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_GET, /* bRequest */ FU_HID_REPORT_GET, /* bRequest */
HID_FEATURE | FU_CSR_REPORT_ID_STATUS, /* wValue */ FU_HID_FEATURE | FU_CSR_REPORT_ID_STATUS, /* wValue */
0x0000, /* wIndex */ 0x0000, /* wIndex */
buf, sizeof(buf), &sz, buf, sizeof(buf), &sz,
FU_CSR_DEVICE_TIMEOUT, 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_DIRECTION_HOST_TO_DEVICE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_SET, /* bRequest */ FU_HID_REPORT_SET, /* bRequest */
HID_FEATURE | FU_CSR_REPORT_ID_CONTROL, /* wValue */ FU_HID_FEATURE | FU_CSR_REPORT_ID_CONTROL, /* wValue */
0x0000, /* wIndex */ 0x0000, /* wIndex */
buf, sizeof(buf), &sz, buf, sizeof(buf), &sz,
FU_CSR_DEVICE_TIMEOUT, 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_DIRECTION_DEVICE_TO_HOST,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_GET, /* bRequest */ FU_HID_REPORT_GET, /* bRequest */
HID_FEATURE | FU_CSR_REPORT_ID_COMMAND, /* wValue */ FU_HID_FEATURE | FU_CSR_REPORT_ID_COMMAND, /* wValue */
0x0000, /* wIndex */ 0x0000, /* wIndex */
buf, sizeof(buf), &sz, buf, sizeof(buf), &sz,
FU_CSR_DEVICE_TIMEOUT, 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_DIRECTION_HOST_TO_DEVICE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_SET, /* bRequest */ FU_HID_REPORT_SET, /* bRequest */
HID_FEATURE | FU_CSR_REPORT_ID_COMMAND, /* wValue */ FU_HID_FEATURE | FU_CSR_REPORT_ID_COMMAND, /* wValue */
0x0000, /* wIndex */ 0x0000, /* wIndex */
buf, buf,
sizeof(buf), sizeof(buf),

4
plugins/dell-dock/fu-dell-dock-hid.c
View File

@ -89,7 +89,7 @@ fu_dell_dock_hid_set_report (FuDevice *self,
ret = g_usb_device_control_transfer ( ret = g_usb_device_control_transfer (
usb_device, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, usb_device, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, 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, 0x0000, outbuffer, 192, &actual_len,
HIDI2C_TRANSACTION_TIMEOUT, NULL, &error_local); HIDI2C_TRANSACTION_TIMEOUT, NULL, &error_local);
if (ret) if (ret)
@ -129,7 +129,7 @@ fu_dell_dock_hid_get_report (FuDevice *self,
ret = g_usb_device_control_transfer ( ret = g_usb_device_control_transfer (
usb_device, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, usb_device, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
G_USB_DEVICE_REQUEST_TYPE_CLASS, 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, 0x0000, inbuffer, 192, &actual_len,
HIDI2C_TRANSACTION_TIMEOUT, NULL, &error_local); HIDI2C_TRANSACTION_TIMEOUT, NULL, &error_local);
if (ret) if (ret)

2
plugins/logitech-hidpp/fu-logitech-hidpp-bootloader.c
View File

@ -346,7 +346,7 @@ fu_logitech_hidpp_bootloader_request (FuLogitechHidPpBootloader *self,
G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_SET, FU_HID_REPORT_SET,
0x0200, 0x0000, 0x0200, 0x0000,
buf_request, buf_request,
sizeof (buf_request), sizeof (buf_request),

2
plugins/rts54hid/fu-rts54hid-common.h
View File

@ -9,7 +9,7 @@
#pragma once #pragma once
#define FU_RTS54HID_TRANSFER_BLOCK_SIZE 0x80 #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] */ /* [vendor-cmd:64] [data-payload:128] */
#define FU_RTS54HID_CMD_BUFFER_OFFSET_DATA 0x40 #define FU_RTS54HID_CMD_BUFFER_OFFSET_DATA 0x40

16
plugins/rts54hid/fu-rts54hid-device.c
View File

@ -41,7 +41,7 @@ fu_rts54hid_device_set_report (FuRts54HidDevice *self,
G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_SET, FU_HID_REPORT_SET,
0x0200, 0x0000, 0x0200, 0x0000,
buf, buf_sz, buf, buf_sz,
&actual_len, &actual_len,
@ -69,7 +69,7 @@ fu_rts54hid_device_get_report (FuRts54HidDevice *self,
G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_GET, FU_HID_REPORT_GET,
0x0100, 0x0000, 0x0100, 0x0000,
buf, buf_sz, buf, buf_sz,
&actual_len, /* actual length */ &actual_len, /* actual length */
@ -99,7 +99,7 @@ fu_rts54hid_device_set_clock_mode (FuRts54HidDevice *self, gboolean enable, GErr
.bufferlen = 0, .bufferlen = 0,
.parameters = 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)); memcpy (buf, &cmd_buffer, sizeof(cmd_buffer));
if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) { if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) {
g_prefix_error (error, "failed to set clock-mode=%i: ", enable); 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, .bufferlen = 0,
.parameters = 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)); memcpy (buf, &cmd_buffer, sizeof(cmd_buffer));
if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) { if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) {
g_prefix_error (error, "failed to soft reset: "); 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), .bufferlen = GUINT16_TO_LE (data_sz),
.parameters = 0, .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_sz <= 128, FALSE);
g_return_val_if_fail (data != NULL, 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), .bufferlen = GUINT16_TO_LE (1),
.parameters = 0, .parameters = 0,
}; };
guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 };
/* set then get */ /* set then get */
memcpy (buf, &cmd_buffer, sizeof(cmd_buffer)); memcpy (buf, &cmd_buffer, sizeof(cmd_buffer));
@ -208,7 +208,7 @@ fu_rts54hid_device_erase_spare_bank (FuRts54HidDevice *self, GError **error)
.bufferlen = 0, .bufferlen = 0,
.parameters = 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)); memcpy (buf, &cmd_buffer, sizeof(cmd_buffer));
if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) { if (!fu_rts54hid_device_set_report (self, buf, sizeof(buf), error)) {
g_prefix_error (error, "failed to erase spare bank: "); 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), .bufferlen = GUINT16_TO_LE (32),
.parameters = 0, .parameters = 0,
}; };
guint8 buf[FU_RTS54HID_REPORT_LENGTH] = { 0 }; guint8 buf[FU_RTS54FU_HID_REPORT_LENGTH] = { 0 };
g_autofree gchar *version = NULL; g_autofree gchar *version = NULL;
/* set then get */ /* set then get */

4
plugins/rts54hid/fu-rts54hid-module.c
View File

@ -61,7 +61,7 @@ fu_rts54hid_module_i2c_write (FuRts54HidModule *self,
.data_sz = self->register_addr_len, .data_sz = self->register_addr_len,
.speed = self->i2c_speed | 0x80}, .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_sz <= 128, FALSE);
g_return_val_if_fail (data != NULL, 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, .data_sz = self->register_addr_len,
.speed = self->i2c_speed | 0x80}, .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_sz <= 192, FALSE);
g_return_val_if_fail (data != NULL, FALSE); g_return_val_if_fail (data != NULL, FALSE);

8
plugins/synaptics-cxaudio/fu-synaptics-cxaudio-device.c
View File

@ -94,8 +94,8 @@ fu_synaptics_cxaudio_device_output_report (FuSynapticsCxaudioDevice *self,
G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_SET, FU_HID_REPORT_SET,
(HID_REPORT_TYPE_OUTPUT << 8) | report_number, (FU_HID_REPORT_TYPE_OUTPUT << 8) | report_number,
FU_SYNAPTICS_CXAUDIO_HID_INTERFACE, FU_SYNAPTICS_CXAUDIO_HID_INTERFACE,
buf, bufsz, &actual_length, buf, bufsz, &actual_length,
FU_SYNAPTICS_CXAUDIO_USB_TIMEOUT, NULL, error)) { 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_DIRECTION_DEVICE_TO_HOST,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_GET, FU_HID_REPORT_GET,
(HID_REPORT_TYPE_INPUT << 8) | ReportID, (FU_HID_REPORT_TYPE_INPUT << 8) | ReportID,
FU_SYNAPTICS_CXAUDIO_HID_INTERFACE, FU_SYNAPTICS_CXAUDIO_HID_INTERFACE,
buf, bufsz, &actual_length, buf, bufsz, &actual_length,
FU_SYNAPTICS_CXAUDIO_USB_TIMEOUT, NULL, error)) { FU_SYNAPTICS_CXAUDIO_USB_TIMEOUT, NULL, error)) {

8
plugins/wacom-usb/fu-wac-device.c
View File

@ -149,8 +149,8 @@ fu_wac_device_get_feature_report (FuWacDevice *self,
G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_GET, /* bRequest */ FU_HID_REPORT_GET, /* bRequest */
HID_FEATURE | cmd, /* wValue */ FU_HID_FEATURE | cmd, /* wValue */
0x0000, /* wIndex */ 0x0000, /* wIndex */
buf, bufsz, &sz, buf, bufsz, &sz,
FU_WAC_DEVICE_TIMEOUT, 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_DIRECTION_HOST_TO_DEVICE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_REQUEST_TYPE_CLASS,
G_USB_DEVICE_RECIPIENT_INTERFACE, G_USB_DEVICE_RECIPIENT_INTERFACE,
HID_REPORT_SET, /* bRequest */ FU_HID_REPORT_SET, /* bRequest */
HID_FEATURE | cmd, /* wValue */ FU_HID_FEATURE | cmd, /* wValue */
0x0000, /* wIndex */ 0x0000, /* wIndex */
buf, bufsz, &sz, buf, bufsz, &sz,
FU_WAC_DEVICE_TIMEOUT, FU_WAC_DEVICE_TIMEOUT,