Changeset 206 for trunk

Timestamp:

Jan 23, 2021, 6:50:32 PM (5 years ago)

Author:

David Azarewicz

Message:

Reworked internal implementation of /U

Location:

trunk

Files:

• src/os2ahci/ReadMe.txt (modified) (1 diff)
• src/os2ahci/apm.c (modified) (2 diffs)
• src/os2ahci/ioctl.c (modified) (3 diffs)
• src/os2ahci/os2ahci.c (modified) (3 diffs)
• tools/AddToFile.cmd (modified) (4 diffs)

trunk/src/os2ahci/ReadMe.txt

@@ -388 +388 @@
 Change Log
 ==========
-v.2.08 01-Nov-2020 - David Azarewicz
+v.2.08 01-Jan-2021 - David Azarewicz
   Corrected RM ADD handle and unit.
+  Changed the internal implementation of /U to accomodate gpt filter.
 
 v.2.07 19-May-2019 - David Azarewicz

trunk/src/os2ahci/apm.c

@@ -124 +124 @@
       for (d = 0; d <= ai->ports[p].dev_max; d++)
       {
-        if (ai->ports[p].devs[d].present && !ai->ports[p].devs[d].ignored)
+        if (ai->ports[p].devs[d].present)
         {
           ahci_flush_cache(ai, p, d);
@@ -244 +244 @@
       writel(port_mmio + PORT_SCR_ACT, 0);
       readl(port_mmio + PORT_SCR_ACT);  /* flush */
-
-      #if 0
-      /* cannot flush caches this way */
-      ahci_start_port(ai, p, 0);
-
-      /* flush cache on all attached devices */
-      for (d = 0; d <= ai->ports[p].dev_max; d++)
-      {
-        if (ai->ports[p].devs[d].present && !ai->ports[p].devs[d].ignored)
-        {
-          ahci_flush_cache(ai, p, d);
-        }
-      }
-      #endif
     }
   }

trunk/src/os2ahci/ioctl.c

@@ -88 +88 @@
       for (d = 0; d <= pi->dev_max; d++)
       {
-        if (pi->devs[d].present && !pi->devs[d].ignored)
+        if (pi->devs[d].present)
         {
           /* add this device to the device list */
@@ -140 +140 @@
   if (a >= ad_info_cnt || p > ad_infos[a].port_max
      || d > ad_infos[a].ports[p].dev_max
-     || !ad_infos[a].ports[p].devs[d].present
-     || ad_infos[a].ports[p].devs[d].ignored)
+     || !ad_infos[a].ports[p].devs[d].present)
   {
     return(RPDONE | RPERR_UNIT);
@@ -537 +536 @@
       for (_d = 0; _d <= pi->dev_max; _d++)
       {
-        if (pi->devs[_d].present && !pi->devs[_d].ignored)
+        if (pi->devs[_d].present)
         {
           if (unit-- == 0)

trunk/src/os2ahci/os2ahci.c

@@ -1118 +1118 @@
         for (d = 0; d <= ad_info->ports[p].dev_max; d++)
         {
-          if (ad_info->ports[p].devs[d].present && !ad_info->ports[p].devs[d].ignored)
+          if (ad_info->ports[p].devs[d].present)
           {
             if (ad_info->ports[p].devs[d].atapi && emulate_scsi[dta][p])
@@ -1157 +1157 @@
           for (d = 0; d <= ad_info->ports[p].dev_max; d++)
           {
-            if (ad_info->ports[p].devs[d].present && !ad_info->ports[p].devs[d].ignored
-                && ad_info->ports[p].devs[d].atapi && emulate_scsi[a][p])
+            if (ad_info->ports[p].devs[d].present && ad_info->ports[p].devs[d].atapi && emulate_scsi[a][p])
             {
               if (add_unit_info(pIorb_conf, dta, a, p, d, scsi_id++))
@@ -1648 +1647 @@
     pUi->UnitType     = ai->ports[p].devs[d].dev_type;
     pUi->QueuingCount = ai->ports[p].devs[d].ncq_max;
-    if (ai->ports[p].devs[d].removable)
-    {
-      pUi->UnitFlags |= UF_REMOVABLE;
-    }
-    if (scsi_id > 0) {
-      /* set fake SCSI ID for this unit */
-      pUi->UnitSCSITargetID = scsi_id;
-    }
+    if (ai->ports[p].devs[d].removable) pUi->UnitFlags |= UF_REMOVABLE;
+    if (ai->ports[p].devs[d].ignored) pUi->UnitFlags |= UF_NODASD_SUPT;
+    if (scsi_id > 0) pUi->UnitSCSITargetID = scsi_id; /* set fake SCSI ID for this unit */
   }
   else

trunk/tools/AddToFile.cmd

@@ -3 +3 @@
  * Written by and Copyright (c) 2010-2018 David Azarewicz http://88watts.net
  *
- * @#D Azarewicz:1.03#@##1## 02 Mar 2020              DAZAR1    ::::::@@AddToFile.cmd (c) David Azarewicz 2020
+ * @#D Azarewicz:1.04#@##1## 02 Jan 2021              DAZAR1    ::::::@@AddToFile.cmd (c) David Azarewicz 2021
  * V1.01 16-Sep-2016 First official release
  * V1.02 02-Jun-2017 Added Asd to bldlevel, added DATE1
  * V1.03 02-Mar-2020 Added STRING function
+ * V1.04 02-Jan-2021 Added FILESIZE function
  *
  * The following line is for the help sample code for the VAR function:
@@ -30 +31 @@
   Say '  STRING - Adds the string with %Y substitution.';
   Say '  VAR - Adds the value of the specified variable from a specified file.';
+  Say '  FILESIZE - Adds the file size.';
   Say '  FILE - Adds the contents of a file.';
   Say 'Examples:';
@@ -68 +70 @@
   call 'AddToFile.cmd' MyCmd;
   MyCmd=MyFile||',#define XYZ "%A",VAR,EXAMPLEVAR=,AddToFile.cmd';
+  rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
+  call 'AddToFile.cmd' MyCmd;
+  MyCmd=MyFile||',#define FSIZE,FILESIZE,addtofile.cmd';
   rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
   call 'AddToFile.cmd' MyCmd;
@@ -213 +218 @@
     end;
     rc=stream(String,'c','close');
+    rc=lineout(OutFile);
+  end
+
+  when (Function="FILESIZE") then do
+    NewStr=stream(Parm1,'c','query size');
+    RepLoc=Pos('%A', String);
+    if (RepLoc>0) then OutStr=Substr(String,1,RepLoc-1)||NewStr||Substr(String,RepLoc+2);
+    else OutStr=String||' '||NewStr;
+    rc=lineout(OutFile, OutStr);
     rc=lineout(OutFile);
   end