Changeset 68

Timestamp:

Dec 27, 2010, 2:13:49 PM (15 years ago)

Author:

markus

Message:

made it compile, added atapi command mapping/padding (->12 bytes)

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (1 diff)
• atapi.c (modified) (4 diffs)
• atapi.h (modified) (2 diffs)
• ctxhook.c (modified) (1 diff)
• os2ahci.def (modified) (1 diff)
• os2ahci.h (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -1246 +1246 @@
     next = iorb->pNxtIORB;
     iorb->Status = IORB_DONE;
-    aws_free(iorb_workspace(iorb));
+    aws_free(add_workspace(iorb));
     if (iorb->RequestControl & IORB_ASYNC_POST) {
       iorb->NotifyAddress(iorb);

trunk/src/os2ahci/atapi.c

@@ -32 +32 @@
 
 static void atapi_req_sense_pp      (IORBH _far *iorb);
+static int atapi_pad_cdb            (u8 _far *cmd_in, u16 cmd_in_len,
+                                     u8 _far *cmd_out, u16 _far *cmd_out_len);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -143 +145 @@
   IORB_ADAPTER_PASSTHRU _far *pt = (IORB_ADAPTER_PASSTHRU _far *) iorb;
   int rc;
-  u8 cdb[ATAPI_MAX_CDB_LEN] = {0};
+  u8 cdb[ATAPI_MAX_CDB_LEN];
   u16 cdb_len;
 
   if (pt->ControllerCmdLen > ATAPI_MAX_CDB_LEN) {
-    ioerb_seterr(IOERR_CMD_SYNTAX);
+    iorb_seterr(iorb, IOERR_CMD_SYNTAX);
     return -1;
   }
-  /* AHCI requires 12 or 16 byte commands; for now, we pad them
-   * since I have no idea what to do with commands that do not
-   * have a 12 or 16 byte equivalent */
-  memcpy(cdb, pt->pControllerCmd, pt->ControllerCmdLen);
-  cdb_len = max(ATAPI_MIN_CDB_LEN, pt->ControllerCmdLen);
+  /* AHCI requires 12 or 16 byte commands */
+  atapi_pad_cdb(pt->pControllerCmd, pt->ControllerCmdLen,
+                (u8 _far *) cdb, (u16 _far *) &cdb_len);
 
   /* we do not perform the S/G limitation recovery loop here:
@@ -195 +195 @@
   int rc;
   u8 cdb[ATAPI_MIN_CDB_LEN];
-  ATAPI_CDB_6 *pcdb; = (ATAPI_CDB_6*) cdb;
+  ATAPI_CDB_6 _far *pcdb = (ATAPI_CDB_6 _far *) cdb;
   
   /* allocate sense buffer in ADD workspace */
@@ -289 +289 @@
 }
 
+/******************************************************************************
+ * pad atapi commands; AHCI requires ATAPI commands to be either 12 or
+ * 16 bytes in length. This func converts commands that have a 12 byte
+ * equivalent, and pads the others to 12 bytes.
+ * cmd_out buffer is expected to be ATAPI_MAX_CDB_LEN in size.
+ * returns 0 on success, != 0 if the command can't be converted.
+ */
+int atapi_pad_cdb(u8 _far *cmd_in, u16 cmd_in_len, 
+                  u8 _far *cmd_out, u16 _far *cmd_out_len)
+{
+  ATAPI_CDB_12 _far *p12;
+
+  if (cmd_in_len == ATAPI_MIN_CDB_LEN || cmd_in_len == ATAPI_MAX_CDB_LEN) {
+    /* command does not need to be converted */
+    memcpy(cmd_out, cmd_in, cmd_in_len);
+    *cmd_out_len = cmd_in_len;
+    return 0;
+  }
+
+  memset(cmd_out, 0x00, ATAPI_MAX_CDB_LEN);
+  p12 = (ATAPI_CDB_12 _far *) cmd_out;
+  /* we always convert to 12 byte CDBs */
+  *cmd_out_len = ATAPI_MIN_CDB_LEN;
+
+  /* check if command can be converted */
+  switch (cmd_in[0]) {
+
+  case ATAPI_CMD_READ_6:
+  case ATAPI_CMD_WRITE_6:
+    /* convert from 6 to 12 byte equivalent */
+    p12->cmd = 0xa0 | (cmd_in[0] & 0x0f);
+    p12->flags = cmd_in[1] & 0xc0; /* 6byte cmds have no flags (FUA etc.) */
+    SET_CDB_32(p12->lba, (u32) cmd_in[3] | (u32) cmd_in[2] << 8 | 
+                         (u32) (cmd_in[1] & 0x1f) << 16);
+    SET_CDB_32(p12->trans_len, (u32) cmd_in[4]);
+    p12->control = cmd_in[5];
+    break;
+
+  case ATAPI_CMD_READ_10:
+  case ATAPI_CMD_WRITE_10:
+    /* convert from 10 byte to 12 byte equivalent */
+    p12->cmd = 0xa0 | (cmd_in[0] & 0x0f);
+    p12->flags = cmd_in[1];
+    memcpy(p12->lba, cmd_in + 2, 4);
+    SET_CDB_32(p12->trans_len, (u32) GET_CDB_16(cmd_in + 7));
+    p12->control = cmd_in[9];
+    break;
+
+  default:
+    /* pad with zeroes to 12 bytes */
+    memset(cmd_out, 0x00, ATAPI_MIN_CDB_LEN);
+    memcpy(cmd_out, cmd_in, cmd_in_len);
+    break;
+  }
+
+  return 0;
+}
+

trunk/src/os2ahci/atapi.h

@@ -123 +123 @@
 } ATAPI_SENSE_DATA;
 
+/******************************************************************************Ü
+ * ATAPI_CDB_6 - describes 6 byte ATAPI command
+ */
+typedef struct _ATAPI_CDB_6 {
+  u8   cmd;            /* command code */
+  u8   lun;            /* SCSI lun (ignored) */
+  u8   resvd[2];
+  u8   trans_len;      /* transfer length */
+  u8   control;
+} ATAPI_CDB_6;
+
 /******************************************************************************
  * ATAPI_CDB_10 - describes layout of generic 10 byte ATAPI command
@@ -146 +157 @@
 } ATAPI_CDB_12;
 
-/******************************************************************************Ü
- * ATAPI_CDB_6 - describes 6 byte ATAPI command
- */
-typedef struct _ATAPI_CDB_6 {
-  u8   cmd;            /* command code */
-  u8   lun;            /* SCSI lun (ignored) */
-  u8   resvd[2];
-  u8   trans_len;      /* transfer length */
-  u8   control;
-} ATAPI_CDB_6;
-
 
 /* ---------------------------- global variables --------------------------- */

trunk/src/os2ahci/ctxhook.c

@@ -336 +336 @@
                * picked up by subsequent trigger_engine() calls.
                */
-              requeue_iorb(iorn);
+              iorb_requeue(iorb);
 
             } else {

trunk/src/os2ahci/os2ahci.def

@@ -1 +1 @@
 library os2ahci
-Description '$@#thi.guten (www.thiguten.de):1.00.20101221#@OS/2 AHCI Adapter Device Driver'
+Description '$@#thi.guten (www.thiguten.de):1.00.20101227#@OS/2 AHCI Adapter Device Driver'
 protmode
 

trunk/src/os2ahci/os2ahci.h

@@ -77 +77 @@
 /* default command timeout (can be overwritten in the IORB) */
 #define DEFAULT_TIMEOUT  30000
+
+/* max/min macros */
+#define max(a, b)  a > b ? a : b
+#define min(a, b)  a < b ? a : b
 
 /* debug output macros */