Changeset fccf289 in mainline

Timestamp:

2014-01-18T22:36:24Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c9e954c

Parents:

9f6cb910

Message:

ohci: Add ohci_ prefix to driver interface functions.

Location:

uspace/drv/bus/usb/ohci

Files:

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

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

@@ -103 +103 @@
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
@@ -267 +267 @@
 }
 
-int hc_status(hcd_t *hcd, uint32_t *status)
+int ohci_hc_status(hcd_t *hcd, uint32_t *status)
 {
         assert(hcd);
@@ -283 +283 @@
 /** Add USB transfer to the schedule.
  *
- * @param[in] instance OHCI hc driver structure.
+ * @param[in] hcd HCD driver structure.
  * @param[in] batch Batch representing the transfer.
  * @return Error code.
  */
-int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+int ohci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
         assert(hcd);
@@ -324 +324 @@
 /** Interrupt handling routine
  *
- * @param[in] instance OHCI hc driver structure.
+ * @param[in] hcd HCD driver structure.
  * @param[in] status Value of the status register at the time of interrupt.
  */
-void hc_interrupt(hcd_t *hcd, uint32_t status)
+void ohci_hc_interrupt(hcd_t *hcd, uint32_t status)
 {
         assert(hcd);

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

@@ -78 +78 @@
 } hc_t;
 
-int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
-int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun);
 int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts);
 void hc_fini(hc_t *instance);
@@ -85 +83 @@
 void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep);
 void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
-int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
-int hc_status(hcd_t *hcd, uint32_t *status);
 
-void hc_interrupt(hcd_t *hcd, uint32_t status);
+int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
+
+void ohci_hc_interrupt(hcd_t *hcd, uint32_t status);
+int ohci_hc_status(hcd_t *hcd, uint32_t *status);
+int ohci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 #endif
 /**

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

@@ -58 +58 @@
         const int ret =  hc_init(instance, res, irq);
         if (ret == EOK)
-                hcd_set_implementation(hcd, instance, hc_schedule,
-                    ohci_endpoint_init, ohci_endpoint_fini, hc_interrupt,
-                    hc_status);
+                hcd_set_implementation(hcd, instance, ohci_hc_schedule,
+                    ohci_endpoint_init, ohci_endpoint_fini, ohci_hc_interrupt,
+                    ohci_hc_status);
         return ret;
 }
@@ -86 +86 @@
         const int 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, ohci_hc_gen_irq_code,
             ohci_driver_init, ohci_driver_fini);
         if (ret != EOK) {