add new file

BaS_gcc.includes

@@ -4,4 +4,4 @@ tos/pci_mem/include
 tos/pci_test/include
 tos/vmem_test/include
 tos/fpga_test
-.
+/usr/lib/gcc/m68k-atari-mint/4.6.4/include

Makefile

@@ -351,7 +351,7 @@ indent: $(CSRCS)
 
 .PHONY: tags
 tags:
-	ctags $(patsubst %,%/*,$(VPATH))
+	ctags $(patsubst %,%/*[cS],$(VPATH))
 
 .PHONY: printvars
 printvars:

TODO

@@ -0,0 +1 @@
+- it appears TOS system variables aren't protected (at least the Cookie Jar can be read from user mode)

include/usb_defs.h

@@ -27,6 +27,7 @@
 #define _USB_DEFS_H_
 
 #define CONFIG_USB_INTERRUPT_POLLING
+
 /* USB constants */
 
 /* Device and/or Interface Class codes */

pci/ehci-hcd.c

@@ -271,7 +271,7 @@ static int ehci_reset(void)
     if ((gehci.ent->vendor == PCI_VENDOR_ID_NEC) && (gehci.ent->device == PCI_DEVICE_ID_NEC_USB_2))
     {
         dbg("ehci_reset set 48MHz clock\r\n");
-        pci_write_config_longword(gehci.handle, 0xE4, 0x20); // oscillator
+        pci_write_config_longword(gehci.handle, 0xE4, swpl(0x20L)); // oscillator
         wait(5);
     }
 
@@ -607,7 +607,7 @@ static int ehci_submit_root(struct usb_device *dev, uint32_t pipe, void *buffer,
 
     status_reg = (uint32_t *) &gehci.hcor->or_portsc[swpw(req->index) - 1];
     srclen = 0;
-    dbg("ehci_submit_root req=%u (%#x), type=%u (%#x), value=%u, index=%u\r\n",
+    dbg("req=%u (%#x), type=%u (%#x), value=%u, index=%u\r\n",
         req->request, req->request, req->requesttype, req->requesttype, swpw(req->value), swpw(req->index));
     typeReq = req->request | req->requesttype << 8;
 
@@ -774,7 +774,7 @@ static int ehci_submit_root(struct usb_device *dev, uint32_t pipe, void *buffer,
              * caller must wait, then call GetPortStatus
              * usb 2.0 specification say 50 ms resets on root
              */
-                        wait(50 * 1000);
+                        wait_ms(50);
                         portreset |= (1 << swpw(req->index));
                     }
                     break;
@@ -827,7 +827,8 @@ static int ehci_submit_root(struct usb_device *dev, uint32_t pipe, void *buffer,
             dbg("Unknown request\r\n");
             goto unknown;
     }
-    wait(1 * 1000);
+    //wait(1000);
+    wait_ms(2);
     len = min3(srclen, swpw(req->length), length);
     if (srcptr != NULL && len > 0)
         memcpy(buffer, srcptr, len);
@@ -930,6 +931,7 @@ int ehci_usb_lowlevel_init(long handle, const struct pci_device_id *ent, void **
     struct pci_rd *pci_rsc_desc;
 
     pci_rsc_desc = pci_get_resource(handle); /* USB EHCI */
+
     if (handle && (ent != NULL))
     {
         memset(&gehci, 0, sizeof(struct ehci));

pci/ohci-hcd.c

@@ -50,6 +50,7 @@
 #include "interrupts.h"
 
 //#define DEBUG
+//#define DEBUG_OHCI
 #include "debug.h"
 
 #undef OHCI_USE_NPS         /* force NoPowerSwitching mode */
@@ -154,7 +155,7 @@ struct pci_device_id ohci_usb_pci_table[] =
 
 /* global ohci_t */
 static ohci_t gohci[10];
-int ohci_inited;
+static int ohci_inited;
 
 static inline uint32_t roothub_a(volatile ohci_t *ohci)	{ return readl(&ohci->regs->roothub.a); }
 static inline uint32_t roothub_b(volatile ohci_t *ohci)	{ return readl(&ohci->regs->roothub.b); }
@@ -168,6 +169,137 @@ static void td_submit_job(volatile ohci_t *ohci, struct usb_device *dev, uint32_
                           volatile urb_priv_t *urb, int interval);
 
 
+void write_registers(volatile ohci_t *ohci)
+{
+    int32_t reg;
+    dbg("--------REGISTERS----------\n\r");
+    readl(&ohci->regs->revision);
+    readl(&ohci->regs->control);
+    readl(&ohci->regs->cmdstatus);
+    readl(&ohci->regs->intrstatus);
+    readl(&ohci->regs->intrenable);
+    readl(&ohci->regs->intrdisable);
+    readl(&ohci->regs->hcca);
+    readl(&ohci->regs->ed_periodcurrent);
+    readl(&ohci->regs->ed_controlhead);
+    readl(&ohci->regs->ed_controlcurrent);
+    readl(&ohci->regs->ed_bulkhead);
+    readl(&ohci->regs->ed_bulkcurrent);
+    readl(&ohci->regs->donehead);
+    readl(&ohci->regs->fminterval);
+    readl(&ohci->regs->fmremaining);
+    readl(&ohci->regs->fmnumber);
+    readl(&ohci->regs->periodicstart);
+    readl(&ohci->regs->lsthresh);
+    readl(&ohci->regs->roothub.a);
+    readl(&ohci->regs->roothub.b);
+    readl(&ohci->regs->roothub.status);
+    readl(&ohci->regs->roothub.portstatus[0]);
+   dbg("--------REGISTERS W----------\n\r");
+    reg = readl(&ohci->regs->revision);
+    dbg("revision:................0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->revision );
+
+    reg = readl(&ohci->regs->control);
+    dbg("control:.................0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->control );
+
+    reg = readl(&ohci->regs->cmdstatus);
+    dbg("cmdstatus:...............0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->cmdstatus);
+
+    reg = readl(&ohci->regs->intrstatus);
+    dbg("intrstatus:..............0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->intrstatus);
+
+    reg = readl(&ohci->regs->intrenable);
+    dbg("intrenable:..............0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->intrenable);
+
+    reg = readl(&ohci->regs->intrdisable);
+    dbg("intrdisable:.............0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->intrdisable);
+
+    reg = readl(&ohci->regs->hcca);
+    dbg("hcca:....................0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->hcca);
+
+    reg = readl(&ohci->regs->ed_periodcurrent);
+    dbg("periodcurrent:...........0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->ed_periodcurrent);
+
+    reg = readl(&ohci->regs->ed_controlhead);
+    dbg("ed_controlhead:..........0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->ed_controlhead);
+
+    reg = readl(&ohci->regs->ed_controlcurrent);
+    dbg("ed_controlcurrent:.......0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->ed_controlcurrent);
+
+    reg = readl(&ohci->regs->ed_bulkhead);
+    dbg("ed_bulkhead:.............0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->ed_bulkhead);
+
+    reg = readl(&ohci->regs->ed_bulkcurrent);
+    dbg("ed_bulkcurrent:..........0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->ed_bulkcurrent);
+
+    reg = readl(&ohci->regs->donehead);
+    dbg("donehead:................0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->donehead);
+
+    reg = readl(&ohci->regs->fminterval);
+    dbg("fminterval:..............0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->fminterval);
+
+    reg = readl(&ohci->regs->fmremaining);
+    dbg("fmremaining:.............0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->fmremaining);
+
+    reg = readl(&ohci->regs->fmnumber);
+    dbg("fmnumber:................0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->fmnumber);
+
+    reg = readl(&ohci->regs->periodicstart);
+    dbg("periodicstart:...........0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->periodicstart);
+
+    reg = readl(&ohci->regs->lsthresh);
+    dbg("lstresh:.................0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->lsthresh);
+
+    reg = readl(&ohci->regs->roothub.a);
+    dbg("roothub_a:...............0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->roothub.a);
+
+    reg = readl(&ohci->regs->roothub.b);
+    dbg("roothub_b:...............0x%lx\r\n", roothub_b);
+    writel(reg, &ohci->regs->roothub.b);
+
+    reg = readl(&ohci->regs->roothub.status);
+    dbg("roothub.status:..........0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->roothub.status);
+
+    reg = readl(&ohci->regs->roothub.portstatus[0]);
+    dbg("roothub.portstatus[0]:...0x%lx\r\n", reg);
+    writel(reg, &ohci->regs->roothub.portstatus[0]);
+}
+
+void dump_hcca(ohci_t *ohci)
+{
+    volatile struct ohci_hcca *hcca = ohci->hcca;
+
+    dbg("hcca pad1: 0x%lx\r\n", hcca->pad1);
+    dbg("hcca frame no: 0x%x\r\n", hcca->frame_no);
+    dbg("hcca done head: 0x%x\r\n", hcca->done_head);
+    dbg("hcca int table:\r\n");
+#ifdef DEBUG
+    hexdump(hcca->int_table, sizeof(hcca->int_table));
+    dbg("\r\nhcca reserved area:\r\n");
+    hexdump(hcca->reserved_for_hc, sizeof(hcca->reserved_for_hc));
+#endif
+}
+
 static struct td *ptd;
 
 /* TDs ... */
@@ -214,7 +346,7 @@ static void urb_free_priv(volatile urb_priv_t *urb)
             }
         }
     }
-    /* FIXME: driver_mem_free(urb); */
+    driver_mem_free(urb);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -235,8 +367,8 @@ static void pkt_print(ohci_t *ohci, urb_priv_t *purb, struct usb_device *dev,
         usb_pipedevice(pipe),
         usb_pipeendpoint(pipe),
         usb_pipeout(pipe)? 'O': 'I',
-        usb_pipetype(pipe) < 2 ? \
-            (usb_pipeint(pipe)? "INTR": "ISOC"): \
+        usb_pipetype(pipe) < 2 ?
+            (usb_pipeint(pipe) ? "INTR": "ISOC") :
             (usb_pipecontrol(pipe)? "CTRL": "BULK"),
         (purb ? purb->actual_length : 0),
         transfer_len, dev->status);
@@ -390,8 +522,8 @@ static void ohci_dump_roothub(ohci_t *controller, int verbose)
     temp = roothub_a(controller);
     (void) temp;
 
-    //	ndp = (temp & RH_A_NDP);
-    ndp = controller->ndp;
+    ndp = (temp & RH_A_NDP);
+    // ndp = controller->ndp;
     if (verbose)
     {
         dbg("roothub.a: %08x POTPGT=%d%s%s%s%s%s NDP=%d\r\n", temp,
@@ -1065,7 +1197,7 @@ static void check_status(volatile ohci_t *ohci, td_t *td_list)
 
     if (cc)
     {
-        err("OHCI usb-%s-%c error: %s (%x)\r\n", ohci->slot_name, (char) ohci->controller + '0', cc_to_string[cc], cc);
+        err("%s (%x)\r\n", ohci->slot_name, (char) ohci->controller + '0', cc_to_string[cc], cc);
         if (*phwHeadP & swpl(0x1))
         {
             if (lurb_priv && ((td_list->index + 1) < urb_len))
@@ -1323,8 +1455,8 @@ static unsigned char root_hub_str_index1[] =
 
 #define OK(x)               len = (x); break
 #ifdef DEBUG_OHCI
-#define WR_RH_STAT(x)		{ err("WR:status %#8x", (x)); writel((x), &ohci->regs->roothub.status); }
-#define WR_RH_PORTSTAT(x)	{ err("WR:portstatus[%d] %#8x", wIndex - 1, (x)); writel((x), &ohci->regs->roothub.portstatus[wIndex - 1]); }
+#define WR_RH_STAT(x)       { inf("WR:status %#8x", (x)); writel((x), &ohci->regs->roothub.status); }
+#define WR_RH_PORTSTAT(x)   { inf("WR:portstatus[%d] %#8x", wIndex - 1, (x)); writel((x), &ohci->regs->roothub.portstatus[wIndex - 1]); }
 #else
 #define WR_RH_STAT(x)       { writel((x), &ohci->regs->roothub.status); }
 #define WR_RH_PORTSTAT(x)   { writel((x), &ohci->regs->roothub.portstatus[wIndex - 1]); }
@@ -1381,7 +1513,7 @@ static int ohci_submit_rh_msg(volatile ohci_t *ohci, struct usb_device *dev, uin
 #else
     if (ohci->irq)
     {
-        wait_ms(10);
+        wait_ms(1);
     }
 #endif
 
@@ -1636,7 +1768,7 @@ static int submit_common_msg(volatile ohci_t *ohci, struct usb_device *dev, uint
 #else
     if (ohci->irq)
     {
-        wait_us(10);
+        wait_ms(1);
     }
 #endif
 
@@ -1654,7 +1786,7 @@ static int submit_common_msg(volatile ohci_t *ohci, struct usb_device *dev, uint
 
 #if 0
     wait_us(10);
-    /* ohci_dump_status(ohci); */
+    ohci_dump_status(ohci);
 #endif
 
     /* allow more time for a BULK device to react - some are slow */
@@ -1710,7 +1842,7 @@ static int submit_common_msg(volatile ohci_t *ohci, struct usb_device *dev, uint
 
         if (--timeout)
         {
-            wait_ms(10);
+            wait_ms(1);
 //            if (!urb->finished)
 //                xprintf("*\r\n");
         }
@@ -1730,7 +1862,7 @@ static int submit_common_msg(volatile ohci_t *ohci, struct usb_device *dev, uint
     pkt_print(ohci, urb, dev, pipe, buffer, transfer_len, setup, "RET(ctlr)", usb_pipein(pipe));
 #else
     if (ohci->irq)
-        wait_ms(10);
+        wait_us(10);
 #endif
     /* free TDs in urb_priv */
     if (!usb_pipeint(pipe))
@@ -1779,7 +1911,8 @@ int ohci_submit_control_msg(struct usb_device *dev, uint32_t pipe, void *buffer,
 
 int ohci_submit_int_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, int interval)
 {
-    err("submit_int_msg dev 0x%p ohci 0x%p buffer 0x%p len %d", dev, dev->priv_hcd, buffer, transfer_len);
+    err("submit_int_msg dev 0x%p ohci 0x%p buffer 0x%p len %d\r\n", dev, dev->priv_hcd, buffer, transfer_len);
+
     return submit_common_msg((ohci_t *)dev->priv_hcd, dev, pipe, buffer, transfer_len, NULL, interval);
 }
 
@@ -1814,12 +1947,13 @@ static int hc_reset(volatile ohci_t *ohci)
             if (handle >= 0)
             {
                 uint32_t id = 0;
-                id = pci_read_config_longword(handle, PCIIDR);
+                id = swpl(pci_read_config_longword(handle, PCIIDR));
                 if ((PCI_VENDOR_ID_PHILIPS == (id & 0xFFFF)) && (PCI_DEVICE_ID_PHILIPS_ISP1561_2 == (id >> 16)))
                 {
                     int timeout = 1000;
                     uint32_t usb_base_addr = 0xFFFFFFFF;
                     struct pci_rd *pci_rsc_desc;
+
                     pci_rsc_desc = pci_get_resource(handle); /* USB OHCI */
                     if ((long) pci_rsc_desc >= 0)
                     {
@@ -1831,6 +1965,7 @@ static int hc_reset(volatile ohci_t *ohci)
                                 if (usb_base_addr == 0xFFFFFFFF)
                                 {
                                     uint32_t base = pci_rsc_desc->offset + pci_rsc_desc->start;
+
                                     writel((uint32_t) readl((uint32_t *) base + EHCI_USBCMD_OFF) | EHCI_USBCMD_HCRESET, (uint32_t *) base + EHCI_USBCMD_OFF);
                                     while (readl((uint32_t *) base + EHCI_USBCMD_OFF) & EHCI_USBCMD_HCRESET)
                                     {
@@ -1839,7 +1974,7 @@ static int hc_reset(volatile ohci_t *ohci)
                                             err("USB RootHub reset timed out!\r\n");
                                             break;
                                         }
-                                        wait_us(1);
+                                        wait_ms(1);
                                     }
                                 }
                             }
@@ -1861,13 +1996,13 @@ static int hc_reset(volatile ohci_t *ohci)
 #if defined(MACHINE_FIREBEE)
         {
             dbg("USB OHCI set 48MHz clock\r\n");
-            pci_write_config_longword(ohci->handle, 0xE4, 0x21); // oscillator & disable ehci
+            pci_write_config_longword(ohci->handle, 0xE4, swpw(0x21)); // oscillator & disable ehci
             wait_us(1);
         }
         //else
 #else
         {
-            pci_write_config_longword(ohci->handle, 0xE4, pci_read_config_longword(ohci->handle, 0xE4) | 0x01); // disable ehci
+            pci_write_config_longword(ohci->handle, 0xE4, swpl(swpl(pci_read_config_longword(ohci->handle, 0xE4)) | 0x01)); // disable ehci
             wait_us(1);
         }
 #endif
@@ -1916,6 +2051,7 @@ static int hc_reset(volatile ohci_t *ohci)
         }
         wait_us(1);
     }
+
     return 0;
 }
 
@@ -1940,7 +2076,7 @@ static int hc_start(volatile ohci_t *ohci)
     writel(0, &ohci->regs->ed_controlhead);
     writel(0, &ohci->regs->ed_bulkhead);
 
-    writel((uint32_t) ohci->hcca, &ohci->regs->hcca); /* a reset clears this */
+    writel((uint32_t) ohci->hcca /* + 0x40000000UL */, &ohci->regs->hcca); /* a reset clears this */
 
     fminterval = 0x2edf;
     writel((fminterval * 9) / 10, &ohci->regs->periodicstart);
@@ -2001,7 +2137,6 @@ static int hc_interrupt(volatile ohci_t *ohci)
     int ints;
     int stat = -1;
 
-    dbg("\r\n");
     if ((ohci->hcca->done_head != 0) && !(swpl(ohci->hcca->done_head) & 0x01))
     {
         ints =  OHCI_INTR_WDH;
@@ -2020,7 +2155,7 @@ static int hc_interrupt(volatile ohci_t *ohci)
             ints &= readl(&regs->intrenable);
             if (ints == 0)
             {
-                dbg("no interrupt...\r\n");
+                // dbg("no interrupt...\r\n");
 
                 return 0xff;
             }
@@ -2039,7 +2174,7 @@ static int hc_interrupt(volatile ohci_t *ohci)
 
     if (ints & OHCI_INTR_UE) /* e.g. due to PCI Master/Target Abort */
     {
-        unsigned short status = pci_read_config_word(ohci->handle, PCISR);
+        unsigned short status = swpw(pci_read_config_word(ohci->handle, PCISR));
 
         err("OHCI Unrecoverable Error, controller usb-%s-%c disabled\r\n(SR:0x%04X%s%s%s%s%s%s)",
             ohci->slot_name, (char) ohci->controller + '0', status & 0xFFFF,
@@ -2155,17 +2290,17 @@ static void hc_free_buffers(volatile ohci_t *ohci)
 {
     if (ohci->td_unaligned != NULL)
     {
-        /* FIXME: driver_mem_free(ohci->td_unaligned); */
+        driver_mem_free(ohci->td_unaligned);
         ohci->td_unaligned = NULL;
     }
     if (ohci->ohci_dev_unaligned != NULL)
     {
-        /* FIXME: driver_mem_free(ohci->ohci_dev_unaligned); */
+        driver_mem_free(ohci->ohci_dev_unaligned);
         ohci->ohci_dev_unaligned = NULL;
     }
     if (ohci->hcca_unaligned  != NULL)
     {
-        /* FIXME: driver_mem_free(ohci->hcca_unaligned); */
+        driver_mem_free(ohci->hcca_unaligned);
         ohci->hcca_unaligned = NULL;
     }
 }
@@ -2208,7 +2343,7 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void
     /* align the storage */
     ohci->hcca = (struct ohci_hcca *) (((uint32_t) ohci->hcca_unaligned + 255) & ~255);
     memset((void *) ohci->hcca, 0, sizeof(struct ohci_hcca));
-    inf("aligned ghcca %p\r\n", ohci->hcca);
+    inf("aligned and cleared ghcca %p\r\n", ohci->hcca);
 
     ohci->ohci_dev_unaligned = driver_mem_alloc(sizeof(struct ohci_device) + 8);
     if (ohci->ohci_dev_unaligned == NULL)
@@ -2337,6 +2472,8 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void
         /* Initialization failed */
         return -1;
     }
+    write_registers(ohci);
+    dump_hcca(ohci);
 
 #ifdef DEBUG_OHCI
     ohci_dump(ohci, 1);

pci/pci.c

@@ -107,6 +107,7 @@ int32_t pci_get_interrupt_cause(void)
 {
     int32_t handle;
     int32_t *hdl = &handles[0];
+
     /*
      * loop through all PCI devices...
      */
@@ -954,6 +955,9 @@ static void pci_device_config(uint16_t bus, uint16_t device, uint16_t function)
 
     cr |= PCICR_INT_DISABLE;
 
+    /* allow bus mastering */
+    cr |= PCICR_MASTER;
+
     /*
      * enable device memory or I/O access
      */
@@ -974,7 +978,7 @@ static void pci_bridge_config(uint16_t bus, uint16_t device, uint16_t function)
 
     pci_write_config_longword(handle, PCIBISTR, MCF_PCI_PCICR1_CACHELINESIZE(8) |
                               MCF_PCI_PCICR1_LATTIMER(0x20));
-    pci_write_config_longword(handle, PCIBAR0, swpl(0x00000000));
+    pci_write_config_longword(handle, PCIBAR0, swpl(0x40000000));
     pci_write_config_longword(handle, PCIBAR1, 0x0);
     pci_write_config_word(handle, PCI_LANESWAP_W(PCICR), swpw(
                               (1 << 1)  /* memory space */

sys/BaS.c

@@ -741,7 +741,7 @@ void init_isr(void)
 
 
     MCF_XLB_XARB_IMR = MCF_XLB_XARB_IMR_SEAE |          /* slave error acknowledge interrupt */
-                       MCF_XLB_XARB_IMR_MME |           /* multiple master at prio 0 interrupt */
+                       // MCF_XLB_XARB_IMR_MME |           /* multiple master at prio 0 interrupt */
                        MCF_XLB_XARB_IMR_TTAE |          /* TT address only interrupt */
                        MCF_XLB_XARB_IMR_TTRE |          /* TT reserved interrupt enable */
                        MCF_XLB_XARB_IMR_ECWE |          /* external control word interrupt */
@@ -757,10 +757,12 @@ void init_isr(void)
     MCF_PCIARB_PACR = MCF_PCIARB_PACR_EXTMINTEN(0x1f) | /* external master broken interrupt */
                       MCF_PCIARB_PACR_INTMINTEN;        /* internal master broken interrupt */
 
+#ifdef NOT_USED /* TODO: this appears to crash early and needs some further work */
     if (!isr_register_handler(64 + INT_SOURCE_XLBARB, 7, 1, xlbarb_interrupt_handler, NULL, NULL))
     {
         dbg("Error: unable to register isr for XLB ARB interrupts\r\n");
     }
+#endif
 }
 
 void ide_init(void)
@@ -787,11 +789,6 @@ void init_usb(void)
     int usb_found = 0;
     int index = 0;
 
-    /*
-     * disabled for now
-     */
-    return;
-
     inf("USB controller initialization:\r\n");
 
     do
@@ -1051,7 +1048,14 @@ void BaS(void)
     video_init();
 
     /* initialize USB devices */
-    // init_usb();
+
+    /*
+     *  FIXME: USB device scan sometimes finds mouse and keyboard but also sometimes just hangs or crashes.
+     * this seems to be related to XLBARB interrupts - need to investigate
+     */
+#ifdef NOT_USED
+    init_usb();
+#endif /* FIXME */
 
     set_ipl(7);     /* disable interrupts */
 

usb/usb.c

@@ -155,12 +155,12 @@ int usb_init(int32_t handle, const struct pci_device_id *ent)
             break;
 
         case PCI_CLASS_SERIAL_USB_OHCI:
-            dbg("initialize ohci host controller interface\r\n");
+            inf("initialize ohci host controller interface\r\n");
             res = ohci_usb_lowlevel_init(handle, ent, (void *) &priv);
             break;
 
         case PCI_CLASS_SERIAL_USB_EHCI:
-            dbg("initialize ehci host controller interface\r\n");
+            inf("initialize ehci host controller interface\r\n");
             res = ehci_usb_lowlevel_init(handle, ent, (void *) &priv);
             break;
 
@@ -188,7 +188,7 @@ int usb_init(int32_t handle, const struct pci_device_id *ent)
             }
         }
 
-        xprintf("Scanning bus for devices... ");
+        xprintf("Scanning bus for devices...\r\n");
 
         controller_priv[bus_index] = priv;
         controller_priv[bus_index]->usbnum = bus_index;
@@ -399,7 +399,7 @@ int usb_bulk_msg(struct usb_device *dev, unsigned int pipe, void *data, int len,
 
     while (timeout--)
     {
-        if (!((volatile uint32_t) dev->status & USB_ST_NOT_PROC))	/* FIXME: this volatile does nothing! */
+        if (!((* (volatile uint32_t *) &dev->status) & USB_ST_NOT_PROC))
             break;
         wait(1);
     }
@@ -634,6 +634,7 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type, unsigned char
     dbg("dev=%d type=%d, index=%d\r\n", dev->devnum, type, index);
     res = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
             USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, (type << 8) + index, 0, buf, size, USB_CNTL_TIMEOUT);
+    dbg("result=0x%x\r\n", res);
     return res;
 }
 
@@ -919,7 +920,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
 
     if (tbuf == NULL)
     {
-        dbg("usb_string: malloc failure\r\n");
+        err("usb_string: malloc failure\r\n");
         return -1;
     }
 
@@ -944,7 +945,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
             dev->have_langid = -1;
             dev->string_langid = tbuf[2] | (tbuf[3] << 8);
                 /* always use the first langid listed */
-            dbg("USB device number %d default language ID 0x%x\r\n", dev->devnum, dev->string_langid);
+            inf("USB device number %d default language ID 0x%x\r\n", dev->devnum, dev->string_langid);
         }
     }
     error = usb_string_sub(dev, dev->string_langid, index, tbuf);
@@ -1056,7 +1057,7 @@ struct usb_device *usb_alloc_new_device(int bus, void *priv)
     int index = dev_index[bus];
     struct usb_device *dev;
 
-    dbg("USB %d new device %d\r\n", bus, index);
+    dbg("USB bus %d new device %d\r\n", bus, index);
     if (index >= USB_MAX_DEVICE)
     {
         dbg("ERROR, too many USB Devices, max=%d\r\n", USB_MAX_DEVICE);
@@ -1118,7 +1119,6 @@ int usb_new_device(struct usb_device *dev)
         return 1;
     }
 
-//#define CONFIG_LEGACY_USB_INIT_SEQ
 #ifdef CONFIG_LEGACY_USB_INIT_SEQ
     /*
      * this is the old and known way of initializing devices, it is
@@ -1132,7 +1132,7 @@ int usb_new_device(struct usb_device *dev)
     dev->epmaxpacketin[0] = 8;
     dev->epmaxpacketout[0] = 8;
     error = usb_get_descriptor(dev, USB_DT_DEVICE, 0, &dev->descriptor, 8);
-    if (err < 8)
+    if (error < 8)
     {
         err("\r\nUSB device not responding, giving up (status=%lX)\r\n", dev->status);
         driver_mem_free(tmpbuf);
@@ -1278,17 +1278,26 @@ int usb_new_device(struct usb_device *dev)
     {
         usb_string(dev, dev->descriptor.iManufacturer, dev->mf, sizeof(dev->mf));
     }
+    else
+        strcpy(dev->mf, "NONE");
+
     if (dev->descriptor.iProduct)
     {
         usb_string(dev, dev->descriptor.iProduct, dev->prod, sizeof(dev->prod));
     }
+    else
+        strcpy(dev->prod, "NONE");
+
     if (dev->descriptor.iSerialNumber)
     {
         usb_string(dev, dev->descriptor.iSerialNumber, dev->serial, sizeof(dev->serial));
     }
-    inf("Manufacturer %s\r\n", dev->mf);
-    inf("Product      %s\r\n", dev->prod);
-    inf("SerialNumber %s\r\n", dev->serial);
+    else
+        strcpy(dev->serial, "NONE");
+
+    inf("usb %d, dev %d: Manufacturer: %s, ", dev->usbnum, dev->devnum, dev->mf);
+    inf("Product     : %s, ", dev->prod);
+    inf("SerialNumber: %s\r\n", dev->serial);
 
     /* now probe if the device is a hub */
     usb_hub_probe(dev, 0);
@@ -1319,7 +1328,6 @@ void usb_scan_devices(void *priv)
     dev = usb_alloc_new_device(bus_index, priv);
     if (usb_new_device(dev))
     {
-        xprintf("No USB Device found\r\n");
         if (dev != NULL)
         {
             dev_index[bus_index]--;

usb/usb_kbd.c

@@ -563,9 +563,13 @@ int drv_usb_kbd_init(void)
             if(dev == NULL)
                 break;
             if(usb_kbd_register(dev) > 0)
+            {
+                xprintf("usb device %d, %d registered as keyboard\r\n", j, i);
+
                 return 1;
             }
         }
+    }
     /* no USB Keyboard found */
     return -1;
 }

usb/usb_mouse.c

@@ -26,7 +26,7 @@
 #include "exceptions.h"
 #include "driver_mem.h"
 
-// // #define DEBUG
+// #define DEBUG
 #include "debug.h"
 
 extern void ltoa(char *buf, long n, unsigned long base);
@@ -97,10 +97,14 @@ int drv_usb_mouse_init(void)
                 break;
             }
 
-            xprintf("Try to register usb device %d,%d as mouse\r\n", i, j);
             if (usb_mouse_register(dev) > 0)
+            {
+                xprintf("usb device %d, %d registered as mouse\r\n", j, i);
+
                 return 1;
             }
+
+        }
     }
     /* no USB Mouse found */
     return -1;