Changeset 35b8bfe in mainline

Timestamp:

2014-08-16T13:05:28Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3abf70c7

Parents:

8820544

Message:

ATAPI commands correspond to SCSI SPC, SBC and MMC commands (with a few quirks) so use libscsi.

Location:

uspace

Files:

• drv/block/ata_bd/ata_bd.c (modified) (7 diffs)
• drv/block/ata_bd/ata_hw.h (modified) (1 diff)
• lib/scsi/include/scsi/mmc.h (added)
• lib/scsi/include/scsi/spc.h (modified) (1 diff)

uspace/drv/block/ata_bd/ata_bd.c

@@ -54 +54 @@
 #include <bd_srv.h>
 #include <fibril_synch.h>
+#include <scsi/mmc.h>
 #include <scsi/sbc.h>
+#include <scsi/spc.h>
 #include <stdint.h>
 #include <str.h>
@@ -343 +345 @@
         identify_data_t idata;
         uint8_t model[40];
-        ata_inquiry_data_t inq_data;
+        scsi_std_inquiry_data_t inq_data;
         size_t isize;
         uint16_t w;
@@ -472 +474 @@
 
                 /* Check device type. */
-                if (INQUIRY_PDEV_TYPE(inq_data.pdev_type) != PDEV_TYPE_CDROM)
+                if (INQUIRY_PDEV_TYPE(inq_data.pqual_devtype) != SCSI_DEV_CD_DVD)
                         ddf_msg(LVL_WARN, "Peripheral device type is not CD-ROM.");
 
@@ -831 +833 @@
     size_t *rcvd_size)
 {
-        ata_pcmd_inquiry_t cp;
+        uint8_t cpb[12];
+        scsi_cdb_inquiry_t *cp = (scsi_cdb_inquiry_t *)cpb;
         int rc;
 
-        memset(&cp, 0, sizeof(cp));
-
-        cp.opcode = PCMD_INQUIRY;
-        cp.alloc_len = min(obuf_size, 0xff); /* Allocation length */
-
-        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size, rcvd_size);
+        memset(cpb, 0, sizeof(cpb));
+
+        /*
+         * For SFF 8020 compliance the inquiry must be padded to 12 bytes
+         * and allocation length must fit in one byte.
+         */
+        cp->op_code = SCSI_CMD_INQUIRY;
+
+        /* Allocation length */
+        cp->alloc_len = host2uint16_t_be(min(obuf_size, 0xff));
+
+        rc = ata_cmd_packet(disk, cpb, sizeof(cpb), obuf, obuf_size, rcvd_size);
         if (rc != EOK)
                 return rc;
@@ -894 +903 @@
     void *obuf, size_t obuf_size)
 {
-        ata_pcmd_read_12_t cp;
+        scsi_cdb_read_12_t cp;
         int rc;
 
@@ -902 +911 @@
         memset(&cp, 0, sizeof(cp));
 
-        cp.opcode = PCMD_READ_12;
-        cp.ba = host2uint32_t_be(ba);
-        cp.nblocks = host2uint32_t_be(cnt);
+        cp.op_code = SCSI_CMD_READ_12;
+        cp.lba = host2uint32_t_be(ba);
+        cp.xfer_len = host2uint32_t_be(cnt);
 
         rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size, NULL);
@@ -933 +942 @@
     size_t obuf_size)
 {
-        ata_pcmd_read_toc_t cp;
+        uint8_t cpb[12];
+        scsi_cdb_read_toc_t *cp = (scsi_cdb_read_toc_t *)cpb;
         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(disk, &cp, sizeof(cp), obuf, obuf_size, NULL);
+        memset(cpb, 0, sizeof(cpb));
+
+        cp->op_code = SCSI_CMD_READ_TOC;
+        cp->msf = 0;
+        cp->format = 0x01; /* 0x01 = multi-session mode */
+        cp->track_sess_no = session;
+        cp->alloc_len = host2uint16_t_be(obuf_size);
+        cp->control = 0x40; /* 0x01 = multi-session mode (shifted to MSB) */
+
+        rc = ata_cmd_packet(disk, cpb, sizeof(cpb), obuf, obuf_size, NULL);
         if (rc != EOK)
                 return rc;
-        
+
         return EOK;
 }

uspace/drv/block/ata_bd/ata_hw.h

@@ -241 +241 @@
 };
 
-/** ATA packet command codes. */
-enum ata_pkt_command {
-        PCMD_INQUIRY            = 0x12,
-        PCMD_READ_12            = 0xa8,
-        PCMD_READ_TOC           = 0x43
-};
-
-/** ATAPI Inquiry command */
-typedef struct {
-        uint8_t opcode;         /**< Operation code (PCMD_INQUIRY) */
-        uint8_t _res0;
-        uint8_t _res1;
-        uint8_t _res2;
-        uint8_t alloc_len;      /**< Allocation length */
-        uint8_t _res3;
-        uint8_t _res4;
-        uint8_t _res5;
-        uint32_t _res6;
-} __attribute__ ((packed)) ata_pcmd_inquiry_t;
-
-/** ATAPI Read(12) command */
-typedef struct {
-        uint8_t opcode;         /**< Operation code (PCMD_READ_12) */
-        uint8_t _res0;
-        uint32_t ba;            /**< Starting block address */
-        uint32_t nblocks;       /**< Number of blocks to transfer */
-        uint8_t _res1;
-        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) */
-typedef struct {
-        uint8_t pdev_type;      /** Reserved, Peripheral device type */
-        uint8_t rmb;            /** RMB, Reserved */
-        uint8_t std_version;    /** ISO version, ECMA version, ANSI version */
-        uint8_t atapi_ver_rdf;  /** ATAPI version, Response data format */
-        uint8_t additional_len; /** Additional length */
-        uint8_t _res0;
-        uint8_t _res1;
-        uint8_t _res2;
-        uint8_t vendor_id[8];   /** Vendor ID */
-        uint8_t product_id[8];  /** Product ID */
-        uint8_t product_rev[4]; /** Product revision level */
-} ata_inquiry_data_t;
-
-/** Extract value of ata_inquiry_data_t.pdev_type */
+/** Extract value of device type from scsi_std_inquiry_data_t.pqual_devtype */
 #define INQUIRY_PDEV_TYPE(val) ((val) & 0x1f)
-
-/** Values for ata_inquiry_data_t.pdev_type */
-enum ata_pdev_type {
-        PDEV_TYPE_CDROM         = 0x05
-};
 
 enum ata_pdev_signature {

uspace/lib/scsi/include/scsi/spc.h

@@ -46 +46 @@
 };
 
-/** SCSI Inquiry command */
+/** SCSI Inquiry command
+ *
+ * Note: for SFF 8020 the command must be zero-padded to 12 bytes
+ * and alloc_len must be <= 0xff.
+ */
 typedef struct {
         /** Operation code (SCSI_CMD_INQUIRY) */