[coreboot] r3575 - trunk/payloads/libpayload/drivers/usb

Author: jcrouse
Date: 2008-09-11 19:29:00 +0200 (Thu, 11 Sep 2008)
New Revision: 3575

Modified:
   trunk/payloads/libpayload/drivers/usb/uhci.c
   trunk/payloads/libpayload/drivers/usb/uhci.h
   trunk/payloads/libpayload/drivers/usb/usb.c
   trunk/payloads/libpayload/drivers/usb/usb_dev.c
   trunk/payloads/libpayload/drivers/usb/usbhid.c
   trunk/payloads/libpayload/drivers/usb/usbhub.c
   trunk/payloads/libpayload/drivers/usb/usbinit.c
   trunk/payloads/libpayload/drivers/usb/usbmsc.c
Log:
Fix the USB code to find the headers after they were moved.

Signed-off-by: Jordan Crouse 
Acked-by: Jordan Crouse

Modified: trunk/payloads/libpayload/drivers/usb/uhci.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/uhci.c	2008-09-11 17:26:53 UTC (rev 3574)
+++ trunk/payloads/libpayload/drivers/usb/uhci.c	2008-09-11 17:29:00 UTC (rev 3575)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include "usb.h"
+#include <usb/usb.h>
 #include "uhci.h"
 #include <arch/virtual.h>

Modified: trunk/payloads/libpayload/drivers/usb/uhci.h
===================================================================
--- trunk/payloads/libpayload/drivers/usb/uhci.h	2008-09-11 17:26:53 UTC (rev 3574)
+++ trunk/payloads/libpayload/drivers/usb/uhci.h	2008-09-11 17:29:00 UTC (rev 3575)
@@ -31,7 +31,7 @@
 #define __UHCI_H

#include <pci.h>
-#include "usb.h"
+#include <usb/usb.h>

typedef union {
    struct {

Modified: trunk/payloads/libpayload/drivers/usb/usb.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/usb.c	2008-09-11 17:26:53 UTC (rev 3574)
+++ trunk/payloads/libpayload/drivers/usb/usb.c	2008-09-11 17:29:00 UTC (rev 3575)
@@ -28,7 +28,7 @@
  */

#include <config.h>
-#include "usb.h"
+#include <usb/usb.h>

hci_t *usb_hcs = 0;

Modified: trunk/payloads/libpayload/drivers/usb/usb_dev.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/usb_dev.c	2008-09-11 17:26:53 UTC (rev 3574)
+++ trunk/payloads/libpayload/drivers/usb/usb_dev.c	2008-09-11 17:29:00 UTC (rev 3575)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include "usb.h"
+#include <usb/usb.h>

static void
 usb_nop_destroy (usbdev_t *dev)

Modified: trunk/payloads/libpayload/drivers/usb/usbhid.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/usbhid.c	2008-09-11 17:26:53 UTC (rev 3574)
+++ trunk/payloads/libpayload/drivers/usb/usbhid.c	2008-09-11 17:29:00 UTC (rev 3575)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include "usb.h"
+#include <usb/usb.h>

enum { hid_subclass_none = 0, hid_subclass_boot = 1 };
 enum { hid_proto_boot = 0, hid_proto_report = 1 };

Modified: trunk/payloads/libpayload/drivers/usb/usbhub.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/usbhub.c	2008-09-11 17:26:53 UTC (rev 3574)
+++ trunk/payloads/libpayload/drivers/usb/usbhub.c	2008-09-11 17:29:00 UTC (rev 3575)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include "usb.h"
+#include <usb/usb.h>

// assume that host_to_device is overwritten if necessary
 #define DR_PORT gen_bmRequestType(host_to_device, class_type, other_recp)

Modified: trunk/payloads/libpayload/drivers/usb/usbinit.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/usbinit.c	2008-09-11 17:26:53 UTC (rev 3574)
+++ trunk/payloads/libpayload/drivers/usb/usbinit.c	2008-09-11 17:29:00 UTC (rev 3575)
@@ -28,9 +28,9 @@
  */

#include <config.h>
-#include "usb.h"
+#include <usb/usb.h>
 #include "uhci.h"
-#include "usbdisk.h"
+#include <usb/usbdisk.h>

/**
  * Initializes USB controller attached to PCI

Modified: trunk/payloads/libpayload/drivers/usb/usbmsc.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/usbmsc.c	2008-09-11 17:26:53 UTC (rev 3574)
+++ trunk/payloads/libpayload/drivers/usb/usbmsc.c	2008-09-11 17:29:00 UTC (rev 3575)
@@ -28,9 +28,9 @@
  */

#include <arch/endian.h>
-#include "usb.h"
-#include "usbmsc.h"
-#include "usbdisk.h"
+#include <usb/usb.h>
+#include <usb/usbmsc.h>
+#include <usb/usbdisk.h>

enum {
    msc_subclass_rbc = 0x1,