Changeset 9f6cb910 in mainline

Timestamp:

2014-01-18T22:04:48Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fccf289

Parents:

4bfcf22

Message:

uhci: Add uhci_ prefix to driver interface functions.

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (4 diffs)
• hc.h (modified) (1 diff)
• main.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/hc.c

@@ -105 +105 @@
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
@@ -154 +154 @@
  * - resume from suspend state (not implemented)
  */
-void hc_interrupt(hcd_t *hcd, uint32_t status)
+void uhci_hc_interrupt(hcd_t *hcd, uint32_t status)
 {
         assert(hcd);
@@ -408 +408 @@
 }
 
-int hc_status(hcd_t *hcd, uint32_t *status)
+int uhci_hc_status(hcd_t *hcd, uint32_t *status)
 {
         assert(hcd);
@@ -432 +432 @@
  * Checks for bandwidth availability and appends the batch to the proper queue.
  */
-int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+int uhci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
         assert(hcd);

uspace/drv/bus/usb/uhci/hc.h

@@ -125 +125 @@
 int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interupts);
 void hc_fini(hc_t *instance);
-int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
 
-void hc_interrupt(hcd_t *hcd, uint32_t status);
-int hc_status(hcd_t *hcd, uint32_t *status);
-int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
+
+void uhci_hc_interrupt(hcd_t *hcd, uint32_t status);
+int uhci_hc_status(hcd_t *hcd, uint32_t *status);
+int uhci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 
 #endif

uspace/drv/bus/usb/uhci/main.c

@@ -59 +59 @@
         const int ret =  hc_init(instance, res, irq);
         if (ret == EOK)
-                hcd_set_implementation(hcd, instance, hc_schedule, NULL, NULL,
-                    hc_interrupt, hc_status);
+                hcd_set_implementation(hcd, instance, uhci_hc_schedule, NULL,
+                    NULL, uhci_hc_interrupt, uhci_hc_status);
         return ret;
 }
@@ -127 +127 @@
         ret = ddf_hcd_device_setup_all(device, USB_SPEED_FULL,
             BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11,
-            ddf_hcd_gen_irq_handler, hc_gen_irq_code,
+            ddf_hcd_gen_irq_handler, uhci_hc_gen_irq_code,
             uhci_driver_init, uhci_driver_fini);
         if (ret != EOK) {