From e42f11d7a23be129a04c0be6647e76eb309ddfd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Fri, 24 Sep 2021 11:51:56 +0200 Subject: [PATCH] winebus.sys: Remove old vendor rumble report. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Bernon Signed-off-by: Alexandre Julliard --- dlls/winebus.sys/hid.c | 40 +-------------------------------- dlls/winebus.sys/unix_private.h | 1 - 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 2a02a660f03..0c8e85dfc5f 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -317,32 +317,6 @@ BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page BOOL hid_device_add_haptics(struct unix_device *iface) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; - const BYTE vendor_report = ++desc->next_report_id[HidP_Output]; - const BYTE vendor_template[] = - { - USAGE_PAGE(2, HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN), - COLLECTION(1, Report), - REPORT_ID(1, vendor_report), - /* padding */ - REPORT_COUNT(1, 0x02), - REPORT_SIZE(1, 0x08), - OUTPUT(1, Data|Var|Abs), - /* actuators */ - USAGE(1, 0x01), - LOGICAL_MINIMUM(1, 0x00), - LOGICAL_MAXIMUM(1, 0xff), - PHYSICAL_MINIMUM(1, 0x00), - PHYSICAL_MAXIMUM(1, 0xff), - REPORT_SIZE(1, 0x08), - REPORT_COUNT(1, 0x02), - OUTPUT(1, Data|Var|Abs), - /* padding */ - REPORT_COUNT(1, 0x02), - REPORT_SIZE(1, 0x08), - OUTPUT(1, Data|Var|Abs), - END_COLLECTION, - }; - const BYTE haptics_features_report = ++desc->next_report_id[HidP_Feature]; const BYTE haptics_waveform_report = ++desc->next_report_id[HidP_Output]; const BYTE haptics_template[] = @@ -409,8 +383,6 @@ BOOL hid_device_add_haptics(struct unix_device *iface) END_COLLECTION, }; - iface->hid_haptics.vendor_report = vendor_report; - iface->hid_haptics.features_report = haptics_features_report; iface->hid_haptics.waveform_report = haptics_waveform_report; iface->hid_haptics.features.waveform_list[0] = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; @@ -419,9 +391,6 @@ BOOL hid_device_add_haptics(struct unix_device *iface) iface->hid_haptics.features.duration_list[1] = 0; iface->hid_haptics.features.waveform_cutoff_time_ms = 1000; - if (!hid_report_descriptor_append(desc, vendor_template, sizeof(vendor_template))) - return FALSE; - return hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template)); } @@ -457,15 +426,8 @@ NTSTATUS hid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffe static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) { struct hid_haptics *haptics = &iface->hid_haptics; - if (packet->reportId == haptics->vendor_report) - { - WORD left = packet->reportBuffer[2] * 128; - WORD right = packet->reportBuffer[3] * 128; - io->Information = packet->reportBufferLen; - io->Status = iface->hid_vtbl->haptics_start(iface, -1, left, right); - } - else if (packet->reportId == haptics->waveform_report) + if (packet->reportId == haptics->waveform_report) { struct hid_haptics_waveform *waveform = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); struct hid_haptics_waveform *rumble = haptics->waveforms + HAPTICS_WAVEFORM_RUMBLE_INDEX; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 5da5ca58e7f..01638bf19fc 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -83,7 +83,6 @@ struct hid_haptics { struct hid_haptics_features features; struct hid_haptics_waveform waveforms[HAPTICS_WAVEFORM_LAST_INDEX + 1]; - BYTE vendor_report; BYTE features_report; BYTE waveform_report; };