[fireball] 39918: - Fix wrong placement of KEYBOARD_DEVICE_EXTENSION structure. - Fix wrong include order. - Fixes build.

Author: fireball
Date: Mon Mar  9 21:49:47 2009
New Revision: 39918

URL: http://svn.reactos.org/svn/reactos?rev=39918&view=rev
Log:
- Fix wrong placement of KEYBOARD_DEVICE_EXTENSION structure.
- Fix wrong include order.
- Fixes build.

Modified:
    trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c
    trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h

Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr...
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Mon Mar  9 21:49:47 2009
@@ -7,7 +7,6 @@
  */

#include "usbdriver.h"
-#include "kbdmou.h"

NTSTATUS
 AddRegistryEntry(IN PCWSTR PortTypeName,

Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbdr...
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h [iso-8859-1] Mon Mar  9 21:49:47 2009
@@ -1,5 +1,7 @@
 #ifndef __KEYBOARD_H__
 #define __KEYBOARD_H__
+
+#include "kbdmou.h"

typedef struct _KEYBOARD_DRVR_EXTENSION
 {
@@ -17,6 +19,15 @@
     struct _KEYBOARD_DEVICE_EXTENSION *device_ext; // back pointer
 } 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
 kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);