[fireball] 39863: - Add first version of USB keyboard driver (limitations: no keyboard LEDs support, no repeated keypress support, right-side modifier keys not supported). - Cleanup source code of USB mouse driver.
Author: fireball Date: Wed Mar 4 16:40:22 2009 New Revision: 39863
URL: http://svn.reactos.org/svn/reactos?rev=39863&view=rev Log: - Add first version of USB keyboard driver (limitations: no keyboard LEDs support, no repeated keypress support, right-side modifier keys not supported). - Cleanup source code of USB mouse driver.
Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c - copied, changed from r39836, trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h - copied, changed from r39836, trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild
Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr... ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c [iso-8859-1] Wed Mar 4 16:40:22 2009 @@ -162,8 +162,8 @@ pdrvr[MOUSE_DRIVER_IDX].driver_init = mouse_driver_init; pdrvr[MOUSE_DRIVER_IDX].driver_destroy = mouse_driver_destroy;
- //pdrvr[KEYBOARD_DRIVER_IDX].driver_init = gendrv_if_driver_init; - //pdrvr[KEYBOARD_DRIVER_IDX].driver_destroy = gendrv_if_driver_destroy; + pdrvr[KEYBOARD_DRIVER_IDX].driver_init = kbd_driver_init; + pdrvr[KEYBOARD_DRIVER_IDX].driver_destroy = kbd_driver_destroy; }
BOOLEAN
Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr... ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h [iso-8859-1] Wed Mar 4 16:40:22 2009 @@ -50,7 +50,6 @@
} USB_DRIVER_DESCRIPTION,*PUSB_DRIVER_DESCRIPTION;
-#define DEVMGR_MAX_DRIVERS 7//8 #define RH_DRIVER_IDX 0 #define HUB_DRIVER_IDX 1 #define UMSS_DRIVER_IDX 2 @@ -58,7 +57,8 @@ #define GEN_DRIVER_IDX 4 #define GEN_IF_DRIVER_IDX 5 #define MOUSE_DRIVER_IDX 6 -#define KEYBOARD_DRIVER_IDX 7//temp disabled +#define KEYBOARD_DRIVER_IDX 7 +#define DEVMGR_MAX_DRIVERS 8
typedef struct _USB_DRIVER {
Copied: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c (from r39836, trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr... ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Wed Mar 4 16:40:22 2009 @@ -1,40 +1,56 @@ /* * PROJECT: ReactOS USB Drivers * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: mouse.c - * PURPOSE: Generic USB mouse driver + * FILE: keyboard.c + * PURPOSE: Generic USB keyboard driver * PROGRAMMERS: Aleksey Bragin (aleksey@reactos.org) */
#include "usbdriver.h" -#include "ntddmou.h" #include "kbdmou.h"
-//FIXME: is it needed at all? -typedef struct _USBMP_DEVICE_EXTENSION -{ - BOOLEAN IsFDO; -} USBMP_DEVICE_EXTENSION, *PUSBMP_DEVICE_EXTENSION; - /* Data for embedded drivers */ -//CONNECT_DATA KbdClassInformation; -CONNECT_DATA MouseClassInformation; - -PDEVICE_OBJECT MouseFdo = NULL; - - -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_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); -VOID mouse_irq(PURB purb, PVOID pcontext); +CONNECT_DATA KbdClassInformation; + +PDEVICE_OBJECT KeyboardFdo = NULL; + +NTSTATUS +AddRegistryEntry(IN PCWSTR PortTypeName, + IN PUNICODE_STRING DeviceName, + IN PCWSTR RegistryPath); + +BOOLEAN kbd_connect(PDEV_CONNECT_DATA dev_mgr, DEV_HANDLE dev_handle); +BOOLEAN kbd_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); +BOOLEAN kbd_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); +VOID kbd_irq(PURB purb, PVOID pcontext); static NTSTATUS -MouseCreateDevice(IN PDRIVER_OBJECT DriverObject); - +KeyboardCreateDevice(IN PDRIVER_OBJECT DriverObject); +void * memscan(void * addr, int c, size_t size); + +static UCHAR usb_kbd_keycode[256] = +{ + 0, 0, 0, 0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, + 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 21, 44, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 28, 1, 14, 15, 57, 12, 13, 26, + 27, 43, 43, 39, 40, 41, 51, 52, 53, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 87, 88, 99, 70,119,110,102,104,111,107,109,106, + 105,108,103, 69, 98, 55, 74, 78, 96, 79, 80, 81, 75, 76, 77, 71, + 72, 73, 82, 83, 86,127,116,117,183,184,185,186,187,188,189,190, + 191,192,193,194,134,138,130,132,128,129,131,137,133,135,136,113, + 115,114, 0, 0, 0,121, 0, 89, 93,124, 92, 94, 95, 0, 0, 0, + 122,123, 90, 91, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 29, 42, 56,125, 97, 54,100,126,164,166,165,163,161,115,114,113, + 150,158,159,128,136,177,178,176,142,152,173,140 +};
BOOLEAN -mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) -{ - PMOUSE_DRVR_EXTENSION pdrvr_ext; +kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) +{ + PKEYBOARD_DRVR_EXTENSION pdrvr_ext;
if (dev_mgr == NULL || pdriver == NULL) return FALSE; @@ -49,38 +65,38 @@ pdriver->driver_desc.if_num = 1; // Interface Number pdriver->driver_desc.if_class = USB_CLASS_HID; // Interface Class pdriver->driver_desc.if_sub_class = 1; // Interface SubClass - pdriver->driver_desc.if_protocol = 2; // Interface Protocol - - pdriver->driver_desc.driver_name = "USB Mouse driver"; // Driver name for Name Registry + pdriver->driver_desc.if_protocol = 1; // Interface Protocol + + pdriver->driver_desc.driver_name = "USB Keyboard driver"; // Driver name for Name Registry pdriver->driver_desc.dev_class = USB_CLASS_HID; pdriver->driver_desc.dev_sub_class = 1; // Device Subclass - pdriver->driver_desc.dev_protocol = 2; // Protocol Info. - - pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(MOUSE_DRVR_EXTENSION)); - pdriver->driver_ext_size = sizeof(MOUSE_DRVR_EXTENSION); - - RtlZeroMemory(pdriver->driver_ext, sizeof(MOUSE_DRVR_EXTENSION)); - pdrvr_ext = (PMOUSE_DRVR_EXTENSION) pdriver->driver_ext; + pdriver->driver_desc.dev_protocol = 1; // Protocol Info. + + pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(KEYBOARD_DRVR_EXTENSION)); + pdriver->driver_ext_size = sizeof(KEYBOARD_DRVR_EXTENSION); + + RtlZeroMemory(pdriver->driver_ext, sizeof(KEYBOARD_DRVR_EXTENSION)); + pdrvr_ext = (PKEYBOARD_DRVR_EXTENSION) pdriver->driver_ext; pdrvr_ext->dev_mgr = dev_mgr;
pdriver->disp_tbl.version = 1; - pdriver->disp_tbl.dev_connect = mouse_connect; - pdriver->disp_tbl.dev_disconnect = mouse_disconnect; - pdriver->disp_tbl.dev_stop = mouse_stop; + pdriver->disp_tbl.dev_connect = kbd_connect; + pdriver->disp_tbl.dev_disconnect = kbd_disconnect; + pdriver->disp_tbl.dev_stop = kbd_stop; pdriver->disp_tbl.dev_reserved = NULL;
// Zero out the class information structure - RtlZeroMemory(&MouseClassInformation, sizeof(CONNECT_DATA)); + RtlZeroMemory(&KbdClassInformation, sizeof(CONNECT_DATA));
// Create the device - MouseCreateDevice(dev_mgr->usb_driver_obj); - - usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_driver_init(): mouse driver is initialized\n")); + KeyboardCreateDevice(dev_mgr->usb_driver_obj); + + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_driver_init(): keyboard driver is initialized\n")); return TRUE; }
BOOLEAN -mouse_driver_destroy(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) +kbd_driver_destroy(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) { //PMOUSE_DRVR_EXTENSION pdrvr_ext; if (dev_mgr == NULL || pdriver == NULL) @@ -94,35 +110,35 @@ usb_free_mem(pdriver->driver_ext); pdriver->driver_ext = NULL; pdriver->driver_ext_size = 0; - usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_driver_destroy(): mouse driver is destroyed\n")); + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_driver_destroy(): keyboard driver is destroyed\n")); return TRUE; }
BOOLEAN -mouse_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle) +kbd_connect(PDEV_CONNECT_DATA param, DEV_HANDLE dev_handle) { PURB purb; NTSTATUS status; PUSB_DEV_MANAGER dev_mgr; PUSB_DRIVER pdrvr; PUSB_DEV pdev; - PMOUSE_DRVR_EXTENSION pdev_ext; + PKEYBOARD_DRVR_EXTENSION pdev_ext; // LONG i; PUSB_ENDPOINT_DESC pendp_desc = NULL; ULONG MaxPacketSize;
- usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_connect(): entering...\n")); + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): entering...\n"));
dev_mgr = param->dev_mgr; pdrvr = param->pdriver; - pdev_ext = (PMOUSE_DRVR_EXTENSION)pdrvr->driver_ext; + pdev_ext = (PKEYBOARD_DRVR_EXTENSION)pdrvr->driver_ext;
// Lock USB Device status = usb_query_and_lock_dev(dev_mgr, dev_handle, &pdev); if (status != STATUS_SUCCESS) { //usb_free_mem(desc_buf); - usb_dbg_print(DBGLVL_MEDIUM, ("mouse_connect(): unable to query&lock device, status=0x%x\n", status)); + usb_dbg_print(DBGLVL_MEDIUM, ("kbd_connect(): unable to query&lock device, status=0x%x\n", status)); return FALSE; }
@@ -138,7 +154,7 @@ while (Offset < 512) { pendp_desc = (PUSB_ENDPOINT_DESC)&Buffer[Offset]; - usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_connect(): DescType=0x%x, Attrs=0x%x, Len=%d\n", + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_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 && @@ -161,8 +177,9 @@ // endpoint must be IN if ((pendp_desc->bEndpointAddress & USB_DIR_IN) == 0) return FALSE; - } - + + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): FoundEndpoint=%d\n", FoundEndpoint)); + }
// Endpoint descriptor substitution code { @@ -183,7 +200,7 @@ // 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, + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_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)); } } @@ -203,12 +220,14 @@ if (MaxPacketSize > 8) MaxPacketSize = 8;
+ RtlZeroMemory(pdev_ext->kbd_old, 8); + // Build a URB for our interrupt transfer UsbBuildInterruptOrBulkTransferRequest(purb, usb_make_handle((dev_handle >> 16), 0, 0), - (PUCHAR)&pdev_ext->mouse_data, + (PUCHAR)&pdev_ext->kbd_data, MaxPacketSize, //use max packet size - mouse_irq, + kbd_irq, pdev_ext, 0);
@@ -224,87 +243,102 @@ }
VOID -mouse_irq(PURB purb, PVOID pcontext) -{ - MOUSE_INPUT_DATA MouseInputData; - ULONG InputDataConsumed; +kbd_irq(PURB purb, PVOID pcontext) +{ + KEYBOARD_INPUT_DATA KeyboardInputData[10]; + ULONG DataPrepared=0, DataConsumed, i; + UCHAR ScanCode; NTSTATUS status; - PMOUSE_DRVR_EXTENSION pdev_ext = (PMOUSE_DRVR_EXTENSION)pcontext; - signed char *data = pdev_ext->mouse_data; - usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_irq(): called\n")); + PKEYBOARD_DRVR_EXTENSION pdev_ext = (PKEYBOARD_DRVR_EXTENSION)pcontext; + PUCHAR data = pdev_ext->kbd_data; + PUCHAR data_old = pdev_ext->kbd_old; + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_irq(): called\n"));
ASSERT(purb);
if (purb->status != STATUS_SUCCESS) { - usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_irq(): purb->status 0x%08X\n", purb->status)); + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_irq(): purb->status 0x%08X\n", purb->status)); //return; }
- 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 - MouseInputData.Flags = MOUSE_MOVE_RELATIVE; - MouseInputData.LastX = data[1]; - MouseInputData.LastY = data[2]; - - MouseInputData.ButtonFlags = 0; - MouseInputData.ButtonData = 0; - - if ((data[0] & 0x01) && ((pdev_ext->btn_old & 0x01) != (data[0] & 0x01))) - MouseInputData.ButtonFlags |= MOUSE_LEFT_BUTTON_DOWN; - else if (!(data[0] & 0x01) && ((pdev_ext->btn_old & 0x01) != (data[0] & 0x01))) - MouseInputData.ButtonFlags |= MOUSE_LEFT_BUTTON_UP; - - if ((data[0] & 0x02) && ((pdev_ext->btn_old & 0x02) != (data[0] & 0x02))) - MouseInputData.ButtonFlags |= MOUSE_RIGHT_BUTTON_DOWN; - else if (!(data[0] & 0x02) && ((pdev_ext->btn_old & 0x02) != (data[0] & 0x02))) - MouseInputData.ButtonFlags |= MOUSE_RIGHT_BUTTON_UP; - - if ((data[0] & 0x04) && ((pdev_ext->btn_old & 0x04) != (data[0] & 0x04))) - MouseInputData.ButtonFlags |= MOUSE_MIDDLE_BUTTON_DOWN; - else if (!(data[0] & 0x04) && ((pdev_ext->btn_old & 0x04) != (data[0] & 0x04))) - MouseInputData.ButtonFlags |= MOUSE_MIDDLE_BUTTON_UP; - - if ((data[0] & 0x08) && ((pdev_ext->btn_old & 0x08) != (data[0] & 0x08))) - MouseInputData.ButtonFlags |= MOUSE_BUTTON_4_DOWN; - else if (!(data[0] & 0x08) && ((pdev_ext->btn_old & 0x08) != (data[0] & 0x08))) - MouseInputData.ButtonFlags |= MOUSE_BUTTON_4_UP; - - if ((data[0] & 0x10) && ((pdev_ext->btn_old & 0x10) != (data[0] & 0x10))) - MouseInputData.ButtonFlags |= MOUSE_BUTTON_5_DOWN; - else if (!(data[0] & 0x10) && ((pdev_ext->btn_old & 0x10) != (data[0] & 0x10))) - MouseInputData.ButtonFlags |= MOUSE_BUTTON_5_UP; - - if (data[3]) - { - MouseInputData.ButtonFlags |= MOUSE_WHEEL; - MouseInputData.ButtonData = data[3]; + usb_dbg_print(DBGLVL_MAXIMUM, ("Kbd input: %d %d %d %d %d %d %d %d\n", data[0], data[1], data[2], data[3], + data[4], data[5], data[6], data[7])); + + // Zero initial kbd data array + RtlZeroMemory(&KeyboardInputData[0], sizeof(KeyboardInputData)); + + // Scan modifier keys + for (i=0; i<8; i++) + { + ScanCode = usb_kbd_keycode[i + 224]; + + if (((data[0] >> i) & 1) != ((data_old[0] >> i) & 1)) + { + usb_dbg_print(DBGLVL_MAXIMUM, ("Scan %d key p/r %d\n", ScanCode, (data[0] >> i) & 1)); + + KeyboardInputData[DataPrepared].MakeCode = ScanCode; + if ((data[0] >> i) & 1) + KeyboardInputData[DataPrepared].Flags |= KEY_MAKE; + else + KeyboardInputData[DataPrepared].Flags |= KEY_BREAK; + DataPrepared++; + } + } + + // Scan normal keys + for (i=2; i<8; i++) + { + if (data_old[i] > 3 && memscan(data + 2, data_old[i], 6) == data + 8) + { + if (usb_kbd_keycode[data_old[i]]) + { + // key released + usb_dbg_print(DBGLVL_MAXIMUM, ("Scan %d key released 1\n", usb_kbd_keycode[data_old[i]])); + + KeyboardInputData[DataPrepared].MakeCode = usb_kbd_keycode[data_old[i]]; + KeyboardInputData[DataPrepared].Flags |= KEY_BREAK; + DataPrepared++; + } + } + + if (data[i] > 3 && memscan(data_old + 2, data[i], 6) == data_old + 8) + { + if (usb_kbd_keycode[data[i]]) + { + // key pressed + usb_dbg_print(DBGLVL_MAXIMUM, ("Scan %d key pressed 1\n", usb_kbd_keycode[data[i]])); + + KeyboardInputData[DataPrepared].MakeCode = usb_kbd_keycode[data[i]]; + KeyboardInputData[DataPrepared].Flags |= KEY_MAKE; + DataPrepared++; + } + } }
// Commit the input data somewhere... - if (MouseClassInformation.ClassService) + if (KbdClassInformation.ClassService && DataPrepared > 0) { KIRQL OldIrql;
KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - (*(PSERVICE_CALLBACK_ROUTINE)MouseClassInformation.ClassService)( - MouseClassInformation.ClassDeviceObject, - &MouseInputData, - (&MouseInputData)+1, - &InputDataConsumed); + (*(PSERVICE_CALLBACK_ROUTINE)KbdClassInformation.ClassService)( + KbdClassInformation.ClassDeviceObject, + &KeyboardInputData[0], + (&KeyboardInputData[0])+DataPrepared, + &DataConsumed); KeLowerIrql(OldIrql); }
- // Save old button data - pdev_ext->btn_old = data[0]; + // Save old keyboard data + RtlCopyMemory(pdev_ext->kbd_old, data, sizeof(data));
// resubmit the urb status = usb_submit_urb(pdev_ext->dev_mgr, purb); }
BOOLEAN -mouse_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle) +kbd_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle) { UNREFERENCED_PARAMETER(dev_handle); UNREFERENCED_PARAMETER(dev_mgr); @@ -312,7 +346,7 @@ }
BOOLEAN -mouse_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle) +kbd_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle) { PDEVICE_OBJECT dev_obj; NTSTATUS status; @@ -344,14 +378,14 @@
// Dispatch routine for our IRPs NTSTATUS -MouseDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) +KbdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) { NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST;
- usb_dbg_print(DBGLVL_MAXIMUM, ("MouseDispatch(DO %p, code 0x%lx) called\n", + usb_dbg_print(DBGLVL_MAXIMUM, ("KbdDispatch(DO %p, code 0x%lx) called\n", DeviceObject, IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode)); -#if 0 + if (DeviceObject == KeyboardFdo) { // it's keyboard's IOCTL @@ -363,23 +397,23 @@ switch (Stk->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_INTERNAL_KEYBOARD_CONNECT: - DPRINT("IOCTL_INTERNAL_KEYBOARD_CONNECT\n"); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(DEV_CONNECT_DATA)) { - DPRINT1("Keyboard IOCTL_INTERNAL_KEYBOARD_CONNECT " - "invalid buffer size\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_INTERNAL_KEYBOARD_CONNECT\n")); + if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { + usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_INTERNAL_KEYBOARD_CONNECT " + "invalid buffer size\n")); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; goto intcontfailure; }
RtlCopyMemory(&KbdClassInformation, Stk->Parameters.DeviceIoControl.Type3InputBuffer, - sizeof(DEV_CONNECT_DATA)); + sizeof(CONNECT_DATA));
Irp->IoStatus.Status = STATUS_SUCCESS; break; - +#if 0 case IOCTL_INTERNAL_I8042_KEYBOARD_WRITE_BUFFER: - DPRINT("IOCTL_INTERNAL_I8042_KEYBOARD_WRITE_BUFFER\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_INTERNAL_I8042_KEYBOARD_WRITE_BUFFER\n")); if (Stk->Parameters.DeviceIoControl.InputBufferLength < 1) { Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; goto intcontfailure; @@ -391,12 +425,13 @@
Irp->IoStatus.Status = STATUS_SUCCESS; break; +#endif case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: - DPRINT("IOCTL_KEYBOARD_QUERY_ATTRIBUTES\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_QUERY_ATTRIBUTES\n")); if (Stk->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_ATTRIBUTES)) { - DPRINT("Keyboard IOCTL_KEYBOARD_QUERY_ATTRIBUTES: " - "invalid buffer size\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_ATTRIBUTES: " + "invalid buffer size\n")); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; goto intcontfailure; } @@ -407,11 +442,11 @@ Irp->IoStatus.Status = STATUS_SUCCESS; break; case IOCTL_KEYBOARD_QUERY_INDICATORS: - DPRINT("IOCTL_KEYBOARD_QUERY_INDICATORS\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_QUERY_INDICATORS\n")); if (Stk->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { - DPRINT("Keyboard IOCTL_KEYBOARD_QUERY_INDICATORS: " - "invalid buffer size\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_INDICATORS: " + "invalid buffer size\n")); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; goto intcontfailure; } @@ -422,11 +457,11 @@ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; break; case IOCTL_KEYBOARD_QUERY_TYPEMATIC: - DPRINT("IOCTL_KEYBOARD_QUERY_TYPEMATIC\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_QUERY_TYPEMATIC\n")); if (Stk->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { - DPRINT("Keyboard IOCTL_KEYBOARD_QUERY_TYPEMATIC: " - "invalid buffer size\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_TYPEMATIC: " + "invalid buffer size\n")); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; goto intcontfailure; } @@ -437,11 +472,11 @@ Irp->IoStatus.Status = STATUS_SUCCESS; break; case IOCTL_KEYBOARD_SET_INDICATORS: - DPRINT("IOCTL_KEYBOARD_SET_INDICATORS\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_SET_INDICATORS\n")); if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { - DPRINT("Keyboard IOCTL_KEYBOARD_SET_INDICTATORS: " - "invalid buffer size\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_SET_INDICTATORS: " + "invalid buffer size\n")); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; goto intcontfailure; } @@ -455,11 +490,11 @@ Irp->IoStatus.Status = STATUS_SUCCESS; break; case IOCTL_KEYBOARD_SET_TYPEMATIC: - DPRINT("IOCTL_KEYBOARD_SET_TYPEMATIC\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_SET_TYPEMATIC\n")); if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { - DPRINT("Keyboard IOCTL_KEYBOARD_SET_TYPEMATIC " - "invalid buffer size\n"); + usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_SET_TYPEMATIC " + "invalid buffer size\n")); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; goto intcontfailure; } @@ -480,53 +515,14 @@
Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; break; - case IOCTL_INTERNAL_I8042_HOOK_KEYBOARD: - /* Nothing to do here */ - Irp->IoStatus.Status = STATUS_SUCCESS; - break; default: - Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + Irp->IoStatus.Status = STATUS_SUCCESS;//STATUS_INVALID_DEVICE_REQUEST; break; } - intcontfailure: Status = Irp->IoStatus.Status; } - else -#endif - if (DeviceObject == MouseFdo) - { - // it's mouse's IOCTL - PIO_STACK_LOCATION Stk; - - Irp->IoStatus.Information = 0; - Stk = IoGetCurrentIrpStackLocation(Irp); - - switch (Stk->Parameters.DeviceIoControl.IoControlCode) - { - case IOCTL_INTERNAL_MOUSE_CONNECT: - usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_INTERNAL_MOUSE_CONNECT\n")); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { - usb_dbg_print(DBGLVL_MINIMUM, ("IOCTL_INTERNAL_MOUSE_CONNECT: " - "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - goto intcontfailure2; - } - - RtlCopyMemory(&MouseClassInformation, - Stk->Parameters.DeviceIoControl.Type3InputBuffer, - sizeof(CONNECT_DATA)); - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - - default: - Irp->IoStatus.Status = STATUS_SUCCESS;//STATUS_INVALID_DEVICE_REQUEST; - break; - } -intcontfailure2: - Status = Irp->IoStatus.Status; - } +
if (Status == STATUS_INVALID_DEVICE_REQUEST) { @@ -539,90 +535,65 @@ return Status; }
-NTSTATUS -AddRegistryEntry( - IN PCWSTR PortTypeName, - IN PUNICODE_STRING DeviceName, - IN PCWSTR RegistryPath) -{ - UNICODE_STRING PathU = RTL_CONSTANT_STRING(L"\REGISTRY\MACHINE\HARDWARE\DEVICEMAP"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hDeviceMapKey = (HANDLE)-1; - HANDLE hPortKey = (HANDLE)-1; - UNICODE_STRING PortTypeNameU; - NTSTATUS Status; - - InitializeObjectAttributes(&ObjectAttributes, &PathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - usb_dbg_print(DBGLVL_MINIMUM, ("ZwOpenKey() failed with status 0x%08lx\n", Status)); - goto cleanup; - } - - RtlInitUnicodeString(&PortTypeNameU, PortTypeName); - InitializeObjectAttributes(&ObjectAttributes, &PortTypeNameU, OBJ_KERNEL_HANDLE, hDeviceMapKey, NULL); - Status = ZwCreateKey(&hPortKey, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); - if (!NT_SUCCESS(Status)) - { - usb_dbg_print(DBGLVL_MINIMUM, ("ZwCreateKey() failed with status 0x%08lx\n", Status)); - goto cleanup; - } - - Status = ZwSetValueKey(hPortKey, DeviceName, 0, REG_SZ, (PVOID)RegistryPath, (ULONG)(wcslen(RegistryPath) * sizeof(WCHAR) + sizeof(UNICODE_NULL))); - if (!NT_SUCCESS(Status)) - { - usb_dbg_print(DBGLVL_MINIMUM, ("ZwSetValueKey() failed with status 0x%08lx\n", Status)); - goto cleanup; - } - - Status = STATUS_SUCCESS; - -cleanup: - if (hDeviceMapKey != (HANDLE)-1) - ZwClose(hDeviceMapKey); - if (hPortKey != (HANDLE)-1) - ZwClose(hPortKey); - return Status; -} - static NTSTATUS -MouseCreateDevice(IN PDRIVER_OBJECT DriverObject) -{ - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\Device\PointerPortUSB"); +KeyboardCreateDevice(IN PDRIVER_OBJECT DriverObject) +{ + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\Device\KeyboardPortUSB"); PDEVEXT_HEADER DeviceExtension; PDEVICE_OBJECT Fdo; NTSTATUS Status;
- Status = AddRegistryEntry(L"PointerPort", &DeviceName, L"REGISTRY\MACHINE\SYSTEM\CurrentControlSet\Services\usbdriver"); + Status = AddRegistryEntry(L"KeyboardPort", &DeviceName, L"REGISTRY\MACHINE\SYSTEM\CurrentControlSet\Services\usbdriver"); if (!NT_SUCCESS(Status)) { - usb_dbg_print(DBGLVL_MINIMUM, ("AddRegistryEntry() for usb mouse driver failed with status 0x%08lx\n", Status)); + usb_dbg_print(DBGLVL_MINIMUM, ("AddRegistryEntry() for usb keyboard driver failed with status 0x%08lx\n", Status)); return Status; }
Status = IoCreateDevice(DriverObject, sizeof(DEVEXT_HEADER), &DeviceName, - FILE_DEVICE_MOUSE, + FILE_DEVICE_KEYBOARD, FILE_DEVICE_SECURE_OPEN, TRUE, &Fdo);
if (!NT_SUCCESS(Status)) { - 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 keyboard driver failed with status 0x%08lx\n", Status)); return Status; } DeviceExtension = (PDEVEXT_HEADER)Fdo->DeviceExtension; RtlZeroMemory(DeviceExtension, sizeof(DEVEXT_HEADER));
- DeviceExtension->dispatch = MouseDispatch; - - MouseFdo = Fdo; + DeviceExtension->dispatch = KbdDispatch; + + KeyboardFdo = Fdo; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - usb_dbg_print(DBGLVL_MEDIUM, ("Created mouse Fdo: %p\n", Fdo)); + usb_dbg_print(DBGLVL_MEDIUM, ("Created keyboard Fdo: %p\n", Fdo));
return STATUS_SUCCESS; }
+/** + * memscan - Find a character in an area of memory. + * @addr: The memory area + * @c: The byte to search for + * @size: The size of the area. + * + * returns the address of the first occurrence of @c, or 1 byte past + * the area if @c is not found + */ +void * memscan(void * addr, int c, size_t size) +{ + unsigned char * p = (unsigned char *) addr; + + while (size) { + if (*p == c) + return (void *) p; + p++; + size--; + } + return (void *) p; +} +
Copied: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h (from r39836, trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr... ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h [iso-8859-1] Wed Mar 4 16:40:22 2009 @@ -1,7 +1,7 @@ -#ifndef __MOUSE_H__ -#define __MOUSE_H__ +#ifndef __KEYBOARD_H__ +#define __KEYBOARD_H__
-typedef struct _MOUSE_DRVR_EXTENSION +typedef struct _KEYBOARD_DRVR_EXTENSION { //INTERRUPT_DATA_BLOCK idb; PUSB_INTERFACE_DESC pif_desc; @@ -9,15 +9,15 @@ PUSB_ENDPOINT_DESC pout_endp_desc, pin_endp_desc, pint_endp_desc;
PUSB_DEV_MANAGER dev_mgr; - signed char mouse_data[8]; - UCHAR btn_old; -} MOUSE_DRVR_EXTENSION, *PMOUSE_DRVR_EXTENSION; + UCHAR kbd_data[8]; + UCHAR kbd_old[8]; +} KEYBOARD_DRVR_EXTENSION, *PKEYBOARD_DRVR_EXTENSION;
BOOLEAN -mouse_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver); +kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);
BOOLEAN -mouse_driver_destroy(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver); +kbd_driver_destroy(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);
#endif
Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr... ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] Wed Mar 4 16:40:22 2009 @@ -7,17 +7,9 @@ */
#include "usbdriver.h" -#include "ntddmou.h" #include "kbdmou.h"
-//FIXME: is it needed at all? -typedef struct _USBMP_DEVICE_EXTENSION -{ - BOOLEAN IsFDO; -} USBMP_DEVICE_EXTENSION, *PUSBMP_DEVICE_EXTENSION; - /* Data for embedded drivers */ -//CONNECT_DATA KbdClassInformation; CONNECT_DATA MouseClassInformation;
PDEVICE_OBJECT MouseFdo = NULL; @@ -351,149 +343,7 @@ usb_dbg_print(DBGLVL_MAXIMUM, ("MouseDispatch(DO %p, code 0x%lx) called\n", DeviceObject, IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode)); -#if 0 - if (DeviceObject == KeyboardFdo) - { - // it's keyboard's IOCTL - PIO_STACK_LOCATION Stk; - - Irp->IoStatus.Information = 0; - Stk = IoGetCurrentIrpStackLocation(Irp); - - switch (Stk->Parameters.DeviceIoControl.IoControlCode) - { - case IOCTL_INTERNAL_KEYBOARD_CONNECT: - DPRINT("IOCTL_INTERNAL_KEYBOARD_CONNECT\n"); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(DEV_CONNECT_DATA)) { - DPRINT1("Keyboard IOCTL_INTERNAL_KEYBOARD_CONNECT " - "invalid buffer size\n"); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - goto intcontfailure; - } - - RtlCopyMemory(&KbdClassInformation, - Stk->Parameters.DeviceIoControl.Type3InputBuffer, - sizeof(DEV_CONNECT_DATA)); - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - - case IOCTL_INTERNAL_I8042_KEYBOARD_WRITE_BUFFER: - DPRINT("IOCTL_INTERNAL_I8042_KEYBOARD_WRITE_BUFFER\n"); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < 1) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - goto intcontfailure; - } - /* if (!DevExt->KeyboardInterruptObject) { - Irp->IoStatus.Status = STATUS_DEVICE_NOT_READY; - goto intcontfailure; - }*/ - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: - DPRINT("IOCTL_KEYBOARD_QUERY_ATTRIBUTES\n"); - if (Stk->Parameters.DeviceIoControl.OutputBufferLength < - sizeof(KEYBOARD_ATTRIBUTES)) { - DPRINT("Keyboard IOCTL_KEYBOARD_QUERY_ATTRIBUTES: " - "invalid buffer size\n"); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; - } - /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - &DevExt->KeyboardAttributes, - sizeof(KEYBOARD_ATTRIBUTES));*/ - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - case IOCTL_KEYBOARD_QUERY_INDICATORS: - DPRINT("IOCTL_KEYBOARD_QUERY_INDICATORS\n"); - if (Stk->Parameters.DeviceIoControl.OutputBufferLength < - sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { - DPRINT("Keyboard IOCTL_KEYBOARD_QUERY_INDICATORS: " - "invalid buffer size\n"); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; - } - /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - &DevExt->KeyboardIndicators, - sizeof(KEYBOARD_INDICATOR_PARAMETERS));*/ - - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - break; - case IOCTL_KEYBOARD_QUERY_TYPEMATIC: - DPRINT("IOCTL_KEYBOARD_QUERY_TYPEMATIC\n"); - if (Stk->Parameters.DeviceIoControl.OutputBufferLength < - sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { - DPRINT("Keyboard IOCTL_KEYBOARD_QUERY_TYPEMATIC: " - "invalid buffer size\n"); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; - } - /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - &DevExt->KeyboardTypematic, - sizeof(KEYBOARD_TYPEMATIC_PARAMETERS));*/ - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - case IOCTL_KEYBOARD_SET_INDICATORS: - DPRINT("IOCTL_KEYBOARD_SET_INDICATORS\n"); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < - sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { - DPRINT("Keyboard IOCTL_KEYBOARD_SET_INDICTATORS: " - "invalid buffer size\n"); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; - } - - /*RtlCopyMemory(&DevExt->KeyboardIndicators, - Irp->AssociatedIrp.SystemBuffer, - sizeof(KEYBOARD_INDICATOR_PARAMETERS));*/ - - //DPRINT("%x\n", DevExt->KeyboardIndicators.LedFlags); - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - case IOCTL_KEYBOARD_SET_TYPEMATIC: - DPRINT("IOCTL_KEYBOARD_SET_TYPEMATIC\n"); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < - sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { - DPRINT("Keyboard IOCTL_KEYBOARD_SET_TYPEMATIC " - "invalid buffer size\n"); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; - } - - /*RtlCopyMemory(&DevExt->KeyboardTypematic, - Irp->AssociatedIrp.SystemBuffer, - sizeof(KEYBOARD_TYPEMATIC_PARAMETERS));*/ - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: - /* We should check the UnitID, but it's kind of pointless as - * all keyboards are supposed to have the same one - */ - /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - &IndicatorTranslation, - sizeof(LOCAL_KEYBOARD_INDICATOR_TRANSLATION));*/ - - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - break; - case IOCTL_INTERNAL_I8042_HOOK_KEYBOARD: - /* Nothing to do here */ - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - default: - Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - -intcontfailure: - Status = Irp->IoStatus.Status; - } - else -#endif + if (DeviceObject == MouseFdo) { // it's mouse's IOCTL
Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr... ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h [iso-8859-1] Wed Mar 4 16:40:22 2009 @@ -41,4 +41,5 @@ #include "hub.h" #include "umss.h" #include "mouse.h" +#include "keyboard.h" #include "uhciver.h"
Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr... ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [iso-8859-1] Wed Mar 4 16:40:22 2009 @@ -22,6 +22,7 @@ <file>etd.c</file> <file>gendrv.c</file> <file>mouse.c</file> + <file>keyboard.c</file> <file>usbdriver.rc</file> <pch>usbdriver.h</pch> </module>
-
fireball＠svn.reactos.org