* Remove inclusions that already exist in the main header.
* Cleanup the main header.
* Improve the GUIDs situation.
CORE-7716
svn path=/trunk/; revision=61504
usbohci.cpp
usb_request.cpp
usb_queue.cpp
- hardware.cpp)
+ hardware.cpp
+ guid.cpp)
add_library(usbohci SHARED
${SOURCE}
--- /dev/null
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <initguid.h>
+#include <libusb.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
#pragma once
-#include <ntddk.h>
-
//
// OHCI Operational Registers
//
-
#ifndef INTERFACES_HPP
#define INTERFACES_HPP
struct IDMAMemoryManager;
struct IUSBQueue;
-#include "libusb.h"
-
//=========================================================================================
//
// class IUSBHardwareDevice
typedef IOHCIQueue *POHCIQUEUE;
-#endif
+#endif /* INTERFACES_HPP */
#ifndef USBOHCI_H__
#define USBOHCI_H__
-#define INITGUID
-
-#include <ntddk.h>
-#include <hubbusif.h>
-#include <usbbusif.h>
-#include <usbioctl.h>
-#include <usb100.h>
-
-extern
-"C"
-{
-#include <usbdlib.h>
-}
-
-//
-// FIXME:
-// #include <usbprotocoldefs.h>
-//
-#include <usb.h>
-#include <stdio.h>
-#include <wdmguid.h>
-
-//
-// FIXME:
-// the following includes are required to get kcom to compile
-//
-#include <portcls.h>
-#include <dmusicks.h>
-#include <kcom.h>
+#include <libusb.h>
#include "hardware.h"
#include "interfaces.h"
NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest);
}
-#endif
+#endif /* USBOHCI_H__ */