From 67c3d9ebe54b5344d58f06011314440f214528bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 11 Jan 2006 20:04:40 +0000 Subject: [PATCH] Fixed building of the UHCI and OHCI modules [reported by AndyBe]. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15914 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/usb/Stack.cpp | 2 +- src/add-ons/kernel/bus_managers/usb/usb_p.h | 2 +- src/add-ons/kernel/busses/usb/ohci.cpp | 3 ++- src/add-ons/kernel/busses/usb/ohci.h | 2 +- src/add-ons/kernel/busses/usb/ohci_software.h | 2 +- src/add-ons/kernel/busses/usb/uhci.cpp | 2 +- src/add-ons/kernel/busses/usb/uhci.h | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/usb/Stack.cpp b/src/add-ons/kernel/bus_managers/usb/Stack.cpp index 1f2aff8618..27a16b712b 100644 --- a/src/add-ons/kernel/bus_managers/usb/Stack.cpp +++ b/src/add-ons/kernel/bus_managers/usb/Stack.cpp @@ -191,7 +191,7 @@ status_t Stack::AllocateChunk( void **log , void **phy , uint8 size ) return B_ERROR; } - dprintf( "USB Stack::Allocate() listhead: %l\n" , listhead ); + dprintf( "USB Stack::Allocate() listhead: %ld\n" , listhead ); memory_chunk *chunk = (memory_chunk *)listhead; *log = (void *)listhead; diff --git a/src/add-ons/kernel/bus_managers/usb/usb_p.h b/src/add-ons/kernel/bus_managers/usb/usb_p.h index e55a1b6294..9d1f41ad6a 100644 --- a/src/add-ons/kernel/bus_managers/usb/usb_p.h +++ b/src/add-ons/kernel/bus_managers/usb/usb_p.h @@ -22,7 +22,7 @@ #ifndef USB_P #define USB_P -#include +#include "usbspec_p.h" /* ++++++++++ Forward declarations diff --git a/src/add-ons/kernel/busses/usb/ohci.cpp b/src/add-ons/kernel/busses/usb/ohci.cpp index 5124a9fc8b..1a1833c435 100644 --- a/src/add-ons/kernel/busses/usb/ohci.cpp +++ b/src/add-ons/kernel/busses/usb/ohci.cpp @@ -43,7 +43,8 @@ #include "ohci.h" #include "ohci_hardware.h" -#include +#include "usb_p.h" + //------------------------------------------------------ // OHCI:: Reverse the bits in a value between 0 and 31 // (Section 3.3.2) diff --git a/src/add-ons/kernel/busses/usb/ohci.h b/src/add-ons/kernel/busses/usb/ohci.h index 2e6f331a4c..d5834be008 100644 --- a/src/add-ons/kernel/busses/usb/ohci.h +++ b/src/add-ons/kernel/busses/usb/ohci.h @@ -28,7 +28,7 @@ // OHCI:: Includes // --------------------------- -#include +#include "usb_p.h" #include "ohci_software.h" struct pci_info; diff --git a/src/add-ons/kernel/busses/usb/ohci_software.h b/src/add-ons/kernel/busses/usb/ohci_software.h index a16f7a4e83..4fcf571e0b 100644 --- a/src/add-ons/kernel/busses/usb/ohci_software.h +++ b/src/add-ons/kernel/busses/usb/ohci_software.h @@ -28,7 +28,7 @@ // OHCI:: Includes // --------------------------- -#include +#include "usb_p.h" #include "ohci_hardware.h" // ------------------------------------ diff --git a/src/add-ons/kernel/busses/usb/uhci.cpp b/src/add-ons/kernel/busses/usb/uhci.cpp index 07235687ac..5c4e7d8c2e 100644 --- a/src/add-ons/kernel/busses/usb/uhci.cpp +++ b/src/add-ons/kernel/busses/usb/uhci.cpp @@ -27,7 +27,7 @@ #include "uhci.h" #include "uhci_hardware.h" -#include +#include "usb_p.h" /* ++++++++++ diff --git a/src/add-ons/kernel/busses/usb/uhci.h b/src/add-ons/kernel/busses/usb/uhci.h index c1c5c0308a..ef7cfe29d6 100644 --- a/src/add-ons/kernel/busses/usb/uhci.h +++ b/src/add-ons/kernel/busses/usb/uhci.h @@ -22,7 +22,7 @@ #ifndef UHCI_H #define UHCI_H -#include +#include "usb_p.h" #include "uhci_hardware.h" struct pci_info;