Changeset 3abf70c7 in mainline for uspace/app/blkdump/blkdump.c

Timestamp:

2014-08-16T22:33:41Z (11 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/app/blkdump/blkdump.c (modified) (2 diffs)

uspace/app/blkdump/blkdump.c

@@ -44 +44 @@
 #include <loc.h>
 #include <byteorder.h>
+#include <scsi/mmc.h>
 #include <sys/types.h>
 #include <sys/typefmt.h>
@@ -214 +215 @@
 static int print_toc(void)
 {
-        toc_block_t *toc;
-
-        toc = block_get_toc(service_id, 0);
-        if (toc == NULL)
+        scsi_toc_multisess_data_t toc;
+        int rc;
+
+        rc = block_read_toc(service_id, 0, &toc, sizeof(toc));
+        if (rc != EOK)
                 return 1;
 
-        printf("TOC size: %" PRIu16 " bytes\n", toc->size);
-        printf("First session: %" PRIu8 "\n", toc->first_session);
-        printf("Last_session: %" PRIu8 "\n", toc->last_session);
+        printf("TOC size: %" PRIu16 " bytes\n", toc.toc_len);
+        printf("First session: %" PRIu8 "\n", toc.first_sess);
+        printf("Last_session: %" PRIu8 "\n", toc.last_sess);
 
         return 0;