Changes in uspace/lib/block/libblock.c [63f8966:991f645] in mainline

File:

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

uspace/lib/block/libblock.c

@@ -75 +75 @@
 typedef struct {
         link_t link;
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
         int dev_phone;
         fibril_mutex_t comm_area_lock;
@@ -91 +91 @@
 static int get_num_blocks(int dev_phone, aoff64_t *nblocks);
 
-static devcon_t *devcon_search(dev_handle_t dev_handle)
+static devcon_t *devcon_search(devmap_handle_t devmap_handle)
 {
         link_t *cur;
@@ -98 +98 @@
         for (cur = dcl_head.next; cur != &dcl_head; cur = cur->next) {
                 devcon_t *devcon = list_get_instance(cur, devcon_t, link);
-                if (devcon->dev_handle == dev_handle) {
+                if (devcon->devmap_handle == devmap_handle) {
                         fibril_mutex_unlock(&dcl_lock);
                         return devcon;
@@ -107 +107 @@
 }
 
-static int devcon_add(dev_handle_t dev_handle, int dev_phone, size_t bsize,
+static int devcon_add(devmap_handle_t devmap_handle, int dev_phone, size_t bsize,
     void *comm_area, size_t comm_size)
 {
@@ -121 +121 @@
         
         link_initialize(&devcon->link);
-        devcon->dev_handle = dev_handle;
+        devcon->devmap_handle = devmap_handle;
         devcon->dev_phone = dev_phone;
         fibril_mutex_initialize(&devcon->comm_area_lock);
@@ -134 +134 @@
         for (cur = dcl_head.next; cur != &dcl_head; cur = cur->next) {
                 devcon_t *d = list_get_instance(cur, devcon_t, link);
-                if (d->dev_handle == dev_handle) {
+                if (d->devmap_handle == devmap_handle) {
                         fibril_mutex_unlock(&dcl_lock);
                         free(devcon);
@@ -152 +152 @@
 }
 
-int block_init(dev_handle_t dev_handle, size_t comm_size)
+int block_init(devmap_handle_t devmap_handle, size_t comm_size)
 {
         int rc;
@@ -165 +165 @@
         }
 
-        dev_phone = devmap_device_connect(dev_handle, IPC_FLAG_BLOCKING);
+        dev_phone = devmap_device_connect(devmap_handle, IPC_FLAG_BLOCKING);
         if (dev_phone < 0) {
                 munmap(comm_area, comm_size);
@@ -185 +185 @@
         }
         
-        rc = devcon_add(dev_handle, dev_phone, bsize, comm_area, comm_size);
+        rc = devcon_add(devmap_handle, dev_phone, bsize, comm_area, comm_size);
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
@@ -195 +195 @@
 }
 
-void block_fini(dev_handle_t dev_handle)
-{
-        devcon_t *devcon = devcon_search(dev_handle);
+void block_fini(devmap_handle_t devmap_handle)
+{
+        devcon_t *devcon = devcon_search(devmap_handle);
         assert(devcon);
         
         if (devcon->cache)
-                (void) block_cache_fini(dev_handle);
+                (void) block_cache_fini(devmap_handle);
 
         devcon_remove(devcon);
@@ -214 +214 @@
 }
 
-int block_bb_read(dev_handle_t dev_handle, 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(dev_handle);
+        devcon_t *devcon = devcon_search(devmap_handle);
         if (!devcon)
                 return ENOENT;
@@ -244 +244 @@
 }
 
-void *block_bb_get(dev_handle_t dev_handle)
-{
-        devcon_t *devcon = devcon_search(dev_handle);
+void *block_bb_get(devmap_handle_t devmap_handle)
+{
+        devcon_t *devcon = devcon_search(devmap_handle);
         assert(devcon);
         return devcon->bb_buf;
@@ -272 +272 @@
 };
 
-int block_cache_init(dev_handle_t dev_handle, 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(dev_handle);
+        devcon_t *devcon = devcon_search(devmap_handle);
         cache_t *cache;
         if (!devcon)
@@ -305 +305 @@
 }
 
-int block_cache_fini(dev_handle_t dev_handle)
-{
-        devcon_t *devcon = devcon_search(dev_handle);
+int block_cache_fini(devmap_handle_t devmap_handle)
+{
+        devcon_t *devcon = devcon_search(devmap_handle);
         cache_t *cache;
         int rc;
@@ -374 +374 @@
  * @param block                 Pointer to where the function will store the
  *                              block pointer on success.
- * @param dev_handle            Device handle of the block device.
+ * @param devmap_handle         Device handle of the block device.
  * @param boff                  Block offset.
  * @param flags                 If BLOCK_FLAGS_NOREAD is specified, block_get()
@@ -382 +382 @@
  * @return                      EOK on success or a negative error code.
  */
-int block_get(block_t **block, dev_handle_t dev_handle, aoff64_t boff, int flags)
+int block_get(block_t **block, devmap_handle_t devmap_handle, aoff64_t boff, int flags)
 {
         devcon_t *devcon;
@@ -391 +391 @@
         int rc;
         
-        devcon = devcon_search(dev_handle);
+        devcon = devcon_search(devmap_handle);
 
         assert(devcon);
@@ -500 +500 @@
 
                 block_initialize(b);
-                b->dev_handle = dev_handle;
+                b->devmap_handle = devmap_handle;
                 b->size = cache->lblock_size;
                 b->boff = boff;
@@ -549 +549 @@
 int block_put(block_t *block)
 {
-        devcon_t *devcon = devcon_search(block->dev_handle);
+        devcon_t *devcon = devcon_search(block->devmap_handle);
         cache_t *cache;
         unsigned blocks_cached;
@@ -645 +645 @@
 /** Read sequential data from a block device.
  *
- * @param dev_handle    Device handle 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.
@@ -657 +657 @@
  * @return              EOK on success or a negative return code on failure.
  */
-int block_seqread(dev_handle_t dev_handle, 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)
 {
@@ -665 +665 @@
         devcon_t *devcon;
 
-        devcon = devcon_search(dev_handle);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         block_size = devcon->pblock_size;
@@ -711 +711 @@
 /** Read blocks directly from device (bypass cache).
  *
- * @param dev_handle    Device handle of the block device.
+ * @param devmap_handle Device handle of the block device.
  * @param ba            Address of first block.
  * @param cnt           Number of blocks.
@@ -718 +718 @@
  * @return              EOK on success or negative error code on failure.
  */
-int block_read_direct(dev_handle_t dev_handle, 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(dev_handle);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         
@@ -739 +739 @@
 /** Write blocks directly to device (bypass cache).
  *
- * @param dev_handle    Device handle of the block device.
+ * @param devmap_handle Device handle of the block device.
  * @param ba            Address of first block.
  * @param cnt           Number of blocks.
@@ -746 +746 @@
  * @return              EOK on success or negative error code on failure.
  */
-int block_write_direct(dev_handle_t dev_handle, aoff64_t ba, size_t cnt,
+int block_write_direct(devmap_handle_t devmap_handle, aoff64_t ba, size_t cnt,
     const void *data)
 {
@@ -752 +752 @@
         int rc;
 
-        devcon = devcon_search(dev_handle);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         
@@ -767 +767 @@
 /** Get device block size.
  *
- * @param dev_handle    Device handle 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(dev_handle_t dev_handle, size_t *bsize)
+int block_get_bsize(devmap_handle_t devmap_handle, size_t *bsize)
 {
         devcon_t *devcon;
 
-        devcon = devcon_search(dev_handle);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         
@@ -784 +784 @@
 /** Get number of blocks on device.
  *
- * @param dev_handle    Device handle 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(dev_handle_t dev_handle, aoff64_t *nblocks)
+int block_get_nblocks(devmap_handle_t devmap_handle, aoff64_t *nblocks)
 {
         devcon_t *devcon;
 
-        devcon = devcon_search(dev_handle);
+        devcon = devcon_search(devmap_handle);
         assert(devcon);
         
@@ -818 +818 @@
                 printf("Error %d reading %d blocks starting at block %" PRIuOFF64
                     " from device handle %d\n", rc, cnt, ba,
-                    devcon->dev_handle);
+                    devcon->devmap_handle);
 #ifndef NDEBUG
                 stacktrace_print();
@@ -844 +844 @@
         if (rc != EOK) {
                 printf("Error %d writing %d blocks starting at block %" PRIuOFF64
-                    " to device handle %d\n", rc, cnt, ba, devcon->dev_handle);
+                    " to device handle %d\n", rc, cnt, ba, devcon->devmap_handle);
 #ifndef NDEBUG
                 stacktrace_print();