- rearrange hid stack
authorJohannes Anderwald <johannes.anderwald@reactos.org>
Sun, 25 Dec 2011 18:25:18 +0000 (18:25 +0000)
committerJohannes Anderwald <johannes.anderwald@reactos.org>
Sun, 25 Dec 2011 18:25:18 +0000 (18:25 +0000)
svn path=/branches/usb-bringup/; revision=54757

drivers/CMakeLists.txt
drivers/hid/CMakeLists.txt [new file with mode: 0644]
drivers/usb/CMakeLists.txt
drivers/usb/hidparse/CMakeLists.txt [deleted file]
drivers/usb/hidparse/hidparse.c [deleted file]
drivers/usb/hidparse/hidparse.h [deleted file]
drivers/usb/hidparse/hidparse.rc [deleted file]
drivers/usb/hidparse/hidparse.spec [deleted file]
drivers/usb/hidusb/CMakeLists.txt [deleted file]
drivers/usb/hidusb/hidusb.c [deleted file]
drivers/usb/hidusb/hidusb.h [deleted file]

index 3960ee1..35be3e0 100644 (file)
@@ -4,6 +4,7 @@ add_subdirectory(battery)
 add_subdirectory(bus)
 add_subdirectory(directx)
 add_subdirectory(filesystems)
+add_subdirectory(hid)
 add_subdirectory(input)
 add_subdirectory(ksfilter)
 add_subdirectory(network)
diff --git a/drivers/hid/CMakeLists.txt b/drivers/hid/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d61190c
--- /dev/null
@@ -0,0 +1,2 @@
+add_subdirectory(hidparse)
+add_subdirectory(hidusb)
\ No newline at end of file
index d208ed2..f0928fa 100644 (file)
@@ -1,4 +1,3 @@
-add_subdirectory(hidparse)
 add_subdirectory(nt4compat)
 add_subdirectory(usbd)
 add_subdirectory(usbehci_new)
diff --git a/drivers/usb/hidparse/CMakeLists.txt b/drivers/usb/hidparse/CMakeLists.txt
deleted file mode 100644 (file)
index a6740cc..0000000
+++ /dev/null
@@ -1,14 +0,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)
diff --git a/drivers/usb/hidparse/hidparse.c b/drivers/usb/hidparse/hidparse.c
deleted file mode 100644 (file)
index fea2650..0000000
+++ /dev/null
@@ -1,727 +0,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@reactos.org)
- *              Johannes Anderwald (johannes.anderwald@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;
-}
diff --git a/drivers/usb/hidparse/hidparse.h b/drivers/usb/hidparse/hidparse.h
deleted file mode 100644 (file)
index f0bc0d2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#define _HIDPI_
-#define _HIDPI_NO_FUNCTION_MACROS_
-#include <ntddk.h>
-#include <hidpddi.h>
-#include <hidpi.h>
-#include <debug.h>
diff --git a/drivers/usb/hidparse/hidparse.rc b/drivers/usb/hidparse/hidparse.rc
deleted file mode 100644 (file)
index 3da21c3..0000000
+++ /dev/null
@@ -1,5 +0,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>
diff --git a/drivers/usb/hidparse/hidparse.spec b/drivers/usb/hidparse/hidparse.spec
deleted file mode 100644 (file)
index 73afdfa..0000000
+++ /dev/null
@@ -1,53 +0,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)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/drivers/usb/hidusb/CMakeLists.txt b/drivers/usb/hidusb/CMakeLists.txt
deleted file mode 100644 (file)
index 87de508..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-list(APPEND SOURCE
-    hidusb.c
-    usbhub.rc)
-
-add_library(hidusb SHARED ${SOURCE})
-
-set_module_type(hidusb kernelmodedriver)
-add_importlibs(hidusb hidclass ntoskrnl usbd)
-
-add_cab_target(usbhub 2)
diff --git a/drivers/usb/hidusb/hidusb.c b/drivers/usb/hidusb/hidusb.c
deleted file mode 100644 (file)
index 56af50a..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * PROJECT:     ReactOS Universal Serial Bus Human Interface Device Driver
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        drivers/usb/hidusb/hidusb.c
- * PURPOSE:     HID USB Interface Driver
- * PROGRAMMERS:
- *              Michael Martin (michael.martin@reactos.org)
- *              Johannes Anderwald (johannes.anderwald@reactos.org)
- */
-
-#include "hidusb.h"
-
-NTSTATUS
-NTAPI
-HidCreate(
-    IN PDEVICE_OBJECT DeviceObject,
-    IN PIRP Irp)
-{
-    PIO_STACK_LOCATION IoStack;
-
-    //
-    // get current irp stack location
-    //
-    IoStack = IoGetCurrentIrpStackLocation(Irp);
-
-    //
-    // sanity check for hidclass driver
-    //
-    ASSERT(IoStack->MajorFunction == IRP_MJ_CREATE || IoStack->MajorFunction == IRP_MJ_CLOSE);
-
-    //
-    // complete request
-    //
-    Irp->IoStatus.Information = 0;
-    Irp->IoStatus.Status = STATUS_SUCCESS;
-    IoCompleteRequest(Irp, IO_NO_INCREMENT);
-
-    //
-    // informal debug print
-    //
-    DPRINT1("HIDUSB Request: %x\n", IoStack->MajorFunction);
-
-    //
-    // done
-    //
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
-HidInternalDeviceControl(
-    IN PDEVICE_OBJECT DeviceObject,
-    IN PIRP Irp)
-{
-    UNIMPLEMENTED
-    ASSERT(FALSE);
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS
-NTAPI
-HidPower(
-    IN PDEVICE_OBJECT DeviceObject,
-    IN PIRP Irp)
-{
-    UNIMPLEMENTED
-    ASSERT(FALSE);
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS
-NTAPI
-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);
-}
-
-NTSTATUS
-NTAPI
-HidPnp(
-    IN PDEVICE_OBJECT DeviceObject,
-    IN PIRP Irp)
-{
-    UNIMPLEMENTED
-    ASSERT(FALSE);
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS
-NTAPI
-DriverEntry(
-    IN PDRIVER_OBJECT DriverObject,
-    IN PUNICODE_STRING RegPath)
-{
-    HID_MINIDRIVER_REGISTRATION Registration;
-    NTSTATUS Status;
-
-    //
-    // initialize driver object
-    //
-    DriverObject->MajorFunction[IRP_MJ_CREATE] = HidCreate;
-    DriverObject->MajorFunction[IRP_MJ_CLOSE] = HidCreate;
-    DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = HidInternalDeviceControl;
-    DriverObject->MajorFunction[IRP_MJ_POWER] = HidPower;
-    DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = HidSystemControl;
-    DriverObject->MajorFunction[IRP_MJ_PNP] = HidPnp;
-
-    //
-    // prepare registration info
-    //
-    RtlZeroMemory(&Registration, sizeof(HID_MINIDRIVER_REGISTRATION));
-
-    //
-    // fill in registration info
-    //
-    Registration.Revision = HID_REVISION;
-    Registration.DriverObject = DriverObject;
-    Registration.RegistryPath = RegPath;
-    Registration.DeviceExtensionSize = sizeof(HID_USB_DEVICE_EXTENSION);
-    Registration.DevicesArePolled = FALSE;
-
-    //
-    // register driver
-    //
-    Status = HidRegisterMinidriver(&Registration);
-
-    //
-    // informal debug
-    //
-    DPRINT1("********* HIDUSB *********\n");
-    DPRINT1("HIDUSB Registration Status %x\n", Status);
-
-    return Status;
-}
diff --git a/drivers/usb/hidusb/hidusb.h b/drivers/usb/hidusb/hidusb.h
deleted file mode 100644 (file)
index e991861..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#define _HIDPI_
-#define _HIDPI_NO_FUNCTION_MACROS_
-#include <ntddk.h>
-#include <hidport.h>
-#include <debug.h>
-
-typedef struct
-{
-    //
-    // event for completion
-    //
-    KEVENT Event;
-
-    //
-    // list for pending requests
-    //
-    LIST_ENTRY PendingRequests;
-
-}HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION;
-