Changeset 132ab5d1 in mainline for uspace/drv/block

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

Location:

uspace/drv/block

Files:

• ahci/ahci.c (modified) (2 diffs)
• ata_bd/ata_bd.c (modified) (4 diffs)
• ata_bd/main.c (modified) (1 diff)
• ddisk/ddisk.c (modified) (4 diffs)
• usbmast/bo_trans.c (modified) (2 diffs)
• usbmast/main.c (modified) (1 diff)

uspace/drv/block/ahci/ahci.c

@@ -890 +890 @@
 /** AHCI interrupt handler.
  *
- * @param iid   The IPC call id.
  * @param icall The IPC call structure.
  * @param dev   DDF device structure.
  *
  */
-static void ahci_interrupt(ipc_callid_t iid, ipc_call_t *icall, ddf_dev_t *dev)
+static void ahci_interrupt(ipc_call_t *icall, ddf_dev_t *dev)
 {
         ahci_dev_t *ahci = dev_ahci_dev(dev);
@@ -1185 +1184 @@
         ct.ranges = ahci_ranges;
         
-        int irq_cap = register_interrupt_handler(dev,
-            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct);
-        if (irq_cap < 0) {
+        int irq_cap;
+        int rc = register_interrupt_handler(dev,
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");
                 goto error_register_interrupt_handler;
         }
         
-        int rc = hw_res_enable_interrupt(ahci->parent_sess,
+        rc = hw_res_enable_interrupt(ahci->parent_sess,
             hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {

uspace/drv/block/ata_bd/ata_bd.c

@@ -62 +62 @@
 #include <stddef.h>
 #include <str.h>
-#include <loc.h>
 #include <inttypes.h>
 #include <errno.h>
 #include <byteorder.h>
-#include <task.h>
 #include <macros.h>
 
@@ -147 +145 @@
 int ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res)
 {
-        int i, rc;
+        int i;
+        int rc;
         int n_disks;
 
@@ -212 +211 @@
 int ata_ctrl_remove(ata_ctrl_t *ctrl)
 {
-        int i, rc;
+        int i;
+        int rc;
 
         ddf_msg(LVL_DEBUG, ": ata_ctrl_remove()");
@@ -236 +236 @@
 int ata_ctrl_gone(ata_ctrl_t *ctrl)
 {
-        int i, rc;
+        int i;
+        int rc;
 
         ddf_msg(LVL_DEBUG, "ata_ctrl_gone()");

uspace/drv/block/ata_bd/main.c

@@ -106 +106 @@
  *
  * @param  dev New device
- * @return     EOK on success or negative error code.
+ * @return     EOK on success or an error code.
  */
 static int ata_dev_add(ddf_dev_t *dev)

uspace/drv/block/ddisk/ddisk.c

@@ -64 +64 @@
 static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
 
-static void ddisk_irq_handler(ipc_callid_t, ipc_call_t *, ddf_dev_t *);
+static void ddisk_irq_handler(ipc_call_t *, ddf_dev_t *);
 
 static driver_ops_t driver_ops = {
@@ -176 +176 @@
 };
 
-void ddisk_irq_handler(ipc_callid_t iid, ipc_call_t *icall, ddf_dev_t *dev)
+void ddisk_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
 {
         ddf_msg(LVL_DEBUG, "ddisk_irq_handler(), status=%" PRIx32,
@@ -408 +408 @@
  *
  * @param  dev New device
- * @return     EOK on success or negative error code.
+ * @return     EOK on success or an error code.
  */
 static int ddisk_dev_add(ddf_dev_t *dev)
@@ -503 +503 @@
         ddisk_irq_commands[0].addr = (void *) &res_phys->status;
         ddisk_irq_commands[3].addr = (void *) &res_phys->command;
-        ddisk->irq_cap = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
-            ddisk_irq_handler, &ddisk_irq_code);
-        if (ddisk->irq_cap < 0) {
-                rc = ddisk->irq_cap;
+        rc = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
+            ddisk_irq_handler, &ddisk_irq_code, &ddisk->irq_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 goto error;

uspace/drv/block/usbmast/bo_trans.c

@@ -228 +228 @@
  *
  * @param mfun          Mass storage function
- * @return              Error code of maximum LUN (index, not count)
+ * @return              Maximum LUN (index, not count), or -1
  */
 int usb_massstor_get_max_lun(usbmast_dev_t *mdev)
@@ -240 +240 @@
             &data_recv_len);
         if (rc != EOK) {
-                return rc;
+                return -1;
         }
         if (data_recv_len != 1) {
-                return EEMPTY;
-        }
-        return (int) max_lun;
+                return -1;
+        }
+        return max_lun;
 }
 

uspace/drv/block/usbmast/main.c

@@ -215 +215 @@
  * @param mdev          Mass storage device
  * @param lun           LUN
- * @return              EOK on success or negative error code.
+ * @return              EOK on success or an error code.
  */
 static int usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun)