- Fix wrong placement of KEYBOARD_DEVICE_EXTENSION structure.

- Fix wrong include order.
- Fixes build.

svn path=/trunk/; revision=39918
This commit is contained in:
Aleksey Bragin 2009-03-09 18:49:47 +00:00
parent 0ea44d711f
commit 86bdd2b0e0
2 changed files with 11 additions and 1 deletions

View file

@ -7,7 +7,6 @@
*/ */
#include "usbdriver.h" #include "usbdriver.h"
#include "kbdmou.h"
NTSTATUS NTSTATUS
AddRegistryEntry(IN PCWSTR PortTypeName, AddRegistryEntry(IN PCWSTR PortTypeName,

View file

@ -1,6 +1,8 @@
#ifndef __KEYBOARD_H__ #ifndef __KEYBOARD_H__
#define __KEYBOARD_H__ #define __KEYBOARD_H__
#include "kbdmou.h"
typedef struct _KEYBOARD_DRVR_EXTENSION typedef struct _KEYBOARD_DRVR_EXTENSION
{ {
PUSB_INTERFACE_DESC pif_desc; PUSB_INTERFACE_DESC pif_desc;
@ -17,6 +19,15 @@ typedef struct _KEYBOARD_DRVR_EXTENSION
struct _KEYBOARD_DEVICE_EXTENSION *device_ext; // back pointer struct _KEYBOARD_DEVICE_EXTENSION *device_ext; // back pointer
} KEYBOARD_DRVR_EXTENSION, *PKEYBOARD_DRVR_EXTENSION; } KEYBOARD_DRVR_EXTENSION, *PKEYBOARD_DRVR_EXTENSION;
typedef struct _KEYBOARD_DEVICE_EXTENSION
{
DEVEXT_HEADER hdr; // mandatory header
PKEYBOARD_DRVR_EXTENSION DriverExtension;
KEYBOARD_INDICATOR_PARAMETERS KeyboardIndicators;
CONNECT_DATA ConnectData;
PDEVICE_OBJECT Fdo;
} KEYBOARD_DEVICE_EXTENSION, *PKEYBOARD_DEVICE_EXTENSION;
BOOLEAN BOOLEAN
kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver); kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);