Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[janderwald] 54758: - - rearrange hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:28:57 2011 New Revision: 54758 URL: http://svn.reactos.org/svn/reactos?rev=54758&view=rev Log: - - rearrange hid stack Removed: branches/usb-bringup/drivers/usb/hidparse/

1 0

[janderwald] 54757: - rearrange hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:25:18 2011 New Revision: 54757 URL: http://svn.reactos.org/svn/reactos?rev=54757&view=rev Log: - rearrange hid stack Added: branches/usb-bringup/drivers/hid/CMakeLists.txt (with props) Removed: branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt branches/usb-bringup/drivers/usb/hidparse/hidparse.c branches/usb-bringup/drivers/usb/hidparse/hidparse.h branches/usb-bringup/drivers/usb/hidparse/hidparse.rc branches/usb-bringup/drivers/usb/hidparse/hidparse.spec branches/usb-bringup/drivers/usb/hidusb/ Modified: branches/usb-bringup/drivers/CMakeLists.txt branches/usb-bringup/drivers/usb/CMakeLists.txt Modified: branches/usb-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/CMakeLists.… ============================================================================== --- branches/usb-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/CMakeLists.txt [iso-8859-1] Sun Dec 25 18:25:18 2011 @@ -4,6 +4,7 @@ add_subdirectory(bus) add_subdirectory(directx) add_subdirectory(filesystems) +add_subdirectory(hid) add_subdirectory(input) add_subdirectory(ksfilter) add_subdirectory(network) Added: 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 (added) +++ branches/usb-bringup/drivers/hid/CMakeLists.txt [iso-8859-1] Sun Dec 25 18:25:18 2011 @@ -1,0 +1,2 @@ +add_subdirectory(hidparse) +add_subdirectory(hidusb) Propchange: branches/usb-bringup/drivers/hid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] Sun Dec 25 18:25:18 2011 @@ -1,4 +1,3 @@ -add_subdirectory(hidparse) add_subdirectory(nt4compat) add_subdirectory(usbd) add_subdirectory(usbehci_new) Removed: branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt (removed) @@ -1,14 +1,0 @@ - -spec2def(hidparse.sys hidparse.spec) -add_definitions(-DDEBUG_MODE) - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -add_library(hidparse SHARED hidparse.c hidparse.rc ${CMAKE_CURRENT_BINARY_DIR}/hidparse.def) - -set_module_type(hidparse kernelmodedriver) -add_importlibs(hidparse ntoskrnl) -add_cab_target(hidparse 2) - -add_cab_target(hidparse 2) -add_importlib_target(hidparse.spec) Removed: branches/usb-bringup/drivers/usb/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.c (removed) @@ -1,727 +1,0 @@ -/* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface - * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/hidparse/hidparse.c - * PURPOSE: HID Parser - * PROGRAMMERS: - * Michael Martin (michael.martin(a)reactos.org) - * Johannes Anderwald (johannes.anderwald(a)reactos.org) - */ - -#include "hidparse.h" - - -VOID -NTAPI -HidP_FreeCollectionDescription ( - IN PHIDP_DEVICE_DESC DeviceDescription) -{ - DPRINT1("HidP_FreeCollectionDescription DeviceDescription %p\n", DeviceDescription); - - // - // free collection - // - ExFreePool(DeviceDescription->CollectionDesc); - - // - // free report ids - // - ExFreePool(DeviceDescription->ReportIDs); -} - -#undef HidP_GetButtonCaps - -HIDAPI -NTSTATUS -NTAPI -HidP_GetButtonCaps( - HIDP_REPORT_TYPE ReportType, - PHIDP_BUTTON_CAPS ButtonCaps, - PUSHORT ButtonCapsLength, - PHIDP_PREPARSED_DATA PreparsedData) -{ - return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0, ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData); -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetSpecificButtonCaps( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PHIDP_BUTTON_CAPS ButtonCaps, - IN OUT PULONG ButtonCapsLength, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - - -HIDAPI -NTSTATUS -NTAPI -HidP_GetCaps( - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_CAPS Capabilities) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HidP_GetCollectionDescription( - IN PHIDP_REPORT_DESCRIPTOR ReportDesc, - IN ULONG DescLength, - IN POOL_TYPE PoolType, - OUT PHIDP_DEVICE_DESC DeviceDescription) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetData( - IN HIDP_REPORT_TYPE ReportType, - OUT PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetExtendedAttributes( - IN HIDP_REPORT_TYPE ReportType, - IN USHORT DataIndex, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, - IN OUT PULONG LengthAttributes) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetLinkCollectionNodes( - OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, - IN OUT PULONG LinkCollectionNodesLength, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetScaledUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - OUT PLONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - - - -HIDAPI -NTSTATUS -NTAPI -HidP_UsageListDifference( - IN PUSAGE PreviousUsageList, - IN PUSAGE CurrentUsageList, - OUT PUSAGE BreakUsageList, - OUT PUSAGE MakeUsageList, - IN ULONG UsageListLength) -{ - ULONG Index, SubIndex, bFound, BreakUsageIndex = 0, MakeUsageIndex = 0; - USAGE CurrentUsage, Usage; - - if (UsageListLength) - { - Index = 0; - do - { - /* get current usage */ - CurrentUsage = PreviousUsageList[Index]; - - /* is the end of list reached? */ - if (!CurrentUsage) - break; - - /* start searching in current usage list */ - SubIndex = 0; - bFound = FALSE; - do - { - /* get usage of current list */ - Usage = CurrentUsageList[SubIndex]; - - /* end of list reached? */ - if (!Usage) - break; - - /* check if it matches the current one */ - if (CurrentUsage == Usage) - { - /* it does */ - bFound = TRUE; - break; - } - - /* move to next usage */ - SubIndex++; - }while(SubIndex < UsageListLength); - - /* was the usage found ?*/ - if (!bFound) - { - /* store it in the break usage list */ - BreakUsageList[BreakUsageIndex] = CurrentUsage; - BreakUsageIndex++; - } - - /* move to next usage */ - Index++; - - }while(Index < UsageListLength); - - /* now process the new items */ - Index = 0; - do - { - /* get current usage */ - CurrentUsage = CurrentUsageList[Index]; - - /* is the end of list reached? */ - if (!CurrentUsage) - break; - - /* start searching in current usage list */ - SubIndex = 0; - bFound = FALSE; - do - { - /* get usage of previous list */ - Usage = PreviousUsageList[SubIndex]; - - /* end of list reached? */ - if (!Usage) - break; - - /* check if it matches the current one */ - if (CurrentUsage == Usage) - { - /* it does */ - bFound = TRUE; - break; - } - - /* move to next usage */ - SubIndex++; - }while(SubIndex < UsageListLength); - - /* was the usage found ?*/ - if (!bFound) - { - /* store it in the make usage list */ - MakeUsageList[MakeUsageIndex] = CurrentUsage; - MakeUsageIndex++; - } - - /* move to next usage */ - Index++; - - }while(Index < UsageListLength); - } - - /* does the break list contain empty entries */ - if (BreakUsageIndex < UsageListLength) - { - /* zeroize entries */ - RtlZeroMemory(&BreakUsageList[BreakUsageIndex], sizeof(USAGE) * (UsageListLength - BreakUsageIndex)); - } - - /* does the make usage list contain empty entries */ - if (MakeUsageIndex < UsageListLength) - { - /* zeroize entries */ - RtlZeroMemory(&MakeUsageList[MakeUsageIndex], sizeof(USAGE) * (UsageListLength - MakeUsageIndex)); - } - - /* done */ - return HIDP_STATUS_SUCCESS; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetSpecificValueCaps( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -ULONG -NTAPI -HidP_MaxUsageListLength( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage OPTIONAL, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - OUT USAGE *UsageList, - IN OUT ULONG *UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HidP_SysPowerEvent ( - IN PCHAR HidPacket, - IN USHORT HidPacketLength, - IN PHIDP_PREPARSED_DATA Ppd, - OUT PULONG OutputBuffer) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HidP_SysPowerCaps ( - IN PHIDP_PREPARSED_DATA Ppd, - OUT PULONG OutputBuffer) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - OUT PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetUsagesEx( - IN HIDP_REPORT_TYPE ReportType, - IN USHORT LinkCollection, - OUT PUSAGE_AND_PAGE ButtonList, - IN OUT ULONG *UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - return HidP_GetUsages(ReportType, HID_USAGE_PAGE_UNDEFINED, LinkCollection, (PUSAGE)ButtonList, UsageLength, PreparsedData, Report, ReportLength); -} - - -HIDAPI -NTSTATUS -NTAPI -HidP_UsageAndPageListDifference( - IN PUSAGE_AND_PAGE PreviousUsageList, - IN PUSAGE_AND_PAGE CurrentUsageList, - OUT PUSAGE_AND_PAGE BreakUsageList, - OUT PUSAGE_AND_PAGE MakeUsageList, - IN ULONG UsageListLength) -{ - ULONG Index, SubIndex, BreakUsageListIndex = 0, MakeUsageListIndex = 0, bFound; - PUSAGE_AND_PAGE CurrentUsage, Usage; - - if (UsageListLength) - { - /* process removed usages */ - Index = 0; - do - { - /* get usage from current index */ - CurrentUsage = &PreviousUsageList[Index]; - - /* end of list reached? */ - if (CurrentUsage->Usage == 0 && CurrentUsage->UsagePage == 0) - break; - - /* search in current list */ - SubIndex = 0; - bFound = FALSE; - do - { - /* get usage */ - Usage = &CurrentUsageList[SubIndex]; - - /* end of list reached? */ - if (Usage->Usage == 0 && Usage->UsagePage == 0) - break; - - /* does it match */ - if (Usage->Usage == CurrentUsage->Usage && Usage->UsagePage == CurrentUsage->UsagePage) - { - /* found match */ - bFound = TRUE; - } - - /* move to next index */ - SubIndex++; - - }while(SubIndex < UsageListLength); - - if (!bFound) - { - /* store it in break usage list */ - BreakUsageList[BreakUsageListIndex].Usage = CurrentUsage->Usage; - BreakUsageList[BreakUsageListIndex].UsagePage = CurrentUsage->UsagePage; - BreakUsageListIndex++; - } - - /* move to next index */ - Index++; - - }while(Index < UsageListLength); - - /* process new usages */ - Index = 0; - do - { - /* get usage from current index */ - CurrentUsage = &CurrentUsageList[Index]; - - /* end of list reached? */ - if (CurrentUsage->Usage == 0 && CurrentUsage->UsagePage == 0) - break; - - /* search in current list */ - SubIndex = 0; - bFound = FALSE; - do - { - /* get usage */ - Usage = &PreviousUsageList[SubIndex]; - - /* end of list reached? */ - if (Usage->Usage == 0 && Usage->UsagePage == 0) - break; - - /* does it match */ - if (Usage->Usage == CurrentUsage->Usage && Usage->UsagePage == CurrentUsage->UsagePage) - { - /* found match */ - bFound = TRUE; - } - - /* move to next index */ - SubIndex++; - - }while(SubIndex < UsageListLength); - - if (!bFound) - { - /* store it in break usage list */ - MakeUsageList[MakeUsageListIndex].Usage = CurrentUsage->Usage; - MakeUsageList[MakeUsageListIndex].UsagePage = CurrentUsage->UsagePage; - MakeUsageListIndex++; - } - - /* move to next index */ - Index++; - }while(Index < UsageListLength); - } - - /* are there remaining free list entries */ - if (BreakUsageListIndex < UsageListLength) - { - /* zero them */ - RtlZeroMemory(&BreakUsageList[BreakUsageListIndex], (UsageListLength - BreakUsageListIndex) * sizeof(USAGE_AND_PAGE)); - } - - /* are there remaining free list entries */ - if (MakeUsageListIndex < UsageListLength) - { - /* zero them */ - RtlZeroMemory(&MakeUsageList[MakeUsageListIndex], (UsageListLength - MakeUsageListIndex) * sizeof(USAGE_AND_PAGE)); - } - - /* done */ - return HIDP_STATUS_SUCCESS; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_UnsetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_TranslateUsagesToI8042ScanCodes( - IN PUSAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_TranslateUsageAndPagesToI8042ScanCodes( - IN PUSAGE_AND_PAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - IN ULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetScaledUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN LONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetData( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -ULONG -NTAPI -HidP_MaxDataListLength( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_InitializeReportForID( - IN HIDP_REPORT_TYPE ReportType, - IN UCHAR ReportID, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -#undef HidP_GetValueCaps - -HIDAPI -NTSTATUS -NTAPI -HidP_GetValueCaps( - HIDP_REPORT_TYPE ReportType, - PHIDP_VALUE_CAPS ValueCaps, - PULONG ValueCapsLength, - PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegPath) -{ - - DPRINT1("********* HID PARSE *********\n"); - return STATUS_SUCCESS; -} Removed: branches/usb-bringup/drivers/usb/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.h (removed) @@ -1,8 +1,0 @@ -#pragma once - -#define _HIDPI_ -#define _HIDPI_NO_FUNCTION_MACROS_ -#include <ntddk.h> -#include <hidpddi.h> -#include <hidpi.h> -#include <debug.h> Removed: branches/usb-bringup/drivers/usb/hidparse/hidparse.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.rc [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.rc (removed) @@ -1,5 +1,0 @@ -#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> Removed: branches/usb-bringup/drivers/usb/hidparse/hidparse.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.spec [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.spec (removed) @@ -1,53 +1,0 @@ -@ stdcall HidP_FreeCollectionDescription(ptr) -@ stdcall HidP_GetButtonCaps(long ptr ptr ptr) -@ stdcall HidP_GetCaps(ptr ptr) -@ stdcall HidP_GetCollectionDescription(ptr long long ptr) -@ stdcall HidP_GetData(long ptr ptr ptr ptr long) -@ stdcall HidP_GetExtendedAttributes(long long ptr ptr long) -@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) -@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) -@ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) -@ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) -@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) -@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) -@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) -@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) -@ stdcall HidP_GetValueCaps(long ptr ptr ptr) -@ stdcall HidP_InitializeReportForID(long long ptr ptr long) -@ stdcall HidP_MaxDataListLength(long ptr) -@ stdcall HidP_MaxUsageListLength(long long ptr) -@ stdcall HidP_SetData(long ptr ptr ptr ptr long) -@ stdcall HidP_SetScaledUsageValue(long long long long long ptr ptr long) -@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) -@ stdcall HidP_SetUsageValueArray(long long long long ptr long long ptr long) -@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) -@ stdcall HidP_SysPowerCaps(ptr ptr) -@ stdcall HidP_SysPowerEvent(ptr long ptr ptr) -@ stdcall HidP_TranslateUsageAndPagesToI8042ScanCodes(ptr long long ptr ptr ptr) -@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) -@ stdcall HidP_UnsetUsages(long long long ptr ptr ptr ptr long) -@ stdcall HidP_UsageAndPageListDifference(ptr ptr ptr ptr long) -@ stdcall HidP_UsageListDifference(ptr ptr ptr ptr long) - - - - - - - - - - - - - - - - - - - - - - -

1 0

[janderwald] 54756: - rearrange hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:23:22 2011 New Revision: 54756 URL: http://svn.reactos.org/svn/reactos?rev=54756&view=rev Log: - rearrange hid stack Added: branches/usb-bringup/drivers/hid/hidparse/ (props changed) - copied from r54755, branches/usb-bringup/drivers/usb/hidparse/ Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 25 18:23:22 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Dec 25 18:23:22 2011 @@ -1,0 +1,6 @@ +/branches/header-work/drivers/usb/hidparse:45691-47721 +/branches/reactos-yarotows/drivers/usb/hidparse:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/drivers/usb/hidparse:49994-49995 +/branches/ros-amd64-bringup/drivers/usb/hidparse:36852 +/branches/ros-amd64-bringup/reactos/drivers/usb/hidparse:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/drivers/usb/hidparse:48236-51323 Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[tfaber] 54755: [NTOSKRNL/FORMATTING] - Trim trailing whitespace and get rid of tabs in Mm
by tfaber＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: tfaber Date: Sun Dec 25 18:21:05 2011 New Revision: 54755 URL: http://svn.reactos.org/svn/reactos?rev=54755&view=rev Log: [NTOSKRNL/FORMATTING] - Trim trailing whitespace and get rid of tabs in Mm Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pageop.c trunk/reactos/ntoskrnl/mm/powerpc/page.c trunk/reactos/ntoskrnl/mm/powerpc/pfault.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=54… Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… Modified: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/pfault… Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=547… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=…

1 0

[janderwald] 54754: - rearrange hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:17:07 2011 New Revision: 54754 URL: http://svn.reactos.org/svn/reactos?rev=54754&view=rev Log: - rearrange hid stack Added: branches/usb-bringup/drivers/hid/hidusb/ (props changed) - copied from r54753, branches/usb-bringup/drivers/usb/hidusb/ Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 25 18:17:07 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Dec 25 18:17:07 2011 @@ -1,0 +1,6 @@ +/branches/header-work/drivers/usb/hidusb:45691-47721 +/branches/reactos-yarotows/drivers/usb/hidusb:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/drivers/usb/hidusb:49994-49995 +/branches/ros-amd64-bringup/drivers/usb/hidusb:36852 +/branches/ros-amd64-bringup/reactos/drivers/usb/hidusb:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/drivers/usb/hidusb:48236-51323 Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[janderwald] 54753: - add directory for hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:16:35 2011 New Revision: 54753 URL: http://svn.reactos.org/svn/reactos?rev=54753&view=rev Log: - add directory for hid stack Added: branches/usb-bringup/drivers/hid/ (with props) Propchange: branches/usb-bringup/drivers/hid/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 25 18:16:35 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

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