Changeset 3abf70c7 in mainline for uspace/lib/block/block.c

Timestamp:

2014-08-16T22:33:41Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

da79df42

Parents:

35b8bfe

Message:

libblock is not the best place to define SCSI structures.

File:

• uspace/lib/block/block.c (modified) (1 diff)

uspace/lib/block/block.c

@@ -877 +877 @@
  *
  * @return Allocated TOC structure.
- * @return NULL on failure.
- *
- */
-toc_block_t *block_get_toc(service_id_t service_id, uint8_t session)
+ * @return EOK on success or negative error code.
+ *
+ */
+int block_read_toc(service_id_t service_id, uint8_t session, void *buf,
+    size_t bufsize)
 {
         devcon_t *devcon = devcon_search(service_id);
-        toc_block_t *toc = NULL;
-        int rc;
-        
-        assert(devcon);
-        
-        toc = (toc_block_t *) malloc(sizeof(toc_block_t));
-        if (toc == NULL)
-                return NULL;
-        
-        rc = bd_read_toc(devcon->bd, session, toc, sizeof(toc_block_t));
-        if (rc != EOK) {
-                free(toc);
-                return NULL;
-        }
-        
-        return toc;
+        
+        assert(devcon);
+        return bd_read_toc(devcon->bd, session, buf, bufsize);
 }