Author: akhaldi Date: Sat Dec 21 14:19:14 2013 New Revision: 61320
URL: http://svn.reactos.org/svn/reactos?rev=61320&view=rev Log: [USBEHCI] * Move hardware.h inclusion to the main header. * Define INITGUID in the main header. CORE-7716
Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp trunk/reactos/drivers/usb/usbehci/usbehci.h
Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwar... ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat Dec 21 14:19:14 2013 @@ -8,9 +8,7 @@ * Johannes Anderwald (johannes.anderwald@reactos.org) */
-#define INITGUID #include "usbehci.h" -#include "hardware.h"
typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext);
Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_que... ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sat Dec 21 14:19:14 2013 @@ -9,7 +9,6 @@ */
#include "usbehci.h" -#include "hardware.h"
class CUSBQueue : public IEHCIQueue {
Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_req... ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sat Dec 21 14:19:14 2013 @@ -8,10 +8,7 @@ * Johannes Anderwald (johannes.anderwald@reactos.org) */
-#define INITGUID - #include "usbehci.h" -#include "hardware.h"
class CUSBRequest : public IEHCIRequest {
Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehci... ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Sat Dec 21 14:19:14 2013 @@ -1,5 +1,7 @@ #ifndef USBEHCI_H__ #define USBEHCI_H__ + +#define INITGUID
#include <ntddk.h> #define NDEBUG @@ -31,6 +33,7 @@ #include <dmusicks.h> #include <kcom.h>
+#include "hardware.h" #include "interfaces.h"
//