Changeset 15d0046 in mainline for uspace/app/blkdump/blkdump.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/blkdump/blkdump.c (modified) (3 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("Multisession Information:\n");
+        printf("\tFirst complete session: %" PRIu8 "\n", toc.first_sess);
+        printf("\tLast complete session: %" PRIu8 "\n", toc.last_sess);
+        printf("\tFirst track of last complete session:\n");
+        printf("\t\tADR / Control: 0x%" PRIx8 "\n", toc.ftrack_lsess.adr_control);
+        printf("\t\tTrack number: %" PRIu8 "\n", toc.ftrack_lsess.track_no);
+        printf("\t\tStart block address: %" PRIu32 "\n", toc.ftrack_lsess.start_addr);
 
         return 0;
@@ -271 +277 @@
 static void syntax_print(void)
 {
-        printf("syntax: blkdump [--relative] [--offset <num_blocks>] [--count <num_blocks>] <device_name>\n");
+        printf("syntax: blkdump [--toc] [--relative] [--offset <num_blocks>] "
+            "[--count <num_blocks>] <device_name>\n");
 }