Changes in uspace/drv/uhci-hcd/uhci_hc.c [ff34e5a:a9f91cd] in mainline

File:

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

uspace/drv/uhci-hcd/uhci_hc.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbuhcihc
+/** @addtogroup usb
  * @{
  */
 /** @file
- * @brief UHCI Host controller driver routines
+ * @brief UHCI driver
  */
 #include <errno.h>
@@ -59 +59 @@
         }
 };
+
+/** Gets USB address of the calling device.
+ *
+ * @param[in] fun UHCI hc function.
+ * @param[in] handle Handle of the device seeking address.
+ * @param[out] address Place to store found address.
+ * @return Error code.
+ */
 /*----------------------------------------------------------------------------*/
 static int uhci_hc_init_transfer_lists(uhci_hc_t *instance);
@@ -70 +78 @@
     bool low_speed, usb_transfer_type_t transfer, size_t size);
 /*----------------------------------------------------------------------------*/
-/** Initialize UHCI hcd driver structure
+/** Initializes UHCI hcd driver structure
  *
  * @param[in] instance Memory place to initialize.
@@ -78 +86 @@
  * @return Error code.
  * @note Should be called only once on any structure.
- *
- * Initializes memory structures, starts up hw, and launches debugger and
- * interrupt fibrils.
- */
-int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun,
-    void *regs, size_t reg_size, bool interrupts)
+ */
+int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun, void *regs, size_t reg_size)
 {
         assert(reg_size >= sizeof(regs_t));
@@ -96 +100 @@
         } else (void) 0
 
-        instance->hw_interrupts = interrupts;
         /* Setup UHCI function. */
         instance->ddf_instance = fun;
@@ -115 +118 @@
 
         uhci_hc_init_hw(instance);
-        if (!interrupts) {
-                instance->cleaner =
-                    fibril_create(uhci_hc_interrupt_emulator, instance);
-                fibril_add_ready(instance->cleaner);
-        }
+        instance->cleaner =
+            fibril_create(uhci_hc_interrupt_emulator, instance);
+        fibril_add_ready(instance->cleaner);
 
         instance->debug_checker = fibril_create(uhci_hc_debug_checker, instance);
@@ -129 +130 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Initialize UHCI hc hw resources.
+/** Initializes UHCI hcd hw resources.
  *
  * @param[in] instance UHCI structure to use.
- * For magic values see UHCI Design Guide
  */
 void uhci_hc_init_hw(uhci_hc_t *instance)
@@ -153 +153 @@
         pio_write_32(&registers->flbaseadd, pa);
 
-        if (instance->hw_interrupts) {
-                /* Enable all interrupts, but resume interrupt */
-                pio_write_16(&instance->registers->usbintr,
-                    UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
-        }
+        /* Enable all interrupts, but resume interrupt */
+//      pio_write_16(&instance->registers->usbintr,
+//          UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
 
         uint16_t status = pio_read_16(&registers->usbcmd);
@@ -168 +166 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Initialize UHCI hc memory structures.
+/** Initializes UHCI hcd memory structures.
  *
  * @param[in] instance UHCI structure to use.
  * @return Error code
  * @note Should be called only once on any structure.
- *
- * Structures:
- *  - interrupt code (I/O addressses are customized per instance)
- *  - transfer lists (queue heads need to be accessible by the hw)
- *  - frame list page (needs to be one UHCI hw accessible 4K page)
  */
 int uhci_hc_init_mem_structures(uhci_hc_t *instance)
@@ -236 +229 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Initialize UHCI hc transfer lists.
+/** Initializes UHCI hcd transfer lists.
  *
  * @param[in] instance UHCI structure to use.
  * @return Error code
  * @note Should be called only once on any structure.
- *
- * Initializes transfer lists and sets them in one chain to support proper
- * USB scheduling. Sets pointer table for quick access.
  */
 int uhci_hc_init_transfer_lists(uhci_hc_t *instance)
@@ -303 +293 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Schedule batch for execution.
+/** Schedules batch for execution.
  *
  * @param[in] instance UHCI structure to use.
  * @param[in] batch Transfer batch to schedule.
  * @return Error code
- *
- * Checks for bandwidth availability and appends the batch to the proper queue.
  */
 int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch)
@@ -324 +312 @@
                 return ENOTSUP;
         }
-        /* TODO: check available bandwidth here */
+        /* TODO: check available bandwith here */
 
         transfer_list_t *list =
@@ -334 +322 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Take action based on the interrupt cause.
+/** Takes action based on the interrupt cause.
  *
  * @param[in] instance UHCI structure to use.
- * @param[in] status Value of the status register at the time of interrupt.
- *
- * Interrupt might indicate:
- * - transaction completed, either by triggering IOC, SPD, or an error
- * - some kind of device error
- * - resume from suspend state (not implemented)
+ * @param[in] status Value of the stsatus regiser at the time of interrupt.
  */
 void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status)
@@ -359 +342 @@
 /** Polling function, emulates interrupts.
  *
- * @param[in] arg UHCI hc structure to use.
- * @return EOK (should never return)
+ * @param[in] arg UHCI structure to use.
+ * @return EOK
  */
 int uhci_hc_interrupt_emulator(void* arg)
@@ -383 +366 @@
  *
  * @param[in] arg UHCI structure to use.
- * @return EOK (should never return)
+ * @return EOK
  */
 int uhci_hc_debug_checker(void *arg)
@@ -447 +430 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check transfer packets, for USB validity
+/** Checks transfer packets, for USB validity
  *
  * @param[in] low_speed Transfer speed.
  * @param[in] transfer Transer type
  * @param[in] size Maximum size of used packets
- * @return True if transaction is allowed by USB specs, false otherwise
+ * @return EOK
  */
 bool allowed_usb_packet(