Changeset c4f32fff in mainline

Timestamp:

2015-04-12T10:58:45Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

42d0eeb6

Parents:

7b084d3

Message:

Add members to hold disk size and number of blocks.
Cleanup.

File:

• uspace/drv/block/ddisk/ddisk.c (modified) (11 diffs)

uspace/drv/block/ddisk/ddisk.c

@@ -96 +96 @@
 typedef struct {
         fibril_mutex_t lock;
+
         fibril_condvar_t io_cv;
         bool io_busy;
+
+        ssize_t size;
+        size_t blocks;
+
+        uintptr_t dma_buffer_phys;
+        void *dma_buffer;
+
         ddf_dev_t *dev;
         ddf_fun_t *fun;
+
         ddisk_res_t ddisk_res;
         ddisk_regs_t *ddisk_regs;
-        uintptr_t dma_buffer_phys;
-        void *dma_buffer;
+
         bd_srvs_t bds;
 } ddisk_dev_t;
@@ -196 +204 @@
             read, ba, buf);
 
-        if (ba >= pio_read_32(&ddisk_dev->ddisk_regs->size) / DDISK_BLOCK_SIZE)
+        if (ba >= ddisk_dev->blocks)
                 return ELIMIT;
 
@@ -268 +276 @@
         ddisk_dev_t *ddisk_dev = (ddisk_dev_t *) bd->srvs->sarg;
 
-        *rnb = pio_read_32(&ddisk_dev->ddisk_regs->size) / DDISK_BLOCK_SIZE;
+        *rnb = ddisk_dev->blocks;
         return EOK;     
 }
@@ -366 +374 @@
         ddisk_dev->fun = NULL;
         rc = EOK;
+
 error:
         return rc;
@@ -405 +414 @@
         int rc;
 
+        /*
+         * Get our resources.
+         */
         rc = ddisk_get_res(dev, &res);
         if (rc != EOK) {
@@ -411 +423 @@
         }
 
+        /*
+         * Allocate soft state.
+         */
         ddisk_dev = ddf_dev_data_alloc(dev, sizeof(ddisk_dev_t));
         if (!ddisk_dev) {
@@ -418 +433 @@
         }
 
+        /*
+         * Initialize soft state.
+         */
         fibril_mutex_initialize(&ddisk_dev->lock);
+        ddisk_dev->dev = dev;
+        ddisk_dev->ddisk_res = res;
+
         fibril_condvar_initialize(&ddisk_dev->io_cv);
         ddisk_dev->io_busy = false;
-        ddisk_dev->dev = dev;
-        ddisk_dev->ddisk_res = res;
+
+        bd_srvs_init(&ddisk_dev->bds);
+        ddisk_dev->bds.ops = &ddisk_bd_ops;
+        ddisk_dev->bds.sarg = ddisk_dev;
 
         /*
@@ -435 +458 @@
         ddisk_dev->ddisk_regs = vaddr;
 
-        if ((int32_t) pio_read_32(&ddisk_dev->ddisk_regs->size) <= 0) {
+        ddisk_dev->size = (int32_t) pio_read_32(&ddisk_dev->ddisk_regs->size);
+        ddisk_dev->blocks = ddisk_dev->size / DDISK_BLOCK_SIZE;
+
+        if (ddisk_dev->size <= 0) {
                 ddf_msg(LVL_WARN, "No disk detected.");
                 rc = EIO;
@@ -456 +482 @@
             ddisk_dev->dma_buffer, (void *) ddisk_dev->dma_buffer_phys);
 
-        bd_srvs_init(&ddisk_dev->bds);
-        ddisk_dev->bds.ops = &ddisk_bd_ops;
-        ddisk_dev->bds.sarg = ddisk_dev;
-
+        /*
+         * Create an exposed function.
+         */
         rc = ddisk_fun_create(ddisk_dev);
         if (rc != EOK) {
@@ -485 +510 @@
          */
         ddf_msg(LVL_NOTE,
-            "Device at %p with %" PRIu32 " blocks (%" PRIu32
-            "B) using interrupt %d",
-            (void *) ddisk_dev->ddisk_res.base,
-            pio_read_32(&ddisk_dev->ddisk_regs->size) / DDISK_BLOCK_SIZE,
-            pio_read_32(&ddisk_dev->ddisk_regs->size),
-            ddisk_dev->ddisk_res.irq);
+            "Device at %p with %zd blocks (%zuB) using interrupt %d",
+            (void *) ddisk_dev->ddisk_res.base, ddisk_dev->blocks,
+            ddisk_dev->size, ddisk_dev->ddisk_res.irq);
 
         return EOK;
@@ -499 +521 @@
         if (ddisk_dev->dma_buffer)
                 dmamem_unmap_anonymous(ddisk_dev->dma_buffer);
+
         return rc;
 }