Changeset a9f91cd in mainline for uspace/drv/uhci-hcd/uhci_hc.c

Timestamp:

2011-03-13T18:09:16Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

335382d, f123909

Parents:

9351353

Message:

Refactoring final touches

File:

• uspace/drv/uhci-hcd/uhci_hc.c (modified) (11 diffs)

uspace/drv/uhci-hcd/uhci_hc.c

@@ -68 +68 @@
  */
 /*----------------------------------------------------------------------------*/
-static int uhci_init_transfer_lists(uhci_hc_t *instance);
-static int uhci_init_mem_structures(uhci_hc_t *instance);
-static void uhci_init_hw(uhci_hc_t *instance);
-
-static int uhci_interrupt_emulator(void *arg);
-static int uhci_debug_checker(void *arg);
+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(
@@ -113 +113 @@
             io, reg_size);
 
-        ret = uhci_init_mem_structures(instance);
+        ret = uhci_hc_init_mem_structures(instance);
         CHECK_RET_DEST_FUN_RETURN(ret,
             "Failed to initialize UHCI memory structures.\n");
 
-        uhci_init_hw(instance);
+        uhci_hc_init_hw(instance);
         instance->cleaner =
-            fibril_create(uhci_interrupt_emulator, instance);
+            fibril_create(uhci_hc_interrupt_emulator, instance);
         fibril_add_ready(instance->cleaner);
 
-        instance->debug_checker = fibril_create(uhci_debug_checker, instance);
+        instance->debug_checker = fibril_create(uhci_hc_debug_checker, instance);
         fibril_add_ready(instance->debug_checker);
 
@@ -134 +134 @@
  * @param[in] instance UHCI structure to use.
  */
-void uhci_init_hw(uhci_hc_t *instance)
+void uhci_hc_init_hw(uhci_hc_t *instance)
 {
         assert(instance);
@@ -172 +172 @@
  * @note Should be called only once on any structure.
  */
-int uhci_init_mem_structures(uhci_hc_t *instance)
+int uhci_hc_init_mem_structures(uhci_hc_t *instance)
 {
         assert(instance);
@@ -201 +201 @@
 
         /* Init transfer lists */
-        ret = uhci_init_transfer_lists(instance);
+        ret = uhci_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 +235 @@
  * @note Should be called only once on any structure.
  */
-int uhci_init_transfer_lists(uhci_hc_t *instance)
+int uhci_hc_init_transfer_lists(uhci_hc_t *instance)
 {
         assert(instance);
@@ -299 +299 @@
  * @return Error code
  */
-int uhci_schedule(uhci_hc_t *instance, batch_t *batch)
+int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch)
 {
         assert(instance);
@@ -327 +327 @@
  * @param[in] status Value of the stsatus regiser at the time of interrupt.
  */
-void uhci_interrupt(uhci_hc_t *instance, uint16_t status)
+void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status)
 {
         assert(instance);
@@ -345 +345 @@
  * @return EOK
  */
-int uhci_interrupt_emulator(void* arg)
+int uhci_hc_interrupt_emulator(void* arg)
 {
         usb_log_debug("Started interrupt emulator.\n");
@@ -357 +357 @@
                 if (status != 0)
                         usb_log_debug2("UHCI status: %x.\n", status);
-                uhci_interrupt(instance, status);
+                uhci_hc_interrupt(instance, status);
                 async_usleep(UHCI_CLEANER_TIMEOUT);
         }
@@ -368 +368 @@
  * @return EOK
  */
-int uhci_debug_checker(void *arg)
+int uhci_hc_debug_checker(void *arg)
 {
         uhci_hc_t *instance = (uhci_hc_t*)arg;