Changeset 50114ef in mainline for uspace/drv/uhci-hcd/hc.c

Timestamp:

2011-03-24T13:45:48Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

915a851

Parents:

5f80527 (diff), e18e0d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/drv/uhci-hcd/hc.c (moved) (moved from uspace/drv/uhci-hcd/uhci_hc.c ) (17 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -42 +42 @@
 #include <usb_iface.h>
 
-#include "uhci_hc.h"
+#include "hc.h"
 
 static irq_cmd_t uhci_cmds[] = {
@@ -60 +60 @@
 };
 /*----------------------------------------------------------------------------*/
-static int uhci_hc_init_transfer_lists(uhci_hc_t *instance);
-static int uhci_hc_init_mem_structures(uhci_hc_t *instance);
-static void uhci_hc_init_hw(uhci_hc_t *instance);
-
-static int uhci_hc_interrupt_emulator(void *arg);
-static int uhci_hc_debug_checker(void *arg);
-
-static bool allowed_usb_packet(
+static int hc_init_transfer_lists(hc_t *instance);
+static int hc_init_mem_structures(hc_t *instance);
+static void hc_init_hw(hc_t *instance);
+
+static int hc_interrupt_emulator(void *arg);
+static int hc_debug_checker(void *arg);
+
+static bool usb_is_allowed(
     bool low_speed, usb_transfer_type_t transfer, size_t size);
 /*----------------------------------------------------------------------------*/
@@ -82 +82 @@
  * interrupt fibrils.
  */
-int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun,
+int hc_init(hc_t *instance, ddf_fun_t *fun,
     void *regs, size_t reg_size, bool interrupts)
 {
@@ -112 +112 @@
             io, reg_size);
 
-        ret = uhci_hc_init_mem_structures(instance);
+        ret = hc_init_mem_structures(instance);
         CHECK_RET_DEST_FUN_RETURN(ret,
             "Failed to initialize UHCI memory structures.\n");
 
-        uhci_hc_init_hw(instance);
+        hc_init_hw(instance);
         if (!interrupts) {
                 instance->cleaner =
-                    fibril_create(uhci_hc_interrupt_emulator, instance);
+                    fibril_create(hc_interrupt_emulator, instance);
                 fibril_add_ready(instance->cleaner);
         } else {
@@ -125 +125 @@
         }
 
-        instance->debug_checker = fibril_create(uhci_hc_debug_checker, instance);
-        fibril_add_ready(instance->debug_checker);
+        instance->debug_checker =
+            fibril_create(hc_debug_checker, instance);
+//      fibril_add_ready(instance->debug_checker);
 
         return EOK;
@@ -137 +138 @@
  * For magic values see UHCI Design Guide
  */
-void uhci_hc_init_hw(uhci_hc_t *instance)
+void hc_init_hw(hc_t *instance)
 {
         assert(instance);
@@ -185 +186 @@
  *  - frame list page (needs to be one UHCI hw accessible 4K page)
  */
-int uhci_hc_init_mem_structures(uhci_hc_t *instance)
+int hc_init_mem_structures(hc_t *instance)
 {
         assert(instance);
@@ -214 +215 @@
 
         /* Init transfer lists */
-        ret = uhci_hc_init_transfer_lists(instance);
+        ret = hc_init_transfer_lists(instance);
         CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to init transfer lists.\n");
         usb_log_debug("Initialized transfer lists.\n");
@@ -235 +236 @@
 
         /* Init device keeper*/
-        usb_device_keeper_init(&instance->device_manager);
+        usb_device_keeper_init(&instance->manager);
         usb_log_debug("Initialized device manager.\n");
 
@@ -251 +252 @@
  * USB scheduling. Sets pointer table for quick access.
  */
-int uhci_hc_init_transfer_lists(uhci_hc_t *instance)
+int hc_init_transfer_lists(hc_t *instance)
 {
         assert(instance);
@@ -317 +318 @@
  * Checks for bandwidth availability and appends the batch to the proper queue.
  */
-int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch)
+int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
         assert(batch);
         const int low_speed = (batch->speed == USB_SPEED_LOW);
-        if (!allowed_usb_packet(
+        if (!usb_is_allowed(
             low_speed, batch->transfer_type, batch->max_packet_size)) {
                 usb_log_warning(
-                    "Invalid USB packet specified %s SPEED %d %zu.\n",
+                    "Invalid USB transfer specified %s SPEED %d %zu.\n",
                     low_speed ? "LOW" : "FULL" , batch->transfer_type,
                     batch->max_packet_size);
@@ -350 +351 @@
  * - resume from suspend state (not implemented)
  */
-void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status)
+void hc_interrupt(hc_t *instance, uint16_t status)
 {
         assert(instance);
@@ -372 +373 @@
                 if (instance->hw_failures < UHCI_ALLOWED_HW_FAIL) {
                         /* reinitialize hw, this triggers virtual disconnect*/
-                        uhci_hc_init_hw(instance);
+                        hc_init_hw(instance);
                 } else {
                         usb_log_fatal("Too many UHCI hardware failures!.\n");
-                        uhci_hc_fini(instance);
+                        hc_fini(instance);
                 }
         }
@@ -385 +386 @@
  * @return EOK (should never return)
  */
-int uhci_hc_interrupt_emulator(void* arg)
+int hc_interrupt_emulator(void* arg)
 {
         usb_log_debug("Started interrupt emulator.\n");
-        uhci_hc_t *instance = (uhci_hc_t*)arg;
+        hc_t *instance = (hc_t*)arg;
         assert(instance);
 
@@ -397 +398 @@
                 if (status != 0)
                         usb_log_debug2("UHCI status: %x.\n", status);
-                uhci_hc_interrupt(instance, status);
+                hc_interrupt(instance, status);
                 async_usleep(UHCI_CLEANER_TIMEOUT);
         }
@@ -408 +409 @@
  * @return EOK (should never return)
  */
-int uhci_hc_debug_checker(void *arg)
-{
-        uhci_hc_t *instance = (uhci_hc_t*)arg;
+int hc_debug_checker(void *arg)
+{
+        hc_t *instance = (hc_t*)arg;
         assert(instance);
 
@@ -470 +471 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check transfer packets, for USB validity
+/** Check transfers for USB validity
  *
  * @param[in] low_speed Transfer speed.
  * @param[in] transfer Transer type
- * @param[in] size Maximum size of used packets
+ * @param[in] size Size of data packets
  * @return True if transaction is allowed by USB specs, false otherwise
  */
-bool allowed_usb_packet(
+bool usb_is_allowed(
     bool low_speed, usb_transfer_type_t transfer, size_t size)
 {