Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed init_usb() for little endian PCI routines

Browse Source
This commit is contained in:
Markus Fröschle
2013-11-07 19:45:36 +00:00
parent a45c195ee8
commit a1ba2c76fd
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BaS_gcc/sources/sysinit.c
View File

@@ -35,6 +35,7 @@
#include "bas_string.h" #include "bas_string.h"
#include "bas_types.h" #include "bas_types.h"
#include "wait.h" #include "wait.h"
#include "util.h"
#include "version.h" #include "version.h"
#ifdef MACHINE_FIREBEE #ifdef MACHINE_FIREBEE
#include "firebee.h" #include "firebee.h"
@@ -525,15 +526,17 @@ void init_usb(void)
id = pci_read_config_longword(handle, PCIIDR); id = pci_read_config_longword(handle, PCIIDR);
class = pci_read_config_longword(handle, PCIREV); class = pci_read_config_longword(handle, PCIREV);
if (class >> 16 == PCI_CLASS_SERIAL_USB) if (PCI_CLASS_CODE(class) == PCI_CLASS_SERIAL_USB)
{ {
xprintf("serial USB found at #%x\r\n", handle); xprintf("serial USB found at #%x\r\n", handle);
if (class >> 8 == PCI_CLASS_SERIAL_USB_EHCI) xprintf("PCI_SUBCLASS(0x%08x) = 0x%06x (looking for 0x%06x\r\n",
class, PCI_SUBCLASS(class), PCI_CLASS_SERIAL_USB_EHCI);
if (PCI_SUBCLASS(class) == PCI_CLASS_SERIAL_USB_EHCI)
{ {
board = ehci_usb_pci_table; board = ehci_usb_pci_table;
while (board->vendor) while (board->vendor)
{ {
if ((board->vendor == (id & 0xffff)) && board->device == (id >> 16)) if ((board->vendor == PCI_VENDOR_ID(id)) && board->device == PCI_DEVICE_ID(id))
{ {
if (usb_init(handle, board) >= 0) if (usb_init(handle, board) >= 0)
{ {
@@ -543,12 +546,12 @@ void init_usb(void)
board++; board++;
} }
} }
if (class >> 8 == PCI_CLASS_SERIAL_USB_OHCI) if (PCI_SUBCLASS(class) == PCI_CLASS_SERIAL_USB_OHCI)
{ {
board = ohci_usb_pci_table; board = ohci_usb_pci_table;
while (board->vendor) while (board->vendor)
{ {
if ((board->vendor == (id & 0xffff)) && board->device == (id >> 16)) if ((board->vendor == (id & 0xffff)) && board->device == PCI_DEVICE_ID(id))
{ {
if (usb_init(handle, board) >= 0) if (usb_init(handle, board) >= 0)
usb_found++; usb_found++;