Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 55042: [USB-BRINGUP-TRUNK] - Don't do any special checks for AddDevice; a failure check is enough
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 04:17:22 2012 New Revision: 55042 URL: http://svn.reactos.org/svn/reactos?rev=55042&view=rev Log: [USB-BRINGUP-TRUNK] - Don't do any special checks for AddDevice; a failure check is enough Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Jan 21 04:17:22 2012 @@ -102,16 +102,7 @@ return Status; } - /* Check if driver added a FDO above the PDO */ Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - if (Fdo == DeviceNode->PhysicalDeviceObject) - { - /* FIXME: What do we do? Unload the driver or just disable the device? */ - DPRINT1("An FDO was not attached\n"); - ObDereferenceObject(Fdo); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_UNSUCCESSFUL; - } /* Check if we have a ACPI device (needed for power management) */ if (Fdo->DeviceType == FILE_DEVICE_ACPI)

1 0

[cgutman] 55041: [USB-BRINGUP-TRUNK] - Open a file handle to the port driver like Windows does - USB mice are working now
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 02:59:46 2012 New Revision: 55041 URL: http://svn.reactos.org/svn/reactos?rev=55041&view=rev Log: [USB-BRINGUP-TRUNK] - Open a file handle to the port driver like Windows does - USB mice are working now Modified: branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.h branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.h Modified: branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sat Jan 21 02:59:46 2012 @@ -824,6 +824,72 @@ return Status; } +static NTSTATUS NTAPI +ClassPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->InterfaceName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwOpenFile(&DeviceExtension->FileHandle, + FILE_READ_DATA, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (!NT_SUCCESS(Status)) + DeviceExtension->FileHandle = NULL; + } + else + DeviceExtension->FileHandle = NULL; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_STOP_DEVICE: + if (DeviceExtension->FileHandle) + { + ZwClose(DeviceExtension->FileHandle); + DeviceExtension->FileHandle = NULL; + } + Status = STATUS_SUCCESS; + break; + + default: + Status = Irp->IoStatus.Status; + break; + } + + Irp->IoStatus.Status = Status; + if (NT_SUCCESS(Status)) + { + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->LowerDevice, Irp); + } + else + { + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +} + static VOID NTAPI ClassStartIo( IN PDEVICE_OBJECT DeviceObject, @@ -1021,6 +1087,7 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = ClassClose; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = ClassCleanup; DriverObject->MajorFunction[IRP_MJ_READ] = ClassRead; + DriverObject->MajorFunction[IRP_MJ_PNP] = ClassPnp; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ClassDeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ForwardIrpAndForget; DriverObject->DriverStartIo = ClassStartIo; Modified: branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Sat Jan 21 02:59:46 2012 @@ -48,6 +48,7 @@ PORT_DEVICE_STATE PnpState; PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT ClassDO; + HANDLE FileHandle; UNICODE_STRING InterfaceName; } PORT_DEVICE_EXTENSION, *PPORT_DEVICE_EXTENSION; Modified: branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c [iso-8859-1] Sat Jan 21 02:59:46 2012 @@ -800,6 +800,72 @@ return Status; } +static NTSTATUS NTAPI +ClassPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->InterfaceName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwOpenFile(&DeviceExtension->FileHandle, + FILE_READ_DATA, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (!NT_SUCCESS(Status)) + DeviceExtension->FileHandle = NULL; + } + else + DeviceExtension->FileHandle = NULL; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_STOP_DEVICE: + if (DeviceExtension->FileHandle) + { + ZwClose(DeviceExtension->FileHandle); + DeviceExtension->FileHandle = NULL; + } + Status = STATUS_SUCCESS; + break; + + default: + Status = Irp->IoStatus.Status; + break; + } + + Irp->IoStatus.Status = Status; + if (NT_SUCCESS(Status)) + { + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->LowerDevice, Irp); + } + else + { + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +} + static VOID NTAPI ClassStartIo( IN PDEVICE_OBJECT DeviceObject, @@ -993,6 +1059,7 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = ClassClose; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = ClassCleanup; DriverObject->MajorFunction[IRP_MJ_READ] = ClassRead; + DriverObject->MajorFunction[IRP_MJ_PNP] = ClassPnp; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ClassDeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ForwardIrpAndForget; DriverObject->DriverStartIo = ClassStartIo; Modified: branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.h [iso-8859-1] Sat Jan 21 02:59:46 2012 @@ -48,6 +48,7 @@ PORT_DEVICE_STATE PnpState; PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT ClassDO; + HANDLE FileHandle; UNICODE_STRING InterfaceName; } PORT_DEVICE_EXTENSION, *PPORT_DEVICE_EXTENSION;

1 0

[janderwald] 55040: [HIDCLASS] - Remove superflous asserts
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 01:56:02 2012 New Revision: 55040 URL: http://svn.reactos.org/svn/reactos?rev=55040&view=rev Log: [HIDCLASS] - Remove superflous asserts 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] Sat Jan 21 01:56:02 2012 @@ -132,7 +132,6 @@ // store result // DPRINT1("NewBuffer %S\n", NewBuffer); - ASSERT(FALSE); Irp->IoStatus.Information = (ULONG_PTR)NewBuffer; return STATUS_SUCCESS; } @@ -272,7 +271,6 @@ // // store result // - ASSERT(FALSE); Irp->IoStatus.Information = (ULONG_PTR)Ptr; return STATUS_SUCCESS; }

1 0

[janderwald] 55039: [USB-BRINGUP] - Fix build of hidparse
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 01:48:30 2012 New Revision: 55039 URL: http://svn.reactos.org/svn/reactos?rev=55039&view=rev Log: [USB-BRINGUP] - Fix build of hidparse Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -333,11 +333,6 @@ HID_PARSER Parser; // - // sanity check - // - ASSERT(ReportType == HidP_Input || ReportType == HidP_Output || ReportType == HidP_Feature); - - // // init parser // HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, NULL, &Parser); @@ -345,7 +340,7 @@ // // translate usage pages // - return HidParser_TranslateUsageAndPagesToI8042ScanCodes(Parser, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + return HidParser_TranslateUsageAndPagesToI8042ScanCodes(&Parser, ChangedUsageList, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); } Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -7,4 +7,5 @@ #include <hidpi.h> #define NDEBUG #include <debug.h> -#include "hidparser.h" +#include "hidparser.h" +#include <stdio.h> 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] Sat Jan 21 01:48:30 2012 @@ -101,7 +101,6 @@ { PHID_PARSER_CONTEXT ParserContext; ULONG Index; - ULONG ReportCount = 0; // // get parser context @@ -863,7 +862,6 @@ PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; - ULONG ItemCount = 0; USHORT CurrentUsagePage; PHID_REPORT_ITEM ReportItem; ULONG Data; @@ -1017,7 +1015,7 @@ // // is this a key break // - if (KeyAction == HidP_KeyboardBreak) + if (KeyAction == HidP_Keyboard_Break) { // // add break Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -49,7 +49,7 @@ OUT PHIDP_DEVICE_DESC DeviceDescription) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionCount, ReportCount; + ULONG CollectionCount; ULONG Index; // Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -330,6 +330,7 @@ NTSTATUS NTAPI HidParser_TranslateUsageAndPagesToI8042ScanCodes( + IN PHID_PARSER Parser, IN PUSAGE_AND_PAGE ChangedUsageList, IN ULONG UsageListLength, IN HIDP_KEYBOARD_DIRECTION KeyAction, @@ -418,6 +419,16 @@ IN OUT PCHAR Report, IN ULONG ReportLength); + +HIDPARSER_STATUS +HidParser_TranslateUsage( + IN PHID_PARSER Parser, + IN USAGE Usage, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext); + HIDAPI NTSTATUS NTAPI Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h [iso-8859-1] Sat Jan 21 01:48:30 2012 @@ -4,6 +4,7 @@ #include <assert.h> #include <pshpack1.h> #include "hidparser.h" +#include <ntddkbd.h> /* * Copyright 2007, Haiku, Inc. All Rights Reserved.

1 0

[cgutman] 55038: [USB-BRINGUP-TRUNK] - Fix HID class installation
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 01:44:10 2012 New Revision: 55038 URL: http://svn.reactos.org/svn/reactos?rev=55038&view=rev Log: [USB-BRINGUP-TRUNK] - Fix HID class installation Modified: branches/usb-bringup-trunk/media/inf/input.inf branches/usb-bringup-trunk/media/inf/syssetup.inf Modified: branches/usb-bringup-trunk/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/inp… ============================================================================== --- branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] Sat Jan 21 01:44:10 2012 @@ -10,13 +10,13 @@ DefaultDestDir = 12 HID_Inst.CopyFilesDLL.NT = 11 -[HIDClassReg] -HKR,,,,%HID.ClassName% -HKR,,Icon,,-24 -HKR,,NoInstallClass,,1 +[HIDClass.NT.AddReg] +HKR,,,0,%HID.ClassName% +HKR,,Icon,0,"-24" +HKR,,NoInstallClass,0,1 [ClassInstall32.NT] -Addreg=HIDClassReg +AddReg=HIDClass.NT.AddReg [Manufacturer] %StdMfg% = StdMfg Modified: branches/usb-bringup-trunk/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/sys… ============================================================================== --- branches/usb-bringup-trunk/media/inf/syssetup.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/media/inf/syssetup.inf [iso-8859-1] Sat Jan 21 01:44:10 2012 @@ -11,6 +11,7 @@ fdc.inf hal.inf hdc.inf +input.inf keyboard.inf machine.inf msmouse.inf

1 0

[cgutman] 55037: [USB-BRINGUP-TRUNK] - Fix input.inf and include it in reactos.cab
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 01:29:33 2012 New Revision: 55037 URL: http://svn.reactos.org/svn/reactos?rev=55037&view=rev Log: [USB-BRINGUP-TRUNK] - Fix input.inf and include it in reactos.cab Modified: branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff branches/usb-bringup-trunk/media/inf/input.inf Modified: branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 21 01:29:33 2012 @@ -666,6 +666,7 @@ media\inf\fdc.inf 6 media\inf\hal.inf 6 media\inf\hdc.inf 6 +media\inf\input.inf 6 media\inf\intl.inf 6 media\inf\layout.inf 6 media\inf\machine.inf 6 Modified: branches/usb-bringup-trunk/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/inp… ============================================================================== --- branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] Sat Jan 21 01:29:33 2012 @@ -2,43 +2,41 @@ Signature="$WINDOWS NT$" Class=HIDClass ClassGuid={745a17a0-74d3-11d0-b6fe-00a0c90f57da} -Provider=%MSFT% +Provider=%ReactOS% LayoutFile=layout.inf -DriverVer=07/01/2001,5.1.2600.5512 +DriverVer=01/20/2012,1.00 [DestinationDirs] DefaultDestDir = 12 HID_Inst.CopyFilesDLL.NT = 11 -SPI_Files_DLL = 11 - -[ClassInstall] -Addreg=HIDClassReg [HIDClassReg] HKR,,,,%HID.ClassName% HKR,,Icon,,-24 HKR,,NoInstallClass,,1 -[ClassInstall32] +[ClassInstall32.NT] Addreg=HIDClassReg +[Manufacturer] +%StdMfg% = StdMfg +%MSMice% = MSMice + [MSMice] -%USB\VID_045E&PID_0009.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0009 -%USB\VID_045E&PID_001E.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_001E -%USB\VID_045E&PID_0023.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0023 -%USB\VID_045E&PID_0024.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0024 -%USB\VID_045E&PID_0025.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0025 -%USB\VID_045E&PID_0029.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0029 -%USB\VID_045E&PID_0039.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0039 -%USB\VID_045E&PID_0040.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0040 -%USB\VID_045E&PID_0047.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0047 +%USB\VID_045E&PID_0009.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0009 +%USB\VID_045E&PID_001E.DeviceDesc%=HID_Inst,USB\VID_045E&PID_001E +%USB\VID_045E&PID_0023.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0023 +%USB\VID_045E&PID_0024.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0024 +%USB\VID_045E&PID_0025.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0025 +%USB\VID_045E&PID_0029.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0029 +%USB\VID_045E&PID_0039.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0039 +%USB\VID_045E&PID_0040.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0040 +%USB\VID_045E&PID_0047.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0047 - -[Standard] -%HID_DEVICE_SYSTEM_GAME%=HID_Raw_Inst,, HID_DEVICE_SYSTEM_GAME -%HID_DEVICE%=HID_Raw_Inst,, HID_DEVICE -%HID.DeviceDesc% = HID_Inst,,GENERIC_HID_DEVICE,USB\Class_03&SubClass_01,USB\Class_03 - +[StdMfg] +%HID.DeviceDesc% = HID_Inst,GENERIC_HID_DEVICE +%HID.DeviceDesc% = HID_Inst,USB\Class_03&SubClass_01 +%HID.DeviceDesc% = HID_Inst,USB\Class_03 [HID_Inst.NT] Copyfiles = HID_Inst.CopyFiles.NT, HID_Inst.CopyFilesDLL.NT @@ -59,15 +57,13 @@ StartType = 3 ErrorControl = 1 ServiceBinary = %12%\hidusb.sys -LoadOrderGroup = extended base +LoadOrderGroup = Extended Base -[strings] -MSFT = "ReactOS" -HID.DeviceDesc = "USB-HID (Human Interface Device)" -HID.DefaultDevice = "HID-Standardgerät" -HID.ClassName = "Eingabegeräte (Human Interface Devices)" -HID.SvcDesc = "ReactOS HID Class-Treiber" +[Strings] +ReactOS = "ReactOS Team" +HID.ClassName = "Human Interface Devices" +HID.DeviceDesc = "USB Human Interface Device" +StdMfg = "(Standard Human Interface Devices)" +MSMice = "Microsoft" - -

1 0

[cgutman] 55036: [USB-BRINGUP-TRUNK] - Fix a BSOD during usbstor device initialization - Enable usbstor in 1st stage
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 00:31:09 2012 New Revision: 55036 URL: http://svn.reactos.org/svn/reactos?rev=55036&view=rev Log: [USB-BRINGUP-TRUNK] - Fix a BSOD during usbstor device initialization - Enable usbstor in 1st stage Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Jan 21 00:31:09 2012 @@ -76,7 +76,7 @@ ;PCI\CC_0C0300 = usbuhci PCI\CC_0C0310 = usbohci PCI\CC_0C0320 = usbehci -;USB\Class_08&SubClass_06&Prot_50 = usbstor +USB\Class_08&SubClass_06&Prot_50 = usbstor HID_DEVICE_SYSTEM_KEYBOARD = kbdhid [BootBusExtenders.Load] Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c [iso-8859-1] Sat Jan 21 00:31:09 2012 @@ -411,7 +411,7 @@ // DPRINT1("USBSTOR_SelectConfiguration failed to set interface %x\n", Status); FreeItem(InterfaceList); - FreeItem(Urb); + ExFreePool(Urb); return Status; } @@ -425,7 +425,7 @@ // failed to allocate interface information structure // FreeItem(InterfaceList); - FreeItem(Urb); + ExFreePool(Urb); return Status; } @@ -470,7 +470,7 @@ // free interface list & urb // FreeItem(InterfaceList); - FreeItem(Urb); + ExFreePool(Urb); // // done

1 0

[cgutman] 55035: [USB-BRINGUP-TRUNK] - Revert r55030
by cgutman＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: cgutman Date: Sat Jan 21 00:09:55 2012 New Revision: 55035 URL: http://svn.reactos.org/svn/reactos?rev=55035&view=rev Log: [USB-BRINGUP-TRUNK] - Revert r55030 Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h 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] Sat Jan 21 00:09:55 2012 @@ -101,7 +101,7 @@ { PHID_PARSER_CONTEXT ParserContext; ULONG Index; - //ULONG ReportCount = 0; + ULONG ReportCount = 0; // // get parser context @@ -863,7 +863,7 @@ PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; - //ULONG ItemCount = 0; + ULONG ItemCount = 0; USHORT CurrentUsagePage; PHID_REPORT_ITEM ReportItem; ULONG Data; @@ -1017,7 +1017,7 @@ // // is this a key break // - if (KeyAction == HidP_Keyboard_Break) + if (KeyAction == HidP_KeyboardBreak) { // // add break Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] Sat Jan 21 00:09:55 2012 @@ -49,7 +49,7 @@ OUT PHIDP_DEVICE_DESC DeviceDescription) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionCount; + ULONG CollectionCount, ReportCount; ULONG Index; // @@ -678,9 +678,7 @@ // // process usage // - //Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); - UNIMPLEMENTED - Status = HIDPARSER_STATUS_NOT_IMPLEMENTED; + Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); } else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) { Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sat Jan 21 00:09:55 2012 @@ -13,7 +13,6 @@ #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ #include <ntddk.h> -#include <ntddkbd.h> #include <hidpddi.h> #include <hidpi.h> #include <debug.h> @@ -331,7 +330,6 @@ NTSTATUS NTAPI HidParser_TranslateUsageAndPagesToI8042ScanCodes( - IN PHID_PARSER Parser, IN PUSAGE_AND_PAGE ChangedUsageList, IN ULONG UsageListLength, IN HIDP_KEYBOARD_DIRECTION KeyAction,

1 0

[cgutman] 55034: [USB-BRINGUP-TRUNK] - Add usbd to bootcd because usbohci depends on it - Make device interface creation failure a non-fatal error so the port drivers start successfully in 1st stage
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 23:58:29 2012 New Revision: 55034 URL: http://svn.reactos.org/svn/reactos?rev=55034&view=rev Log: [USB-BRINGUP-TRUNK] - Add usbd to bootcd because usbohci depends on it - Make device interface creation failure a non-fatal error so the port drivers start successfully in 1st stage Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Jan 20 23:58:29 2012 @@ -35,6 +35,7 @@ hidclass.sys=,,,,,,,,,,,,4 hidparse.sys=,,,,,,,,,,,,4 hidusb.sys=,,,,,,,,,,,,4 +usbd.sys=,,,,,,,,,,,,4 usbhub.sys=,,,,,,,,,,,,4 ;usbuhci.sys=,,,,,,,,,,,,4 usbohci.sys=,,,,,,,,,,,,4 Modified: branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Fri Jan 20 23:58:29 2012 @@ -9,3 +9,5 @@ set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) add_importlib_target(usbd.spec) + +add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Fri Jan 20 23:58:29 2012 @@ -3299,7 +3299,7 @@ // // done // - return Status; + return STATUS_SUCCESS; } NTSTATUS Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Jan 20 23:58:29 2012 @@ -3287,7 +3287,7 @@ // // done // - return Status; + return STATUS_SUCCESS; } NTSTATUS

1 0

[cgutman] 55033: [USB-BRINGUP-TRUNK] - Add add_cd_file line for mouhid
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 23:24:07 2012 New Revision: 55033 URL: http://svn.reactos.org/svn/reactos?rev=55033&view=rev Log: [USB-BRINGUP-TRUNK] - Add add_cd_file line for mouhid Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] Fri Jan 20 23:24:07 2012 @@ -8,3 +8,4 @@ set_module_type(mouhid kernelmodedriver) add_importlibs(mouhid ntoskrnl hal hidparse) +add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all)

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