Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Unhack usb mouse driver after endpoint parsing code was corrected.

Browse source 
- Cleanup usb mouse driver source code, make its structure similar to the usb keyboard driver.

svn path=/trunk/; revision=39978
This commit is contained in:
Aleksey Bragin 2009-03-12 11:29:09 +00:00
parent 70d2641a89
commit 0641e0eff8
2 changed files with 44 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
reactos/drivers/usb/nt4compat/usbdriver/mouse.c
View file

@ -7,21 +7,12 @@
*/ */
#include "usbdriver.h" #include "usbdriver.h"
#include "kbdmou.h"
/* Data for embedded drivers */
CONNECT_DATA MouseClassInformation;
PDEVICE_OBJECT MouseFdo = NULL;
BOOLEAN mouse_connect(PDEV_CONNECT_DATA dev_mgr, DEV_HANDLE dev_handle); BOOLEAN mouse_connect(PDEV_CONNECT_DATA dev_mgr, DEV_HANDLE dev_handle);
BOOLEAN mouse_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); BOOLEAN mouse_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle);
BOOLEAN mouse_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); BOOLEAN mouse_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle);
VOID mouse_irq(PURB purb, PVOID pcontext); VOID mouse_irq(PURB purb, PVOID pcontext);
static NTSTATUS static NTSTATUS MouseCreateDevice(IN PDRIVER_OBJECT DriverObject, IN PMOUSE_DRVR_EXTENSION DriverExtension);
MouseCreateDevice(IN PDRIVER_OBJECT DriverObject);
BOOLEAN BOOLEAN
mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver)
@ -61,11 +52,8 @@ mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver)
pdriver->disp_tbl.dev_stop = mouse_stop; pdriver->disp_tbl.dev_stop = mouse_stop;
pdriver->disp_tbl.dev_reserved = NULL; pdriver->disp_tbl.dev_reserved = NULL;
// Zero out the class information structure
RtlZeroMemory(&MouseClassInformation, sizeof(CONNECT_DATA));
// Create the device // Create the device
MouseCreateDevice(dev_mgr->usb_driver_obj); MouseCreateDevice(dev_mgr->usb_driver_obj, pdrvr_ext);
usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_driver_init(): mouse driver is initialized\n")); usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_driver_init(): mouse driver is initialized\n"));
return TRUE; return TRUE;
@ -118,69 +106,13 @@ mouse_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle)
return FALSE; return FALSE;
} }
// Endpoint-finding code // Get pointer to the endpoint descriptor
if (param->if_desc) pendp_desc = pdev->usb_config->interf[0].endp[0].pusb_endp_desc;
{
// Get a pointer to the config packet from compdev
PUCHAR Buffer = (PUCHAR)param->if_desc;
ULONG Offset = 0;
BOOLEAN FoundEndpoint = FALSE;
// Find our the only needed endpoint descriptor // Store max packet size
while (Offset < 512) MaxPacketSize = pendp_desc->wMaxPacketSize;
{ if (MaxPacketSize > 8)
pendp_desc = (PUSB_ENDPOINT_DESC)&Buffer[Offset]; MaxPacketSize = 8;
usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_connect(): DescType=0x%x, Attrs=0x%x, Len=%d\n",
pendp_desc->bDescriptorType, pendp_desc->bmAttributes, pendp_desc->bLength));
if (pendp_desc->bDescriptorType == USB_DT_ENDPOINT &&
pendp_desc->bLength == sizeof(USB_ENDPOINT_DESC))
{
// Found it
FoundEndpoint = TRUE;
break;
}
Offset += pendp_desc->bLength;
}
if (!FoundEndpoint)
return FALSE;
// FIXME: Check if it's INT endpoint
// (pendp_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)
// endpoint must be IN
if ((pendp_desc->bEndpointAddress & USB_DIR_IN) == 0)
return FALSE;
}
// Endpoint descriptor substitution code
{
ULONG if_idx, endp_idx;
PUSB_ENDPOINT pendp;
//FoundEndpoint = FALSE;
for(if_idx = 0; if_idx < MAX_INTERFACES_PER_CONFIG /*pdev->usb_config->if_count*/; if_idx++)
{
for(endp_idx = 0; endp_idx < MAX_ENDPS_PER_IF /*pdev->usb_config->interf[if_idx].endp_count*/; endp_idx++)
{
pendp = &pdev->usb_config->interf[if_idx].endp[endp_idx];
if (pendp->pusb_endp_desc != NULL)
{
//HACKHACK: for some reason this usb driver chooses different and completely wrong
// endpoint. Since I don't have time to research this, I just find the
// endpoint descriptor myself and copy it
memcpy(pendp->pusb_endp_desc, pendp_desc, pendp_desc->bLength);
usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_connect(): [%i][%i] DescType=0x%x, Attrs=0x%x, Len=%d\n",if_idx, endp_idx,
pendp->pusb_endp_desc->bDescriptorType, pendp->pusb_endp_desc->bmAttributes, pendp->pusb_endp_desc->bLength));
}
}
}
}
// Unlock USB Device // Unlock USB Device
usb_unlock_dev(pdev); usb_unlock_dev(pdev);
@ -191,17 +123,13 @@ mouse_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle)
return FALSE; return FALSE;
RtlZeroMemory(purb, sizeof(URB)); RtlZeroMemory(purb, sizeof(URB));
MaxPacketSize = pendp_desc->wMaxPacketSize;
if (MaxPacketSize > 8)
MaxPacketSize = 8;
// Build a URB for our interrupt transfer // Build a URB for our interrupt transfer
UsbBuildInterruptOrBulkTransferRequest(purb, UsbBuildInterruptOrBulkTransferRequest(purb,
usb_make_handle((dev_handle >> 16), 0, 0), usb_make_handle((dev_handle >> 16), 0, 0),
(PUCHAR)&pdev_ext->mouse_data, (PUCHAR)&pdev_ext->mouse_data,
MaxPacketSize, //use max packet size MaxPacketSize, //use max packet size
mouse_irq, mouse_irq,
pdev_ext, pdev_ext->device_ext,
0); 0);
// Call USB driver stack // Call USB driver stack
@ -221,8 +149,9 @@ mouse_irq(PURB purb, PVOID pcontext)
MOUSE_INPUT_DATA MouseInputData; MOUSE_INPUT_DATA MouseInputData;
ULONG InputDataConsumed; ULONG InputDataConsumed;
NTSTATUS status; NTSTATUS status;
PMOUSE_DRVR_EXTENSION pdev_ext = (PMOUSE_DRVR_EXTENSION)pcontext; PMOUSE_DRVR_EXTENSION pdev_ext;
signed char *data = pdev_ext->mouse_data; PMOUSE_DEVICE_EXTENSION DeviceExtension = (PMOUSE_DEVICE_EXTENSION)pcontext;
signed char *data;
usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_irq(): called\n")); usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_irq(): called\n"));
ASSERT(purb); ASSERT(purb);
@ -230,9 +159,12 @@ mouse_irq(PURB purb, PVOID pcontext)
if (purb->status != STATUS_SUCCESS) if (purb->status != STATUS_SUCCESS)
{ {
usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_irq(): purb->status 0x%08X\n", purb->status)); usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_irq(): purb->status 0x%08X\n", purb->status));
//return; return;
} }
pdev_ext = DeviceExtension->DriverExtension;
data = pdev_ext->mouse_data;
usb_dbg_print(DBGLVL_MAXIMUM, ("Mouse input: x %d, y %d, w %d, btn: 0x%02x\n", data[1], data[2], data[3], data[0])); usb_dbg_print(DBGLVL_MAXIMUM, ("Mouse input: x %d, y %d, w %d, btn: 0x%02x\n", data[1], data[2], data[3], data[0]));
// Fill mouse input data structure // Fill mouse input data structure
@ -275,13 +207,13 @@ mouse_irq(PURB purb, PVOID pcontext)
} }
// Commit the input data somewhere... // Commit the input data somewhere...
if (MouseClassInformation.ClassService) if (DeviceExtension->ConnectData.ClassService)
{ {
KIRQL OldIrql; KIRQL OldIrql;
KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
(*(PSERVICE_CALLBACK_ROUTINE)MouseClassInformation.ClassService)( (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ConnectData.ClassService)(
MouseClassInformation.ClassDeviceObject, DeviceExtension->ConnectData.ClassDeviceObject,
&MouseInputData, &MouseInputData,
(&MouseInputData)+1, (&MouseInputData)+1,
&InputDataConsumed); &InputDataConsumed);
@ -339,12 +271,15 @@ NTSTATUS
MouseDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) MouseDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
{ {
NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST;
PMOUSE_DEVICE_EXTENSION DeviceExtension;
DeviceExtension = DeviceObject->DeviceExtension;
usb_dbg_print(DBGLVL_MAXIMUM, ("MouseDispatch(DO %p, code 0x%lx) called\n", usb_dbg_print(DBGLVL_MAXIMUM, ("MouseDispatch(DO %p, code 0x%lx) called\n",
DeviceObject, DeviceObject,
IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode)); IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode));
if (DeviceObject == MouseFdo) if (DeviceObject == DeviceExtension->Fdo)
{ {
// it's mouse's IOCTL // it's mouse's IOCTL
PIO_STACK_LOCATION Stk; PIO_STACK_LOCATION Stk;
@ -363,7 +298,7 @@ MouseDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
goto intcontfailure2; goto intcontfailure2;
} }
RtlCopyMemory(&MouseClassInformation, RtlCopyMemory(&DeviceExtension->ConnectData,
Stk->Parameters.DeviceIoControl.Type3InputBuffer, Stk->Parameters.DeviceIoControl.Type3InputBuffer,
sizeof(CONNECT_DATA)); sizeof(CONNECT_DATA));
@ -437,10 +372,10 @@ cleanup:
} }
static NTSTATUS static NTSTATUS
MouseCreateDevice(IN PDRIVER_OBJECT DriverObject) MouseCreateDevice(IN PDRIVER_OBJECT DriverObject, IN PMOUSE_DRVR_EXTENSION DriverExtension)
{ {
UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\PointerPortUSB"); UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\PointerPortUSB");
PDEVEXT_HEADER DeviceExtension; PMOUSE_DEVICE_EXTENSION DeviceExtension;
PDEVICE_OBJECT Fdo; PDEVICE_OBJECT Fdo;
NTSTATUS Status; NTSTATUS Status;
@ -452,7 +387,7 @@ MouseCreateDevice(IN PDRIVER_OBJECT DriverObject)
} }
Status = IoCreateDevice(DriverObject, Status = IoCreateDevice(DriverObject,
sizeof(DEVEXT_HEADER), sizeof(MOUSE_DEVICE_EXTENSION),
&DeviceName, &DeviceName,
FILE_DEVICE_MOUSE, FILE_DEVICE_MOUSE,
FILE_DEVICE_SECURE_OPEN, FILE_DEVICE_SECURE_OPEN,
@ -464,12 +399,14 @@ MouseCreateDevice(IN PDRIVER_OBJECT DriverObject)
usb_dbg_print(DBGLVL_MINIMUM, ("IoCreateDevice() for usb mouse driver failed with status 0x%08lx\n", Status)); usb_dbg_print(DBGLVL_MINIMUM, ("IoCreateDevice() for usb mouse driver failed with status 0x%08lx\n", Status));
return Status; return Status;
} }
DeviceExtension = (PDEVEXT_HEADER)Fdo->DeviceExtension; DeviceExtension = (PMOUSE_DEVICE_EXTENSION)Fdo->DeviceExtension;
RtlZeroMemory(DeviceExtension, sizeof(DEVEXT_HEADER)); RtlZeroMemory(DeviceExtension, sizeof(MOUSE_DEVICE_EXTENSION));
DeviceExtension->dispatch = MouseDispatch; DeviceExtension->hdr.dispatch = MouseDispatch;
DeviceExtension->DriverExtension = DriverExtension;
DriverExtension->device_ext = DeviceExtension;
MouseFdo = Fdo; DeviceExtension->Fdo = Fdo;
Fdo->Flags &= ~DO_DEVICE_INITIALIZING; Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
usb_dbg_print(DBGLVL_MEDIUM, ("Created mouse Fdo: %p\n", Fdo)); usb_dbg_print(DBGLVL_MEDIUM, ("Created mouse Fdo: %p\n", Fdo));

14
reactos/drivers/usb/nt4compat/usbdriver/mouse.h
View file

@ -1,18 +1,26 @@
#ifndef __MOUSE_H__ #ifndef __MOUSE_H__
#define __MOUSE_H__ #define __MOUSE_H__
#include "kbdmou.h"
typedef struct _MOUSE_DRVR_EXTENSION typedef struct _MOUSE_DRVR_EXTENSION
{ {
//INTERRUPT_DATA_BLOCK idb;
PUSB_INTERFACE_DESC pif_desc; PUSB_INTERFACE_DESC pif_desc;
UCHAR if_idx, out_endp_idx, in_endp_idx, int_endp_idx;
PUSB_ENDPOINT_DESC pout_endp_desc, pin_endp_desc, pint_endp_desc;
PUSB_DEV_MANAGER dev_mgr; PUSB_DEV_MANAGER dev_mgr;
signed char mouse_data[8]; signed char mouse_data[8];
UCHAR btn_old; UCHAR btn_old;
struct _MOUSE_DEVICE_EXTENSION *device_ext; // back pointer
} MOUSE_DRVR_EXTENSION, *PMOUSE_DRVR_EXTENSION; } MOUSE_DRVR_EXTENSION, *PMOUSE_DRVR_EXTENSION;
typedef struct _MOUSE_DEVICE_EXTENSION
{
DEVEXT_HEADER hdr; // mandatory header
PMOUSE_DRVR_EXTENSION DriverExtension;
CONNECT_DATA ConnectData;
PDEVICE_OBJECT Fdo;
} MOUSE_DEVICE_EXTENSION, *PMOUSE_DEVICE_EXTENSION;
BOOLEAN BOOLEAN
mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver); mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);