Changeset b0f00a9 in mainline for uspace/srv/bd/ata_bd/ata_bd.c

Timestamp:

2011-11-06T22:21:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/srv/bd/ata_bd/ata_bd.c (modified) (12 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -57 +57 @@
 #include <stdint.h>
 #include <str.h>
-#include <devmap.h>
+#include <loc.h>
 #include <sys/types.h>
 #include <inttypes.h>
@@ -81 +81 @@
 static const size_t identify_data_size = 512;
 
-/** Size of the communication area. */
-static size_t comm_size;
-
 /** I/O base address of the command registers. */
 static uintptr_t cmd_physical;
@@ -105 +102 @@
 static void print_syntax(void);
 static int ata_bd_init(void);
-static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 static int ata_bd_read_blocks(int disk_id, uint64_t ba, size_t cnt,
     void *buf);
@@ -122 +119 @@
 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);
 static int coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc);
@@ -179 +178 @@
                 
                 snprintf(name, 16, "%s/ata%udisk%d", NAMESPACE, ctl_num, i);
-                rc = devmap_device_register(name, &disk[i].devmap_handle);
+                rc = loc_service_register(name, &disk[i].service_id);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -247 +246 @@
         int rc;
 
-        rc = devmap_driver_register(NAME, ata_bd_connection);
+        rc = loc_server_register(NAME, ata_bd_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -274 +273 @@
 
 /** Block device connection handler */
-static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         void *fs_va = NULL;
@@ -280 +279 @@
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dsid;
+        size_t comm_size;       /**< Size of the communication area. */
         unsigned int flags;
         int retval;
@@ -287 +287 @@
         int disk_id, i;
 
-        /* Get the device handle. */
-        dh = IPC_GET_ARG1(*icall);
+        /* Get the device service ID. */
+        dsid = IPC_GET_ARG1(*icall);
 
         /* Determine which disk device is the client connecting to. */
         disk_id = -1;
         for (i = 0; i < MAX_DISKS; i++)
-                if (disk[i].devmap_handle == dh)
+                if (disk[i].service_id == dsid)
                         disk_id = i;
 
@@ -317 +317 @@
         (void) async_share_out_finalize(callid, fs_va);
 
-        while (1) {
+        while (true) {
                 callid = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
-                switch (method) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!method) {
                         /* The other side has hung up. */
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (method) {
                 case BD_READ_BLOCKS:
                         ba = MERGE_LOUP32(IPC_GET_ARG1(call),
@@ -352 +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;
@@ -809 +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.
  *