Changeset 186

Timestamp:

Feb 28, 2017, 10:50:54 PM (8 years ago)

Author:

David Azarewicz

Message:

Doc changes
Warpin package changes

Location:

trunk

Files:

• src/os2ahci/Makefile (modified) (3 diffs)
• src/os2ahci/ReadMe.txt (modified) (2 diffs)
• src/os2ahci/ata.c (modified) (1 diff)
• src/os2ahci/os2ahci.c (modified) (1 diff)
• src/os2ahci/trace.c (modified) (1 diff)
• tools/ahci.wis (modified) (1 diff)

trunk/src/os2ahci/Makefile

@@ -91 +91 @@
 !endif
 
-!ifneq FIXPACK
+!ifdef FIXPACK
 CDEFS+= -DTESTVER
 !endif
@@ -168 +168 @@
   @md $(ZIPDIR)\pkg2
   @copy /b $(ROOT)\Tools\smartahci.exe $(ZIPDIR)\pkg2 >NUL
-  #@copy $(ROOT)\Tools\testlog.cmd $(ZIPDIR)\pkg2 >NUL
 
   @md $(ZIPDIR)\pkg20
@@ -185 +184 @@
 clean: .symbolic
   rm -f *.def *.err *.lnk version.h
+  rm $(ROOT)\AHCI-*-WPI.zip
   @if exist Debug @!rm -r Debug
   @if exist Retail @!rm -r Retail

trunk/src/os2ahci/ReadMe.txt

@@ -1 +1 @@
 AHCI Driver for OS/2 v2.01
-
---- NOTICE ---
-This driver has been in use for more than a month so I am bumping
-it up from alpha to beta software. Use of beta software in a
-production environment is not recommended.
 
 
@@ -22 +17 @@
 Copyright (c) 2011 thi.guten Software Development
 Copyright (c) 2011 Mensys B.V.
-Copyright (c) 2013-2016 David Azarewicz
+Copyright (c) 2013-2017 David Azarewicz
 
 Authors: Christian Mueller, Markus Thielen

trunk/src/os2ahci/ata.c

@@ -286 +286 @@
   cmd_hdr->options |= n << 16;
 
-  if (D32g_DbgLevel >= 7)
+  if ((D32g_DbgLevel >= 7) || (atapi_cmd != NULL))
   {
     DPRINTF(0,"ATA command for %d.%d.%d, slot %d:\n", ad_no(ai), p, d, slot);

trunk/src/os2ahci/os2ahci.c

@@ -612 +612 @@
     pIorb->ErrorCode = 0;
     memset(&pIorb->ADDWorkSpace, 0x00, sizeof(ADD_WORKSPACE));
+
+    #ifdef DEBUG
+    DumpIorb(pIorb); /* DAZ TESTING */
+    #endif
 
     if (iorb_driver_level(pIorb))

trunk/src/os2ahci/trace.c

@@ -69 +69 @@
 void DumpIorb(IORBH *pIorb)
 {
-  DPRINTF(2,"IORB %x: Size=%x Len=%x Handle=%x CmdCode=%x\n",
+  if (D32g_DbgLevel < 2) return;
+  if (!ad_infos[iorb_unit_adapter(pIorb)].ports[iorb_unit_port(pIorb)].devs[iorb_unit_device(pIorb)].atapi) return;
+
+  dprintf(0,"IORB %x: Size=%x Len=%x Handle=%x CmdCode=%x\n",
       pIorb, sizeof(IORBH), pIorb->Length, pIorb->UnitHandle, pIorb->CommandCode);
-  DPRINTF(2,"  CmdMod=%x ReqCtrl=%x Status=%x ErrorCode=%x\n",
+  dprintf(0,"  CmdMod=%x ReqCtrl=%x Status=%x ErrorCode=%x\n",
       pIorb->CommandModifier, pIorb->RequestControl, pIorb->Status, pIorb->ErrorCode);
-  DPRINTF(2,"  Timeout=%x StatusBlkLen=%x pStatusBlk=%x Res=%x pNxtIORB=%x\n",
+  dprintf(0,"  Timeout=%x StatusBlkLen=%x pStatusBlk=%x Res=%x pNxtIORB=%x\n",
       pIorb->Timeout, pIorb->StatusBlockLen, pIorb->pStatusBlock, pIorb->Reserved_1,
       pIorb->pNxtIORB);

trunk/tools/ahci.wis

@@ -82 +82 @@
   <PAGE INDEX=1 TYPE=README>
    <TEXT>Welcome to the =("GetEnv MyTitle")</TEXT>
-   <README EXTRACTFROMPCK="20" FORMAT="PLAIN">README</README>
+   <README EXTRACTFROMPCK="20" FORMAT="PLAIN">ReadMe.txt</README>
   </PAGE>
   <PAGE INDEX=2 TYPE=CONTAINER>