Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[janderwald] 54768: [USB-BRINGUP] - Partly implement mouse read completion - Implement read initiation - Implement MouHid_Create, MouHid_Close
by janderwald＠svn.reactos.org 27 Dec '11

27 Dec '11

Author: janderwald Date: Tue Dec 27 02:35:03 2011 New Revision: 54768 URL: http://svn.reactos.org/svn/reactos?rev=54768&view=rev Log: [USB-BRINGUP] - Partly implement mouse read completion - Implement read initiation - Implement MouHid_Create, MouHid_Close Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c branches/usb-bringup/drivers/hid/mouhid/mouhid.h Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Tue Dec 27 02:35:03 2011 @@ -137,6 +137,89 @@ KeLowerIrql(OldIrql); } +NTSTATUS +NTAPI +MouHid_ReadCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PMOUHID_DEVICE_EXTENSION DeviceExtension; + USHORT ButtonFlags; + MOUSE_INPUT_DATA MouseInputData; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get mouse change flags */ + MouHid_GetButtonFlags(DeviceObject, &ButtonFlags); + + /* FIXME detect mouse move change */ + /* FIXME detect mouse wheel change */ + + /* init input data */ + RtlZeroMemory(&MouseInputData, sizeof(MOUSE_INPUT_DATA)); + + /* init input data */ + MouseInputData.ButtonFlags = ButtonFlags; + + /* dispatch mouse action */ + MouHid_DispatchInputData(DeviceObject, &MouseInputData); + + /* re-init read */ + MouHid_InitiateRead(DeviceObject); + + /* stop completion */ + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +MouHid_InitiateRead( + IN PDEVICE_OBJECT DeviceObject) +{ + PMOUHID_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* re-use irp */ + IoReuseIrp(DeviceExtension->Irp, STATUS_SUCCESS); + + /* init irp */ + DeviceExtension->Irp->MdlAddress = DeviceExtension->ReportMDL; + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(DeviceExtension->Irp); + + /* init stack location */ + IoStack->Parameters.Read.Length = DeviceExtension->ReportLength; + IoStack->Parameters.Read.Key = 0; + IoStack->Parameters.Read.ByteOffset.QuadPart = 0LL; + IoStack->MajorFunction = IRP_MJ_READ; + IoStack->FileObject = DeviceExtension->FileObject; + + /* set completion routine */ + IoSetCompletionRoutine(DeviceExtension->Irp, MouHid_ReadCompletion, DeviceExtension, TRUE, TRUE, TRUE); + + /* start the read */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, DeviceExtension->Irp); + + /* done */ + return Status; +} + +NTSTATUS +NTAPI +MouHid_CreateCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + KeSetEvent((PKEVENT)Context, 0, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} NTSTATUS @@ -145,9 +228,68 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + KEVENT Event; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("MOUHID: IRP_MJ_CREATE\n"); + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* copy stack location to next */ + IoCopyCurrentIrpStackLocationToNext(Irp); + + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* prepare irp */ + IoSetCompletionRoutine(Irp, MouHid_CreateCompletion, &Event, TRUE, TRUE, TRUE); + + /* call lower driver */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* request pending */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* is the driver already in use */ + if (DeviceExtension->FileObject == NULL) + { + /* did the caller specify correct attributes */ + if (IoStack->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_READONLY) + { + /* store file object */ + DeviceExtension->FileObject = IoStack->FileObject; + + /* initiating read */ + Status = MouHid_InitiateRead(DeviceObject); + } + else + { + /* wrong mode */ + DPRINT1("MOUHID: wrong attributes: %x\n", IoStack->Parameters.Create.FileAttributes); + } + } + + /* complete request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } @@ -157,9 +299,21 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* FIXME: cancel irp */ + + /* remove file object */ + DeviceExtension->FileObject = NULL; + + /* skip location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* pass irp to down the stack */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); } NTSTATUS Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] Tue Dec 27 02:35:03 2011 @@ -32,4 +32,11 @@ ULONG ReportLength; -}MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; + PFILE_OBJECT FileObject; + +}MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; + + +NTSTATUS +MouHid_InitiateRead( + IN PDEVICE_OBJECT DeviceObject);

1 0

[janderwald] 54767: - Link to hal - Implement mouse button change detection - Implement support routine for dispatching mouse input data - Allocate mdl for input report, not yet used
by janderwald＠svn.reactos.org 27 Dec '11

27 Dec '11

Author: janderwald Date: Tue Dec 27 00:46:10 2011 New Revision: 54767 URL: http://svn.reactos.org/svn/reactos?rev=54767&view=rev Log: - Link to hal - Implement mouse button change detection - Implement support routine for dispatching mouse input data - Allocate mdl for input report, not yet used Modified: branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt branches/usb-bringup/drivers/hid/mouhid/mouhid.c branches/usb-bringup/drivers/hid/mouhid/mouhid.h Modified: branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] Tue Dec 27 00:46:10 2011 @@ -6,7 +6,7 @@ add_library(mouhid SHARED mouhid.c mouhid.rc) set_module_type(mouhid kernelmodedriver) -add_importlibs(mouhid ntoskrnl hidparse) +add_importlibs(mouhid ntoskrnl hal hidparse) add_cab_target(mouhid 2) add_cab_target(mouhid 2) Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Tue Dec 27 00:46:10 2011 @@ -10,6 +10,135 @@ #include "mouhid.h" +static USHORT MouHid_ButtonDownFlags[] = +{ + MOUSE_LEFT_BUTTON_DOWN, + MOUSE_RIGHT_BUTTON_DOWN, + MOUSE_MIDDLE_BUTTON_DOWN, + MOUSE_BUTTON_4_DOWN, + MOUSE_BUTTON_5_DOWN +}; + +static USHORT MouHid_ButtonUpFlags[] = +{ + MOUSE_LEFT_BUTTON_UP, + MOUSE_RIGHT_BUTTON_UP, + MOUSE_MIDDLE_BUTTON_UP, + MOUSE_BUTTON_4_UP, + MOUSE_BUTTON_5_UP +}; + +VOID +MouHid_GetButtonFlags( + IN PDEVICE_OBJECT DeviceObject, + OUT PUSHORT ButtonFlags) +{ + PMOUHID_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + USAGE Usage; + ULONG Index; + PUSAGE TempList; + ULONG CurrentUsageListLength; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* init flags */ + *ButtonFlags = 0; + + /* get usages */ + CurrentUsageListLength = DeviceExtension->UsageListLength; + Status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, HIDP_LINK_COLLECTION_UNSPECIFIED, DeviceExtension->CurrentUsageList, &CurrentUsageListLength, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + if (Status != HIDP_STATUS_SUCCESS) + { + DPRINT1("MouHid_GetButtonFlags failed to get usages with %x\n", Status); + return; + } + + /* extract usage list difference */ + Status = HidP_UsageListDifference(DeviceExtension->PreviousUsageList, DeviceExtension->CurrentUsageList, DeviceExtension->BreakUsageList, DeviceExtension->MakeUsageList, DeviceExtension->UsageListLength); + if (Status != HIDP_STATUS_SUCCESS) + { + DPRINT1("MouHid_GetButtonFlags failed to get usages with %x\n", Status); + return; + } + + if (DeviceExtension->UsageListLength) + { + Index = 0; + do + { + /* get usage */ + Usage = DeviceExtension->BreakUsageList[Index]; + if (!Usage) + break; + + if (Usage <= 5) + { + /* max 5 buttons supported */ + *ButtonFlags |= MouHid_ButtonDownFlags[Usage]; + } + + /* move to next index*/ + Index++; + }while(Index < DeviceExtension->UsageListLength); + } + + if (DeviceExtension->UsageListLength) + { + Index = 0; + do + { + /* get usage */ + Usage = DeviceExtension->MakeUsageList[Index]; + if (!Usage) + break; + + if (Usage <= 5) + { + /* max 5 buttons supported */ + *ButtonFlags |= MouHid_ButtonUpFlags[Usage]; + } + + /* move to next index*/ + Index++; + }while(Index < DeviceExtension->UsageListLength); + } + + /* now switch the previous list with current list */ + TempList = DeviceExtension->CurrentUsageList; + DeviceExtension->CurrentUsageList = DeviceExtension->PreviousUsageList; + DeviceExtension->PreviousUsageList = TempList; +} + +VOID +MouHid_DispatchInputData( + IN PDEVICE_OBJECT DeviceObject, + IN PMOUSE_INPUT_DATA InputData) +{ + PMOUHID_DEVICE_EXTENSION DeviceExtension; + KIRQL OldIrql; + ULONG InputDataConsumed; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* sanity check */ + ASSERT(DeviceExtension->ClassService); + ASSERT(DeviceExtension->ClassDeviceObject); + + /* raise irql */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* dispatch input data */ + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassService)(DeviceExtension->ClassDeviceObject, InputData, InputData + 1, &InputDataConsumed); + + /* lower irql to previous level */ + KeLowerIrql(OldIrql); +} + + + NTSTATUS NTAPI MouHid_Create( @@ -69,7 +198,7 @@ Attributes->MouseIdentifier = DeviceExtension->MouseIdentifier; /* number of buttons */ - Attributes->NumberOfButtons = DeviceExtension->Buttons; + Attributes->NumberOfButtons = DeviceExtension->UsageListLength; /* sample rate not used for usb */ Attributes->SampleRate = 0; @@ -227,6 +356,7 @@ ULONG ValueCapsLength; HIDP_VALUE_CAPS ValueCaps; PMOUHID_DEVICE_EXTENSION DeviceExtension; + PUSHORT Buffer; /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -273,11 +403,44 @@ return STATUS_UNSUCCESSFUL; } - /* get number of buttons */ + /* init input report*/ + DeviceExtension->ReportLength = Capabilities.InputReportByteLength; + ASSERT(DeviceExtension->ReportLength); + DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); + ASSERT(DeviceExtension->Report); + RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); + DeviceExtension->ReportMDL = IoAllocateMdl(DeviceExtension->Report, DeviceExtension->ReportLength, FALSE, FALSE, NULL); + ASSERT(DeviceExtension->ReportMDL); + + + /* get max number of buttons */ Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); ASSERT(Buttons > 0); + + /* now allocate an array for those buttons */ + Buffer = ExAllocatePool(NonPagedPool, sizeof(USAGE) * 4 * Buttons); + if (!Buffer) + { + /* no memory */ + ExFreePool(PreparsedData); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init usage lists */ + RtlZeroMemory(Buffer, sizeof(USAGE) * 4 * Buttons); + DeviceExtension->CurrentUsageList = Buffer; + Buffer += Buttons; + DeviceExtension->PreviousUsageList = Buffer; + Buffer += Buttons; + DeviceExtension->MakeUsageList = Buffer; + Buffer += Buttons; + DeviceExtension->BreakUsageList = Buffer; + /* store number of buttons */ - DeviceExtension->Buttons = (USHORT)Buttons; + DeviceExtension->UsageListLength = (USHORT)Buttons; + + /* store preparsed data */ + DeviceExtension->PreparsedData = PreparsedData; ValueCapsLength = 1; HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, &ValueCaps, &ValueCapsLength, PreparsedData); @@ -456,7 +619,6 @@ /* init device extension */ DeviceExtension->MouseIdentifier = MOUSE_HID_HARDWARE; - DeviceExtension->Buttons = 0; DeviceExtension->WheelUsagePage = 0; DeviceExtension->NextDeviceObject = NextDeviceObject; KeInitializeEvent(&DeviceExtension->Event, NotificationEvent, FALSE); Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] Tue Dec 27 00:46:10 2011 @@ -17,7 +17,19 @@ KEVENT Event; PDEVICE_OBJECT ClassDeviceObject; PVOID ClassService; - USHORT Buttons; USHORT MouseIdentifier; USHORT WheelUsagePage; + + USHORT UsageListLength; + PUSAGE CurrentUsageList; + PUSAGE PreviousUsageList; + PUSAGE BreakUsageList; + PUSAGE MakeUsageList; + PVOID PreparsedData; + + PMDL ReportMDL; + PUCHAR Report; + ULONG ReportLength; + + }MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION;

1 0

[cgutman] 54766: [NTOSKRNL] - Don't flush the TLB in MmEnableVirtualMapping and MmCreateVirtualMapping because the PTE is already invalid so it can't possibly be in the TLB per x86 spec - Added exp...
by cgutman＠svn.reactos.org 26 Dec '11

26 Dec '11

Author: cgutman Date: Mon Dec 26 23:12:38 2011 New Revision: 54766 URL: http://svn.reactos.org/svn/reactos?rev=54766&view=rev Log: [NTOSKRNL] - Don't flush the TLB in MmEnableVirtualMapping and MmCreateVirtualMapping because the PTE is already invalid so it can't possibly be in the TLB per x86 spec - Added explanations of why flushes are needed or not needed in certain places - A few small code improvements - Should speed up ROS a bit by avoiding unnecessary TLB entry flushing Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Mon Dec 26 23:12:38 2011 @@ -457,22 +457,26 @@ */ Pte = InterlockedExchangePte(Pt, 0); - WasValid = (PAGE_MASK(Pte) != 0); if (WasValid) { + /* Flush the TLB since we transitioned this PTE + * from valid to invalid so any stale translations + * are removed from the cache */ + MiFlushTlb(Pt, Address); + Pfn = PTE_TO_PFN(Pte); - MiFlushTlb(Pt, Address); - } - else - { + + if (FreePage) + { + MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); + Pfn = 0; + } + } + else + { + MmUnmapPageTable(Pt); Pfn = 0; - MmUnmapPageTable(Pt); - } - - if (FreePage && WasValid) - { - MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); } /* @@ -524,7 +528,8 @@ */ Pte = InterlockedExchangePte(Pt, 0); - //MiFlushTlb(Pt, Address); + /* We don't need to flush here because page file entries + * are invalid translations, so the processor won't cache them */ MmUnmapPageTable(Pt); if(!(Pte & 0x800)) @@ -652,14 +657,10 @@ { Pte = *Pt; } while (Pte != InterlockedCompareExchangePte(Pt, Pte | PA_PRESENT, Pte)); - if (!(Pte & PA_PRESENT)) - { - MiFlushTlb(Pt, Address); - } - else - { - MmUnmapPageTable(Pt); - } + + /* We don't need to flush the TLB here because it + * won't cache translations for non-present pages */ + MmUnmapPageTable(Pt); } BOOLEAN @@ -713,7 +714,10 @@ { KeBugCheck(MEMORY_MANAGEMENT); } - //MiFlushTlb(Pt, Address); + + /* We don't need to flush the TLB here because it + * only caches valid translations and a zero PTE + * is not a valid translation */ MmUnmapPageTable(Pt); return(STATUS_SUCCESS); @@ -809,22 +813,16 @@ } oldPdeOffset = PdeOffset; - Pte = InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes);; + Pte = InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); /* There should not be anything valid here */ if (PAGE_MASK(Pte) != 0) { - PMMPFN Pfn1 = MiGetPfnEntry(PTE_TO_PFN(Pte)); - (void)Pfn1; DPRINT1("Bad PTE %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); } - /* flush if currently mapped, just continue editing if hyperspace - * NOTE : This check is similar to what is done in MiFlushTlb, but we - * don't use it because it would unmap the page table */ - if (Addr >= MmSystemRangeStart || (!IS_HYPERSPACE(Pt))) - { - KeInvalidateTlbEntry(Addr); - } + + /* We don't need to flush the TLB here because it only caches valid translations + * and we're moving this PTE from invalid to valid so it can't be cached right now */ } ASSERT(Addr > Address); @@ -933,8 +931,9 @@ if(!PAGE_MASK(Pte)) { DPRINT1("Invalid Pte %lx\n", Pte); - __debugbreak(); - } + KeBugCheck(MEMORY_MANAGEMENT); + } + if((Pte & Attributes) != Attributes) MiFlushTlb(Pt, Address); else @@ -955,7 +954,7 @@ DPRINT("MmGetPhysicalAddress(vaddr %x)\n", vaddr); Pte = MmGetPageEntryForProcess(NULL, vaddr); - if (Pte != 0 && Pte & PA_PRESENT) + if (Pte != 0 && (Pte & PA_PRESENT)) { p.QuadPart = PAGE_MASK(Pte); p.u.LowPart |= (ULONG_PTR)vaddr & (PAGE_SIZE - 1);

1 0

[janderwald] 54765: [USB-BRINGUP] - Implement retrieving device / configuration descriptor - Partly implement hid descriptor parsing - Select configuration when initialization is complete - Impleme...
by janderwald＠svn.reactos.org 26 Dec '11

26 Dec '11

Author: janderwald Date: Mon Dec 26 21:51:05 2011 New Revision: 54765 URL: http://svn.reactos.org/svn/reactos?rev=54765&view=rev Log: [USB-BRINGUP] - Implement retrieving device / configuration descriptor - Partly implement hid descriptor parsing - Select configuration when initialization is complete - Implement starting up device Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.c branches/usb-bringup/drivers/hid/hidusb/hidusb.h Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] Mon Dec 26 21:51:05 2011 @@ -86,13 +86,13 @@ // // store result // - ASSERT(HidDeviceExtension->HidDescriptor); + ASSERT(HidDeviceExtension->DeviceDescriptor); Irp->IoStatus.Information = sizeof(HID_DESCRIPTOR); Attributes = (PHID_DEVICE_ATTRIBUTES)Irp->UserBuffer; Attributes->Size = sizeof(HID_DEVICE_ATTRIBUTES); - Attributes->VendorID = HidDeviceExtension->VendorID; - Attributes->ProductID = HidDeviceExtension->ProductID; - Attributes->VersionNumber = HidDeviceExtension->VersionNumber; + Attributes->VendorID = HidDeviceExtension->DeviceDescriptor->idVendor; + Attributes->ProductID = HidDeviceExtension->DeviceDescriptor->idProduct; + Attributes->VersionNumber = HidDeviceExtension->DeviceDescriptor->bcdDevice; // // complete request @@ -187,14 +187,6 @@ } NTSTATUS -Hid_PnpStart( - IN PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS NTAPI Hid_PnpCompletion( IN PDEVICE_OBJECT DeviceObject, @@ -211,6 +203,437 @@ // return STATUS_MORE_PROCESSING_REQUIRED; } + +NTSTATUS +Hid_DispatchUrb( + IN PDEVICE_OBJECT DeviceObject, + IN PURB Urb) +{ + PIRP Irp; + KEVENT Event; + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + // + // init event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + + // + // build irp + // + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_SUBMIT_URB, DeviceExtension->NextDeviceObject, NULL, 0, NULL, 0, TRUE, &Event, &IoStatus); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get next stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // store urb + // + IoStack->Parameters.Others.Argument1 = (PVOID)Urb; + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + + // + // call driver + // + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + // + // wait for the request to finish + // + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // done + // + return Status; +} + +NTSTATUS +Hid_GetDescriptor( + IN PDEVICE_OBJECT DeviceObject, + IN USHORT UrbLength, + IN OUT PVOID *UrbBuffer, + IN OUT PULONG UrbBufferLength, + IN UCHAR DescriptorType, + IN UCHAR Index, + IN USHORT LanguageIndex) +{ + PURB Urb; + NTSTATUS Status; + UCHAR Allocated = FALSE; + + // + // allocate urb + // + Urb = (PURB)ExAllocatePool(NonPagedPool, UrbLength); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // is there an urb buffer + // + if (!*UrbBuffer) + { + // + // allocate buffer + // + *UrbBuffer = ExAllocatePool(NonPagedPool, *UrbBufferLength); + if (!*UrbBuffer) + { + // + // no memory + // + ExFreePool(Urb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero buffer + // + RtlZeroMemory(*UrbBuffer, *UrbBufferLength); + Allocated = TRUE; + } + + // + // zero urb + // + RtlZeroMemory(Urb, UrbLength); + + // + // build descriptor request + // + UsbBuildGetDescriptorRequest(Urb, UrbLength, DescriptorType, Index, LanguageIndex, *UrbBuffer, NULL, *UrbBufferLength, NULL); + + // + // dispatch urb + // + Status = Hid_DispatchUrb(DeviceObject, Urb); + + // + // did the request fail + // + if (!NT_SUCCESS(Status)) + { + if (Allocated) + { + // + // free allocated buffer + // + ExFreePool(*UrbBuffer); + *UrbBuffer = NULL; + } + + // + // free urb + // + ExFreePool(Urb); + *UrbBufferLength = 0; + return Status; + } + + // + // did urb request fail + // + if (!NT_SUCCESS(Urb->UrbHeader.Status)) + { + if (Allocated) + { + // + // free allocated buffer + // + ExFreePool(*UrbBuffer); + *UrbBuffer = NULL; + } + + // + // free urb + // + ExFreePool(Urb); + *UrbBufferLength = 0; + return STATUS_UNSUCCESSFUL; + } + + // + // store result length + // + *UrbBufferLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; + + // + // free urb + // + ExFreePool(Urb); + + // + // completed successfully + // + return STATUS_SUCCESS; +} + +NTSTATUS +Hid_SelectConfiguration( + IN PDEVICE_OBJECT DeviceObject) +{ + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + NTSTATUS Status; + USBD_INTERFACE_LIST_ENTRY InterfaceList[2]; + PURB Urb; + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // now parse the descriptors + // + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(HidDeviceExtension->ConfigurationDescriptor, + HidDeviceExtension->ConfigurationDescriptor, + -1, + -1, + USB_DEVICE_CLASS_HUMAN_INTERFACE, + -1, + -1); + + // + // sanity check + // + ASSERT(InterfaceDescriptor); + ASSERT(InterfaceDescriptor->bInterfaceClass == USB_DEVICE_CLASS_HUMAN_INTERFACE); + ASSERT(InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + + // + // setup interface list + // + RtlZeroMemory(InterfaceList, sizeof(InterfaceList)); + InterfaceList[0].InterfaceDescriptor = InterfaceDescriptor; + + // + // build urb + // + Urb = USBD_CreateConfigurationRequestEx(HidDeviceExtension->ConfigurationDescriptor, InterfaceList); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // dispatch request + // + Status = Hid_DispatchUrb(DeviceObject, Urb); + if (NT_SUCCESS(Status)) + { + // + // store configuration handle + // + HidDeviceExtension->ConfigurationHandle = Urb->UrbSelectConfiguration.ConfigurationHandle; + + // + // copy interface info + // + HidDeviceExtension->InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)ExAllocatePool(NonPagedPool, Urb->UrbSelectConfiguration.Interface.Length); + if (HidDeviceExtension->InterfaceInfo) + { + // + // copy interface info + // + RtlCopyMemory(HidDeviceExtension->InterfaceInfo, &Urb->UrbSelectConfiguration.Interface, Urb->UrbSelectConfiguration.Interface.Length); + } + } + + // + // free urb request + // + ExFreePool(Urb); + + // + // done + // + return Status; +} + + +NTSTATUS +Hid_PnpStart( + IN PDEVICE_OBJECT DeviceObject) +{ + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + ULONG DescriptorLength; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PHID_DESCRIPTOR HidDescriptor; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // get device descriptor + // + DescriptorLength = sizeof(USB_DEVICE_DESCRIPTOR); + Status = Hid_GetDescriptor(DeviceObject, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->DeviceDescriptor, &DescriptorLength, USB_DEVICE_DESCRIPTOR_TYPE, 0, 0); + if (!NT_SUCCESS(Status)) + { + // + // failed to obtain device descriptor + // + DPRINT1("Hid_PnpStart failed to get device descriptor %x\n", Status); + return Status; + } + + // + // now get the configuration descriptor + // + DescriptorLength = sizeof(USB_CONFIGURATION_DESCRIPTOR); + Status = Hid_GetDescriptor(DeviceObject, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->ConfigurationDescriptor, &DescriptorLength, USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0); + if (!NT_SUCCESS(Status)) + { + // + // failed to obtain device descriptor + // + DPRINT1("Hid_PnpStart failed to get device descriptor %x\n", Status); + return Status; + } + + // + // sanity check + // + ASSERT(DescriptorLength); + ASSERT(HidDeviceExtension->ConfigurationDescriptor); + ASSERT(HidDeviceExtension->ConfigurationDescriptor->bLength); + + // + // store full length + // + DescriptorLength = HidDeviceExtension->ConfigurationDescriptor->wTotalLength; + + // + // delete partial configuration descriptor + // + ExFreePool(HidDeviceExtension->ConfigurationDescriptor); + HidDeviceExtension->ConfigurationDescriptor = NULL; + + // + // get full configuration descriptor + // + Status = Hid_GetDescriptor(DeviceObject, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->ConfigurationDescriptor, &DescriptorLength, USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0); + if (!NT_SUCCESS(Status)) + { + // + // failed to obtain device descriptor + // + DPRINT1("Hid_PnpStart failed to get device descriptor %x\n", Status); + return Status; + } + + // + // now parse the descriptors + // + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(HidDeviceExtension->ConfigurationDescriptor, + HidDeviceExtension->ConfigurationDescriptor, + -1, + -1, + USB_DEVICE_CLASS_HUMAN_INTERFACE, + -1, + -1); + if (!InterfaceDescriptor) + { + // + // no interface class + // + DPRINT1("NO HID Class found\n"); + return STATUS_UNSUCCESSFUL; + } + + // + // sanity check + // + ASSERT(InterfaceDescriptor->bInterfaceClass == USB_DEVICE_CLASS_HUMAN_INTERFACE); + ASSERT(InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + + // + // move to next descriptor + // + HidDescriptor = (PHID_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); + ASSERT(HidDescriptor->bLength >= 2); + + // + // check if this is the hid descriptor + // + if (HidDescriptor->bLength == sizeof(HID_DESCRIPTOR) && HidDescriptor->bDescriptorType == HID_HID_DESCRIPTOR_TYPE) + { + // + // found + // + HidDeviceExtension->HidDescriptor = HidDescriptor; + + // + // select configuration + // + Status = Hid_SelectConfiguration(DeviceObject); + + // + // done + // + return Status; + } + + // + // FIXME parse hid descriptor + // + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_SUCCESS; +} + NTSTATUS NTAPI Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.h [iso-8859-1] Mon Dec 26 21:51:05 2011 @@ -5,6 +5,11 @@ #include <ntddk.h> #include <hidport.h> #include <debug.h> +#include <hubbusif.h> +#include <usbbusif.h> +#include <usbioctl.h> +#include <usb.h> +#include <usbdlib.h> typedef struct { @@ -19,13 +24,28 @@ LIST_ENTRY PendingRequests; // + // device descriptor + // + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; + + // + // configuration descriptor + // + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + + // + // interface information + // + PUSBD_INTERFACE_INFORMATION InterfaceInfo; + + // + // configuration handle + // + USBD_CONFIGURATION_HANDLE ConfigurationHandle; + + // // hid descriptor // PHID_DESCRIPTOR HidDescriptor; - - USHORT VendorID; - USHORT ProductID; - USHORT VersionNumber; - }HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION;

1 0

[janderwald] 54764: [USB-BRINGUP] - Implement IOCTL_HID_GET_DEVICE_ATTRIBUTES, IOCTL_HID_GET_DEVICE_DESCRIPTOR for hidusb - Partly implement pnp dispatch routines for hidusb
by janderwald＠svn.reactos.org 26 Dec '11

26 Dec '11

Author: janderwald Date: Mon Dec 26 18:20:32 2011 New Revision: 54764 URL: http://svn.reactos.org/svn/reactos?rev=54764&view=rev Log: [USB-BRINGUP] - Implement IOCTL_HID_GET_DEVICE_ATTRIBUTES, IOCTL_HID_GET_DEVICE_DESCRIPTOR for hidusb - Partly implement pnp dispatch routines for hidusb Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.c branches/usb-bringup/drivers/hid/hidusb/hidusb.h Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] Mon Dec 26 18:20:32 2011 @@ -52,6 +52,111 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PIO_STACK_LOCATION IoStack; + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + PHID_DEVICE_ATTRIBUTES Attributes; + ULONG Length; + NTSTATUS Status; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(IoStack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_HID_GET_DEVICE_ATTRIBUTES: + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_DEVICE_ATTRIBUTES)) + { + // + // invalid request + // + Irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_BUFFER_SIZE; + } + // + // store result + // + ASSERT(HidDeviceExtension->HidDescriptor); + Irp->IoStatus.Information = sizeof(HID_DESCRIPTOR); + Attributes = (PHID_DEVICE_ATTRIBUTES)Irp->UserBuffer; + Attributes->Size = sizeof(HID_DEVICE_ATTRIBUTES); + Attributes->VendorID = HidDeviceExtension->VendorID; + Attributes->ProductID = HidDeviceExtension->ProductID; + Attributes->VersionNumber = HidDeviceExtension->VersionNumber; + + // + // complete request + // + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + case IOCTL_HID_GET_DEVICE_DESCRIPTOR: + { + // + // sanity check + // + ASSERT(HidDeviceExtension->HidDescriptor); + + // + // store length + // + Length = min(HidDeviceExtension->HidDescriptor->bLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + // + // copy descriptor + // + RtlCopyMemory(Irp->UserBuffer, HidDeviceExtension->HidDescriptor, Length); + + // + // store result length + // + Irp->IoStatus.Information = HidDeviceExtension->HidDescriptor->bLength; + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* complete request */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + case IOCTL_HID_GET_REPORT_DESCRIPTOR: + case IOCTL_HID_READ_REPORT: + case IOCTL_HID_WRITE_REPORT: + case IOCTL_GET_PHYSICAL_DESCRIPTOR: + case IOCTL_HID_SEND_IDLE_NOTIFICATION_REQUEST: + case IOCTL_HID_GET_FEATURE: + case IOCTL_HID_SET_FEATURE: + case IOCTL_HID_SET_OUTPUT_REPORT: + case IOCTL_HID_GET_INPUT_REPORT: + case IOCTL_HID_GET_INDEXED_STRING: + case IOCTL_HID_GET_MS_GENRE_DESCRIPTOR: + { + DPRINT1("UNIMPLEMENTED %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + ASSERT(FALSE); + } + default: + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +} + +NTSTATUS +NTAPI +HidPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ UNIMPLEMENTED ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; @@ -59,48 +164,247 @@ NTSTATUS NTAPI -HidPower( +HidSystemControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PHID_DEVICE_EXTENSION DeviceExtension; + + // + // get hid device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // copy stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // submit request + // + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +Hid_PnpStart( + IN PDEVICE_OBJECT DeviceObject) +{ UNIMPLEMENTED - ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; } NTSTATUS NTAPI -HidSystemControl( +Hid_PnpCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + // + // signal event + // + KeSetEvent((PRKEVENT)Context, 0, FALSE); + + // + // done + // + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +HidPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; - - // - // get hid device extension + KEVENT Event; + + // + // get device extension // DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // - // copy stack location - // - IoCopyCurrentIrpStackLocationToNext(Irp); - - // - // submit request - // - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); -} - -NTSTATUS -NTAPI -HidPnp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // handle requests based on request type + // + switch(IoStack->MinorFunction) + { + case IRP_MN_REMOVE_DEVICE: + { + // + // pass request onto lower driver + // + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + // + // free resources + // + if (HidDeviceExtension->HidDescriptor) + { + ExFreePool(HidDeviceExtension->HidDescriptor); + HidDeviceExtension->HidDescriptor = NULL; + } + + // + // done + // + return Status; + } + case IRP_MN_QUERY_PNP_DEVICE_STATE: + { + // + // device can not be disabled + // + Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; + + // + // pass request to next request + // + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + // + // done + // + return Status; + } + case IRP_MN_STOP_DEVICE: + { + // + // FIXME: unconfigure the device + // + + // + // prepare irp + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + + // + // send irp and wait for completion + // + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + // + // free resources + // + if (HidDeviceExtension->HidDescriptor) + { + ExFreePool(HidDeviceExtension->HidDescriptor); + HidDeviceExtension->HidDescriptor = NULL; + } + + // + // done + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + case IRP_MN_QUERY_CAPABILITIES: + { + // + // prepare irp + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + + // + // send irp and wait for completion + // + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (NT_SUCCESS(Status)) + { + // + // driver supports D1 & D2 + // + IoStack->Parameters.DeviceCapabilities.Capabilities->DeviceD1 = TRUE; + IoStack->Parameters.DeviceCapabilities.Capabilities->DeviceD2 = TRUE; + } + + // + // done + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + case IRP_MN_START_DEVICE: + { + // + // prepare irp + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + + // + // send irp and wait for completion + // + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + // + // did the device successfully start + // + if (!NT_SUCCESS(Status)) + { + // + // failed + // + DPRINT1("HIDUSB: IRP_MN_START_DEVICE failed with %x\n", Status); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + // + // start device + // + Status = Hid_PnpStart(DeviceObject); + + // + // complete request + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + default: + { + // + // forward and forget request + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } + } } NTSTATUS Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.h [iso-8859-1] Mon Dec 26 18:20:32 2011 @@ -18,5 +18,14 @@ // LIST_ENTRY PendingRequests; + // + // hid descriptor + // + PHID_DESCRIPTOR HidDescriptor; + + USHORT VendorID; + USHORT ProductID; + USHORT VersionNumber; + }HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION;

1 0

[ekohl] 54763: [EVENTLOG] - Replace the log file critical section by a resource and use shared locks for read actions and exclusive locks for write actions. - Add stubs for clear and backup actions.
by ekohl＠svn.reactos.org 26 Dec '11

26 Dec '11

Author: ekohl Date: Mon Dec 26 13:54:05 2011 New Revision: 54763 URL: http://svn.reactos.org/svn/reactos?rev=54763&view=rev Log: [EVENTLOG] - Replace the log file critical section by a resource and use shared locks for read actions and exclusive locks for write actions. - Add stubs for clear and backup actions. Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Mon Dec 26 13:54:05 2011 @@ -88,7 +88,7 @@ EVENTLOGHEADER Header; WCHAR *LogName; WCHAR *FileName; - CRITICAL_SECTION cs; + RTL_RESOURCE Lock; PEVENT_OFFSET_INFO OffsetInfo; ULONG OffsetInfoSize; ULONG OffsetInfoNext; @@ -140,6 +140,14 @@ BOOL LogfWriteData(PLOGFILE LogFile, DWORD BufSize, PBYTE Buffer); + +NTSTATUS +LogfClearFile(PLOGFILE LogFile, + PUNICODE_STRING BackupFileName); + +NTSTATUS +LogfBackupFile(PLOGFILE LogFile, + PUNICODE_STRING BackupFileName); PLOGFILE LogfCreate(WCHAR * LogName, WCHAR * FileName); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Dec 26 13:54:05 2011 @@ -364,7 +364,8 @@ if (!bResult) goto fail; - InitializeCriticalSection(&LogFile->cs); + RtlInitializeResource(&LogFile->Lock); + LogfListAddItem(LogFile); return LogFile; @@ -391,13 +392,13 @@ if (LogFile == NULL) return; - EnterCriticalSection(&LogFile->cs); + RtlAcquireResourceExclusive(&LogFile->Lock, TRUE); FlushFileBuffers(LogFile->hFile); CloseHandle(LogFile->hFile); LogfListRemoveItem(LogFile); - DeleteCriticalSection(&LogFile->cs); + RtlDeleteResource(&LogFile->Lock); HeapFree(MyHeap, 0, LogFile->LogName); HeapFree(MyHeap, 0, LogFile->FileName); @@ -727,7 +728,8 @@ } dwRecNum = *RecordNumber; - EnterCriticalSection(&LogFile->cs); + + RtlAcquireResourceShared(&LogFile->Lock, TRUE); *BytesRead = 0; *BytesNeeded = 0; @@ -736,7 +738,7 @@ if (!dwOffset) { - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return ERROR_HANDLE_EOF; } @@ -756,7 +758,7 @@ if (dwRecSize > BufSize) { *BytesNeeded = dwRecSize; - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return ERROR_INSUFFICIENT_BUFFER; } @@ -857,12 +859,12 @@ *BytesRead = dwBufferUsage; * RecordNumber = dwRecNum; - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return ERROR_SUCCESS; Done: DPRINT1("LogfReadEvent failed with %x\n",GetLastError()); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return GetLastError(); } @@ -883,11 +885,11 @@ GetSystemTime(&st); SystemTimeToEventTime(&st, &((PEVENTLOGRECORD) Buffer)->TimeWritten); - EnterCriticalSection(&LogFile->cs); + RtlAcquireResourceExclusive(&LogFile->Lock, TRUE); if (!GetFileSizeEx(LogFile->hFile, &logFileSize)) { - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -906,7 +908,7 @@ { DPRINT1("Failed to allocate buffer for OldestRecord!\n"); HeapFree(GetProcessHeap(), 0, RecBuf); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -920,7 +922,7 @@ { DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, RecBuf); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -928,14 +930,14 @@ { DPRINT1("ReadFile() failed!\n"); HeapFree(GetProcessHeap(), 0, RecBuf); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } if (RecBuf->Reserved != LOGFILE_SIGNATURE) { DPRINT1("LogFile corrupt!\n"); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -963,14 +965,14 @@ FILE_BEGIN) == INVALID_SET_FILE_POINTER) { DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } if (!WriteFile(LogFile->hFile, Buffer, BufSize, &dwWritten, NULL)) { DPRINT1("WriteFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -978,7 +980,7 @@ LogFile->Header.CurrentRecordNumber, WriteOffSet)) { - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -997,7 +999,7 @@ FILE_BEGIN) == INVALID_SET_FILE_POINTER) { DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -1019,7 +1021,7 @@ NULL)) { DPRINT1("WriteFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -1027,7 +1029,7 @@ INVALID_SET_FILE_POINTER) { DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } @@ -1038,20 +1040,54 @@ NULL)) { DPRINT1("WriteFile failed! LastError = %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); return FALSE; } if (!FlushFileBuffers(LogFile->hFile)) { - LeaveCriticalSection(&LogFile->cs); DPRINT1("FlushFileBuffers() failed! %d\n", GetLastError()); - return FALSE; - } - - LeaveCriticalSection(&LogFile->cs); + RtlReleaseResource(&LogFile->Lock); + return FALSE; + } + + RtlReleaseResource(&LogFile->Lock); return TRUE; } + + +NTSTATUS +LogfClearFile(PLOGFILE LogFile, + PUNICODE_STRING BackupFileName) +{ + RtlAcquireResourceExclusive(&LogFile->Lock, TRUE); + + if (BackupFileName->Length > 0) + { + /* FIXME: Write a backup file */ + } + + LogfInitializeNew(LogFile); + + RtlReleaseResource(&LogFile->Lock); + + return STATUS_SUCCESS; +} + + +NTSTATUS +LogfBackupFile(PLOGFILE LogFile, + PUNICODE_STRING BackupFileName) +{ +// RtlAcquireResourceShared(&LogFile->Lock, TRUE); + + /* FIXME: Write a backup file */ + +// RtlReleaseResource(&LogFile->Lock); + + return STATUS_NOT_IMPLEMENTED; +} + /* Returns 0 if nothing found. */ ULONG LogfOffsetByNumber(PLOGFILE LogFile, DWORD RecordNumber) Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Mon Dec 26 13:54:05 2011 @@ -161,7 +161,8 @@ PRPC_UNICODE_STRING BackupFileName) { PLOGHANDLE lpLogHandle; - PLOGFILE lpLogFile; + + DPRINT("ElfrClearELFW()\n"); lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); if (!lpLogHandle) @@ -169,16 +170,8 @@ return STATUS_INVALID_HANDLE; } - lpLogFile = lpLogHandle->LogFile; - - if (BackupFileName->Length > 0) - { - /* FIXME: Write a backup file */ - } - - LogfInitializeNew(lpLogFile); - - return STATUS_SUCCESS; + return LogfClearFile(lpLogHandle->LogFile, + (PUNICODE_STRING)BackupFileName); } @@ -187,9 +180,20 @@ IELF_HANDLE LogHandle, PRPC_UNICODE_STRING BackupFileName) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PLOGHANDLE lpLogHandle; + + DPRINT("ElfrBackupELFW()\n"); + + lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!lpLogHandle) + { + return STATUS_INVALID_HANDLE; + } + + return LogfBackupFile(lpLogHandle->LogFile, + (PUNICODE_STRING)BackupFileName); +} + /* Function 2 */ NTSTATUS ElfrCloseEL( @@ -279,6 +283,8 @@ RPC_CLIENT_ID ClientId, DWORD Event) { + DPRINT("ElfrChangeNotify()"); + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; }

1 0

[janderwald] 54762: [USB-BRINGUP] - Halfplement mouse hid driver, WIP, untested
by janderwald＠svn.reactos.org 26 Dec '11

26 Dec '11

Author: janderwald Date: Mon Dec 26 03:37:22 2011 New Revision: 54762 URL: http://svn.reactos.org/svn/reactos?rev=54762&view=rev Log: [USB-BRINGUP] - Halfplement mouse hid driver, WIP, untested Added: branches/usb-bringup/drivers/hid/mouhid/ (with props) branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt (with props) branches/usb-bringup/drivers/hid/mouhid/mouhid.c (with props) branches/usb-bringup/drivers/hid/mouhid/mouhid.h (with props) branches/usb-bringup/drivers/hid/mouhid/mouhid.rc (with props) Modified: branches/usb-bringup/drivers/hid/CMakeLists.txt branches/usb-bringup/drivers/hid/hidclass/hidclass.c Modified: branches/usb-bringup/drivers/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/hid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/CMakeLists.txt [iso-8859-1] Mon Dec 26 03:37:22 2011 @@ -1,3 +1,4 @@ add_subdirectory(hidclass) add_subdirectory(hidparse) -add_subdirectory(hidusb) +add_subdirectory(hidusb) +add_subdirectory(mouhid) Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Mon Dec 26 03:37:22 2011 @@ -111,14 +111,13 @@ return Status; } -NTSTATUS +VOID NTAPI HidClassDriverUnload( IN PDRIVER_OBJECT DriverObject) { UNIMPLEMENTED ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; } NTSTATUS Propchange: branches/usb-bringup/drivers/hid/mouhid/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Dec 26 03:37:22 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/mouhid/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/mouhid/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/mouhid/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] Mon Dec 26 03:37:22 2011 @@ -1,0 +1,13 @@ + +add_definitions(-DDEBUG_MODE) + +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +add_library(mouhid SHARED mouhid.c mouhid.rc) + +set_module_type(mouhid kernelmodedriver) +add_importlibs(mouhid ntoskrnl hidparse) +add_cab_target(mouhid 2) + +add_cab_target(mouhid 2) + Propchange: branches/usb-bringup/drivers/hid/mouhid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c (added) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Mon Dec 26 03:37:22 2011 @@ -1,0 +1,514 @@ +/* + * PROJECT: ReactOS HID Stack + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/hid/mouhid/mouhid.c + * PURPOSE: Mouse HID Driver + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "mouhid.h" + +NTSTATUS +NTAPI +MouHid_Create( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +MouHid_Close( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +MouHid_DeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PMOUSE_ATTRIBUTES Attributes; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + PCONNECT_DATA Data; + + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* handle requests */ + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_MOUSE_QUERY_ATTRIBUTES) + { + /* verify output buffer length */ + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) + { + /* invalid request */ + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + /* get output buffer */ + Attributes = (PMOUSE_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer; + + /* type of mouse */ + Attributes->MouseIdentifier = DeviceExtension->MouseIdentifier; + + /* number of buttons */ + Attributes->NumberOfButtons = DeviceExtension->Buttons; + + /* sample rate not used for usb */ + Attributes->SampleRate = 0; + + /* queue length */ + Attributes->InputDataQueueLength = 2; + + /* complete request */ + Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_MOUSE_CONNECT) + { + /* verify input buffer length */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) + { + /* invalid request */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* is it already connected */ + if (DeviceExtension->ClassService) + { + /* already connected */ + Irp->IoStatus.Status = STATUS_SHARING_VIOLATION; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SHARING_VIOLATION; + } + + /* get connect data */ + Data = (PCONNECT_DATA)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + /* store connect details */ + DeviceExtension->ClassDeviceObject = Data->ClassDeviceObject; + DeviceExtension->ClassService = Data->ClassService; + + /* completed successfully */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_MOUSE_DISCONNECT) + { + /* not supported */ + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_MOUSE_ENABLE) + { + /* not supported */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_MOUSE_DISABLE) + { + /* not supported */ + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* unknown request not supported */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +MouHid_InternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* skip stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* pass and forget */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +NTAPI +MouHid_Power( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +MouHid_SubmitRequest( + PDEVICE_OBJECT DeviceObject, + ULONG IoControlCode, + ULONG InputBufferSize, + PVOID InputBuffer, + ULONG OutputBufferSize, + PVOID OutputBuffer) +{ + KEVENT Event; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + PIRP Irp; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatus; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* build request */ + Irp = IoBuildDeviceIoControlRequest(IoControlCode, DeviceExtension->NextDeviceObject, InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, FALSE, &Event, &IoStatus); + if (!Irp) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* send request */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* wait for request to complete */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + /* done */ + return Status; +} + +NTSTATUS +NTAPI +MouHid_StartDevice( + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + ULONG Buttons; + HID_COLLECTION_INFORMATION Information; + PVOID PreparsedData; + HIDP_CAPS Capabilities; + ULONG ValueCapsLength; + HIDP_VALUE_CAPS ValueCaps; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* query collection information */ + Status = MouHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, 0, NULL, sizeof(HID_COLLECTION_INFORMATION), &Information); + if (!NT_SUCCESS(Status)) + { + /* failed to query collection information */ + return Status; + } + + /* lets allocate space for preparsed data */ + PreparsedData = ExAllocatePool(NonPagedPool, Information.DescriptorSize); + if (PreparsedData) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* now obtain the preparsed data */ + Status = MouHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_DRIVER_CONFIG, 0, NULL, Information.DescriptorSize, PreparsedData); + if (!NT_SUCCESS(Status)) + { + /* failed to get preparsed data */ + ExFreePool(PreparsedData); + return Status; + } + + /* lets get the caps */ + Status = HidP_GetCaps(PreparsedData, &Capabilities); + if (!NT_SUCCESS(Status)) + { + /* failed to get capabilities */ + ExFreePool(PreparsedData); + return Status; + } + + /* verify capabilities */ + if (Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) + { + /* not supported */ + ExFreePool(PreparsedData); + return STATUS_UNSUCCESSFUL; + } + + /* get number of buttons */ + Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); + ASSERT(Buttons > 0); + /* store number of buttons */ + DeviceExtension->Buttons = (USHORT)Buttons; + + ValueCapsLength = 1; + HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, &ValueCaps, &ValueCapsLength, PreparsedData); + + ValueCapsLength = 1; + HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, &ValueCaps, &ValueCapsLength, PreparsedData); + + /* now check for wheel mouse support */ + ValueCapsLength = 1; + Status = HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_WHEEL, &ValueCaps, &ValueCapsLength, PreparsedData); + if (Status == HIDP_STATUS_SUCCESS ) + { + /* mouse has wheel support */ + DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; + DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; + } + else + { + /* check if the mouse has z-axis */ + ValueCapsLength = 1; + Status = HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Z, &ValueCaps, &ValueCapsLength, PreparsedData); + if (Status == HIDP_STATUS_SUCCESS && ValueCapsLength == 1) + { + /* wheel support */ + DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; + DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; + } + } + + /* completed successfully */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MouHid_StartDeviceCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + KeSetEvent((PKEVENT)Context, 0, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +MouHid_Pnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + KEVENT Event; + NTSTATUS Status; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE) + { + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_REMOVE_DEVICE) + { + /* FIXME synchronization */ + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + IoFreeIrp(DeviceExtension->Irp); + IoDetachDevice(DeviceExtension->NextDeviceObject); + IoDeleteDevice(DeviceObject); + return Status; + } + else if (IoStack->MinorFunction == IRP_MN_START_DEVICE) + { + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* copy stack location */ + IoCopyCurrentIrpStackLocationToNext (Irp); + + /* set completion routine */ + IoSetCompletionRoutine(Irp, MouHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); + Irp->IoStatus.Status = 0; + + /* pass request */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (!NT_SUCCESS(Status)) + { + /* failed */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* lets start the device */ + Status = MouHid_StartDevice(DeviceObject); + DPRINT1("MouHid_StartDevice %x\n", Status); + + /* complete request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return Status; + } + else + { + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } +} + +NTSTATUS +NTAPI +MouHid_AddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject, NextDeviceObject; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + POWER_STATE State; + + /* create device object */ + Status = IoCreateDevice(DriverObject, sizeof(MOUHID_DEVICE_EXTENSION), NULL, FILE_DEVICE_MOUSE, 0, FALSE, &DeviceObject); + if (!NT_SUCCESS(Status)) + { + /* failed to create device object */ + return Status; + } + + /* now attach it */ + NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + if (!NextDeviceObject) + { + /* failed to attach */ + IoDeleteDevice(DeviceObject); + return STATUS_DEVICE_NOT_CONNECTED; + } + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* zero extension */ + RtlZeroMemory(DeviceExtension, sizeof(MOUHID_DEVICE_EXTENSION)); + + /* init device extension */ + DeviceExtension->MouseIdentifier = MOUSE_HID_HARDWARE; + DeviceExtension->Buttons = 0; + DeviceExtension->WheelUsagePage = 0; + DeviceExtension->NextDeviceObject = NextDeviceObject; + KeInitializeEvent(&DeviceExtension->Event, NotificationEvent, FALSE); + DeviceExtension->Irp = IoAllocateIrp(NextDeviceObject->StackSize, FALSE); + + /* FIXME handle allocation error */ + ASSERT(DeviceExtension->Irp); + + /* FIXME query parameter 'FlipFlopWheel', 'WheelScalingFactor' */ + + /* set power state to D0 */ + State.DeviceState = PowerDeviceD0; + PoSetPowerState(DeviceObject, DevicePowerState, State); + + /* init device object */ + DeviceObject->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* completed successfully */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +MouHid_Unload( + IN PDRIVER_OBJECT DriverObject) +{ + UNIMPLEMENTED + ASSERT(FALSE); +} + + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + /* FIXME check for parameters 'UseOnlyMice', 'TreatAbsoluteAsRelative', 'TreatAbsolutePointerAsAbsolute' */ + + /* initialize driver object */ + DriverObject->DriverUnload = MouHid_Unload; + DriverObject->DriverExtension->AddDevice = MouHid_AddDevice; + DriverObject->MajorFunction[IRP_MJ_CREATE] = MouHid_Create; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = MouHid_Close; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = MouHid_DeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = MouHid_InternalDeviceControl; + DriverObject->MajorFunction[IRP_MJ_POWER] = MouHid_Power; + DriverObject->MajorFunction[IRP_MJ_PNP] = MouHid_Pnp; + DriverObject->DriverUnload = MouHid_Unload; + DriverObject->DriverExtension->AddDevice = MouHid_AddDevice; + + /* done */ + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/hid/mouhid/mouhid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.h (added) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] Mon Dec 26 03:37:22 2011 @@ -1,0 +1,23 @@ +#pragma once + +#define _HIDPI_NO_FUNCTION_MACROS_ +#include <ntddk.h> +#include <hidclass.h> +#include <hidpddi.h> +#include <hidpi.h> +#include <debug.h> +#include <ntddmou.h> +#include <kbdmou.h> + + +typedef struct +{ + PDEVICE_OBJECT NextDeviceObject; + PIRP Irp; + KEVENT Event; + PDEVICE_OBJECT ClassDeviceObject; + PVOID ClassService; + USHORT Buttons; + USHORT MouseIdentifier; + USHORT WheelUsagePage; +}MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; Propchange: branches/usb-bringup/drivers/hid/mouhid/mouhid.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/mouhid/mouhid.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.rc (added) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.rc [iso-8859-1] Mon Dec 26 03:37:22 2011 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB HID Parser\0" +#define REACTOS_STR_INTERNAL_NAME "hidparse\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hidparse.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup/drivers/hid/mouhid/mouhid.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 54761: [NTOSKRNL] - Don't change page protection while the memory area is being deleted
by cgutman＠svn.reactos.org 26 Dec '11

26 Dec '11

Author: cgutman Date: Mon Dec 26 02:52:26 2011 New Revision: 54761 URL: http://svn.reactos.org/svn/reactos?rev=54761&view=rev Log: [NTOSKRNL] - Don't change page protection while the memory area is being deleted Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Dec 26 02:52:26 2011 @@ -495,7 +495,7 @@ MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); - if (MemoryArea == NULL) + if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Mon Dec 26 02:52:26 2011 @@ -781,6 +781,9 @@ } } + /* There must be no page ops in progress */ + ASSERT(MemoryArea->PageOpCount == 0); + /* Remove the tree item. */ { if (MemoryArea->Parent != NULL) Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Mon Dec 26 02:52:26 2011 @@ -148,6 +148,9 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); Offset = PAGE_ROUND_DOWN(Offset); + + /* Making a page op during marea destruction is illegal */ + ASSERT(!MArea->DeleteInProgress); /* * Calcuate the hash value for pageop structure

1 0

[janderwald] 54760: [HIDCLASS] - Implement AddDevice routine
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 23:07:50 2011 New Revision: 54760 URL: http://svn.reactos.org/svn/reactos?rev=54760&view=rev Log: [HIDCLASS] - Implement AddDevice routine Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/precomp.h Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun Dec 25 23:07:50 2011 @@ -11,6 +11,7 @@ #include "precomp.h" static LPWSTR ClientIdentificationAddress = L"HIDCLASS"; +static ULONG HidClassDeviceNumber = 0; ULONG NTAPI @@ -32,9 +33,82 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + WCHAR CharDeviceName[64]; + NTSTATUS Status; + UNICODE_STRING DeviceName; + PDEVICE_OBJECT NewDeviceObject; + PHIDCLASS_DEVICE_EXTENSION DeviceExtension; + ULONG DeviceExtensionSize; + PHIDCLASS_DRIVER_EXTENSION DriverExtension; + + + /* increment device number */ + InterlockedIncrement((PLONG)&HidClassDeviceNumber); + + /* construct device name */ + swprintf(CharDeviceName, L"\\Device\\_HID%08x", HidClassDeviceNumber); + + /* initialize device name */ + RtlInitUnicodeString(&DeviceName, CharDeviceName); + + /* get driver object extension */ + DriverExtension = (PHIDCLASS_DRIVER_EXTENSION) IoGetDriverObjectExtension(DriverObject, ClientIdentificationAddress); + if (!DriverExtension) + { + /* device removed */ + ASSERT(FALSE); + return STATUS_DEVICE_CONFIGURATION_ERROR; + } + + /* calculate device extension size */ + DeviceExtensionSize = sizeof(HIDCLASS_DEVICE_EXTENSION) + DriverExtension->DeviceExtensionSize; + + /* now create the device */ + Status = IoCreateDevice(DriverObject, DeviceExtensionSize, &DeviceName, FILE_DEVICE_UNKNOWN, 0, FALSE, &NewDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* failed to create device object */ + ASSERT(FALSE); + return Status; + } + + /* get device extension */ + DeviceExtension = (PHIDCLASS_DEVICE_EXTENSION)NewDeviceObject->DeviceExtension; + + /* zero device extension */ + RtlZeroMemory(DeviceExtension, sizeof(HIDCLASS_DEVICE_EXTENSION)); + + /* initialize device extension */ + DeviceExtension->HidDeviceExtension.PhysicalDeviceObject = PhysicalDeviceObject; + DeviceExtension->HidDeviceExtension.MiniDeviceExtension = (PVOID)((ULONG_PTR)DeviceExtension + sizeof(HIDCLASS_DEVICE_EXTENSION)); + DeviceExtension->HidDeviceExtension.NextDeviceObject = IoAttachDeviceToDeviceStack(NewDeviceObject, PhysicalDeviceObject); + DeviceExtension->IsFDO = TRUE; + DeviceExtension->DriverExtension = DriverExtension; + + /* sanity check */ + ASSERT(DeviceExtension->HidDeviceExtension.NextDeviceObject); + + /* increment stack size */ + NewDeviceObject->StackSize++; + + /* init device object */ + NewDeviceObject->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + NewDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* now call driver provided add device routine */ + ASSERT(DriverExtension->AddDevice != 0); + Status = DriverExtension->AddDevice(DriverObject, NewDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* failed */ + DPRINT1("HIDCLASS: AddDevice failed with %x\n", Status); + IoDetachDevice(DeviceExtension->HidDeviceExtension.NextDeviceObject); + IoDeleteDevice(NewDeviceObject); + return Status; + } + + /* succeeded */ + return Status; } NTSTATUS Modified: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Sun Dec 25 23:07:50 2011 @@ -16,4 +16,12 @@ PDRIVER_UNLOAD DriverUnload; KSPIN_LOCK Lock; -}HIDCLASS_DRIVER_EXTENSION, *PHIDCLASS_DRIVER_EXTENSION; +}HIDCLASS_DRIVER_EXTENSION, *PHIDCLASS_DRIVER_EXTENSION; + +typedef struct +{ + HID_DEVICE_EXTENSION HidDeviceExtension; + BOOLEAN IsFDO; + PHIDCLASS_DRIVER_EXTENSION DriverExtension; + +}HIDCLASS_DEVICE_EXTENSION, *PHIDCLASS_DEVICE_EXTENSION;

1 0

[janderwald] 54759: [USB-BRINGUP] - add template for hidclass driver - fix hidusb build
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 20:21:34 2011 New Revision: 54759 URL: http://svn.reactos.org/svn/reactos?rev=54759&view=rev Log: [USB-BRINGUP] - add template for hidclass driver - fix hidusb build Added: branches/usb-bringup/drivers/hid/hidclass/ (with props) branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt (with props) branches/usb-bringup/drivers/hid/hidclass/hidclass.c (with props) branches/usb-bringup/drivers/hid/hidclass/hidclass.rc (with props) branches/usb-bringup/drivers/hid/hidclass/hidclass.spec (with props) branches/usb-bringup/drivers/hid/hidclass/precomp.h (with props) branches/usb-bringup/drivers/hid/hidusb/hidusb.rc (with props) Modified: branches/usb-bringup/drivers/hid/CMakeLists.txt branches/usb-bringup/drivers/hid/hidusb/CMakeLists.txt branches/usb-bringup/drivers/hid/hidusb/hidusb.c branches/usb-bringup/include/ddk/hidclass.h branches/usb-bringup/include/ddk/hidport.h Modified: branches/usb-bringup/drivers/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/hid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/CMakeLists.txt [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -1,2 +1,3 @@ +add_subdirectory(hidclass) add_subdirectory(hidparse) add_subdirectory(hidusb) Propchange: branches/usb-bringup/drivers/hid/hidclass/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 25 20:21:34 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/hidclass/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/hidclass/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/hidclass/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -1,0 +1,19 @@ + +spec2def(hidclass.sys hidclass.spec) + +list(APPEND SOURCE + hidclass.c + hidclass.rc + ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) + +add_library(hidclass SHARED ${SOURCE}) + +set_entrypoint(hidclass 0) +set_image_base(hidclass 0x00010000) +set_subsystem(hidclass native) +set_target_properties(hidclass PROPERTIES SUFFIX ".sys") + + +add_importlibs(hidclass ntoskrnl hidparse hal) +add_cab_target(hidclass 2) +add_importlib_target(hidclass.spec) Propchange: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c (added) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -1,0 +1,116 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Human Interface Device Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/hid/hidclass/hidclass.c + * PURPOSE: HID Class Driver + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "precomp.h" + +static LPWSTR ClientIdentificationAddress = L"HIDCLASS"; + +ULONG +NTAPI +DllInitialize(ULONG Unknown) +{ + return 0; +} + +ULONG +NTAPI +DllUnload() +{ + return 0; +} + +NTSTATUS +NTAPI +HidClassAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClassDriverUnload( + IN PDRIVER_OBJECT DriverObject) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClassDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidRegisterMinidriver( + IN PHID_MINIDRIVER_REGISTRATION MinidriverRegistration) +{ + NTSTATUS Status; + PHIDCLASS_DRIVER_EXTENSION DriverExtension; + + /* check if the version matches */ + if (MinidriverRegistration->Revision > HID_REVISION) + { + /* revision mismatch */ + ASSERT(FALSE); + return STATUS_REVISION_MISMATCH; + } + + /* now allocate the driver object extension */ + Status = IoAllocateDriverObjectExtension(MinidriverRegistration->DriverObject, (PVOID)ClientIdentificationAddress, sizeof(HIDCLASS_DRIVER_EXTENSION), (PVOID*)&DriverExtension); + if (!NT_SUCCESS(Status)) + { + /* failed to allocate driver extension */ + ASSERT(FALSE); + return Status; + } + + /* zero driver extension */ + RtlZeroMemory(DriverExtension, sizeof(HIDCLASS_DRIVER_EXTENSION)); + + /* init driver extension */ + DriverExtension->DriverObject = MinidriverRegistration->DriverObject; + DriverExtension->DeviceExtensionSize = MinidriverRegistration->DeviceExtensionSize; + DriverExtension->DevicesArePolled = MinidriverRegistration->DevicesArePolled; + DriverExtension->AddDevice = MinidriverRegistration->DriverObject->DriverExtension->AddDevice; + DriverExtension->DriverUnload = MinidriverRegistration->DriverObject->DriverUnload; + + /* copy driver dispatch routines */ + RtlCopyMemory(DriverExtension->MajorFunction, MinidriverRegistration->DriverObject->MajorFunction, sizeof(PDRIVER_DISPATCH) * IRP_MJ_MAXIMUM_FUNCTION); + + /* initialize lock */ + KeInitializeSpinLock(&DriverExtension->Lock); + + /* now replace dispatch routines */ + DriverExtension->DriverObject->DriverExtension->AddDevice = HidClassAddDevice; + DriverExtension->DriverObject->DriverUnload = HidClassDriverUnload; + DriverExtension->DriverObject->MajorFunction[IRP_MJ_CREATE] = HidClassDispatch; + DriverExtension->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HidClassDispatch; + DriverExtension->DriverObject->MajorFunction[IRP_MJ_READ] = HidClassDispatch; + DriverExtension->DriverObject->MajorFunction[IRP_MJ_WRITE] = HidClassDispatch; + DriverExtension->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = HidClassDispatch; + DriverExtension->DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = HidClassDispatch; + DriverExtension->DriverObject->MajorFunction[IRP_MJ_POWER] = HidClassDispatch; + DriverExtension->DriverObject->MajorFunction[IRP_MJ_PNP] = HidClassDispatch; + + /* done */ + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/hid/hidclass/hidclass.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/hidclass/hidclass.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.rc (added) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.rc [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB HID Bus Driver\0" +#define REACTOS_STR_INTERNAL_NAME "hidclass\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hidclass.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup/drivers/hid/hidclass/hidclass.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/hidclass/hidclass.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.spec (added) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.spec [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -1,0 +1,4 @@ +@ stdcall -private DllInitialize(long) +@ stdcall -private DllUnload() +@ stdcall HidRegisterMinidriver(ptr) + Propchange: branches/usb-bringup/drivers/hid/hidclass/hidclass.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h (added) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -1,0 +1,19 @@ +#pragma once + +#define _HIDPI_NO_FUNCTION_MACROS_ +#include <ntddk.h> +#include <hidport.h> +#include <debug.h> + + +typedef struct +{ + PDRIVER_OBJECT DriverObject; + ULONG DeviceExtensionSize; + BOOLEAN DevicesArePolled; + PDRIVER_DISPATCH MajorFunction[IRP_MJ_MAXIMUM_FUNCTION]; + PDRIVER_ADD_DEVICE AddDevice; + PDRIVER_UNLOAD DriverUnload; + KSPIN_LOCK Lock; + +}HIDCLASS_DRIVER_EXTENSION, *PHIDCLASS_DRIVER_EXTENSION; Propchange: branches/usb-bringup/drivers/hid/hidclass/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/hid/hidusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -1,11 +1,11 @@ list(APPEND SOURCE hidusb.c - usbhub.rc) + hidusb.rc) add_library(hidusb SHARED ${SOURCE}) set_module_type(hidusb kernelmodedriver) add_importlibs(hidusb hidclass ntoskrnl usbd) -add_cab_target(usbhub 2) +add_cab_target(hidusb 2) Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -89,7 +89,7 @@ // // submit request // - return IoCallDriver(DeviceExtension->NextDeviceObject); + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); } NTSTATUS Added: branches/usb-bringup/drivers/hid/hidusb/hidusb.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.rc (added) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.rc [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB HID Interface Driver\0" +#define REACTOS_STR_INTERNAL_NAME "hidusb\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hidusb.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup/drivers/hid/hidusb/hidusb.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidclas… ============================================================================== --- branches/usb-bringup/include/ddk/hidclass.h [iso-8859-1] (original) +++ branches/usb-bringup/include/ddk/hidclass.h [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -75,14 +75,6 @@ #define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) #define IOCTL_HID_GET_INDEXED_STRING HID_OUT_CTL_CODE(120) #define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) - -/* FIXME: these values are wrong! */ -#define IOCTL_HID_GET_STRING 0 -#define IOCTL_HID_GET_DEVICE_ATTRIBUTES 1 -#define IOCTL_HID_GET_DEVICE_DESCRIPTOR 2 -#define IOCTL_HID_READ_REPORT 3 -#define IOCTL_HID_WRITE_REPORT 4 -#define IOCTL_HID_GET_REPORT_DESCRIPTOR 5 typedef enum _HID_STRING_TYPE { Modified: branches/usb-bringup/include/ddk/hidport.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidport… ============================================================================== --- branches/usb-bringup/include/ddk/hidport.h [iso-8859-1] (original) +++ branches/usb-bringup/include/ddk/hidport.h [iso-8859-1] Sun Dec 25 20:21:34 2011 @@ -50,8 +50,8 @@ typedef VOID -(*HID_SEND_IDLE_CALLBACK)( - __in PVOID Context +(NTAPI *HID_SEND_IDLE_CALLBACK)( + IN PVOID Context ); typedef struct _HID_SUBMIT_IDLE_NOTIFICATION_CALLBACK_INFO

1 0

← Newer
1
2
3
4
5
6
7
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2011