Print a warning regarding unknown USB controller devices.

Signed-off-by: Steven A. Falco <[email protected]>

---

I have observed a device that claims a USB controller programming
interface of 0xfe.  I don't know what the device is, but it is
helpful to see a warning.  So I've changed the individual if()
statements to a switch() and added a default case to spit out the
warning.

diff --git a/payloads/libpayload/drivers/usb/usbinit.c 
b/payloads/libpayload/drivers/usb/usbinit.c
index f0d5a60..5c2eae6 100644
--- a/payloads/libpayload/drivers/usb/usbinit.c
+++ b/payloads/libpayload/drivers/usb/usbinit.c
@@ -70,40 +70,47 @@ usb_controller_initialize (int bus, int dev, int func)
 
                printf ("%02x:%02x.%x %04x:%04x.%d ", bus, dev, func,
                        pciid >> 16, pciid & 0xFFFF, func);
-               if (prog_if == 0) {
-                       printf ("UHCI controller\n");
+               switch(prog_if) {
+                       case 0x00:
+                               printf ("UHCI controller\n");
 #ifdef CONFIG_USB_UHCI
-                       uhci_init (addr);
+                               uhci_init (addr);
 #else
-                       printf ("Not supported.\n");
+                               printf ("Not supported.\n");
 #endif
-               }
-               if (prog_if == 0x10) {
-                       printf ("OHCI controller\n");
+                               break;
+
+                       case 0x10:
+                               printf ("OHCI controller\n");
 #ifdef CONFIG_USB_OHCI
-                       ohci_init(addr);
+                               ohci_init(addr);
 #else
-                       printf ("Not supported.\n");
+                               printf ("Not supported.\n");
 #endif
+                               break;
 
-               }
-               if (prog_if == 0x20) {
-                       printf ("EHCI controller\n");
+                       case 0x20:
+                               printf ("EHCI controller\n");
 #ifdef CONFIG_USB_EHCI
-                       ehci_init(addr);
+                               ehci_init(addr);
 #else
-                       printf ("Not supported.\n");
+                               printf ("Not supported.\n");
 #endif
+                               break;
 
-               }
-               if (prog_if == 0x30) {
-                       printf ("xHCI controller\n");
+                       case 0x30:
+                               printf ("xHCI controller\n");
 #ifdef CONFIG_USB_XHCI
-                       xhci_init(addr);
+                               xhci_init(addr);
 #else
-                       printf ("Not supported.\n");
+                               printf ("Not supported.\n");
 #endif
+                               break;
 
+                       default:
+                               printf ("unknown controller %x not supported\n",
+                                               prog_if);
+                               break;
                }
        }
 

-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to