Changes in uspace/drv/block/ahci/ahci.c [56fd7cf:76c07e4] in mainline

File:

• uspace/drv/block/ahci/ahci.c (modified) (17 diffs)

uspace/drv/block/ahci/ahci.c

@@ -34 +34 @@
 #include <errno.h>
 #include <stdio.h>
+#include <devman.h>
 #include <ddf/interrupt.h>
 #include <ddf/log.h>
@@ -159 +160 @@
 };
 
-/** Get SATA structure from DDF function. */
-static sata_dev_t *fun_sata_dev(ddf_fun_t *fun)
-{
-        return ddf_fun_data_get(fun);
-}
-
-/** Get AHCI structure from DDF device. */
-static ahci_dev_t *dev_ahci_dev(ddf_dev_t *dev)
-{
-        return ddf_dev_data_get(dev);
-}
-
 /** Get SATA device name.
  *
@@ -183 +172 @@
     size_t sata_dev_name_length, char *sata_dev_name)
 {
-        sata_dev_t *sata = fun_sata_dev(fun);
+        sata_dev_t *sata = (sata_dev_t *) fun->driver_data;
         str_cpy(sata_dev_name, sata_dev_name_length, sata->model);
         return EOK;
@@ -198 +187 @@
 static int ahci_get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
 {
-        sata_dev_t *sata = fun_sata_dev(fun);
+        sata_dev_t *sata = (sata_dev_t *) fun->driver_data;
         *num_blocks = sata->blocks;
         return EOK;
@@ -213 +202 @@
 static int ahci_get_block_size(ddf_fun_t *fun, size_t *block_size)
 {
-        sata_dev_t *sata = fun_sata_dev(fun);
+        sata_dev_t *sata = (sata_dev_t *) fun->driver_data;
         *block_size = sata->block_size;
         return EOK;
@@ -231 +220 @@
     size_t count, void *buf)
 {
-        sata_dev_t *sata = fun_sata_dev(fun);
+        sata_dev_t *sata = (sata_dev_t *) fun->driver_data;
         
         void *phys;
@@ -274 +263 @@
     size_t count, void *buf)
 {
-        sata_dev_t *sata = fun_sata_dev(fun);
+        sata_dev_t *sata = (sata_dev_t *) fun->driver_data;
         
         void *phys;
@@ -896 +885 @@
 static void ahci_interrupt(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *icall)
 {
-        ahci_dev_t *ahci = dev_ahci_dev(dev);
+        ahci_dev_t *ahci = (ahci_dev_t *) dev->driver_data;
         unsigned int port = IPC_GET_ARG1(*icall);
         ahci_port_is_t pxis = IPC_GET_ARG2(*icall);
@@ -930 +919 @@
  *
  */
-static sata_dev_t *ahci_sata_allocate(ahci_dev_t *ahci, volatile ahci_port_t *port)
+static sata_dev_t *ahci_sata_allocate(volatile ahci_port_t *port)
 {
         size_t size = 4096;
@@ -937 +926 @@
         void *virt_cmd = NULL;
         void *virt_table = NULL;
-        ddf_fun_t *fun;
-        
-        fun = ddf_fun_create(ahci->dev, fun_exposed, NULL);
-        
-        sata_dev_t *sata = ddf_fun_data_alloc(fun, sizeof(sata_dev_t));
+        
+        sata_dev_t *sata = malloc(sizeof(sata_dev_t));
         if (sata == NULL)
                 return NULL;
         
-        sata->fun = fun;
+        bzero(sata, sizeof(sata_dev_t));
+        
         sata->port = port;
         
@@ -1042 +1029 @@
 {
         ddf_fun_t *fun = NULL;
-        int rc;
-        
-        sata_dev_t *sata = ahci_sata_allocate(ahci, port);
+        sata_dev_t *sata = ahci_sata_allocate(port);
         if (sata == NULL)
                 return EINTR;
@@ -1076 +1061 @@
         fibril_mutex_unlock(&sata_devices_count_lock);
         
-        rc= ddf_fun_set_name(sata->fun, sata_dev_name);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed setting function name.");
+        fun = ddf_fun_create(dev, fun_exposed, sata_dev_name);
+        if (fun == NULL) {
+                ddf_msg(LVL_ERROR, "Failed creating function.");
                 goto error;
         }
         
-        ddf_fun_set_ops(fun, &ahci_ops);
-        
-        rc = ddf_fun_bind(fun);
+        fun->ops = &ahci_ops;
+        fun->driver_data = sata;
+        int rc = ddf_fun_bind(fun);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed binding function.");
@@ -1134 +1119 @@
 static ahci_dev_t *ahci_ahci_create(ddf_dev_t *dev)
 {
-        ahci_dev_t *ahci = ddf_dev_data_alloc(dev, sizeof(ahci_dev_t));
+        ahci_dev_t *ahci = malloc(sizeof(ahci_dev_t));
         if (!ahci)
                 return NULL;
         
-        /* Connect to parent device */
-        ahci->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
-        if (ahci->parent_sess == NULL)
-                return NULL;
+        bzero(ahci, sizeof(ahci_dev_t));
         
         ahci->dev = dev;
@@ -1147 +1129 @@
         hw_res_list_parsed_t hw_res_parsed;
         hw_res_list_parsed_init(&hw_res_parsed);
-        if (hw_res_get_list_parsed(ahci->parent_sess, &hw_res_parsed, 0) != EOK)
+        if (hw_res_get_list_parsed(dev->parent_sess, &hw_res_parsed, 0) != EOK)
                 goto error_get_res_parsed;
         
@@ -1229 +1211 @@
         
         /* Set master latency timer. */
-        pci_config_space_write_8(ahci->parent_sess, AHCI_PCI_MLT, 32);
+        pci_config_space_write_8(ahci->dev->parent_sess, AHCI_PCI_MLT, 32);
         
         /* Enable PCI interrupt and bus mastering */
         ahci_pcireg_cmd_t cmd;
         
-        pci_config_space_read_16(ahci->parent_sess, AHCI_PCI_CMD, &cmd.u16);
+        pci_config_space_read_16(ahci->dev->parent_sess, AHCI_PCI_CMD, &cmd.u16);
         cmd.id = 0;
         cmd.bme = 1;
-        pci_config_space_write_16(ahci->parent_sess, AHCI_PCI_CMD, cmd.u16);
+        pci_config_space_write_16(ahci->dev->parent_sess, AHCI_PCI_CMD, cmd.u16);
         
         /* Enable AHCI and interrupt. */
@@ -1255 +1237 @@
 static int ahci_dev_add(ddf_dev_t *dev) 
 {
+        /* Connect to parent device */
+        dev->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            dev->handle, IPC_FLAG_BLOCKING);
+        if (dev->parent_sess == NULL)
+                return EINTR;
+        
         ahci_dev_t *ahci = ahci_ahci_create(dev);
         if (ahci == NULL)
                 goto error;
         
+        dev->driver_data = ahci;
+        
         /* Start AHCI hardware. */
         ahci_ahci_hw_start(ahci);
@@ -1268 +1258 @@
         
 error:
+        async_hangup(dev->parent_sess);
         return EINTR;
 }