Changeset 184

Timestamp:

Dec 15, 2016, 12:31:51 AM (9 years ago)

Author:

David Azarewicz

Message:

Reworked makefile
Fixed context hook logic.

Location:

trunk/src/os2ahci

Files:

• Makefile (modified) (8 diffs)
• ahci.c (modified) (16 diffs)
• ata.c (modified) (5 diffs)
• atapi.c (modified) (1 diff)
• ctxhook.c (modified) (3 diffs)
• os2ahci.c (modified) (12 diffs)
• os2ahci.h (modified) (4 diffs)
• pci.c (modified) (1 diff)
• trace.c (modified) (3 diffs)

trunk/src/os2ahci/Makefile

@@ -14 +14 @@
 BLD_MINOR=01 # must be 2 digits
 BLD_REV=0 # not used at this time
-FIXPACK=Test Build
 
 !ifndef %ROOT
-ROOT=$+$(%cwd)$-
-!else
+!error ROOT must be set in the environment.
+!endif
 ROOT=$(%ROOT)
-!endif
 
 !ifndef %WATCOM # if not defined in the environment
@@ -51 +49 @@
 !endif
 
+!ifdef %FIXPACK
+FIXPACK=$(%FIXPACK)
+!endif
+
 VERSION=$(BLD_MAJOR).$(BLD_MINOR)
 ZIPDIR=$(ROOT)\tmp
@@ -73 +75 @@
 
 !ifdef __LOADDLL__
-!loaddll wcc   $(WATCOM)\BINP\DLL\wccd.dll
+!loaddll wcc386   $(WATCOM)\BINP\DLL\wccd386.dll
 !loaddll wlink $(WATCOM)\BINP\DLL\wlinkd.dll
 !endif
@@ -80 +82 @@
 AFLAGS=-q -6p -bt=os2 -wx -d1
 CFLAGS =-q -bt=os2 -6s -olinar -s -ze -zl -zq -zfp -zgp -ms -wx -zp1 -ecs -ei -za99
-CFLAGS_DEBUG=-q -bt=os2 -6s -olinar -s -ze -zl -zq -zfp -zgp -ms -wx -zp1 -ecs -ei -za99
-!ifneq FIXPACK
-CFLAGS+= -DTESTVER
+
+!ifdef DEBUG
+CDEFS=-DDEBUG
+O=Debug
+!else
+CDEFS=
+O=Retail
 !endif
 
-###############################################################################
-# Main dependencies
+!ifneq FIXPACK
+CDEFS+= -DTESTVER
+!endif
 
 LIBS = $(DRV32KIT)\Drv32.lib $(DDK)\base32\lib\kee.lib
 
-OBJS = os2ahci.obj pci.obj ahci.obj ata.obj atapi.obj &
-       ctxhook.obj trace.obj ioctl.obj apm.obj thunk.obj
+OBJS = $(O)\os2ahci.obj $(O)\pci.obj $(O)\ahci.obj $(O)\ata.obj $(O)\atapi.obj &
+       $(O)\ctxhook.obj $(O)\trace.obj $(O)\ioctl.obj $(O)\apm.obj $(O)\thunk.obj
 
-INCS = os2ahci.h ahci.h
+.asm.obj: .autodepend
+  $(AS) $(AFLAGS) -fo=$^@ $[@
+  #wdis -l $^@
 
-all: os2ahci.add os2ahci.sym
+.c.obj: .autodepend
+  $(CC) $(CFLAGS) $(CDEFS) -fo=$^@ $[@
+  wdis -l $^@
 
-clean: .symbolic
-  rm -f $(OBJS) os2ahci.add *.cod *.lst *.def *.map *.sym *.err *.lnk version.h
+all: directory $(O)\os2ahci.add $(O)\os2ahci.sym
 
-###############################################################################
-# Object/source dependencies
-
-os2ahci.obj: os2ahci.c Makefile $(INCS) version.h ioctl.h
-
-pci.obj: pci.c Makefile $(INCS)
-
-ahci.obj: ahci.c Makefile $(INCS) ata.h atapi.h
-
-ata.obj: ata.c Makefile $(INCS) ata.h
-
-atapi.obj: atapi.c Makefile $(INCS) atapi.h ata.h
-
-ctxhook.obj: ctxhook.c Makefile $(INCS) ata.h atapi.h
-
-apm.obj: apm.c Makefile $(INCS)
-
-ioctl.obj: ioctl.c Makefile $(INCS) ioctl.h atapi.h
-
-trace.obj: trace.c Makefile $(INCS)
-
-###############################################################################
-# Action definitions (compile/link commands)
+directory: .symbolic
+  $(ROOT)\Tools\createpath.cmd $(O)
 
 version.h: Makefile .always
@@ -135 +124 @@
   @AddToFile $^@,$#define BLDLEVEL,BLDLEVEL2,$(VENDOR),$(VERSION),AHCI Driver (c) %Y $(VENDOR),$(FIXPACK)
 
-.asm.obj: .autodepend
-  $(AS) $(AFLAGS) $(AS_INCLUDE) $[@
-  #wdis -l $^@
-
-.c.obj: .autodepend
-  $(CC) $(CFLAGS) $[@
-  wdis -l $^@
-
-os2ahci.add: version.h $(OBJS) makefile
+$(O)\os2ahci.add: version.h $(OBJS) Makefile
   @%create $^&.lrf
   @%append $^&.lrf format os2 lx phys
@@ -168 +149 @@
   @%erase $^&.lrf
 
-os2ahci.sym: os2ahci.map
+$(O)\os2ahci.sym: $(O)\os2ahci.map
   wat2map.cmd $[@ $^*.ma1
-  $(MAPSYM) $^*.ma1
-  @%erase $^*.ma1
+  cd $(O)
+  $(MAPSYM) $^&.ma1
+  @%erase $^&.ma1
+  cd ..
 
-release: os2ahci.add os2ahci.sym .symbolic
+release: $(O)\os2ahci.add $(O)\os2ahci.sym .symbolic
   @if exist $(WPIFILE) @del $(WPIFILE)
   @!rm -rf $(ZIPDIR)
@@ -180 +163 @@
 
   @md $(ZIPDIR)\pkg1
-  @copy /b $(ROOT)\src\os2ahci\os2ahci.add $(ZIPDIR)\pkg1 >NUL
-  @copy /b $(ROOT)\src\os2ahci\os2ahci.sym $(ZIPDIR)\pkg1 >NUL
+  @copy /b $(ROOT)\src\os2ahci\$(O)\os2ahci.add $(ZIPDIR)\pkg1 >NUL
+  @copy /b $(ROOT)\src\os2ahci\$(O)\os2ahci.sym $(ZIPDIR)\pkg1 >NUL
 
   @md $(ZIPDIR)\pkg2
@@ -200 +183 @@
   @!rm -rf $(ZIPDIR)
 
+clean: .symbolic
+  rm -f *.def *.err *.lnk version.h
+  @if exist Debug @!rm -r Debug
+  @if exist Retail @!rm -r Retail
+
+

trunk/src/os2ahci/ahci.c

@@ -148 +148 @@
     if (i == HOST_VERSION) version = val;
 
-    NTPRINTF(" %02x: %08lx", i, val);
+    dprintf(0," %02x: %08lx", i, val);
 
     if (i == HOST_CAP) {
-      NTPRINTF(" -");
-      if (val & HOST_CAP_64)         NTPRINTF(" 64bit");
-      if (val & HOST_CAP_NCQ)        NTPRINTF(" ncq");
-      if (val & HOST_CAP_SNTF)       NTPRINTF(" sntf");
-      if (val & HOST_CAP_MPS)        NTPRINTF(" mps");
-      if (val & HOST_CAP_SSS)        NTPRINTF(" sss");
-      if (val & HOST_CAP_ALPM)       NTPRINTF(" alpm");
-      if (val & HOST_CAP_LED)        NTPRINTF(" led");
-      if (val & HOST_CAP_CLO)        NTPRINTF(" clo");
-      if (val & HOST_CAP_ONLY)       NTPRINTF(" ahci_only");
-      if (val & HOST_CAP_PMP)        NTPRINTF(" pmp");
-      if (val & HOST_CAP_FBS)        NTPRINTF(" fbs");
-      if (val & HOST_CAP_PIO_MULTI)  NTPRINTF(" pio_multi");
-      if (val & HOST_CAP_SSC)        NTPRINTF(" ssc");
-      if (val & HOST_CAP_PART)       NTPRINTF(" part");
-      if (val & HOST_CAP_CCC)        NTPRINTF(" ccc");
-      if (val & HOST_CAP_EMS)        NTPRINTF(" ems");
-      if (val & HOST_CAP_SXS)        NTPRINTF(" sxs");
-      NTPRINTF(" cmd_slots:%d", ((val >> 8) & 0x1f) + 1);
-      NTPRINTF(" ports:%d",     (val & 0x1f) + 1);
+      dprintf(0," -");
+      if (val & HOST_CAP_64)         dprintf(0," 64bit");
+      if (val & HOST_CAP_NCQ)        dprintf(0," ncq");
+      if (val & HOST_CAP_SNTF)       dprintf(0," sntf");
+      if (val & HOST_CAP_MPS)        dprintf(0," mps");
+      if (val & HOST_CAP_SSS)        dprintf(0," sss");
+      if (val & HOST_CAP_ALPM)       dprintf(0," alpm");
+      if (val & HOST_CAP_LED)        dprintf(0," led");
+      if (val & HOST_CAP_CLO)        dprintf(0," clo");
+      if (val & HOST_CAP_ONLY)       dprintf(0," ahci_only");
+      if (val & HOST_CAP_PMP)        dprintf(0," pmp");
+      if (val & HOST_CAP_FBS)        dprintf(0," fbs");
+      if (val & HOST_CAP_PIO_MULTI)  dprintf(0," pio_multi");
+      if (val & HOST_CAP_SSC)        dprintf(0," ssc");
+      if (val & HOST_CAP_PART)       dprintf(0," part");
+      if (val & HOST_CAP_CCC)        dprintf(0," ccc");
+      if (val & HOST_CAP_EMS)        dprintf(0," ems");
+      if (val & HOST_CAP_SXS)        dprintf(0," sxs");
+      dprintf(0," cmd_slots:%d", ((val >> 8) & 0x1f) + 1);
+      dprintf(0," ports:%d",     (val & 0x1f) + 1);
     } else if (i == HOST_CTL) {
-      NTPRINTF(" -");
-      if (val & HOST_AHCI_EN)        NTPRINTF(" ahci_enabled");
-      if (val & HOST_IRQ_EN)         NTPRINTF(" irq_enabled");
-      if (val & HOST_RESET)          NTPRINTF(" resetting");
+      dprintf(0," -");
+      if (val & HOST_AHCI_EN)        dprintf(0," ahci_enabled");
+      if (val & HOST_IRQ_EN)         dprintf(0," irq_enabled");
+      if (val & HOST_RESET)          dprintf(0," resetting");
     } else if (i == HOST_CAP2) {
-      NTPRINTF(" -");
-      if (val & HOST_CAP2_BOH)       NTPRINTF(" boh");
-      if (val & HOST_CAP2_NVMHCI)    NTPRINTF(" nvmhci");
-      if (val & HOST_CAP2_APST)      NTPRINTF(" apst");
-    }
-    NTPRINTF("\n");
+      dprintf(0," -");
+      if (val & HOST_CAP2_BOH)       dprintf(0," boh");
+      if (val & HOST_CAP2_NVMHCI)    dprintf(0," nvmhci");
+      if (val & HOST_CAP2_APST)      dprintf(0," apst");
+    }
+    dprintf(0,"\n");
   }
 }
@@ -228 +228 @@
   if (ai->pci->board >= sizeof(initial_flags) / sizeof(*initial_flags))
   {
-    DPRINTF(0,"error: invalid board index in PCI info\n");
+    dprintf(0,"error: invalid board index in PCI info\n");
     return(-1);
   }
@@ -446 +446 @@
     while (((tmp = readl(ai->mmio + HOST_CTL)) & HOST_RESET) != 0) {
       if (TimerCheckAndBlock(&Timer)) {
-        DPRINTF(0,"controller reset failed (0x%x)\n", tmp);
+        dprintf(0,"controller reset failed (0x%x)\n", tmp);
         return(-1);
       }
@@ -558 +558 @@
 
   /* couldn't enable AHCI mode */
-  DPRINTF(0,"failed to enable AHCI mode on adapter %d\n", ad_no(ai));
+  dprintf(0,"failed to enable AHCI mode on adapter %d\n", ad_no(ai));
   return(1);
 }
@@ -635 +635 @@
 
       #ifdef DAZ_NEW_CODE
-      ai->ports[p].dma_buf = MemAlloc(AHCI_PORT_PRIV_DMA_SZ);
+      ai->ports[p].dma_buf = MemAllocAlign(AHCI_PORT_PRIV_DMA_SZ, 1024);
       ai->ports[p].dma_buf_phys = MemPhysAdr(ai->ports[p].dma_buf);
       #endif
@@ -714 +714 @@
       if (Dev32Help_SetIRQ(irq_handlers[irq_map_cnt], ai->irq, 0) != 0)
       {
-        DPRINTF(0,"failed to register exclusive interrupt\n");
+        dprintf(0,"failed to register exclusive interrupt\n");
         return(-1);
       }
@@ -963 +963 @@
   if ((rc = ahci_stop_fis_rx(ai, p)) != 0)
   {
-    DPRINTF(0,"error: failed to stop FIS receive (%d)\n", rc);
+    dprintf(0,"error: failed to stop FIS receive (%d)\n", rc);
     return(rc);
   }
@@ -970 +970 @@
   if ((rc = ahci_stop_engine(ai, p)) != 0)
   {
-    DPRINTF(0,"error: failed to stop port HW engine (%d)\n", rc);
+    dprintf(0,"error: failed to stop port HW engine (%d)\n", rc);
     return(rc);
   }
@@ -1632 +1632 @@
    * reset, or worse.
    */
+  ai->ports[p].error_count++;
+
   if (irq_stat & PORT_IRQ_UNK_FIS)
   {
@@ -1642 +1644 @@
   if (irq_stat & (PORT_IRQ_HBUS_ERR | PORT_IRQ_HBUS_DATA_ERR))
   {
-    DPRINTF(0,"warning: host bus [data] error for port #%d\n", p);
+    dprintf(0,"warning: host bus [data] error for port #%d\n", p);
     reset_port = 1;
   }
   if (irq_stat & PORT_IRQ_IF_ERR && !(ai->flags & AHCI_HFLAG_IGN_IRQ_IF_ERR))
   {
-    DPRINTF(0,"warning: interface fatal error for port #%d\n", p);
+    dprintf(0,"warning: interface fatal error for port #%d\n", p);
     reset_port = 1;
   }
@@ -1661 +1663 @@
   }
 
-  DPRINTF(0,"port #%d interrupt error status: 0x%08lx; restarting port\n", p, irq_stat);
+  dprintf(0,"port #%d interrupt error status: 0x%08lx; restarting port\n", p, irq_stat);
 
   /* Handle device-specific errors. Those errors typically involve restarting
@@ -1677 +1679 @@
 void ahci_get_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  #ifdef DEBUG
   DPRINTF(7,"ahci_get_geometry(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb));
-  #endif
 
   ahci_exec_iorb(vIorb, pIorb, 0, cmd_func(pIorb, get_geometry));
@@ -1690 +1690 @@
 void ahci_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  #ifdef DEBUG
   DPRINTF(7,"ahci_unit_ready(%d.%d.%d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb));
-  #endif
 
   ahci_exec_iorb(vIorb, pIorb, 0, cmd_func(pIorb, unit_ready));
@@ -1703 +1701 @@
 void ahci_read(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  #ifdef DEBUG
   DPRINTF(7,"ahci_read(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(vIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *) pIorb)->RBA,
           ((IORB_EXECUTEIO *) pIorb)->BlockCount);
-  #endif
 
   ahci_exec_iorb(vIorb, pIorb, 1, cmd_func(pIorb, read));
@@ -1718 +1714 @@
 void ahci_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  #ifdef DEBUG
   DPRINTF(7,"ahci_verify(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *)pIorb)->RBA,
           ((IORB_EXECUTEIO *)pIorb)->BlockCount);
-  #endif
 
   ahci_exec_iorb(vIorb, pIorb, 0, cmd_func(pIorb, verify));
@@ -1733 +1727 @@
 void ahci_write(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  #ifdef DEBUG
   DPRINTF(7,"ahci_write(%d.%d.%d, %d, %d)\n", iorb_unit_adapter(pIorb),
           iorb_unit_port(pIorb), iorb_unit_device(pIorb),
           ((IORB_EXECUTEIO *)pIorb)->RBA,
           ((IORB_EXECUTEIO *)pIorb)->BlockCount);
-  #endif
 
   ahci_exec_iorb(vIorb, pIorb, 1, cmd_func(pIorb, write));

trunk/src/os2ahci/ata.c

@@ -136 +136 @@
       if (ata_cmd.lba_l & 0xf0000000UL)
       {
-        DPRINTF(0,"error: LBA-28 address %d has more than 28 bits\n", ata_cmd.lba_l);
+        dprintf(0,"error: LBA-28 address %d has more than 28 bits\n", ata_cmd.lba_l);
         return(ATA_CMD_INVALID_PARM);
       }
@@ -187 +187 @@
 
     default:
-      DPRINTF(0,"error: v_ata_cmd() called with invalid parameter type (%d)\n", (int) ap);
+      dprintf(0,"error: v_ata_cmd() called with invalid parameter type (%d)\n", (int) ap);
       return(ATA_CMD_INVALID_PARM);
     }
@@ -267 +267 @@
       {
         /* couldn't store all S/G elements in our DMA buffer */
-        DPRINTF(0,"ata_cmd(): too many S/G elements\n");
+        dprintf(0,"ata_cmd(): too many S/G elements\n");
         return(i - 1);
       }
       if ((sg_addr & 1) || (chunk & 1))
       {
-        DPRINTF(0,"error: ata_cmd() called with unaligned S/G element(s)\n");
+        dprintf(0,"error: ata_cmd() called with unaligned S/G element(s)\n");
         return(ATA_CMD_UNALIGNED_ADDR);
       }
@@ -641 +641 @@
     {
       /* more than 32 bits for number of sectors */
-      DPRINTF(0,"warning: limiting disk %d.%d.%d to 2TB\n",
+      dprintf(0,"warning: limiting disk %d.%d.%d to 2TB\n",
               iorb_unit_adapter(pIorb), iorb_unit_port(pIorb),
               iorb_unit_device(pIorb));
@@ -834 +834 @@
 
   DPRINTF(7,"ata_read_unaligned(%d.%d.%d, %d)\n", ad_no(ai), p, d, sector);
+  ai->ports[p].unaligned_read_count++;
 
   /* allocate transfer buffer */

trunk/src/os2ahci/atapi.c

@@ -175 +175 @@
   SET_CDB_32(cdb.trans_len, 1UL);
 
+  ai->ports[p].unaligned_read_count++;
   DPRINTF(4, "atapi_read_unaligned\n");
 

trunk/src/os2ahci/ctxhook.c

@@ -94 +94 @@
   IORBH FAR16DATA *vProblemIorb;
   IORBH FAR16DATA *vIorb;
-  IORBH FAR16DATA *vNext = NULL;
+  IORBH FAR16DATA *vNext;
   u8 *port_mmio;
-  int rearm_ctx_hook = 0;
+  int rearm_ctx_hook;
   int need_reset;
   int ccs;
@@ -103 +103 @@
 
   D32ThunkStackTo32();
+
+  vNext = NULL;
+  rearm_ctx_hook = 0;
 
   DPRINTF(8,"restart_ctxhook() started\n");
@@ -329 +332 @@
   AD_INFO *ai;
   IORBH FAR16DATA *vIorb;
-  IORBH FAR16DATA *vNext = NULL;
-  int rearm_ctx_hook = 0;
+  IORBH FAR16DATA *vNext;
+  int rearm_ctx_hook;
   int a;
   int p;
 
   D32ThunkStackTo32();
+
+  vNext = NULL;
+  rearm_ctx_hook = 0;
 
   DPRINTF(8,"reset_ctxhook() started\n");

trunk/src/os2ahci/os2ahci.c

@@ -422 +422 @@
   if (com_baud) InitComPort(com_baud);
 
-  NTPRINTF("BldLevel: %s\n", BldLevel);
-  NTPRINTF("CmdLine: %s\n", cmd_line);
+  dprintf(0,"BldLevel: %s\n", BldLevel);
+  dprintf(0,"CmdLine: %s\n", cmd_line);
   /*
   if (sizeof(ADD_WORKSPACE) > ADD_WORKSPACE_SIZE)
@@ -634 +634 @@
 
         /* unit handle outside of the allowed range */
-        DPRINTF(0,"warning: IORB for %d.%d.%d out of range\n", a, p, d);
+        dprintf(0,"warning: IORB for %d.%d.%d out of range\n", a, p, d);
         pIorb->Status = IORB_ERROR;
         pIorb->ErrorCode = IOERR_CMD_SYNTAX;
@@ -1077 +1077 @@
     if ((u32)(pPtr + 1) - (u32)pDt > pIorb_conf->DeviceTableLen)
     {
-      DPRINTF(0,"error: device table provided by DASD too small\n");
+      dprintf(0,"error: device table provided by DASD too small\n");
       iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
       goto iocm_device_table_done;
@@ -1106 +1106 @@
         if (ad_info->busy)
         {
-          DPRINTF(0,"error: port scan requested while adapter was busy\n");
+          dprintf(0,"error: port scan requested while adapter was busy\n");
           iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
           goto iocm_device_table_done;
@@ -1118 +1118 @@
         if (rc != 0)
         {
-          DPRINTF(0,"error: port scan failed on adapter #%d\n", dta);
+          dprintf(0,"error: port scan failed on adapter #%d\n", dta);
           iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
           goto iocm_device_table_done;
@@ -1312 +1312 @@
   }
 
+  #ifdef DEBUG
   if (D32g_DbgLevel)
   {
@@ -1347 +1348 @@
            pIorb->Timeout);
   }
+  #endif
 }
 
@@ -1385 +1387 @@
   }
 
+  #ifdef DEBUG
   if (found)
   {
@@ -1393 +1396 @@
     DPRINTF(2,"IORB %x not found in queue %x\n", vIorb, queue);
   }
+  #endif
 
   return(!found);
@@ -1553 +1557 @@
 
   Timer_CancelTimer(timer_handle);
-  DPRINTF(0,"timeout for IORB %x\n", vIorb);
+  dprintf(0,"timeout for IORB %x\n", vIorb);
 
   /* Move the timed-out IORB to the abort queue. Since it's possible that the
@@ -1606 +1610 @@
   /* reset watchdog timer */
   Timer_CancelTimer(timer_handle);
-  DPRINTF(0,"reset watchdog invoked\n");
+  dprintf(0,"reset watchdog invoked\n");
 
   /* call context hook manually */
@@ -1639 +1643 @@
   if ((u32)(pUi + 1) - (u32)pDt > pIorb_conf->DeviceTableLen)
   {
-    DPRINTF(0,"error: device table provided by DASD too small\n");
+    dprintf(0,"error: device table provided by DASD too small\n");
     iorb_seterr(&pIorb_conf->iorbh, IOERR_CMD_SW_RESOURCE);
     return(-1);

trunk/src/os2ahci/os2ahci.h

@@ -40 +40 @@
  *   Legacy APM support is not needed on eCS systems with ACPI and is more reliable without it enabled.
  */
-#define DEBUG
 //#define LEGACY_APM
 //#define DAZ_NEW_CODE
@@ -73 +72 @@
 #define DPRINTF(a,b,...) dprintf(a, b, ##__VA_ARGS__)
 #define DHEXDUMP(a,b,c,d,...) dHexDump(a, b, c, d, ##__VA_ARGS__)
-#define NTPRINTF(...) dprintf(0, ##__VA_ARGS__)
 #define DUMP_HOST_REGS(l,a,b) {if (D32g_DbgLevel>=l) ahci_dump_host_regs(a,b);}
 #define DUMP_PORT_REGS(l,a,b) {if (D32g_DbgLevel>=l) ahci_dump_port_regs(a,b);}
@@ -79 +77 @@
 #define DPRINTF(a,b,...)
 #define DHEXDUMP(a,b,c,d,...)
-#define NTPRINTF(a,...)
-#define DUMP_HOST_REGS(a,b)
+#define DUMP_HOST_REGS(l,a,b)
 #define DUMP_PORT_REGS(l,a,b)
 #endif
@@ -268 +265 @@
     DEV_INFO dev_info;
   } devs[AHCI_MAX_DEVS];
+
+  u32 unaligned_read_count;
+  u32 error_count;
 } P_INFO;
 

trunk/src/os2ahci/pci.c

@@ -633 +633 @@
   for (i = 0; i < ad_info->hw_ports; i++)
   {
-    ad_info->ports[i].dma_buf = MemAlloc(AHCI_PORT_PRIV_DMA_SZ);
+    ad_info->ports[i].dma_buf = MemAllocAlign(AHCI_PORT_PRIV_DMA_SZ, 1024);
     ad_info->ports[i].dma_buf_phys = MemPhysAdr(ad_info->ports[i].dma_buf);
   }

trunk/src/os2ahci/trace.c

@@ -51 +51 @@
     AD_INFO *ai = ad_infos + a;
 
-    NTPRINTF("Adapter %d: PCI=%d:%d:%d ID=%04x:%04x %s %s irq=%d addr=0x%x version=%x\n", a,
+    dprintf(0,"Adapter %d: PCI=%d:%d:%d ID=%04x:%04x %s %s irq=%d addr=0x%x version=%x\n", a,
       PCI_BUS_FROM_BDF(ai->bus_dev_func), PCI_DEV_FROM_BDF(ai->bus_dev_func),
       PCI_FUNC_FROM_BDF(ai->bus_dev_func),
@@ -62 +62 @@
       P_INFO *pi = &ai->ports[p];
 
-      NTPRINTF("  Port %d:\n", p);
+      dprintf(0,"  Port %d:\n", p);
 
       for (d = 0; d <= pi->dev_max; d++)
@@ -68 +68 @@
         if (!pi->devs[d].present)
         {
-          NTPRINTF("    No drive present\n");
+          dprintf(0,"    No drive present\n");
         } else {
-          NTPRINTF("    Drive %d:", d);
-          if (pi->devs[d].atapi) NTPRINTF(" atapi");
-          if (pi->devs[d].removable) NTPRINTF(" removable");
+          dprintf(0,"    Drive %d:", d);
+          if (pi->devs[d].atapi) dprintf(0," atapi");
+          if (pi->devs[d].removable) dprintf(0," removable");
           if (pi->devs[d].dev_info.Method != NULL)
           {
-            NTPRINTF(" %d cylinders, %d heads, %d sectors per track (%dMB) (%s)",
+            dprintf(0," %d cylinders, %d heads, %d sectors per track (%dMB) (%s)",
               pi->devs[d].dev_info.Cylinders, pi->devs[d].dev_info.HeadsPerCylinder, pi->devs[d].dev_info.SectorsPerTrack,
               pi->devs[d].dev_info.TotalSectors/2048, pi->devs[d].dev_info.Method);
           }
-          NTPRINTF("\n");
+          dprintf(0,"\n");
         } /* if */
       } /* for d */