From 413c56304c1f905880fdc970e14aa60ddff85aef Mon Sep 17 00:00:00 2001 From: Pavel Gurvich Date: Sun, 17 Aug 2014 10:58:39 +0300 Subject: [PATCH] UsbDk: Remove unused IOCTL RemoveRedirect Signed-off-by: Pavel Gurvich Signed-off-by: Dmitry Fleytman --- UsbDk/ControlDevice.cpp | 11 ----------- UsbDk/ControlDevice.h | 1 - UsbDk/Public.h | 4 +--- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/UsbDk/ControlDevice.cpp b/UsbDk/ControlDevice.cpp index e7ddb2f..fa95fd0 100644 --- a/UsbDk/ControlDevice.cpp +++ b/UsbDk/ControlDevice.cpp @@ -88,11 +88,6 @@ void CUsbDkControlDeviceQueue::DeviceControl(WDFQUEUE Queue, EnumerateDevices(WdfRequest, Queue); break; } - case IOCTL_USBDK_REMOVE_REDIRECT: - { - RemoveRedirect(WdfRequest, Queue); - break; - } case IOCTL_USBDK_GET_CONFIG_DESCRIPTOR: { GetConfigurationDescriptor(WdfRequest, Queue); @@ -212,12 +207,6 @@ void CUsbDkControlDeviceQueue::GetConfigurationDescriptor(CWdfRequest &Request, } //------------------------------------------------------------------------------------------------------------ -void CUsbDkControlDeviceQueue::RemoveRedirect(CWdfRequest &Request, WDFQUEUE Queue) -{ - DoUSBDeviceOp(Request, Queue, &CUsbDkControlDevice::RemoveRedirect); -} -//------------------------------------------------------------------------------------------------------------ - ULONG CUsbDkControlDevice::CountDevices() { ULONG numberDevices = 0; diff --git a/UsbDk/ControlDevice.h b/UsbDk/ControlDevice.h index 74232f2..aafbb38 100644 --- a/UsbDk/ControlDevice.h +++ b/UsbDk/ControlDevice.h @@ -52,7 +52,6 @@ private: static void CountDevices(CWdfRequest &Request, WDFQUEUE Queue); static void EnumerateDevices(CWdfRequest &Request, WDFQUEUE Queue); static void GetConfigurationDescriptor(CWdfRequest &Request, WDFQUEUE Queue); - static void RemoveRedirect(CWdfRequest &Request, WDFQUEUE Queue); typedef NTSTATUS(CUsbDkControlDevice::*USBDevControlMethod)(const USB_DK_DEVICE_ID&); static void DoUSBDeviceOp(CWdfRequest &Request, WDFQUEUE Queue, USBDevControlMethod Method); diff --git a/UsbDk/Public.h b/UsbDk/Public.h index b782e54..1caf740 100644 --- a/UsbDk/Public.h +++ b/UsbDk/Public.h @@ -39,10 +39,8 @@ ULONG(CTL_CODE( USBDK_DEVICE_TYPE, 0x852, METHOD_BUFFERED, FILE_READ_ACCESS )) #define IOCTL_USBDK_ADD_REDIRECT \ ULONG(CTL_CODE( USBDK_DEVICE_TYPE, 0x854, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS )) -#define IOCTL_USBDK_REMOVE_REDIRECT \ - ULONG(CTL_CODE( USBDK_DEVICE_TYPE, 0x855, METHOD_BUFFERED, FILE_WRITE_ACCESS )) #define IOCTL_USBDK_GET_CONFIG_DESCRIPTOR \ - ULONG(CTL_CODE( USBDK_DEVICE_TYPE, 0x856, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)) + ULONG(CTL_CODE( USBDK_DEVICE_TYPE, 0x855, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)) //UsbDk redirector device IOCTLs #define IOCTL_USBDK_DEVICE_ABORT_PIPE \