Changes in uspace/lib/drv/generic/remote_ahci.c [58563585:9904eb90] in mainline

File:

• uspace/lib/drv/generic/remote_ahci.c (modified) (7 diffs)

uspace/lib/drv/generic/remote_ahci.c

@@ -33 +33 @@
  */
 
-#include <as.h>
 #include <async.h>
-#include <devman.h>
 #include <errno.h>
 #include <stdio.h>
-#include <macros.h>
 #include "ahci_iface.h"
 #include "ddf/driver.h"
@@ -50 +47 @@
 } ahci_iface_funcs_t;
 
-#define MAX_NAME_LENGTH  1024
-
 #define LO(ptr) \
         ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) & 0xffffffff))
@@ -58 +53 @@
         ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) >> 32))
 
-async_sess_t* ahci_get_sess(devman_handle_t funh, char **name)
-{
-        // FIXME: Use a better way than substring match
-        
-        *name = NULL;
-        
-        char devn[MAX_NAME_LENGTH];
-        int rc = devman_fun_get_name(funh, devn, MAX_NAME_LENGTH);
-        if (rc != EOK)
-                return NULL;
-        
-        size_t devn_size = str_size(devn);
-        
-        if ((devn_size > 5) && (str_lcmp(devn, "ahci_", 5) == 0)) {
-                async_sess_t *sess = devman_device_connect(funh, IPC_FLAG_BLOCKING);
-                
-                if (sess) {
-                        *name = str_dup(devn);
-                        return sess;
-                }
-        }
-        
-        return NULL;
-}
-
-int ahci_get_sata_device_name(async_sess_t *sess, size_t sata_dev_name_length,
-    char *sata_dev_name)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        if (!exch)
-                return EINVAL;
-        
-        aid_t req = async_send_2(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
-            IPC_M_AHCI_GET_SATA_DEVICE_NAME, sata_dev_name_length, NULL);
-        
-        async_data_read_start(exch, sata_dev_name, sata_dev_name_length);
-        
-        sysarg_t rc;
-        async_wait_for(req, &rc);
-        
-        return rc;
-}
-
-int ahci_get_num_blocks(async_sess_t *sess, uint64_t *blocks)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        if (!exch)
-                return EINVAL;
-        
-        sysarg_t blocks_hi;
-        sysarg_t blocks_lo;
-        int rc = async_req_1_2(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
-            IPC_M_AHCI_GET_NUM_BLOCKS, &blocks_hi, &blocks_lo);
-        
-        async_exchange_end(exch);
-        
-        if (rc == EOK) {
-                *blocks = (((uint64_t) blocks_hi) << 32)
-                    | (((uint64_t) blocks_lo) & 0xffffffff);
-        }
-        
-        return rc;
-}
-
-int ahci_get_block_size(async_sess_t *sess, size_t *blocks_size)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        if (!exch)
-                return EINVAL;
-        
-        sysarg_t bs;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
-            IPC_M_AHCI_GET_BLOCK_SIZE, &bs);
-        
-        async_exchange_end(exch);
-        
-        if (rc == EOK)
-                *blocks_size = (size_t) bs;
-        
-        return rc;
-}
-
-int ahci_read_blocks(async_sess_t *sess, uint64_t blocknum, size_t count,
-    void *buf)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        if (!exch)
-                return EINVAL;
-        
-        aid_t req;
-        req = async_send_4(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
-            IPC_M_AHCI_READ_BLOCKS, HI(blocknum),  LO(blocknum), count, NULL);
-        
-        async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE);
-        
-        async_exchange_end(exch);
-        
-        sysarg_t rc;
-        async_wait_for(req, &rc);
-        
-        return rc;
-}
-
-int ahci_write_blocks(async_sess_t *sess, uint64_t blocknum, size_t count,
-    void* buf)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        if (!exch)
-                return EINVAL;
-        
-        aid_t req = async_send_4(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
-            IPC_M_AHCI_WRITE_BLOCKS, HI(blocknum),  LO(blocknum), count, NULL);
-        
-        async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE);
-        
-        async_exchange_end(exch);
-        
-        sysarg_t rc;
-        async_wait_for(req, &rc);
-        
-        return rc;
-}
-
 static void remote_ahci_get_sata_device_name(ddf_fun_t *, void *, ipc_callid_t,
     ipc_call_t *);
@@ -193 +65 @@
 
 /** Remote AHCI interface operations. */
-static const remote_iface_func_ptr_t remote_ahci_iface_ops [] = {
+static remote_iface_func_ptr_t remote_ahci_iface_ops [] = {
         [IPC_M_AHCI_GET_SATA_DEVICE_NAME] = remote_ahci_get_sata_device_name,
         [IPC_M_AHCI_GET_NUM_BLOCKS] = remote_ahci_get_num_blocks,
@@ -203 +75 @@
 /** Remote AHCI interface structure.
  */
-const remote_iface_t remote_ahci_iface = {
-        .method_count = ARRAY_SIZE(remote_ahci_iface_ops),
+remote_iface_t remote_ahci_iface = {
+        .method_count = sizeof(remote_ahci_iface_ops) /
+            sizeof(remote_ahci_iface_ops[0]),
         .methods = remote_ahci_iface_ops
 };
@@ -222 +95 @@
         
         char* sata_dev_name = malloc(sata_dev_name_length);
-        if (sata_dev_name == NULL) {
-                async_answer_0(callid, ENOMEM);
-                return;
-        }       
         
         const int ret = ahci_iface->get_sata_device_name(fun,
@@ -236 +105 @@
                 async_data_read_finalize(cid, sata_dev_name, sata_dev_name_length);
         
-        free(sata_dev_name);
         async_answer_0(callid, ret);
 }