Changeset c9e954c in mainline

Timestamp:

2014-01-18T22:37:06Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

615abda

Parents:

fccf289

Message:

ehci: Add ehci_ prefix to driver interface functions.

Location:

uspace/drv/bus/usb/ehci

Files:

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

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

@@ -95 +95 @@
 /** Generate IRQ code.
  * @param[out] ranges PIO ranges buffer.
- * @param[in] ranges_size Size of the ranges buffer (bytes).
- * @param[out] cmds Commands buffer.
- * @param[in] cmds_size Size of the commands buffer (bytes).
  * @param[in] hw_res Device's resources.
  *
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
@@ -215 +212 @@
 }
 
+int ehci_hc_status(hcd_t *hcd, uint32_t *status)
+{
+        assert(hcd);
+        hc_t *instance = hcd->driver.data;
+        assert(instance);
+        assert(status);
+        *status = 0;
+        if (instance->registers) {
+                *status = EHCI_RD(instance->registers->usbsts);
+                EHCI_WR(instance->registers->usbsts, *status);
+        }
+        return EOK;
+}
+
 /** Add USB transfer to the schedule.
  *
- * @param[in] instance EHCI 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 ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
         assert(hcd);
@@ -237 +248 @@
 /** Interrupt handling routine
  *
- * @param[in] instance EHCI 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 ehci_hc_interrupt(hcd_t *hcd, uint32_t status)
 {
         assert(hcd);

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

@@ -71 +71 @@
 } 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);
@@ -79 +77 @@
 void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
 
-int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
-void hc_interrupt(hcd_t *hcd, uint32_t status);
+int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
+
+void ehci_hc_interrupt(hcd_t *hcd, uint32_t status);
+int ehci_hc_status(hcd_t *hcd, uint32_t *status);
+int ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 #endif
 /**

uspace/drv/bus/usb/ehci/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, NULL);
+                hcd_set_implementation(hcd, instance, ehci_hc_schedule,
+                    NULL, NULL, ehci_hc_interrupt, ehci_hc_status);
         return ret;
 }
@@ -98 +98 @@
         const int ret = ddf_hcd_device_setup_all(device, USB_SPEED_HIGH,
             BANDWIDTH_AVAILABLE_USB20, bandwidth_count_usb11,
-            ddf_hcd_gen_irq_handler, hc_gen_irq_code,
+            ddf_hcd_gen_irq_handler, ehci_hc_gen_irq_code,
             ehci_driver_init, ehci_driver_fini);
         if (ret != EOK) {