Commit 2a2fc11d authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

winebus.sys: Remove the now useless device_compare callback.

parent 421a6f53
...@@ -161,16 +161,6 @@ static void iohid_device_destroy(struct unix_device *iface) ...@@ -161,16 +161,6 @@ static void iohid_device_destroy(struct unix_device *iface)
{ {
} }
static int iohid_device_compare(struct unix_device *iface, void *context)
{
struct platform_private *private = impl_from_unix_device(iface);
IOHIDDeviceRef dev2 = (IOHIDDeviceRef)context;
if (private->device != dev2)
return 1;
else
return 0;
}
static NTSTATUS iohid_device_start(struct unix_device *iface) static NTSTATUS iohid_device_start(struct unix_device *iface)
{ {
DWORD length; DWORD length;
...@@ -273,7 +263,6 @@ static void iohid_device_set_feature_report(struct unix_device *iface, HID_XFER_ ...@@ -273,7 +263,6 @@ static void iohid_device_set_feature_report(struct unix_device *iface, HID_XFER_
static const struct unix_device_vtbl iohid_device_vtbl = static const struct unix_device_vtbl iohid_device_vtbl =
{ {
iohid_device_destroy, iohid_device_destroy,
iohid_device_compare,
iohid_device_start, iohid_device_start,
iohid_device_stop, iohid_device_stop,
iohid_device_get_report_descriptor, iohid_device_get_report_descriptor,
......
...@@ -497,11 +497,6 @@ static void sdl_device_destroy(struct unix_device *iface) ...@@ -497,11 +497,6 @@ static void sdl_device_destroy(struct unix_device *iface)
{ {
} }
static int sdl_device_compare(struct unix_device *iface, void *context)
{
return impl_from_unix_device(iface)->id - PtrToUlong(context);
}
static NTSTATUS sdl_device_start(struct unix_device *iface) static NTSTATUS sdl_device_start(struct unix_device *iface)
{ {
struct platform_private *ext = impl_from_unix_device(iface); struct platform_private *ext = impl_from_unix_device(iface);
...@@ -596,7 +591,6 @@ static void sdl_device_set_feature_report(struct unix_device *iface, HID_XFER_PA ...@@ -596,7 +591,6 @@ static void sdl_device_set_feature_report(struct unix_device *iface, HID_XFER_PA
static const struct unix_device_vtbl sdl_device_vtbl = static const struct unix_device_vtbl sdl_device_vtbl =
{ {
sdl_device_destroy, sdl_device_destroy,
sdl_device_compare,
sdl_device_start, sdl_device_start,
sdl_device_stop, sdl_device_stop,
sdl_device_get_reportdescriptor, sdl_device_get_reportdescriptor,
......
...@@ -619,13 +619,6 @@ static void hidraw_device_destroy(struct unix_device *iface) ...@@ -619,13 +619,6 @@ static void hidraw_device_destroy(struct unix_device *iface)
udev_device_unref(private->udev_device); udev_device_unref(private->udev_device);
} }
static int udev_device_compare(struct unix_device *iface, void *platform_dev)
{
struct udev_device *dev1 = impl_from_unix_device(iface)->udev_device;
struct udev_device *dev2 = platform_dev;
return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2));
}
static NTSTATUS hidraw_device_start(struct unix_device *iface) static NTSTATUS hidraw_device_start(struct unix_device *iface)
{ {
EnterCriticalSection(&udev_cs); EnterCriticalSection(&udev_cs);
...@@ -796,7 +789,6 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER ...@@ -796,7 +789,6 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER
static const struct unix_device_vtbl hidraw_device_vtbl = static const struct unix_device_vtbl hidraw_device_vtbl =
{ {
hidraw_device_destroy, hidraw_device_destroy,
udev_device_compare,
hidraw_device_start, hidraw_device_start,
hidraw_device_stop, hidraw_device_stop,
hidraw_device_get_report_descriptor, hidraw_device_get_report_descriptor,
...@@ -898,7 +890,6 @@ static void lnxev_device_set_feature_report(struct unix_device *iface, HID_XFER_ ...@@ -898,7 +890,6 @@ static void lnxev_device_set_feature_report(struct unix_device *iface, HID_XFER_
static const struct unix_device_vtbl lnxev_device_vtbl = static const struct unix_device_vtbl lnxev_device_vtbl =
{ {
lnxev_device_destroy, lnxev_device_destroy,
udev_device_compare,
lnxev_device_start, lnxev_device_start,
lnxev_device_stop, lnxev_device_stop,
lnxev_device_get_report_descriptor, lnxev_device_get_report_descriptor,
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
struct unix_device_vtbl struct unix_device_vtbl
{ {
void (*destroy)(struct unix_device *iface); void (*destroy)(struct unix_device *iface);
int (*compare)(struct unix_device *iface, void *platform_dev);
NTSTATUS (*start)(struct unix_device *iface); NTSTATUS (*start)(struct unix_device *iface);
void (*stop)(struct unix_device *iface); void (*stop)(struct unix_device *iface);
NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length); NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length);
......
...@@ -51,11 +51,6 @@ static void mouse_destroy(struct unix_device *iface) ...@@ -51,11 +51,6 @@ static void mouse_destroy(struct unix_device *iface)
hid_descriptor_free(&impl->desc); hid_descriptor_free(&impl->desc);
} }
static int mouse_compare(struct unix_device *iface, void *context)
{
return 0;
}
static NTSTATUS mouse_start(struct unix_device *iface) static NTSTATUS mouse_start(struct unix_device *iface)
{ {
struct mouse_device *impl = mouse_from_unix_device(iface); struct mouse_device *impl = mouse_from_unix_device(iface);
...@@ -111,7 +106,6 @@ static void mouse_set_feature_report(struct unix_device *iface, HID_XFER_PACKET ...@@ -111,7 +106,6 @@ static void mouse_set_feature_report(struct unix_device *iface, HID_XFER_PACKET
static const struct unix_device_vtbl mouse_vtbl = static const struct unix_device_vtbl mouse_vtbl =
{ {
mouse_destroy, mouse_destroy,
mouse_compare,
mouse_start, mouse_start,
mouse_stop, mouse_stop,
mouse_get_report_descriptor, mouse_get_report_descriptor,
...@@ -155,11 +149,6 @@ static void keyboard_destroy(struct unix_device *iface) ...@@ -155,11 +149,6 @@ static void keyboard_destroy(struct unix_device *iface)
hid_descriptor_free(&impl->desc); hid_descriptor_free(&impl->desc);
} }
static int keyboard_compare(struct unix_device *iface, void *context)
{
return 0;
}
static NTSTATUS keyboard_start(struct unix_device *iface) static NTSTATUS keyboard_start(struct unix_device *iface)
{ {
struct keyboard_device *impl = keyboard_from_unix_device(iface); struct keyboard_device *impl = keyboard_from_unix_device(iface);
...@@ -215,7 +204,6 @@ static void keyboard_set_feature_report(struct unix_device *iface, HID_XFER_PACK ...@@ -215,7 +204,6 @@ static void keyboard_set_feature_report(struct unix_device *iface, HID_XFER_PACK
static const struct unix_device_vtbl keyboard_vtbl = static const struct unix_device_vtbl keyboard_vtbl =
{ {
keyboard_destroy, keyboard_destroy,
keyboard_compare,
keyboard_start, keyboard_start,
keyboard_stop, keyboard_stop,
keyboard_get_report_descriptor, keyboard_get_report_descriptor,
...@@ -275,13 +263,6 @@ static NTSTATUS unix_device_remove(void *args) ...@@ -275,13 +263,6 @@ static NTSTATUS unix_device_remove(void *args)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static NTSTATUS unix_device_compare(void *args)
{
struct device_compare_params *params = args;
struct unix_device *iface = params->iface;
return iface->vtbl->compare(iface, params->context);
}
static NTSTATUS unix_device_start(void *args) static NTSTATUS unix_device_start(void *args)
{ {
struct unix_device *iface = args; struct unix_device *iface = args;
...@@ -333,7 +314,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ...@@ -333,7 +314,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
mouse_device_create, mouse_device_create,
keyboard_device_create, keyboard_device_create,
unix_device_remove, unix_device_remove,
unix_device_compare,
unix_device_start, unix_device_start,
unix_device_get_report_descriptor, unix_device_get_report_descriptor,
unix_device_set_output_report, unix_device_set_output_report,
......
...@@ -98,12 +98,6 @@ struct device_create_params ...@@ -98,12 +98,6 @@ struct device_create_params
struct unix_device *device; struct unix_device *device;
}; };
struct device_compare_params
{
struct unix_device *iface;
void *context;
};
struct device_descriptor_params struct device_descriptor_params
{ {
struct unix_device *iface; struct unix_device *iface;
...@@ -133,7 +127,6 @@ enum unix_funcs ...@@ -133,7 +127,6 @@ enum unix_funcs
mouse_create, mouse_create,
keyboard_create, keyboard_create,
device_remove, device_remove,
device_compare,
device_start, device_start,
device_get_report_descriptor, device_get_report_descriptor,
device_set_output_report, device_set_output_report,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment