Changeset 3de67b4c in mainline for uspace/drv/block/ata_bd/main.c

Timestamp:

2013-06-27T20:43:29Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4339f09

Parents:

9f391e9

Message:

ata_bd needs to use hw_res (PIO resource configration protcol).

File:

• uspace/drv/block/ata_bd/main.c (modified) (4 diffs)

uspace/drv/block/ata_bd/main.c

@@ -36 +36 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <device/hw_res_parsed.h>
 
 #include "ata_bd.h"
@@ -61 +62 @@
 };
 
+static int ata_get_res(ddf_dev_t *dev, ata_base_t *ata_res)
+{
+        async_sess_t *parent_sess;
+        hw_res_list_parsed_t hw_res;
+        int rc;
+
+        parent_sess = ddf_dev_parent_sess_create(dev,
+            EXCHANGE_SERIALIZE);
+        if (parent_sess == NULL)
+                return ENOMEM;
+
+        hw_res_list_parsed_init(&hw_res);
+        rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        if (rc != EOK)
+                return rc;
+
+        if (hw_res.io_ranges.count != 2) {
+                rc = EINVAL;
+                goto error;
+                return EINVAL;
+        }
+
+        ata_res->cmd = hw_res.io_ranges.ranges[0].address;
+        ata_res->ctl = hw_res.io_ranges.ranges[1].address;
+
+        if (hw_res.io_ranges.ranges[0].size < sizeof(ata_ctl_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        if (hw_res.io_ranges.ranges[1].size < sizeof(ata_cmd_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        return EOK;
+error:
+        hw_res_list_parsed_clean(&hw_res);
+        return rc;
+}
 
 /** Add new device
@@ -70 +111 @@
 {
         ata_ctrl_t *ctrl;
-        int rc;
+        ata_base_t res;
+        int rc;
+
+        rc = ata_get_res(dev, &res);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
+                return EINVAL;
+        }
 
         ctrl = ddf_dev_data_alloc(dev, sizeof(ata_ctrl_t));
@@ -81 +129 @@
         ctrl->dev = dev;
 
-        rc = ata_ctrl_init(ctrl);
+        rc = ata_ctrl_init(ctrl, &res);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");