Changeset cccd60c3 in mainline for uspace/lib

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

Files:

• c/generic/device/hw_res.c (modified) (1 diff)
• c/include/device/hw_res.h (modified) (1 diff)
• drv/generic/remote_hw_res.c (modified) (1 diff)
• drv/include/ops/hw_res.h (modified) (1 diff)
• usbhost/include/usb/host/ddf_helpers.h (modified) (1 diff)
• usbhost/src/ddf_helpers.c (modified) (3 diffs)

uspace/lib/c/generic/device/hw_res.c

@@ -75 +75 @@
 }
 
-bool hw_res_enable_interrupt(async_sess_t *sess)
+int hw_res_enable_interrupt(async_sess_t *sess, int irq)
 {
         async_exch_t *exch = async_exchange_begin(sess);
         
-        int rc = async_req_1_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
-            HW_RES_ENABLE_INTERRUPT);
+        int rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_ENABLE_INTERRUPT, irq);
         async_exchange_end(exch);
         
-        return (rc == EOK);
+        return rc;
 }
 

uspace/lib/c/include/device/hw_res.h

@@ -115 +115 @@
 
 extern int hw_res_get_resource_list(async_sess_t *, hw_resource_list_t *);
-extern bool hw_res_enable_interrupt(async_sess_t *);
+extern int hw_res_enable_interrupt(async_sess_t *, int);
 
 extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,

uspace/lib/drv/generic/remote_hw_res.c

@@ -67 +67 @@
         hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
         
-        if (hw_res_ops->enable_interrupt == NULL)
+        if (hw_res_ops->enable_interrupt == NULL) {
                 async_answer_0(callid, ENOTSUP);
-        else if (hw_res_ops->enable_interrupt(fun))
-                async_answer_0(callid, EOK);
-        else
-                async_answer_0(callid, EREFUSED);
+                return;
+        }
+        
+        const int irq = DEV_IPC_GET_ARG1(*call);
+        const int ret = hw_res_ops->enable_interrupt(fun, irq);
+        async_answer_0(callid, ret);
 }
 

uspace/lib/drv/include/ops/hw_res.h

@@ -44 +44 @@
 typedef struct {
         hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
-        bool (*enable_interrupt)(ddf_fun_t *);
+        int (*enable_interrupt)(ddf_fun_t *, int);
         int (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint32_t, uint8_t);
         int (*dma_channel_remain)(ddf_fun_t *, unsigned, size_t *);

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",