Changeset 4046b2f4 in mainline

Timestamp:

2011-08-30T17:35:04Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7a72ce1a

Parents:

c3d19ac

Message:

TOC reading support
cherrypicked from lp:~jkavalik/cdfs/main

Location:

uspace

Files:

• lib/block/libblock.c (modified) (3 diffs)
• lib/block/libblock.h (modified) (1 diff)
• lib/c/include/ipc/bd.h (modified) (1 diff)
• srv/bd/ata_bd/ata_bd.c (modified) (3 diffs)
• srv/bd/ata_bd/ata_hw.h (modified) (2 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);
 
@@ -891 +892 @@
 }
 
+/** Get TOC from device.
+ *
+ * @param service_id Service ID of the block device.
+ * @param session    Starting 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);
+        
+        fibril_mutex_lock(&devcon->comm_area_lock);
+        
+        int rc = read_toc(devcon->sess, session);
+        if (rc == EOK)
+                memcpy(buf, devcon->comm_area, devcon->pblock_size);
+        
+        fibril_mutex_unlock(&devcon->comm_area_lock);
+        
+        return rc;
+}
+
 /** Read blocks from block device.
  *
@@ -981 +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)

uspace/lib/block/libblock.h

@@ -114 +114 @@
 extern int block_get_bsize(service_id_t, size_t *);
 extern int block_get_nblocks(service_id_t, aoff64_t *);
+extern int block_get_toc(service_id_t, uint8_t, void *);
 extern int block_read_direct(service_id_t, aoff64_t, size_t, void *);
 extern int block_read_bytes_direct(service_id_t, aoff64_t, size_t, void *);

uspace/lib/c/include/ipc/bd.h

@@ -42 +42 @@
         BD_GET_NUM_BLOCKS,
         BD_READ_BLOCKS,
-        BD_WRITE_BLOCKS
+        BD_WRITE_BLOCKS,
+        BD_READ_TOC
 } bd_request_t;
 

uspace/srv/bd/ata_bd/ata_bd.c

@@ -118 +118 @@
 static int ata_pcmd_inquiry(int dev_idx, void *obuf, size_t obuf_size);
 static int ata_pcmd_read_12(int dev_idx, uint64_t ba, size_t cnt,
+    void *obuf, size_t obuf_size);
+static int ata_pcmd_read_toc(int dev_idx, uint8_t ses,
     void *obuf, size_t obuf_size);
 static void disk_print_summary(disk_t *d);
@@ -353 +355 @@
                             UPPER32(disk[disk_id].blocks));
                         continue;
+                case BD_READ_TOC:
+                        cnt = IPC_GET_ARG1(call);
+                        if (disk[disk_id].dev_type == ata_pkt_dev)
+                                retval = ata_pcmd_read_toc(disk_id, cnt, fs_va,
+                                    disk[disk_id].block_size);
+                        else
+                                retval = EINVAL;
+                        break;
                 default:
                         retval = EINVAL;
@@ -810 +820 @@
 }
 
+/** Issue ATAPI read TOC command.
+ *
+ * Read TOC in 'multi-session' format (first and last session number
+ * with last session LBA).
+ *
+ * http://suif.stanford.edu/~csapuntz/specs/INF-8020.PDF page 171
+ *
+ * Output buffer must be large enough to hold the data, otherwise the
+ * function will fail.
+ *
+ * @param dev_idx       Device index (0 or 1)
+ * @param session       Starting session
+ * @param obuf          Buffer for storing inquiry data read from device
+ * @param obuf_size     Size of obuf in bytes
+ *
+ * @return EOK on success, EIO on error.
+ */
+static int ata_pcmd_read_toc(int dev_idx, uint8_t session, void *obuf,
+    size_t obuf_size)
+{
+        ata_pcmd_read_toc_t cp;
+        int rc;
+
+        memset(&cp, 0, sizeof(cp));
+
+        cp.opcode = PCMD_READ_TOC;
+        cp.msf = 0;
+        cp.format = 0x01; /* 0x01 = multi-session mode */
+        cp.start = session;
+        cp.size = host2uint16_t_be(obuf_size);
+        cp.oldformat = 0x40; /* 0x01 = multi-session mode (shifted to MSB) */
+        
+        rc = ata_cmd_packet(0, &cp, sizeof(cp), obuf, obuf_size);
+        if (rc != EOK)
+                return rc;
+        
+        return EOK;
+}
+
 /** Read a physical from the device.
  *

uspace/srv/bd/ata_bd/ata_hw.h

@@ -244 +244 @@
 enum ata_pkt_command {
         PCMD_INQUIRY            = 0x12,
-        PCMD_READ_12            = 0xa8
+        PCMD_READ_12            = 0xa8,
+        PCMD_READ_TOC           = 0x43
 };
 
@@ -269 +270 @@
         uint8_t _res2;
 } __attribute__ ((packed)) ata_pcmd_read_12_t;
+
+/** ATAPI Read TOC command */
+typedef struct {
+        uint8_t opcode;         /**< Operation code (PCMD_READ_TOC) */
+        uint8_t msf;            /**< 0x2 = MSF bit set */
+        uint8_t format;         /**< low 3 bits */
+        uint8_t _res0;
+        uint8_t _res1;
+        uint8_t _res2;
+        uint8_t start;          /**< starting track/session number */
+        uint16_t size;          /**< Allocation length */
+        uint8_t oldformat;         /**< high 2 bits */
+        uint8_t _res3;
+        uint8_t _res4;
+} __attribute__ ((packed)) ata_pcmd_read_toc_t;
 
 /** Data returned from Inquiry command (mandatory part) */