Changeset cccd60c3 in mainline for uspace/lib/usbhost

Timestamp:

2017-10-10T06:51:02Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c46bfbc

Parents:

2bdf92a5

Message:

hw_res_enable_interrupt should allow enabling individual interrupts.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/ddf_helpers.h (modified) (1 diff)
• src/ddf_helpers.c (modified) (3 diffs)

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -70 +70 @@
 hcd_t *dev_to_hcd(ddf_dev_t *dev);
 
-int hcd_ddf_enable_interrupts(ddf_dev_t *device);
+int hcd_ddf_enable_interrupt(ddf_dev_t *device, int);
 int hcd_ddf_get_registers(ddf_dev_t *device, hw_res_list_parsed_t *hw_res);
 int hcd_ddf_setup_interrupts(ddf_dev_t *device,

uspace/lib/usbhost/src/ddf_helpers.c

@@ -692 +692 @@
 
 //TODO: Cache parent session in HCD
-/** Call the parent driver with a request to enable interrupts
+/** Call the parent driver with a request to enable interrupt
  *
  * @param[in] device Device asking for interrupts
+ * @param[in] inum Interrupt number
  * @return Error code.
  */
-int hcd_ddf_enable_interrupts(ddf_dev_t *device)
+int hcd_ddf_enable_interrupt(ddf_dev_t *device, int inum)
 {
         async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
@@ -703 +704 @@
                 return EIO;
 
-        const bool enabled = hw_res_enable_interrupt(parent_sess);
-
-        return enabled ? EOK : EIO;
+        return hw_res_enable_interrupt(parent_sess, inum);
 }
 
@@ -776 +775 @@
 
         /* Enable interrupts */
-        int ret = hcd_ddf_enable_interrupts(device);
+        int ret = hcd_ddf_enable_interrupt(device, irq);
         if (ret != EOK) {
                 usb_log_error("Failed to register interrupt handler: %s.\n",