Changeset 3abf70c7 in mainline for uspace/srv/fs/cdfs/cdfs_ops.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/srv/fs/cdfs/cdfs_ops.c (modified) (2 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -48 +48 @@
 #include <errno.h>
 #include <block.h>
+#include <scsi/mmc.h>
 #include <str.h>
 #include <byteorder.h>
@@ -1035 +1036 @@
                         altroot = 0;
         } else {
-                /* Read TOC and find the last session */
-                toc_block_t *toc = block_get_toc(service_id, 1);
-                if ((toc != NULL) && (uint16_t_be2host(toc->size) == 10)) {
-                        altroot = uint32_t_be2host(toc->first_lba);
-                        free(toc);
-                }
+                /*
+                 * Read TOC multisession information and get the start address
+                 * of the first track in the last session
+                 */
+                scsi_toc_multisess_data_t toc;
+
+                rc = block_read_toc(service_id, 1, &toc, sizeof(toc));
+                if (rc == EOK && (uint16_t_be2host(toc.toc_len) == 10))
+                        altroot = uint32_t_be2host(toc.ftrack_lsess.start_addr);
         }