Changeset 200 for trunk

Timestamp:

Mar 27, 2019, 3:12:47 AM (6 years ago)

Author:

David Azarewicz

Message:

Minor changes to debug output.

Location:

trunk

Files:

• src/os2ahci/Makefile (modified) (1 diff)
• src/os2ahci/ahci.c (modified) (2 diffs)
• src/os2ahci/ata.c (modified) (1 diff)
• src/os2ahci/trace.c (modified) (1 diff)
• tools/AddToFile.cmd (modified) (4 diffs)

trunk/src/os2ahci/Makefile

@@ -12 +12 @@
 # Define default build version if not specified in environment
 BLD_MAJOR=2
-BLD_MINOR=06 # must be 2 digits
+BLD_MINOR=07 # must be 2 digits
 BLD_REV=0 # not used at this time
 

trunk/src/os2ahci/ahci.c

@@ -249 +249 @@
     /* more ports in port_map than in HOST_CAP & 0x1f */
     ports = ai->hw_ports;
-    DPRINTF(1,"implemented port map (0x%x) contains more ports than hw_ports (%d), using hw_ports\n", ai->port_map, ports);
+    DPRINTF(0,"implemented port map (0x%x) contains more ports than hw_ports (%d), using hw_ports\n", ai->port_map, ports);
     ai->port_map = (1UL << ports) - 1UL;
   }
@@ -558 +558 @@
     {
       if (i >= MAX_IRQ_HANDLERS) return -1; /* no more handlers available */
-      DPRINTF(2,"registering interrupt #%d\n", ai->irq);
+
+      DPRINTF(2,"registering interrupt %d pin=%d\n", ai->irq, ai->irq_pin);
 
       rc = Dev32Help_SetIRQ(ahci_intr, ai->irq, p, ai->irq);

trunk/src/os2ahci/ata.c

@@ -272 +272 @@
       if ((sg_addr & 1) || (chunk & 1))
       {
-        dprintf(1,"error: ata_cmd() called with unaligned S/G element(s)\n");
+        DPRINTF(0,"warning: ata_cmd() called with unaligned S/G element(s)\n");
         return(ATA_CMD_UNALIGNED_ADDR);
       }

trunk/src/os2ahci/trace.c

@@ -38 +38 @@
       ai->bios_config[HOST_VERSION / sizeof(u32)]);
 
-    for (p = 0; p < ai->hw_ports; p++)
+    for (p = 0; p <= ai->port_max; p++)
     {
       P_INFO *pi = &ai->ports[p];

trunk/tools/AddToFile.cmd

@@ -1 +1 @@
 /** AddToFile.cmd
  * Adds the specified line to the end of the specified file.
- * Written by and Copyright (c) 2010-2016 David Azarewicz http://88watts.net
+ * Written by and Copyright (c) 2010-2018 David Azarewicz http://88watts.net
  *
- * @#D Azarewicz:1.01#@##1## 16 Sep 2016              DAZAR1    ::::::@@AddToFile.cmd (c) David Azarewicz 2016
+ * @#D Azarewicz:1.02#@##1## 15 Nov 2018              DAZAR1    ::::::@@AddToFile.cmd (c) David Azarewicz 2018
  * V1.01 16-Sep-2016 First official release
+ * V1.02 02-Jun-2017 Added Asd to bldlevel, added DATE1
  *
  * The following line is for the help sample code for the VAR function:
@@ -18 +19 @@
   Say 'Functions:';
   Say '  DATEL - Adds the date as a long number.';
-  Say '  BLDLEVEL - Adds a formatted BLDLEVEL string.';
+  Say '  DATE1 - Adds the date in 2017-Jul-01 format.';
+  Say '  BLDLEVEL - Adds a standardized formatted BLDLEVEL string.';
   Say '  DATEYEAR - Adds the current year.';
   Say '  DATEMONTH - Adds the current month.';
@@ -33 +35 @@
   rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
   call 'AddToFile.cmd' MyCmd;
+  MyCmd=MyFile||',#define DDATE,DATE1';
+  rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
+  call 'AddToFile.cmd' MyCmd;
   MyCmd=MyFile||',option description,BLDLEVEL,Vendor,1.2.3,Description,Fixpack,Asd';
   rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
@@ -223 +228 @@
   do while (QUEUED() > 0)
     PARSE PULL Line1':'Line2
+    if (Line1 = "Revision") then leave;
     if (Line1 = "Last Changed Rev") then leave;
     Line2 = "";