Changes in uspace/lib/block/libblock.c [08cba4b:7a72ce1a] in mainline

File:

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

uspace/lib/block/libblock.c

@@ -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);
 
@@ -895 +896 @@
  * @param service_id Service ID of the block device.
  * @param session    Starting session.
- *
- * @return Allocated TOC structure.
- * @return NULL on failure.
- *
- */
-toc_block_t *block_get_toc(service_id_t service_id, uint8_t 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);
         
-        toc_block_t *toc = NULL;
-        
         fibril_mutex_lock(&devcon->comm_area_lock);
         
-        async_exch_t *exch = async_exchange_begin(devcon->sess);
-        int rc = async_req_1_0(exch, BD_READ_TOC, session);
-        async_exchange_end(exch);
-        
-        if (rc == EOK) {
-                toc = (toc_block_t *) malloc(sizeof(toc_block_t));
-                if (toc != NULL) {
-                        memset(toc, 0, sizeof(toc_block_t));
-                        memcpy(toc, devcon->comm_area,
-                            min(devcon->pblock_size, sizeof(toc_block_t)));
-                }
-        }
-        
+        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 toc;
+        return rc;
 }
 
@@ -1018 +1008 @@
 }
 
+/** 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)