Changes in / [02804e1:df0bbe1] in mainline

Location:

uspace

Files:

• app/netstart/self_test.c (deleted)
• app/netstart/self_test.h (deleted)
• drv/ohci/hc.c (modified) (10 diffs)
• drv/ohci/hc.h (modified) (1 diff)
• drv/ohci/main.c (modified) (2 diffs)
• drv/ohci/ohci.c (modified) (3 diffs)
• drv/ohci/pci.c (modified) (1 diff)
• lib/packet/include/net_byteorder.h (added)
• lib/packet/include/net_err.h (added)
• lib/packet/include/socket_errno.h (added)

uspace/drv/ohci/hc.c

@@ -49 +49 @@
 static int interrupt_emulator(hc_t *instance);
 static void hc_gain_control(hc_t *instance);
+static void hc_init_hw(hc_t *instance);
 static int hc_init_transfer_lists(hc_t *instance);
 static int hc_init_memory(hc_t *instance);
@@ -91 +92 @@
                 usb_log_error("Failed add root hub match-id.\n");
         }
-        ret = ddf_fun_bind(hub_fun);
         return ret;
 }
@@ -111 +111 @@
             ret, str_error(ret));
 
-        list_initialize(&instance->pending_batches);
         usb_device_keeper_init(&instance->manager);
         ret = usb_endpoint_manager_init(&instance->ep_manager,
@@ -118 +117 @@
             str_error(ret));
 
+        hc_gain_control(instance);
         ret = hc_init_memory(instance);
         CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
             str_error(ret));
-#undef CHECK_RET_RETURN
-
-
-//      hc_init_hw(instance);
-        hc_gain_control(instance);
+        hc_init_hw(instance);
         fibril_mutex_initialize(&instance->guard);
 
@@ -136 +132 @@
         }
 
+        list_initialize(&instance->pending_batches);
+#undef CHECK_RET_RETURN
         return EOK;
 }
@@ -289 +287 @@
 {
         assert(instance);
-        usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status);
+        usb_log_debug("OHCI interrupt: %x.\n", status);
         if ((status & ~I_SF) == 0) /* ignore sof status */
                 return;
@@ -341 +339 @@
             (uint32_t*)((char*)instance->registers + 0x100);
         usb_log_debug("OHCI legacy register %p: %x.\n",
-            ohci_emulation_reg, *ohci_emulation_reg);
-        /* Do not change A20 state */
-        *ohci_emulation_reg &= 0x100;
-        usb_log_debug("OHCI legacy register %p: %x.\n",
-            ohci_emulation_reg, *ohci_emulation_reg);
+                ohci_emulation_reg, *ohci_emulation_reg);
+        *ohci_emulation_reg &= ~0x1;
 
         /* Interrupt routing enabled => smm driver is active */
@@ -355 +350 @@
                 }
                 usb_log_info("SMM driver: Ownership taken.\n");
-                instance->registers->control &= (C_HCFS_RESET << C_HCFS_SHIFT);
-                async_usleep(50000);
                 return;
         }
@@ -382 +375 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_start_hw(hc_t *instance)
+void hc_init_hw(hc_t *instance)
 {
         /* OHCI guide page 42 */
@@ -481 +474 @@
 {
         assert(instance);
-
-        bzero(&instance->rh, sizeof(instance->rh));
         /* Init queues */
         hc_init_transfer_lists(instance);

uspace/drv/ohci/hc.h

@@ -80 +80 @@
      uintptr_t regs, size_t reg_size, bool interrupts);
 
-void hc_start_hw(hc_t *instance);
-
 /** Safely dispose host controller internal structures
  *

uspace/drv/ohci/main.c

@@ -75 +75 @@
                 return ret;
         }
-//      device->driver_data = ohci;
-        hc_register_hub(&ohci->hc, ohci->rh_fun);
+        device->driver_data = ohci;
 
         usb_log_info("Controlling new OHCI device `%s'.\n", device->name);
@@ -94 +93 @@
 {
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+        sleep(5);
         return ddf_driver_main(&ohci_driver);
 }

uspace/drv/ohci/ohci.c

@@ -54 +54 @@
 {
         assert(dev);
-        assert(dev->driver_data);
         hc_t *hc = &((ohci_t*)dev->driver_data)->hc;
         uint16_t status = IPC_GET_ARG1(*call);
@@ -153 +152 @@
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
             (void *) mem_reg_base, mem_reg_size, irq);
+
+        ret = pci_disable_legacy(device);
+        CHECK_RET_DEST_FUN_RETURN(ret,
+            "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret));
 
         bool interrupts = false;
@@ -213 +216 @@
             "Failed(%d) to create root hub function.\n", ret);
 
+        hc_register_hub(&instance->hc, instance->rh_fun);
 
         instance->rh_fun->ops = &rh_ops;
         instance->rh_fun->driver_data = NULL;
-        
-        device->driver_data = instance;
-
-        hc_start_hw(&instance->hc);
+        ret = ddf_fun_bind(instance->rh_fun);
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed(%d) to register OHCI root hub.\n", ret);
+
         return EOK;
 #undef CHECK_RET_FINI_RETURN

uspace/drv/ohci/pci.c

@@ -136 +136 @@
         return enabled ? EOK : EIO;
 }
+/*----------------------------------------------------------------------------*/
+/** Implements BIOS handoff routine as decribed in OHCI spec
+ *
+ * @param[in] device Device asking for interrupts
+ * @return Error code.
+ */
+int pci_disable_legacy(ddf_dev_t *device)
+{
+        /* TODO: implement */
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /**
  * @}