Changeset 64

Timestamp:

Dec 21, 2010, 12:49:55 PM (15 years ago)

Author:

markus

Message:

changed atapi command bits; ATAPI commands are still not working

Location:

trunk/src/os2ahci

Files:

• atapi.c (modified) (3 diffs)
• atapi.h (modified) (1 diff)
• os2ahci.def (modified) (1 diff)

trunk/src/os2ahci/atapi.c

@@ -93 +93 @@
                  AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
                  AP_DEVICE,    0x4000,
-                 AP_FEATURES,  0x0001,
+                 AP_FEATURES,  ATAPI_FEAT_DMA | ATAPI_FEAT_DMA_TO_HOST,
+                 AP_SECTOR_28, ATAPI_LBA_DMA,
                  AP_END);
 
@@ -156 +157 @@
                              pt->ControllerCmdLen,
                AP_SGLIST,    pt->pSGList, pt->cSGList,
-               AP_FEATURES,  0x0001,
+               /* TODO: do we have to clear DMA_TO_HOST bit for
+                * write, mode select etc. commands?
+                */
+               AP_FEATURES,  ATAPI_FEAT_DMA | ATAPI_FEAT_DMA_TO_HOST,
+               AP_SECTOR_28, ATAPI_LBA_DMA,
                AP_END);
 
@@ -203 +208 @@
                AP_ATAPI_CMD, (void _far*) &cdb, sizeof(cdb),
                AP_VADDR, (void _far *) aws->buf, ATAPI_SENSE_LEN,
+               AP_FEATURES,  ATAPI_FEAT_DMA,
+               AP_SECTOR_28, ATAPI_LBA_DMA,
                AP_END);
 

trunk/src/os2ahci/atapi.h

@@ -66 +66 @@
 #define ATAPI_FLAG_DPO             0x10
 
+#define ATAPI_FEAT_DMA             0x0001
+#define ATAPI_FEAT_DMA_TO_HOST     0x0004
+
+#define ATAPI_LBA_DMA              ((u32)0xffff << 8)
+
 /******************************************************************************
  * ATAPI sense data
  */
-#define ATAPI_SENSE_LEN            64
+#define ATAPI_SENSE_LEN            96
 
 #define ASENSE_NO_SENSE            0x00  /* no sense -> success */

trunk/src/os2ahci/os2ahci.def

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