Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[cgutman] 55375: [HIDCLASS] - Ignore failure to register a device interface during 1st stage setup
by cgutman＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: cgutman Date: Thu Feb 2 17:42:55 2012 New Revision: 55375 URL: http://svn.reactos.org/svn/reactos?rev=55375&view=rev Log: [HIDCLASS] - Ignore failure to register a device interface during 1st stage setup Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Thu Feb 2 17:42:55 2012 @@ -518,10 +518,11 @@ Status = IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, TRUE); DPRINT1("[HIDCLASS] IoSetDeviceInterFaceState %x\n", Status); } - ASSERT(Status == STATUS_SUCCESS); - // - // break - // + + // + // done + // + Status = STATUS_SUCCESS; break; } case IRP_MN_REMOVE_DEVICE:

1 0

[cgutman] 55374: [INF] - Don't install the usbuhci service yet because we have no driver
by cgutman＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: cgutman Date: Thu Feb 2 15:35:31 2012 New Revision: 55374 URL: http://svn.reactos.org/svn/reactos?rev=55374&view=rev Log: [INF] - Don't install the usbuhci service yet because we have no driver Modified: branches/usb-bringup-trunk/media/inf/usbport.inf Modified: branches/usb-bringup-trunk/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/usb… ============================================================================== Binary files - no diff available.

1 0

[janderwald] 55373: [INF] - Fix unknown device for hid keyboard
by janderwald＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: janderwald Date: Thu Feb 2 10:36:33 2012 New Revision: 55373 URL: http://svn.reactos.org/svn/reactos?rev=55373&view=rev Log: [INF] - Fix unknown device for hid keyboard Modified: branches/usb-bringup-trunk/media/inf/keyboard.inf Modified: branches/usb-bringup-trunk/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/key… ============================================================================== Binary files - no diff available.

1 0

[janderwald] 55372: [USBCCGP] - Remove hacks used for broken usbd driver - Implement IRP_MN_REMOVE for FDO & PDO
by janderwald＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: janderwald Date: Thu Feb 2 10:17:14 2012 New Revision: 55372 URL: http://svn.reactos.org/svn/reactos?rev=55372&view=rev Log: [USBCCGP] - Remove hacks used for broken usbd driver - Implement IRP_MN_REMOVE for FDO & PDO Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Thu Feb 2 10:17:14 2012 @@ -259,8 +259,6 @@ return STATUS_SUCCESS; } - - NTSTATUS NTAPI USBCCGP_ScanConfigurationDescriptor( @@ -281,7 +279,7 @@ // // count all interface descriptors // - DescriptorCount = CountInterfaceDescriptors(ConfigurationDescriptor); + DescriptorCount = ConfigurationDescriptor->bNumInterfaces; // // allocate array holding the interface descriptors @@ -302,6 +300,7 @@ // parse configuration descriptor // InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, InterfaceIndex, -1, -1, -1, -1); + ASSERT(InterfaceDescriptor); if (InterfaceDescriptor) { // Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Thu Feb 2 10:17:14 2012 @@ -279,6 +279,7 @@ PDODeviceExtension->FunctionDescriptor = &FDODeviceExtension->FunctionDescriptor[Index]; PDODeviceExtension->NextDeviceObject = FDODeviceExtension->NextDeviceObject; //DeviceObject; HACK PDODeviceExtension->FunctionIndex = Index; + PDODeviceExtension->FDODeviceExtension = FDODeviceExtension; PDODeviceExtension->InterfaceList = FDODeviceExtension->InterfaceList; PDODeviceExtension->InterfaceListCount = FDODeviceExtension->InterfaceListCount; PDODeviceExtension->ConfigurationHandle = FDODeviceExtension->ConfigurationHandle; @@ -423,9 +424,31 @@ // get stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[USBCCGP] PnP Minor %x\n", IoStack->MinorFunction); + DPRINT1("[USBCCGP] PnP Minor %x\n", IoStack->MinorFunction); switch(IoStack->MinorFunction) { + case IRP_MN_REMOVE_DEVICE: + { + /* Send the IRP down the stack */ + Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + // + // Detach from the device stack + // + IoDetachDevice(FDODeviceExtension->NextDeviceObject); + + // + // Delete the device object + // + IoDeleteDevice(DeviceObject); + } + + // + // request completed + // + break; + } case IRP_MN_START_DEVICE: { // Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Thu Feb 2 10:17:14 2012 @@ -307,6 +307,7 @@ PIO_STACK_LOCATION IoStack; PPDO_DEVICE_EXTENSION PDODeviceExtension; NTSTATUS Status; + ULONG Index; // // get current stack location @@ -351,15 +352,31 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("IRP_MN_REMOVE_DEVICE\n"); - - /* Complete the IRP */ + // + // remove us from the fdo's pdo list + // + for(Index = 0; Index < PDODeviceExtension->FDODeviceExtension->FunctionDescriptorCount; Index++) + { + if (PDODeviceExtension->FDODeviceExtension->ChildPDO[Index] == DeviceObject) + { + // + // remove us + // + PDODeviceExtension->FDODeviceExtension->ChildPDO[Index] = NULL; + break; + } + } + + // + // Complete the IRP + // Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Delete the device object */ + // + // Delete the device object + // IoDeleteDevice(DeviceObject); - return STATUS_SUCCESS; } case IRP_MN_QUERY_CAPABILITIES: Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Thu Feb 2 10:17:14 2012 @@ -55,6 +55,7 @@ USBD_CONFIGURATION_HANDLE ConfigurationHandle; // configuration handle PUSBD_INTERFACE_LIST_ENTRY InterfaceList; // interface list ULONG InterfaceListCount; // interface list count + PFDO_DEVICE_EXTENSION FDODeviceExtension; // pointer to fdo's pdo list }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; /* descriptor.c */

1 0

[zguo] 55371: Initial pass at adding wallpapers.
by zguo＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: zguo Date: Thu Feb 2 01:30:25 2012 New Revision: 55371 URL: http://svn.reactos.org/svn/reactos?rev=55371&view=rev Log: Initial pass at adding wallpapers. Added: branches/ros-branch-0_3_14/modules/wallpaper/ (with props) branches/ros-branch-0_3_14/modules/wallpaper/Angelus.ReactOS7.Dark_4-3.jpg (with props) branches/ros-branch-0_3_14/modules/wallpaper/Angelus.Sea04.FarBeyondTheSea_4x3.jpg (with props) branches/ros-branch-0_3_14/modules/wallpaper/RainInTheScreen.4x3.jpg (with props) branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild (with props) Modified: branches/ros-branch-0_3_14/boot/bootdata/hivedef_i386.inf Modified: branches/ros-branch-0_3_14/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/boot/bootdata… ============================================================================== Binary files - no diff available. Propchange: branches/ros-branch-0_3_14/modules/wallpaper/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 2 01:30:25 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-branch-0_3_14/modules/wallpaper/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-branch-0_3_14/modules/wallpaper/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-branch-0_3_14/modules/wallpaper/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-branch-0_3_14/modules/wallpaper/Angelus.ReactOS7.Dark_4-3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_14/modules/wallpaper/Angelus.ReactOS7.Dark_4-3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ros-branch-0_3_14/modules/wallpaper/Angelus.Sea04.FarBeyondTheSea_4x3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_14/modules/wallpaper/Angelus.Sea04.FarBeyondTheSea_4x3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ros-branch-0_3_14/modules/wallpaper/RainInTheScreen.4x3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_14/modules/wallpaper/RainInTheScreen.4x3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== --- branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild (added) +++ branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild [iso-8859-1] Thu Feb 2 01:30:25 2012 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group> + <installfile>Angelus.ReactOS7.Dark_4-3.jpg</installfile> + <installfile>Angelus.Sea04.FarBeyondTheSea_4x3.jpg</installfile> + <installfile>RainInTheScreen.4x3.jpg</installfile> +</group> Propchange: branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 55370: [USBD] - In 2012 a long protected natural resource for bugs was shutdown due to popular usb device support demand - Fix length check in USBD_ParseDescriptors. (PLONG)Descriptor ...
by janderwald＠svn.reactos.org 01 Feb '12

01 Feb '12

Author: janderwald Date: Wed Feb 1 16:59:13 2012 New Revision: 55370 URL: http://svn.reactos.org/svn/reactos?rev=55370&view=rev Log: [USBD] - In 2012 a long protected natural resource for bugs was shutdown due to popular usb device support demand - Fix length check in USBD_ParseDescriptors. (PLONG)Descriptor + TotalLength is not the length of the configuration descriptor but twice the configuration descriptor - Reset found variable in the loop. This fixes finding of interfaces which are not the first one in the configuration descriptor - Again moving to next usb descriptor was broken. UsbDeviceDescriptor = UsbDeviceDescriptor + UsbDeviceDescriptor->bLength does not move to the next but to next XX descriprors specified by bLength - Introduced in rev 17382 (14/08/2005) Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] Wed Feb 1 16:59:13 2012 @@ -32,9 +32,9 @@ * USBD_GetPdoRegistryParameters (implemented) */ -#include <wdm.h> +#include <ntddk.h> #include <usbdi.h> - +#include <debug.h> #ifndef PLUGPLAY_REGKEY_DRIVER #define PLUGPLAY_REGKEY_DRIVER 2 #endif @@ -324,8 +324,8 @@ InterfaceList[InterfaceCount].InterfaceDescriptor != NULL; InterfaceCount++) { - UrbSize += FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes); - UrbSize += (InterfaceList[InterfaceCount].InterfaceDescriptor->bNumEndpoints) * sizeof(USBD_PIPE_INFORMATION); + UrbSize += sizeof(USBD_INTERFACE_INFORMATION); + UrbSize += (InterfaceList[InterfaceCount].InterfaceDescriptor->bNumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION); } UrbSize += sizeof(URB) + sizeof(USBD_INTERFACE_INFORMATION); @@ -410,16 +410,39 @@ LONG DescriptorType ) { - PUSB_COMMON_DESCRIPTOR PComDes = StartPosition; - - while(PComDes) - { - if (PComDes >= (PUSB_COMMON_DESCRIPTOR) - ((PLONG)DescriptorBuffer + TotalLength) ) break; - if (PComDes->bDescriptorType == DescriptorType) return PComDes; - if (PComDes->bLength == 0) break; - PComDes = (PUSB_COMMON_DESCRIPTOR)((ULONG_PTR)PComDes + PComDes->bLength); - } + PUSB_COMMON_DESCRIPTOR CommonDescriptor; + + /* use start position */ + CommonDescriptor = (PUSB_COMMON_DESCRIPTOR)StartPosition; + + + /* find next available descriptor */ + while(CommonDescriptor) + { + if ((ULONG_PTR)CommonDescriptor >= ((ULONG_PTR)DescriptorBuffer + TotalLength)) + { + /* end reached */ + DPRINT1("End reached %p\n", CommonDescriptor); + return NULL; + } + + DPRINT("CommonDescriptor Type %x Length %x\n", CommonDescriptor->bDescriptorType, CommonDescriptor->bLength); + + /* is the requested one */ + if (CommonDescriptor->bDescriptorType == DescriptorType) + { + /* it is */ + return CommonDescriptor; + } + + /* sanity check */ + ASSERT(CommonDescriptor->bLength); + + /* move to next descriptor */ + CommonDescriptor = (PUSB_COMMON_DESCRIPTOR)((ULONG_PTR)CommonDescriptor + CommonDescriptor->bLength); + } + + /* no descriptor found */ return NULL; } @@ -438,45 +461,97 @@ LONG InterfaceProtocol ) { - int x = 0; - PUSB_INTERFACE_DESCRIPTOR UsbInterfaceDesc = StartPosition; - - while(UsbInterfaceDesc) - { - UsbInterfaceDesc = (PUSB_INTERFACE_DESCRIPTOR) - USBD_ParseDescriptors(ConfigurationDescriptor, - ConfigurationDescriptor->wTotalLength, - UsbInterfaceDesc, - USB_INTERFACE_DESCRIPTOR_TYPE); - - if (!UsbInterfaceDesc) break; - + BOOLEAN Found; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + + /* set to start position */ + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)StartPosition; + + DPRINT("USBD_ParseConfigurationDescriptorEx\n"); + DPRINT("ConfigurationDescriptor %p Length %lu\n", ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength); + DPRINT("CurrentOffset %p Offset %lu\n", StartPosition, ((ULONG_PTR)StartPosition - (ULONG_PTR)ConfigurationDescriptor)); + + while(InterfaceDescriptor) + { + /* get interface descriptor */ + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR) USBD_ParseDescriptors(ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, InterfaceDescriptor, USB_INTERFACE_DESCRIPTOR_TYPE); + if (!InterfaceDescriptor) + { + /* no more descriptors available */ + break; + } + + DPRINT("InterfaceDescriptor %p InterfaceNumber %x AlternateSetting %x Length %lu\n", InterfaceDescriptor, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, InterfaceDescriptor->bLength); + + /* set found */ + Found = TRUE; + + /* is there an interface number provided */ if(InterfaceNumber != -1) { - if(InterfaceNumber != UsbInterfaceDesc->bInterfaceNumber) x = 1; - } + if(InterfaceNumber != InterfaceDescriptor->bInterfaceNumber) + { + /* interface number does not match */ + Found = FALSE; + } + } + + /* is there an alternate setting provided */ if(AlternateSetting != -1) { - if(AlternateSetting != UsbInterfaceDesc->bAlternateSetting) x = 1; - } + if(AlternateSetting != InterfaceDescriptor->bAlternateSetting) + { + /* alternate setting does not match */ + Found = FALSE; + } + } + + /* match on interface class */ if(InterfaceClass != -1) { - if(InterfaceClass != UsbInterfaceDesc->bInterfaceClass) x = 1; - } + if(InterfaceClass != InterfaceDescriptor->bInterfaceClass) + { + /* no match with interface class criteria */ + Found = FALSE; + } + } + + /* match on interface sub class */ if(InterfaceSubClass != -1) { - if(InterfaceSubClass != UsbInterfaceDesc->bInterfaceSubClass) x = 1; - } + if(InterfaceSubClass != InterfaceDescriptor->bInterfaceSubClass) + { + /* no interface sub class match */ + Found = FALSE; + } + } + + /* interface protocol criteria */ if(InterfaceProtocol != -1) { - if(InterfaceProtocol != UsbInterfaceDesc->bInterfaceProtocol) x = 1; - } - - if (!x) return UsbInterfaceDesc; - - if (UsbInterfaceDesc->bLength == 0) break; - UsbInterfaceDesc = UsbInterfaceDesc + UsbInterfaceDesc->bLength; - } + if(InterfaceProtocol != InterfaceDescriptor->bInterfaceProtocol) + { + /* no interface protocol match */ + Found = FALSE; + } + } + + if (Found) + { + /* the choosen one */ + return InterfaceDescriptor; + } + + /* sanity check */ + ASSERT(InterfaceDescriptor->bLength); + + /* move to next descriptor */ + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); + } + + DPRINT("No Descriptor With InterfaceNumber %ld AlternateSetting %ld InterfaceClass %ld InterfaceSubClass %ld InterfaceProtocol %ld found\n", InterfaceNumber, + AlternateSetting, InterfaceClass, InterfaceSubClass, InterfaceProtocol); + return NULL; }

1 0

[janderwald] 55369: [KBDHID] - Implement IOCTL_KEYBOARD_QUERY_TYPEMATIC, IOCTL_KEYBOARD_SET_TYPEMATIC - Fix bug in the dispatch routine - Keyboard presses are no longer reported twice
by janderwald＠svn.reactos.org 01 Feb '12

01 Feb '12

Author: janderwald Date: Wed Feb 1 14:28:02 2012 New Revision: 55369 URL: http://svn.reactos.org/svn/reactos?rev=55369&view=rev Log: [KBDHID] - Implement IOCTL_KEYBOARD_QUERY_TYPEMATIC, IOCTL_KEYBOARD_SET_TYPEMATIC - Fix bug in the dispatch routine - Keyboard presses are no longer reported twice Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Wed Feb 1 14:28:02 2012 @@ -53,15 +53,13 @@ { DPRINT1("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); - // - // set up input data - // + /* init input data */ RtlZeroMemory(&InputData, sizeof(KEYBOARD_INPUT_DATA)); /* use keyboard unit id */ - InputData.UnitId = DeviceExtension->KeyboardIndicator.UnitId; - - if (NewScanCodes[Index] > 0x7F) + InputData.UnitId = DeviceExtension->KeyboardTypematic.UnitId; + + if (((UCHAR)(NewScanCodes[Index] & 0xFF))> 0x7F) { /* scan codes greater than 0x7F are a key break */ InputData.Flags |= KEY_BREAK; @@ -74,9 +72,7 @@ KbdHid_DispatchInputData((PKBDHID_DEVICE_EXTENSION)Context, &InputData); } - // - // done - // + /* done */ return TRUE; } @@ -430,11 +426,22 @@ } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_TYPEMATIC) { - /* not implemented */ - DPRINT1("IOCTL_KEYBOARD_QUERY_TYPEMATIC not implemented\n"); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) + { + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* copy indicators */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DeviceExtension->KeyboardTypematic, sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)); + + /* done */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(KEYBOARD_TYPEMATIC_PARAMETERS); IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_INDICATORS) { @@ -457,11 +464,22 @@ } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_TYPEMATIC) { - /* not implemented */ - DPRINT1("IOCTL_KEYBOARD_SET_TYPEMATIC not implemented\n"); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) + { + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* copy indicators */ + RtlCopyMemory(&DeviceExtension->KeyboardTypematic, Irp->AssociatedIrp.SystemBuffer, sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)); + + /* done */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION) { Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Wed Feb 1 14:28:02 2012 @@ -114,6 +114,12 @@ // KEYBOARD_INDICATOR_PARAMETERS KeyboardIndicator; + // + // keyboard type matic + // + KEYBOARD_TYPEMATIC_PARAMETERS KeyboardTypematic; + + }KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION;

1 0

[janderwald] 55368: [HIDPARSER] - A key break code indicator is 0x80, not 0x1 [USBCCGP] - Silence debug print [KBDHID] - Implement IOCTL_KEYBOARD_QUERY_INDICATORS, IOCTL_KEYBOARD_SET_INDICATORS - P...
by janderwald＠svn.reactos.org 01 Feb '12

01 Feb '12

Author: janderwald Date: Wed Feb 1 13:34:20 2012 New Revision: 55368 URL: http://svn.reactos.org/svn/reactos?rev=55368&view=rev Log: [HIDPARSER] - A key break code indicator is 0x80, not 0x1 [USBCCGP] - Silence debug print [KBDHID] - Implement IOCTL_KEYBOARD_QUERY_INDICATORS, IOCTL_KEYBOARD_SET_INDICATORS - Partly implement dispatching to kbdclass - Kbdclass now receives keys from kbdhid. Not yet fully working - Tested in XP+ ReactOS USB Stack + ReactOS HID stack + USB Composite Device Keyboard Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/lib/drivers/hidparser/api.c Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Wed Feb 1 13:34:20 2012 @@ -42,16 +42,36 @@ IN PCHAR NewScanCodes, IN ULONG Length) { - //KEYBOARD_INPUT_DATA InputData; + KEYBOARD_INPUT_DATA InputData; ULONG Index; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PKBDHID_DEVICE_EXTENSION)Context; for(Index = 0; Index < Length; Index++) { DPRINT1("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); + // - // TODO: set up input data + // set up input data // - //KbdHid_DispatchInputData((PKBDHID_DEVICE_EXTENSION)Context, &InputData); + RtlZeroMemory(&InputData, sizeof(KEYBOARD_INPUT_DATA)); + + /* use keyboard unit id */ + InputData.UnitId = DeviceExtension->KeyboardIndicator.UnitId; + + if (NewScanCodes[Index] > 0x7F) + { + /* scan codes greater than 0x7F are a key break */ + InputData.Flags |= KEY_BREAK; + } + + /* store key code */ + InputData.MakeCode = NewScanCodes[Index]; + + /* dispatch scan codes */ + KbdHid_DispatchInputData((PKBDHID_DEVICE_EXTENSION)Context, &InputData); } // @@ -391,9 +411,20 @@ } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_INDICATORS) { - /* not implemented */ - DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATORS not implemented\n"); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) + { + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* copy indicators */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DeviceExtension->KeyboardIndicator, sizeof(KEYBOARD_INDICATOR_PARAMETERS)); + + /* complete request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(KEYBOARD_INDICATOR_PARAMETERS); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -407,11 +438,22 @@ } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_INDICATORS) { - /* not implemented */ - DPRINT1("IOCTL_KEYBOARD_SET_INDICATORS not implemented\n"); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) + { + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* copy indicators */ + RtlCopyMemory(&DeviceExtension->KeyboardIndicator, Irp->AssociatedIrp.SystemBuffer, sizeof(KEYBOARD_INDICATOR_PARAMETERS)); + + /* done */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_TYPEMATIC) { Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Wed Feb 1 13:34:20 2012 @@ -109,6 +109,12 @@ // HIDP_KEYBOARD_MODIFIER_STATE ModifierState; + // + // keyboard indicator state + // + KEYBOARD_INDICATOR_PARAMETERS KeyboardIndicator; + + }KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION; /* defaults from kbfiltr.h */ Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Wed Feb 1 13:34:20 2012 @@ -850,7 +850,7 @@ // Urb = (PURB)IoStack->Parameters.Others.Argument1; ASSERT(Urb); - DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x\n", Urb->UrbHeader.Function); + DPRINT("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x\n", Urb->UrbHeader.Function); if (Urb->UrbHeader.Function == URB_FUNCTION_SELECT_CONFIGURATION) { Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/api.c [iso-8859-1] Wed Feb 1 13:34:20 2012 @@ -663,9 +663,9 @@ if (KeyAction == HidP_Keyboard_Break) { // - // add break - // - ScanCodes[Index] |= KEY_BREAK; + // add break - see USB HID to PS/2 Scan Code Translation Table + // + ScanCodes[Index] |= 0x80; } // @@ -711,7 +711,6 @@ // // FIXME: translate modifier states // - DPRINT1("Usage %x ScanCode %x\n", Usage, ScanCode); HidParser_DispatchKey((PCHAR)&ScanCode, KeyAction, InsertCodesProcedure, InsertCodesContext); //

1 0

[cgutman] 55367: [USBEHCI][USBOHCI] - Wait 100 milliseconds for the port power and insertion to stabilize - Wait for the 10 millisecond "recovery" period after reset
by cgutman＠svn.reactos.org 01 Feb '12

01 Feb '12

Author: cgutman Date: Wed Feb 1 12:16:47 2012 New Revision: 55367 URL: http://svn.reactos.org/svn/reactos?rev=55367&view=rev Log: [USBEHCI][USBOHCI] - Wait 100 milliseconds for the port power and insertion to stabilize - Wait for the 10 millisecond "recovery" period after reset Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Wed Feb 1 12:16:47 2012 @@ -799,8 +799,25 @@ } while (TRUE); // + // delay is 10 ms + // + Timeout.QuadPart = 10; + DPRINT1("Waiting %d milliseconds for port to recover after reset\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + + // // check slow speed line after reset // + PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) { DPRINT1("Non HighSpeed device. Releasing Ownership\n"); @@ -916,9 +933,30 @@ if (Status == C_PORT_CONNECTION) { + LARGE_INTEGER Timeout; + + // + // reset status change bits + // Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); Value |= EHCI_PRT_CONNECTSTATUSCHANGE | EHCI_PRT_ENABLEDSTATUSCHANGE; EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); + + // + // delay is 100 ms + // + Timeout.QuadPart = 100; + DPRINT1("Waiting %d milliseconds for port to stabilize after connection\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); } return STATUS_SUCCESS; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Wed Feb 1 12:16:47 2012 @@ -1191,9 +1191,33 @@ if (Status == C_PORT_CONNECTION || Status == C_PORT_ENABLE) { // - // clear bits + // clear change bits // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC | OHCI_RH_PORTSTATUS_PESC); + + // + // wait for port to stabilize + // + if (Status == C_PORT_CONNECTION) + { + LARGE_INTEGER Timeout; + + // + // delay is 100 ms + // + Timeout.QuadPart = 100; + DPRINT1("Waiting %d milliseconds for port to stabilize after connection\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + } } // @@ -1275,6 +1299,8 @@ } else if (Feature == PORT_RESET) { + LARGE_INTEGER Timeout; + // // assert // @@ -1307,6 +1333,22 @@ }while(TRUE); // + // delay is 10 ms + // + Timeout.QuadPart = 10; + DPRINT1("Waiting %d milliseconds for port to recover after reset\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + + // // trigger the status change interrupt // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE);

1 0

[cgutman] 55366: [USBEHCI] - Wait 20 milliseconds for port reset
by cgutman＠svn.reactos.org 01 Feb '12

01 Feb '12

Author: cgutman Date: Wed Feb 1 11:49:57 2012 New Revision: 55366 URL: http://svn.reactos.org/svn/reactos?rev=55366&view=rev Log: [USBEHCI] - Wait 20 milliseconds for port reset Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Wed Feb 1 11:49:57 2012 @@ -735,6 +735,7 @@ IN ULONG PortIndex) { ULONG PortStatus; + LARGE_INTEGER Timeout; if (PortIndex > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; @@ -759,7 +760,21 @@ PortStatus &= ~EHCI_PRT_ENABLED; EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), PortStatus); - KeStallExecutionProcessor(100); + // + // delay is 20 ms for port reset as per USB 2.0 spec + // + Timeout.QuadPart = 20; + DPRINT1("Waiting %d milliseconds for port reset\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); // // Clear reset

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012