Changes in uspace/lib/block/libblock.c [7a72ce1a:867e2555] in mainline

File:

• uspace/lib/block/libblock.c (modified) (38 diffs)

uspace/lib/block/libblock.c

@@ -39 +39 @@
 #include "libblock.h"
 #include "../../srv/vfs/vfs.h"
-#include <ipc/loc.h>
+#include <ipc/devmap.h>
 #include <ipc/bd.h>
 #include <ipc/services.h>
@@ -78 +78 @@
 typedef struct {
         link_t link;
-        service_id_t service_id;
+        devmap_handle_t devmap_handle;
         async_sess_t *sess;
         fibril_mutex_t comm_area_lock;
@@ -93 +93 @@
 static int get_block_size(async_sess_t *, size_t *);
 static int get_num_blocks(async_sess_t *, aoff64_t *);
-static int read_toc(async_sess_t *, uint8_t);
 static aoff64_t ba_ltop(devcon_t *, aoff64_t);
 
-static devcon_t *devcon_search(service_id_t service_id)
+static devcon_t *devcon_search(devmap_handle_t devmap_handle)
 {
         fibril_mutex_lock(&dcl_lock);
@@ -102 +101 @@
         list_foreach(dcl, cur) {
                 devcon_t *devcon = list_get_instance(cur, devcon_t, link);
-                if (devcon->service_id == service_id) {
+                if (devcon->devmap_handle == devmap_handle) {
                         fibril_mutex_unlock(&dcl_lock);
                         return devcon;
@@ -112 +111 @@
 }
 
-static int devcon_add(service_id_t service_id, async_sess_t *sess,
+static int devcon_add(devmap_handle_t devmap_handle, async_sess_t *sess,
     size_t bsize, void *comm_area, size_t comm_size)
 {
@@ -125 +124 @@
         
         link_initialize(&devcon->link);
-        devcon->service_id = service_id;
+        devcon->devmap_handle = devmap_handle;
         devcon->sess = sess;
         fibril_mutex_initialize(&devcon->comm_area_lock);
@@ -138 +137 @@
         list_foreach(dcl, cur) {
                 devcon_t *d = list_get_instance(cur, devcon_t, link);
-                if (d->service_id == service_id) {
+                if (d->devmap_handle == devmap_handle) {
                         fibril_mutex_unlock(&dcl_lock);
                         free(devcon);
@@ -156 +155 @@
 }
 
-int block_init(exch_mgmt_t mgmt, service_id_t service_id,
+int block_init(exch_mgmt_t mgmt, devmap_handle_t devmap_handle,
     size_t comm_size)
 {
@@ -164 +163 @@
                 return ENOMEM;
         
-        async_sess_t *sess = loc_service_connect(mgmt, service_id,
+        async_sess_t *sess = devmap_device_connect(mgmt, devmap_handle,
             IPC_FLAG_BLOCKING);
         if (!sess) {
@@ -191 +190 @@
         }
         
-        rc = devcon_add(service_id, sess, bsize, comm_area, comm_size);
+        rc = devcon_add(devmap_handle, sess, bsize, comm_area, comm_size);
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
@@ -201 +200 @@
 }
 
-void block_fini(service_id_t service_id)
-{
-        devcon_t *devcon = devcon_search(service_id);
+void block_fini(devmap_handle_t devmap_handle)
+{
+        devcon_t *devcon = devcon_search(devmap_handle);
         assert(devcon);
         
         if (devcon->cache)
-                (void) block_cache_fini(service_id);
+                (void) block_cache_fini(devmap_handle);
         
         devcon_remove(devcon);
@@ -220 +219 @@
 }
 
-int block_bb_read(service_id_t service_id, aoff64_t ba)
+int block_bb_read(devmap_handle_t devmap_handle, aoff64_t ba)
 {
         void *bb_buf;
         int rc;
 
-        devcon_t *devcon = devcon_search(service_id);
+        devcon_t *devcon = devcon_search(devmap_handle);
         if (!devcon)
                 return ENOENT;
@@ -250 +249 @@
 }
 
-void *block_bb_get(service_id_t service_id)
-{
-        devcon_t *devcon = devcon_search(service_id);
+void *block_bb_get(devmap_handle_t devmap_handle)
+{
+        devcon_t *devcon = devcon_search(devmap_handle);
         assert(devcon);
         return devcon->bb_buf;
@@ -278 +277 @@
 };
 
-int block_cache_init(service_id_t service_id, size_t size, unsigned blocks,
+int block_cache_init(devmap_handle_t devmap_handle, size_t size, unsigned blocks,
     enum cache_mode mode)
 {
-        devcon_t *devcon = devcon_search(service_id);
+        devcon_t *devcon = devcon_search(devmap_handle);
         cache_t *cache;
         if (!devcon)
@@ -316 +315 @@
 }
 
-int block_cache_fini(service_id_t service_id)
-{
-        devcon_t *devcon = devcon_search(service_id);
+int block_cache_fini(devmap_handle_t devmap_handle)
+{
+        devcon_t *devcon = devcon_search(devmap_handle);
         cache_t *cache;
         int rc;
@@ -388 +387 @@
  * @param block                 Pointer to where the function will store the
  *                              block pointer on success.
- * @param service_id            Service ID of the block device.
+ * @param devmap_handle         Device handle of the block device.
  * @param ba                    Block address (logical).
  * @param flags                 If BLOCK_FLAGS_NOREAD is specified, block_get()
@@ -396 +395 @@
  * @return                      EOK on success or a negative error code.
  */
-int block_get(block_t **block, service_id_t service_id, aoff64_t ba, int flags)
+int block_get(block_t **block, devmap_handle_t devmap_handle, aoff64_t ba, int flags)
 {
         devcon_t *devcon;
@@ -409 +408 @@
         int rc;
         
-        devcon = devcon_search(service_id);
+        devcon = devcon_search(devmap_handle);
 
         assert(devcon);
@@ -537 +536 @@
 
                 block_initialize(b);
-                b->service_id = service_id;
+                b->devmap_handle = devmap_handle;
                 b->size = cache->lblock_size;
                 b->lba = ba;
@@ -587 +586 @@
 int block_put(block_t *block)
 {
-        devcon_t *devcon = devcon_search(block->service_id);
+        devcon_t *devcon = devcon_search(block->devmap_handle);
         cache_t *cache;
         unsigned blocks_cached;
@@ -688 +687 @@
 /** Read sequential data from a block device.
  *
- * @param service_id    Service ID of the block device.
+ * @param devmap_handle Device handle of the block device.
  * @param bufpos        Pointer to the first unread valid offset within the
  *                      communication buffer.
@@ -700 +699 @@
  * @return              EOK on success or a negative return code on failure.
  */
-int block_seqread(service_id_t service_id, size_t *bufpos, size_t *buflen,
+int block_seqread(devmap_handle_t devmap_handle, size_t *bufpos, size_t *buflen,
     aoff64_t *pos, void *dst, size_t size)
 {
@@ -708 +707 @@
         devcon_t *devcon;
 
-        devcon = devcon_search(service_id);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         block_size = devcon->pblock_size;
@@ -754 +753 @@
 /** Read blocks directly from device (bypass cache).
  *
- * @param service_id    Service ID of the block device.
+ * @param devmap_handle Device handle of the block device.
  * @param ba            Address of first block (physical).
  * @param cnt           Number of blocks.
@@ -761 +760 @@
  * @return              EOK on success or negative error code on failure.
  */
-int block_read_direct(service_id_t service_id, aoff64_t ba, size_t cnt, void *buf)
+int block_read_direct(devmap_handle_t devmap_handle, aoff64_t ba, size_t cnt, void *buf)
 {
         devcon_t *devcon;
         int rc;
 
-        devcon = devcon_search(service_id);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         
@@ -782 +781 @@
 /** Write blocks directly to device (bypass cache).
  *
- * @param service_id    Service ID of the block device.
+ * @param devmap_handle Device handle of the block device.
  * @param ba            Address of first block (physical).
  * @param cnt           Number of blocks.
@@ -789 +788 @@
  * @return              EOK on success or negative error code on failure.
  */
-int block_write_direct(service_id_t service_id, aoff64_t ba, size_t cnt,
+int block_write_direct(devmap_handle_t devmap_handle, aoff64_t ba, size_t cnt,
     const void *data)
 {
@@ -795 +794 @@
         int rc;
 
-        devcon = devcon_search(service_id);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         
@@ -810 +809 @@
 /** Get device block size.
  *
- * @param service_id    Service ID of the block device.
+ * @param devmap_handle Device handle of the block device.
  * @param bsize         Output block size.
  *
  * @return              EOK on success or negative error code on failure.
  */
-int block_get_bsize(service_id_t service_id, size_t *bsize)
+int block_get_bsize(devmap_handle_t devmap_handle, size_t *bsize)
 {
         devcon_t *devcon;
 
-        devcon = devcon_search(service_id);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         
@@ -827 +826 @@
 /** Get number of blocks on device.
  *
- * @param service_id    Service ID of the block device.
+ * @param devmap_handle Device handle of the block device.
  * @param nblocks       Output number of blocks.
  *
  * @return              EOK on success or negative error code on failure.
  */
-int block_get_nblocks(service_id_t service_id, aoff64_t *nblocks)
-{
-        devcon_t *devcon = devcon_search(service_id);
+int block_get_nblocks(devmap_handle_t devmap_handle, aoff64_t *nblocks)
+{
+        devcon_t *devcon = devcon_search(devmap_handle);
         assert(devcon);
         
@@ -842 +841 @@
 /** Read bytes directly from the device (bypass cache)
  * 
- * @param service_id    Service ID of the block device.
+ * @param devmap_handle Device handle of the block device.
  * @param abs_offset    Absolute offset in bytes where to start reading
  * @param bytes                 Number of bytes to read
@@ -849 +848 @@
  * @return              EOK on success or negative error code on failure.
  */
-int block_read_bytes_direct(service_id_t service_id, aoff64_t abs_offset,
+int block_read_bytes_direct(devmap_handle_t devmap_handle, aoff64_t abs_offset,
     size_t bytes, void *data)
 {
@@ -861 +860 @@
         size_t offset;
         
-        rc = block_get_bsize(service_id, &phys_block_size);
+        rc = block_get_bsize(devmap_handle, &phys_block_size);
         if (rc != EOK) {
                 return rc;
@@ -879 +878 @@
         }
         
-        rc = block_read_direct(service_id, first_block, blocks, buffer);
+        rc = block_read_direct(devmap_handle, first_block, blocks, buffer);
         if (rc != EOK) {
                 free(buffer);
@@ -890 +889 @@
         
         return EOK;
-}
-
-/** Get TOC from device.
- *
- * @param service_id Service ID of the block device.
- * @param session    Starting session.
- * @param data       Buffer to read TOC into.
- *
- * @return EOK on success.
- * @return Error code on failure.
- *
- */
-int block_get_toc(service_id_t service_id, uint8_t session, void *data)
-{
-        devcon_t *devcon = devcon_search(service_id);
-        assert(devcon);
-        
-        fibril_mutex_lock(&devcon->comm_area_lock);
-        
-        int rc = read_toc(devcon->sess, session);
-        if (rc == EOK)
-                memcpy(data, devcon->comm_area, devcon->pblock_size);
-        
-        fibril_mutex_unlock(&devcon->comm_area_lock);
-        
-        return rc;
 }
 
@@ -939 +912 @@
                 printf("Error %d reading %zu blocks starting at block %" PRIuOFF64
                     " from device handle %" PRIun "\n", rc, cnt, ba,
-                    devcon->service_id);
+                    devcon->devmap_handle);
 #ifndef NDEBUG
                 stacktrace_print();
@@ -968 +941 @@
         if (rc != EOK) {
                 printf("Error %d writing %zu blocks starting at block %" PRIuOFF64
-                    " to device handle %" PRIun "\n", rc, cnt, ba, devcon->service_id);
+                    " to device handle %" PRIun "\n", rc, cnt, ba, devcon->devmap_handle);
 #ifndef NDEBUG
                 stacktrace_print();
@@ -1008 +981 @@
 }
 
-/** Get TOC from block device. */
-static int read_toc(async_sess_t *sess, uint8_t session)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_req_1_0(exch, BD_READ_TOC, session);
-        async_exchange_end(exch);
-
-        return rc;
-}
-
 /** Convert logical block address to physical block address. */
 static aoff64_t ba_ltop(devcon_t *devcon, aoff64_t lba)