Changeset 178

Timestamp:

Nov 29, 2016, 5:30:22 AM (9 years ago)

Author:

David Azarewicz

Message:

Major reorganization

Location:

trunk/src/os2ahci

Files:

• README (modified) (14 diffs)
• ahci.c (modified) (93 diffs)
• ahci.h (modified) (1 diff)
• apm.c (modified) (15 diffs)
• ata.c (modified) (58 diffs)
• ata.h (modified) (3 diffs)
• atapi.c (modified) (24 diffs)
• atapi.h (modified) (2 diffs)
• ctxhook.c (modified) (20 diffs)
• init.asm (deleted)
• ioctl.c (modified) (35 diffs)
• ioctl.h (modified) (2 diffs)
• libc.c (deleted)
• os2ahci.c (modified) (56 diffs)
• os2ahci.h (modified) (13 diffs)
• pci.c (modified) (31 diffs)
• trace.c (modified) (4 diffs)

trunk/src/os2ahci/README

@@ -1 @@
-AHCI Driver for OS/2 v1.32
+AHCI Driver for OS/2 v2.01
+
+WARNING: This is a alpha level build of this driver. Use
+in a production environment is not recommended.
 
 
@@ -17 +20 @@
 Copyright (c) 2011 thi.guten Software Development
 Copyright (c) 2011 Mensys B.V.
-Copyright (c) 2013-2015 David Azarewicz
+Copyright (c) 2013-2016 David Azarewicz
 
 Authors: Christian Mueller, Markus Thielen
@@ -70 +73 @@
 Option                 Description
 ------------------------------------------------------------------------------
-/b:<baud>              Initialize the COM port to the specified baud rate. Allowable
+/B:<baud>              Initialize the COM port to the specified baud rate. Allowable
                        baud values are: 300, 600, 1200, 2400, 4800, 9600, 19200,
-                       38400, 57600, and 115200. /b has no effect if /c is not also
-                       specified. If /b is not specified, the COM port is not
+                       38400, 57600, and 115200. /B has no effect if /C is not also
+                       specified. If /B is not specified, the COM port is not
                        initialized. For example, if you are using the kernel debugger,
                        the kernel debugger initializes the COM port so you should not
                        use this switch.
 
-/c:<n>                 Set debug COM port base address. Values for n can be:
+/C:<n>                 Set debug COM port base address. Values for n can be:
                          1 = COM1
                          2 = COM2
@@ -84 +87 @@
                        The default is 0. If set to 0 then no output goes to the COM port.
 
-/d[:n]                 Debug output to COM port/trace buffer. Values for n can be:
+/D[:n]                 Debug output to COM port/debug buffer. Values for n can be:
                          1 = requests
                          2 = detailed
-                         3 = verbose, including MMIO operations
+                         3 = verbose
                        If :n is not specified the debug level is incremented for
-                       each /d specified.
-
-/w                     Allows the trace buffer to wrap when full.
-
-/v[:n]                 Display informational messages during boot. Values for n can be:
+                       each /D specified.
+
+/W                     Allows the debug buffer to wrap when full.
+
+/V[:n]                 Display informational messages during boot. Values for n can be:
                          1 = Display sign on banner
                          2 = Display adapter information
                        If :n is not specified the verbosity level is incremented for
-                       each /v specified.
-
-/g:<vendor>:<device>   Add generic PCI ID to list of supported AHCI adapters
-                       (e.g. /g:8086:2829)
-
-/t                     Perform thorough PCI ID scan; default = on, can be
-                       turned off with /!t to perform only a PCI class scan
-
-/f                     Force the use of the HW write cache when using NCQ
+                       each /V specified.
+
+/G:<vendor>:<device>   Add generic PCI ID to list of supported AHCI adapters
+                       (e.g. /G:8086:2829)
+
+/T                     Perform thorough PCI ID scan; default = on, can be
+                       turned off with /!T to perform only a PCI class scan
+
+/F                     Force the use of the HW write cache when using NCQ
                        commands; see "Native Command Queuing" below for
                        further explanation (default = off)
 
-/r                     Reset ports during initialization (default = on)
-                       Can be turned off with /!r, however, when the
+/R                     Reset ports during initialization (default = on)
+                       Can be turned off with /!R, however, when the
                        [Intel] AHCI controller was found to be
                        initialized by the BIOS in SATA mode, ports will
-                       always be reset even when /!r was specified
-
-/a:n                   Set adapter to n for adapter-specific options
+                       always be reset even when /!R was specified
+
+/A:n                   Set adapter to n for adapter-specific options
                        (default = -1, all adapters)
 
-/p:n                   Set port to n for port-specific options
+/P:n                   Set port to n for port-specific options
                        (default = -1, all ports)
 
-/i                     Ignore current adapter if no port has been specified.
+/I                     Ignore current adapter if no port has been specified.
                        Otherwise, ignore the current port on the current adapter.
 
@@ -128 +131 @@
 Option                 Description
 ------------------------------------------------------------------------------
-/s                     Enable SCSI emulation for ATAPI units (default = on)
+/S                     Enable SCSI emulation for ATAPI units (default = on)
                        SCSI emulation is required for tools like cdrecord.
 
-/n                     Enable NCQ (Native Command Queuing) for hard disks
+/N                     Enable NCQ (Native Command Queuing) for hard disks
                        (default = off)
 
-/ls                    Set link speed (default = 0):
+/LS                    Set link speed (default = 0):
                          0 = maximum,
                          1 = limit to generation 1
@@ -140 +143 @@
                          3 = limit to generation 3
 
-/lp                    Set link power management (default = 0):
+/LP                    Set link power management (default = 0):
                          0 = full power management,
                          1 = transitions to "partial slumber state" disabled,
@@ -151 +154 @@
 
 Port-specific options depend on the currently active adapter
-and port selector (/a and /p). Those selectors are -1 per default
+and port selector (/A and /P). Those selectors are -1 per default
 which means "all" adapters/ports. The scope can be reduced by limiting
-it to an adapter (/a) or an adapter and a port (/a and /p). The scope
+it to an adapter (/A) or an adapter and a port (/A and /P). The scope
 can be reset by setting the corresponding option back to -1.
 
 For example:
 
-  BASEDEV=OS2AHCI.ADD /n /a:0 /p:5 /!n /a:1 /p:-1 /!n
+  BASEDEV=OS2AHCI.ADD /N /A:0 /P:5 /!N /A:1 /P:-1 /!N
 
 This has the following effect:
@@ -183 +186 @@
 disks, it's currently turned off by default until we have more feedback
 from OS/2 users. In order to turn on NCQ, just add the command line
-option "/n" to OS2AHCI.ADD.
+option "/N" to OS2AHCI.ADD.
 
 NCQ and HW Caches
@@ -195 +198 @@
 performance loss. In order to prevent OS2AHCI from disabling the HW
 cache when so requested by upstream code, please use the command line
-option "/f".
+option "/F".
 
 This may, of course, result in data loss in case of power failures but
@@ -210 +213 @@
 
  - When suspending, rebooting or shutting down, OS2AHCI always flushes
-   the HW disk cache regardless of the "/f" or "/n" command line options.
+   the HW disk cache regardless of the "/F" or "/N" command line options.
 
 
@@ -218 +221 @@
 There are three kinds of IDE/ATA/SATA controllers:
 
- 1. Legacy controllers (IDE or SATA) without AHCI support
+ 1. Older controllers (IDE or SATA) without AHCI support
     This kind of controller will only be recognized by IDE drivers
     (IBM1S506.ADD or DANIS506.ADD).
 
- 2. AHCI-capable controllers which supports IDE/SATA legacy interfaces
+ 2. AHCI-capable controllers which supports IDE/SATA interfaces
     This kind of controller will work with IDE or AHCI drivers and it's
     up to the user to decide which driver to use.
@@ -252 +255 @@
 Assume a DELL D630 or a Thinkpad T60. The hard disk is attached to the
 SATA/AHCI controller of the ICH-7 hub while the CDROM is attached to the
-legacy PATA IDE controller. This allows two different configurations:
+PATA IDE controller. This allows two different configurations:
 
  1. Drive HDD and CDROM via DANIS506.ADD
  2. Drive HDD via OS2AHCI.ADD and CDROM via DANIS506.ADD
 
-OS2AHCI.ADD can't drive the CDROM because it's attached to a legacy PATA
+OS2AHCI.ADD can't drive the CDROM because it's attached to a PATA
 IDE controller which doesn't support AHCI.
 
@@ -384 +387 @@
 ==========
 
+v.2.01 01-Oct-2016 - David Azarewicz
+  Major reorganization of the entire driver.
+  Enhanced debugging support.
+
 v.1.32 09-Nov-2013 - David Azarewicz
   Fix for some hardware that reports incorrect status
@@ -416 +423 @@
   Added LVM aware disk geometry reporting.
   Begin to add disk information report - not finished yet.
-  Removed undocumented /q switch and made the driver quiet by default.
+  Removed undocumented /Q switch and made the driver quiet by default.
   Debug output improvements.
-  Added /b switch for setting debug baud rate.
+  Added /B switch for setting debug baud rate.
   Fixed up time delay functions
 

trunk/src/os2ahci/ahci.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013-2015 David Azarewicz
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -43 +43 @@
 /* -------------------------- function prototypes -------------------------- */
 
-static void ahci_setup_device     (AD_INFO *ai, int p, int d, u16 *id_buf);
+static void ahci_setup_device(AD_INFO *ai, int p, int d, u16 *id_buf);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -58 +58 @@
  *       pointers to all handler functions which may need to be overridden.
  */
-u16 initial_flags[] = {
+u16 initial_flags[] =
+{
   0,                                        /* board_ahci */
   AHCI_HFLAG_NO_NCQ |                       /* board_ahci_vt8251 */
@@ -84 +85 @@
  * index to the corresponding IRQ.
  */
-static u16      irq_map[MAX_AD];   /* IRQ level for each stub IRQ func */
-static int      irq_map_cnt;       /* number of IRQ stub funcs used */
+static u16 irq_map[MAX_AD];   /* IRQ level for each stub IRQ func */
+static int irq_map_cnt;       /* number of IRQ stub funcs used */
 
 /* ----------------------------- start of code ----------------------------- */
@@ -106 +107 @@
  * bit 0 will be set when the interrupt was not handled.
  */
-#define call_ahci_intr(i)   return(ahci_intr(irq_map[i]) >> 1)
-
-static USHORT _cdecl _far irq_handler_00(void)  { call_ahci_intr(0); }
-static USHORT _cdecl _far irq_handler_01(void)  { call_ahci_intr(1); }
-static USHORT _cdecl _far irq_handler_02(void)  { call_ahci_intr(2); }
-static USHORT _cdecl _far irq_handler_03(void)  { call_ahci_intr(3); }
-static USHORT _cdecl _far irq_handler_04(void)  { call_ahci_intr(4); }
-static USHORT _cdecl _far irq_handler_05(void)  { call_ahci_intr(5); }
-static USHORT _cdecl _far irq_handler_06(void)  { call_ahci_intr(6); }
-static USHORT _cdecl _far irq_handler_07(void)  { call_ahci_intr(7); }
-
-PFN irq_handlers[] = {
+#define call_ahci_intr(i)   return(ahci_intr(irq_map[i]))
+
+static USHORT _cdecl irq_handler_00(void)  { call_ahci_intr(0); }
+static USHORT _cdecl irq_handler_01(void)  { call_ahci_intr(1); }
+static USHORT _cdecl irq_handler_02(void)  { call_ahci_intr(2); }
+static USHORT _cdecl irq_handler_03(void)  { call_ahci_intr(3); }
+static USHORT _cdecl irq_handler_04(void)  { call_ahci_intr(4); }
+static USHORT _cdecl irq_handler_05(void)  { call_ahci_intr(5); }
+static USHORT _cdecl irq_handler_06(void)  { call_ahci_intr(6); }
+static USHORT _cdecl irq_handler_07(void)  { call_ahci_intr(7); }
+
+PFN irq_handlers[] =
+{
   (PFN) irq_handler_00, (PFN) irq_handler_01, (PFN) irq_handler_02,
   (PFN) irq_handler_03, (PFN) irq_handler_04, (PFN) irq_handler_05,
@@ -123 +125 @@
 };
 
+#ifdef DEBUG
 void ahci_dump_host_regs(AD_INFO *ai, int bios_regs)
 {
-  #ifdef DEBUG
   int i;
   u32 version;
 
-  aprintf("AHCI global registers for adapter %d %d:%d:%d irq=%d addr=0x%lx\n",
-      ad_no(ai), ai->bus, ai->dev_func>>3, ai->dev_func&7, ai->irq, ai->mmio_phys);
+  DPRINTF(2,"AHCI global registers for adapter %d %d:%d:%d irq=%d addr=0x%x\n",
+      ad_no(ai),
+      PCI_BUS_FROM_BDF(ai->bus_dev_func), PCI_DEV_FROM_BDF(ai->bus_dev_func),
+      PCI_FUNC_FROM_BDF(ai->bus_dev_func), ai->irq, ai->mmio_phys);
 
   for (i = 0; i <= HOST_CAP2; i += sizeof(u32)) {
@@ -144 +148 @@
     if (i == HOST_VERSION) version = val;
 
-    ntprintf(" %02x: %08lx", i, val);
+    NTPRINTF(" %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", (u16) ((val >> 8) & 0x1f) + 1);
-      ntprintf(" ports:%d",     (u16) (val & 0x1f) + 1);
+      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);
     } 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");
+      NTPRINTF(" -");
+      if (val & HOST_AHCI_EN)        NTPRINTF(" ahci_enabled");
+      if (val & HOST_IRQ_EN)         NTPRINTF(" irq_enabled");
+      if (val & HOST_RESET)          NTPRINTF(" 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");
-  }
-  #endif
+      NTPRINTF(" -");
+      if (val & HOST_CAP2_BOH)       NTPRINTF(" boh");
+      if (val & HOST_CAP2_NVMHCI)    NTPRINTF(" nvmhci");
+      if (val & HOST_CAP2_APST)      NTPRINTF(" apst");
+    }
+    NTPRINTF("\n");
+  }
 }
 
 void ahci_dump_port_regs(AD_INFO *ai, int p)
 {
-  #ifdef DEBUG
-  u8 _far *port_mmio = port_base(ai, p);
-
-  aprintf("AHCI port %d registers:\n", p);
-  ntprintf(" PORT_CMD       = 0x%lx\n", readl(port_mmio + PORT_CMD));
-  ntprintf("command engine status:\n");
-  ntprintf(" PORT_SCR_ACT   = 0x%lx\n", readl(port_mmio + PORT_SCR_ACT));
-  ntprintf(" PORT_CMD_ISSUE = 0x%lx\n", readl(port_mmio + PORT_CMD_ISSUE));
-  ntprintf("link/device status:\n");
-  ntprintf(" PORT_SCR_STAT  = 0x%lx\n", readl(port_mmio + PORT_SCR_STAT));
-  ntprintf(" PORT_SCR_CTL   = 0x%lx\n", readl(port_mmio + PORT_SCR_CTL));
-  ntprintf(" PORT_SCR_ERR   = 0x%lx\n", readl(port_mmio + PORT_SCR_ERR));
-  ntprintf(" PORT_TFDATA    = 0x%lx\n", readl(port_mmio + PORT_TFDATA));
-  ntprintf("interrupt status:\n");
-  ntprintf(" PORT_IRQ_STAT  = 0x%lx\n", readl(port_mmio + PORT_IRQ_STAT));
-  ntprintf(" PORT_IRQ_MASK  = 0x%lx\n", readl(port_mmio + PORT_IRQ_MASK));
-  ntprintf(" HOST_IRQ_STAT  = 0x%lx\n", readl(ai->mmio + HOST_IRQ_STAT));
-  #endif
-}
+  u8 *port_mmio = port_base(ai, p);
+
+  dprintf(0,"AHCI port %d registers:\n", p);
+  dprintf(0,"  PORT_CMD       = 0x%x\n", readl(port_mmio + PORT_CMD));
+  dprintf(0," command engine status:\n");
+  dprintf(0,"  PORT_SCR_ACT   = 0x%x\n", readl(port_mmio + PORT_SCR_ACT));
+  dprintf(0,"  PORT_CMD_ISSUE = 0x%x\n", readl(port_mmio + PORT_CMD_ISSUE));
+  dprintf(0," link/device status:\n");
+  dprintf(0,"  PORT_SCR_STAT  = 0x%x\n", readl(port_mmio + PORT_SCR_STAT));
+  dprintf(0,"  PORT_SCR_CTL   = 0x%x\n", readl(port_mmio + PORT_SCR_CTL));
+  dprintf(0,"  PORT_SCR_ERR   = 0x%x\n", readl(port_mmio + PORT_SCR_ERR));
+  dprintf(0,"  PORT_TFDATA    = 0x%x\n", readl(port_mmio + PORT_TFDATA));
+  dprintf(0," interrupt status:\n");
+  dprintf(0,"  PORT_IRQ_STAT  = 0x%x\n", readl(port_mmio + PORT_IRQ_STAT));
+  dprintf(0,"  PORT_IRQ_MASK  = 0x%x\n", readl(port_mmio + PORT_IRQ_MASK));
+  dprintf(0,"  HOST_IRQ_STAT  = 0x%x\n", readl(ai->mmio + HOST_IRQ_STAT));
+}
+#endif
 
 /******************************************************************************
@@ -221 +223 @@
 
   /* save BIOS configuration */
-  for (i = 0; i < HOST_CAP2; i += sizeof(u32)) {
+  for (i = 0; i < HOST_CAP2; i += sizeof(u32))
+  {
     ai->bios_config[i / sizeof(u32)] = readl(ai->mmio + i);
   }
 
-  ddprintf("ahci_save_bios_config: BIOS AHCI mode is %d\n", ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN);
+  DPRINTF(3,"ahci_save_bios_config: BIOS AHCI mode is %d\n", ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN);
 
   /* HOST_CAP2 only exists for AHCI V1.2 and later */
-  if (ai->bios_config[HOST_VERSION / sizeof(u32)] >= 0x00010200L) {
+  if (ai->bios_config[HOST_VERSION / sizeof(u32)] >= 0x00010200L)
+  {
     ai->bios_config[HOST_CAP2 / sizeof(u32)] = readl(ai->mmio + HOST_CAP2);
-  } else {
+  }
+  else
+  {
     ai->bios_config[HOST_CAP2 / sizeof(u32)] = 0;
   }
 
   if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 &&
-      ai->pci_vendor == PCI_VENDOR_ID_INTEL) {
+      ai->pci_vendor == PCI_VENDOR_ID_INTEL)
+  {
     /* Adapter is not in AHCI mode and the spec says a COMRESET is
      * required when switching from SATA to AHCI mode and vice versa.
@@ -242 +249 @@
   }
 
-  #ifdef DEBUG
-  /* print AHCI register debug information */
-  if (debug) ahci_dump_host_regs(ai, 1);
-  #endif
+  DUMP_HOST_REGS(2,ai,1);
 
   /* Save working copies of CAP, CAP2 and port_map and remove broken feature
@@ -255 +259 @@
   ai->port_map = ai->bios_config[HOST_PORTS_IMPL / sizeof(u32)];
 
-  if (ai->pci->board >= sizeof(initial_flags) / sizeof(*initial_flags)) {
-    dprintf("error: invalid board index in PCI info\n");
+  if (ai->pci->board >= sizeof(initial_flags) / sizeof(*initial_flags))
+  {
+    DPRINTF(0,"error: invalid board index in PCI info\n");
     return(-1);
   }
@@ -262 +267 @@
   ai->hw_ports = (ai->cap & 0x1f) + 1;
 
-  if ((ai->cap & HOST_CAP_64) && (ai->flags & AHCI_HFLAG_32BIT_ONLY)) {
+  if ((ai->cap & HOST_CAP_64) && (ai->flags & AHCI_HFLAG_32BIT_ONLY))
+  {
     /* disable 64-bit support for faulty controllers; OS/2 can't do 64 bits at
      * this point, of course, but who knows where all this will be in a few
@@ -270 +276 @@
   }
 
-  if ((ai->cap & HOST_CAP_NCQ) && (ai->flags & AHCI_HFLAG_NO_NCQ)) {
-    dprintf("controller can't do NCQ, turning off CAP_NCQ\n");
+  if ((ai->cap & HOST_CAP_NCQ) && (ai->flags & AHCI_HFLAG_NO_NCQ))
+  {
+    DPRINTF(1,"controller can't do NCQ, turning off CAP_NCQ\n");
     ai->cap &= ~HOST_CAP_NCQ;
   }
 
-  if (!(ai->cap & HOST_CAP_NCQ) && (ai->flags & AHCI_HFLAG_YES_NCQ)) {
-    dprintf("controller can do NCQ, turning on CAP_NCQ\n");
+  if (!(ai->cap & HOST_CAP_NCQ) && (ai->flags & AHCI_HFLAG_YES_NCQ))
+  {
+    DPRINTF(1,"controller can do NCQ, turning on CAP_NCQ\n");
     ai->cap |= HOST_CAP_NCQ;
   }
 
-  if ((ai->cap & HOST_CAP_PMP) && (ai->flags & AHCI_HFLAG_NO_PMP)) {
-    dprintf("controller can't do PMP, turning off CAP_PMP\n");
+  if ((ai->cap & HOST_CAP_PMP) && (ai->flags & AHCI_HFLAG_NO_PMP))
+  {
+    DPRINTF(1,"controller can't do PMP, turning off CAP_PMP\n");
     ai->cap |= HOST_CAP_PMP;
   }
 
-  if ((ai->cap & HOST_CAP_SNTF) && (ai->flags & AHCI_HFLAG_NO_SNTF)) {
-    dprintf("controller can't do SNTF, turning off CAP_SNTF\n");
+  if ((ai->cap & HOST_CAP_SNTF) && (ai->flags & AHCI_HFLAG_NO_SNTF))
+  {
+    DPRINTF(1,"controller can't do SNTF, turning off CAP_SNTF\n");
     ai->cap &= ~HOST_CAP_SNTF;
   }
 
-  if (ai->pci_vendor == PCI_VENDOR_ID_JMICRON &&
-      ai->pci_device == 0x2361 && ai->port_map != 1) {
-    dprintf("JMB361 has only one port, port_map 0x%lx -> 0x%lx\n", ai->port_map, 1);
+  if (ai->pci_vendor == PCI_VENDOR_ID_JMICRON && ai->pci_device == 0x2361 && ai->port_map != 1)
+  {
+    DPRINTF(1,"JMB361 has only one port, port_map 0x%x -> 0x%x\n", ai->port_map, 1);
     ai->port_map = 1;
     ai->hw_ports = 1;
@@ -307 +317 @@
    */
   ports = ai->hw_ports;
-  for (i = 0; i < AHCI_MAX_PORTS; i++) {
-    if (ai->port_map & (1UL << i)) {
+  for (i = 0; i < AHCI_MAX_PORTS; i++)
+  {
+    if (ai->port_map & (1UL << i))
+    {
       ports--;
     }
   }
-  if (ports < 0) {
+  if (ports < 0)
+  {
     /* more ports in port_map than in HOST_CAP & 0x1f */
     ports = ai->hw_ports;
-    dprintf("implemented port map (0x%lx) contains more ports than nr_ports (%d), using nr_ports\n", ai->port_map, ports);
+    DPRINTF(1,"implemented port map (0x%x) contains more ports than nr_ports (%d), using nr_ports\n", ai->port_map, ports);
     ai->port_map = (1UL << ports) - 1UL;
   }
 
   /* set maximum command slot number */
-  ai->cmd_max = (u16) ((ai->cap >> 8) & 0x1f);
+  ai->cmd_max = ((ai->cap >> 8) & 0x1f);
 
   return(0);
@@ -332 +345 @@
 int ahci_restore_bios_config(AD_INFO *ai)
 {
-  ddprintf("ahci_restore_bios_config: restoring AHCI BIOS configuration on adapter %d\n", ad_no(ai));
+  DPRINTF(3,"ahci_restore_bios_config: restoring AHCI BIOS configuration on adapter %d\n", ad_no(ai));
 
   /* Restore saved BIOS configuration; please note that HOST_CTL is restored
@@ -345 +358 @@
   readl(ai->mmio + HOST_CTL);
 
-  if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 && ai->pci_vendor == PCI_VENDOR_ID_INTEL) {
-
+  if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 && ai->pci_vendor == PCI_VENDOR_ID_INTEL)
+  {
     /* This BIOS apparently accesses the controller via SATA registers and
      * the AHCI spec says that we should issue a COMRESET on each port after
@@ -361 +374 @@
     int p;
 
-    for (p = 0; p < AHCI_MAX_PORTS; p++) {
-      if (ai->port_map & (1UL << p)) {
-        u8 _far *port_mmio = port_base(ai, p);
+    for (p = 0; p < AHCI_MAX_PORTS; p++)
+    {
+      if (ai->port_map & (1UL << p))
+      {
+        u8 *port_mmio = port_base(ai, p);
         u32 tmp;
 
@@ -388 +403 @@
 int ahci_restore_initial_config(AD_INFO *ai)
 {
-  ddprintf("ahci_restore_initial_config: restoring initial configuration on adapter %d\n", ad_no(ai));
+  DPRINTF(3,"ahci_restore_initial_config: restoring initial configuration on adapter %d\n", ad_no(ai));
 
   /* restore saved BIOS configuration */
@@ -413 +428 @@
     TIMER Timer;
 
-    dprintf("controller reset starting on adapter %d\n", ad_no(ai));
+    DPRINTF(2,"controller reset starting on adapter %d\n", ad_no(ai));
 
     /* we must be in AHCI mode, before using anything AHCI-specific, such as HOST_RESET. */
@@ -431 +446 @@
      * the hardware should be considered fried.
      */
-    timer_init(&Timer, 1000);
+    TimerInit(&Timer, 1000);
     while (((tmp = readl(ai->mmio + HOST_CTL)) & HOST_RESET) != 0) {
-      if (timer_check_and_block(&Timer)) {
-        dprintf("controller reset failed (0x%lx)\n", tmp);
+      if (TimerCheckAndBlock(&Timer)) {
+        DPRINTF(0,"controller reset failed (0x%x)\n", tmp);
         return(-1);
       }
@@ -448 +463 @@
       u32 tmp16 = 0;
 
-      ddprintf("ahci_reset_controller: intel detected\n");
+      DPRINTF(1,"ahci_reset_controller: intel detected\n");
       /* configure PCS */
-      pci_read_conf(ai->bus, ai->dev_func, 0x92, sizeof(u16), &tmp16);
+      PciReadConfig(ai->bus, ai->dev_func, 0x92, sizeof(u16), &tmp16);
       if ((tmp16 & ai->port_map) != ai->port_map) {
-        ddprintf("ahci_reset_controller: updating PCS %x/%x\n", (u16)tmp16, ai->port_map);
+        DPRINTF(3,"ahci_reset_controller: updating PCS %x/%x\n", tmp16, ai->port_map);
         tmp16 |= ai->port_map;
-        pci_write_conf(ai->bus, ai->dev_func, 0x92, sizeof(u16), tmp16);
+        PciWriteConfig(ai->bus, ai->dev_func, 0x92, sizeof(u16), tmp16);
       }
     }
@@ -472 +487 @@
 {
   AHCI_PORT_CFG *pc;
-  u8 _far *port_mmio = port_base(ai, p);
-
-  if ((pc = malloc(sizeof(*pc))) == NULL) {
-    return(NULL);
-  }
+  u8 *port_mmio = port_base(ai, p);
+
+  if ((pc = MemAlloc(sizeof(*pc))) == NULL) return(NULL);
 
   pc->cmd_list   = readl(port_mmio + PORT_LST_ADDR);
@@ -496 +509 @@
 void ahci_restore_port_config(AD_INFO *ai, int p, AHCI_PORT_CFG *pc)
 {
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
 
   /* stop the port, first */
   ahci_stop_port(ai, p);
 
-  if (ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) {
+  if (ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN)
+  {
     /* BIOS uses AHCI, too, so we need to restore the port settings;
      * restoring PORT_CMD may well start the port again but that's what
@@ -516 +530 @@
   }
 
-  free(pc);
+  MemFree(pc);
 }
 
@@ -527 +541 @@
   int i;
 
-  if (ctl & HOST_AHCI_EN) {
+  if (ctl & HOST_AHCI_EN)
+  {
     /* AHCI mode already enabled */
     return(0);
@@ -533 +548 @@
 
   /* some controllers need AHCI_EN to be written multiple times */
-  for (i = 0; i < 5; i++) {
+  for (i = 0; i < 5; i++)
+  {
     ctl |= HOST_AHCI_EN;
     writel(ai->mmio + HOST_CTL, ctl);
     ctl = readl(ai->mmio + HOST_CTL);   /* flush && sanity check */
-    if (ctl & HOST_AHCI_EN) {
+    if (ctl & HOST_AHCI_EN)
+    {
       return(0);
     }
@@ -544 +561 @@
 
   /* couldn't enable AHCI mode */
-  dprintf("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);
 }
@@ -575 +592 @@
   TIMER Timer;
 
-  if ((id_buf = malloc(ATA_ID_WORDS * sizeof(u16))) == NULL) {
-    return(-1);
-  }
-
-  if (ai->bios_config[0] == 0) {
-    /* first call */
-    ahci_save_bios_config(ai);
-  }
-
-  if (ahci_enable_ahci(ai)) {
-    goto exit_port_scan;
-  }
+  if ((id_buf = MemAlloc(ATA_ID_WORDS * sizeof(u16))) == NULL) return(-1);
+
+  if (ai->bios_config[0] == 0) ahci_save_bios_config(ai); /* first call */
+
+  if (ahci_enable_ahci(ai)) goto exit_port_scan;
 
   /* perform port scan */
-  dprintf("ahci_scan_ports: scanning ports on adapter %d\n", ad_no(ai));
-  for (p = 0; p < AHCI_MAX_PORTS; p++) {
+  DPRINTF(1,"ahci_scan_ports: scanning ports on adapter %d\n", ad_no(ai));
+  for (p = 0; p < AHCI_MAX_PORTS; p++)
+  {
     if (!(ai->port_map & (1UL << p))) continue;
     if (port_ignore[ad_no(ai)][p]) continue;
 
-    ddprintf("ahci_scan_ports: Wait till not busy on port %d\n", p);
+    DPRINTF(3,"ahci_scan_ports: Wait till not busy on port %d\n", p);
     /* wait until all active commands have completed on this port */
-    timer_init(&Timer, 250);
-    while (ahci_port_busy(ai, p)) {
-      if (timer_check_and_block(&Timer)) break;
-    }
-
-    if (!init_complete) {
-      if ((pc = ahci_save_port_config(ai, p)) == NULL) {
-        goto exit_port_scan;
-      }
+    TimerInit(&Timer, 250);
+    while (ahci_port_busy(ai, p))
+    {
+      if (TimerCheckAndBlock(&Timer)) break;
+    }
+
+    if (!init_complete)
+    {
+      if ((pc = ahci_save_port_config(ai, p)) == NULL) goto exit_port_scan;
     }
 
     /* start/reset port; if no device is attached, this is expected to fail */
-    if (init_reset) {
+    if (init_reset)
+    {
       rc = ahci_reset_port(ai, p, 0);
-    } else {
-      ddprintf("ahci_scan_ports: (re)starting port %d\n", p);
+    }
+    else
+    {
+      DPRINTF(3,"ahci_scan_ports: (re)starting port %d\n", p);
       ahci_stop_port(ai, p);
       rc = ahci_start_port(ai, p, 0);
     }
-    if (rc) {
+    if (rc)
+    {
       /* no device attached to this port */
       ai->port_map &= ~(1UL << p);
@@ -622 +637 @@
 
     /* this port seems to have a device attached and ready for commands */
-    ddprintf("ahci_scan_ports: port %d seems to be attached to a device; probing...\n", p);
+    DPRINTF(1,"ahci_scan_ports: port %d seems to be attached to a device; probing...\n", p);
 
     /* Get ATA(PI) identity. The so-called signature gives us a hint whether
@@ -632 +647 @@
      */
     is_ata = readl(port_base(ai, p) + PORT_SIG) == 0x00000101UL;
-    for (i = 0; i < 2; i++) {
+    for (i = 0; i < 2; i++)
+    {
       rc = ahci_exec_polled_cmd(ai, p, 0, 500,
                                 (is_ata) ? ATA_CMD_ID_ATA : ATA_CMD_ID_ATAPI,
-                                AP_VADDR, (void _far *) id_buf, 512,
+                                AP_VADDR, (void *) id_buf, ATA_ID_WORDS * sizeof(u16),
                                 AP_END);
-      if (rc == 0) {
-        break;
-      }
+      if (rc == 0) break;
 
       /* try again with ATA/ATAPI swapped */
@@ -645 +659 @@
     }
 
-    if (rc == 0) {
+    if (rc == 0)
+    {
       /* we have a valid IDENTIFY or IDENTIFY_PACKET response */
-      ddphex(id_buf, 512, "ATA_IDENTIFY%s results:\n", (is_ata) ? "" : "_PACKET");
+      DHEXDUMP(2,id_buf, ATA_ID_WORDS * sizeof(u16), "ATA_IDENTIFY%s results:\n", (is_ata) ? "" : "_PACKET");
       ahci_setup_device(ai, p, 0, id_buf);
-    } else {
+    }
+    else
+    {
       /* no device attached to this port */
       ai->port_map &= ~(1UL << p);
@@ -661 +678 @@
 
 exit_port_scan:
-  if (!init_complete) {
+  if (!init_complete)
+  {
     ahci_restore_bios_config(ai);
   }
-  free(id_buf);
+  MemFree(id_buf);
   return(0);
 }
@@ -676 +694 @@
 {
   int rc;
-  int p;
+  u32 p;
   int i;
 
-  dprintf("ahci_complete_init: completing initialization of adapter #%d\n", ad_no(ai));
+  DPRINTF(1,"ahci_complete_init: completing initialization of adapter #%d\n", ad_no(ai));
 
   /* register IRQ handlers; each IRQ level is registered only once */
-  for (i = 0; i < irq_map_cnt; i++) {
-    if (irq_map[i] == ai->irq) {
-      /* we already have this IRQ registered */
-      break;
-    }
-  }
-  if (i >= irq_map_cnt) {
-    dprintf("registering interrupt #%d\n", ai->irq);
-    if (DevHelp_SetIRQ(mk_NPFN(irq_handlers[irq_map_cnt]), ai->irq, 1) != 0) {
-      dprintf("failed to register shared interrupt\n");
-      if (DevHelp_SetIRQ(mk_NPFN(irq_handlers[irq_map_cnt]), ai->irq, 0) != 0) {
-        dprintf("failed to register exclusive interrupt\n");
+  for (i = 0; i < irq_map_cnt; i++)
+  {
+    if (irq_map[i] == ai->irq) break; /* we already have this IRQ registered */
+  }
+  if (i >= irq_map_cnt)
+  {
+    DPRINTF(2,"registering interrupt #%d\n", ai->irq);
+    if (Dev32Help_SetIRQ(irq_handlers[irq_map_cnt], ai->irq, 1) != 0)
+    {
+      DPRINTF(0,"failed to register shared interrupt\n");
+      if (Dev32Help_SetIRQ(irq_handlers[irq_map_cnt], ai->irq, 0) != 0)
+      {
+        DPRINTF(0,"failed to register exclusive interrupt\n");
         return(-1);
       }
@@ -701 +720 @@
 
   /* enable AHCI mode */
-  if ((rc = ahci_enable_ahci(ai)) != 0) {
-    return(rc);
-  }
+  if ((rc = ahci_enable_ahci(ai)) != 0) return(rc);
 
   /* Start all ports. The main purpose is to set the command list and FIS
@@ -710 +727 @@
    * enough if a previously detected device has problems.
    */
-  for (p = 0; p < AHCI_MAX_PORTS; p++) {
-    if (ai->port_map & (1UL << p)) {
-      if (init_reset) {
-        ddprintf("ahci_complete_init: resetting port %d\n", p);
+  for (p = 0; p < AHCI_MAX_PORTS; p++)
+  {
+    if (ai->port_map & (1UL << p))
+    {
+      if (init_reset)
+      {
+        DPRINTF(3,"ahci_complete_init: resetting port %d\n", p);
         ahci_reset_port(ai, p, 1);
-      } else {
-        ddprintf("ahci_complete_init: restarting port #%d\n", p);
+      }
+      else
+      {
+        DPRINTF(3,"ahci_complete_init: restarting port #%d\n", p);
         ahci_stop_port(ai, p);
         ahci_start_port(ai, p, 1);
@@ -734 +756 @@
   /* pci_enable_int(ai->bus, ai->dev_func); */
 
+  DPRINTF(1,"ahci_complete_init: done\n");
   return(0);
 }
@@ -751 +774 @@
 int ahci_reset_port(AD_INFO *ai, int p, int ei)
 {
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
   u32 tmp;
   TIMER Timer;
 
-  dprintf("ahci_reset_port: resetting port %d.%d\n", ad_no(ai), p);
-  if (debug > 1) ahci_dump_port_regs(ai, p);
+  DPRINTF(2,"ahci_reset_port: resetting port %d.%d\n", ad_no(ai), p);
+  DUMP_PORT_REGS(2,ai,p);
 
   /* stop port engines (we don't care whether there is an error doing so) */
@@ -772 +795 @@
 
   /* set link speed and power management options */
-  ddprintf("ahci_reset_port: setting link speed and power management options\n");
+  DPRINTF(3,"ahci_reset_port: setting link speed and power management options\n");
   tmp = readl(port_mmio + PORT_SCR_CTL) & ~0x00000fffUL;
-  tmp |= ((u32) link_speed[ad_no(ai)][p] & 0x0f) << 4;
-  tmp |= ((u32) link_power[ad_no(ai)][p] & 0x0f) << 8;
+  tmp |= (link_speed[ad_no(ai)][p] & 0x0f) << 4;
+  tmp |= (link_power[ad_no(ai)][p] & 0x0f) << 8;
   writel(port_mmio + PORT_SCR_CTL, tmp);
 
   /* issue COMRESET on the port */
-  ddprintf("ahci_reset_port: issuing COMRESET on port %d\n", p);
+  DPRINTF(3,"ahci_reset_port: issuing COMRESET on port %d\n", p);
   writel(port_mmio + PORT_SCR_CTL, tmp | 1);
   readl(port_mmio + PORT_SCR_CTL);  /* flush */
@@ -790 +813 @@
 
   /* wait for communication to be re-established after port reset */
-  dprintf("Wait for communication...\n");
-  timer_init(&Timer, 500);
-  while (((tmp = readl(port_mmio + PORT_SCR_STAT)) & 3) != 3) {
-    if (timer_check_and_block(&Timer)) {
-      dprintf("no device present after resetting port #%d (PORT_SCR_STAT = 0x%lx)\n", p, tmp);
+  DPRINTF(2,"Wait for communication...\n");
+  TimerInit(&Timer, 500);
+  while (((tmp = readl(port_mmio + PORT_SCR_STAT)) & 3) != 3)
+  {
+    if (TimerCheckAndBlock(&Timer))
+    {
+      DPRINTF(0,"no device present after resetting port #%d (PORT_SCR_STAT = 0x%x)\n", p, tmp);
       return(-1);
     }
@@ -804 +829 @@
 
   /* start port so we can receive the COMRESET FIS */
-  dprintf("ahci_reset_port: starting port %d again\n", p);
+  DPRINTF(2,"ahci_reset_port: starting port %d again\n", p);
   ahci_start_port(ai, p, ei);
 
   /* wait for device to be ready ((PxTFD & (BSY | DRQ | ERR)) == 0) */
-  timer_init(&Timer, 1000);
-  while (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0) {
-    if (timer_check_and_block(&Timer)) {
-      dprintf("device not ready on port #%d (PORT_TFDATA = 0x%lx)\n", p, tmp);
+  TimerInit(&Timer, 1000);
+  while (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0)
+  {
+    if (TimerCheckAndBlock(&Timer))
+    {
+      DPRINTF(0,"device not ready on port #%d (PORT_TFDATA = 0x%x)\n", p, tmp);
       ahci_stop_port(ai, p);
       return(-1);
     }
   }
-  ddprintf("ahci_reset_port: PORT_TFDATA = 0x%lx\n", readl(port_mmio + PORT_TFDATA));
+  DPRINTF(3,"ahci_reset_port: PORT_TFDATA = 0x%x\n", readl(port_mmio + PORT_TFDATA));
 
   return(0);
@@ -826 +853 @@
 int ahci_start_port(AD_INFO *ai, int p, int ei)
 {
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
   u32 status;
 
-  ddprintf("ahci_start_port %d.%d\n", ad_no(ai), p);
+  DPRINTF(3,"ahci_start_port %d.%d\n", ad_no(ai), p);
   /* check whether device presence is detected and link established */
 
   status = readl(port_mmio + PORT_SCR_STAT);
-  ddprintf("ahci_start_port: PORT_SCR_STAT = 0x%lx\n", status);
-  if ((status & 0xf) != 3) {
-    return(-1);
-  }
+  DPRINTF(3,"ahci_start_port: PORT_SCR_STAT = 0x%x\n", status);
+  if ((status & 0xf) != 3) return(-1);
 
   /* clear SError, if any */
   status = readl(port_mmio + PORT_SCR_ERR);
-  ddprintf("ahci_start_port: PORT_SCR_ERR  = 0x%lx\n", status);
+  DPRINTF(3,"ahci_start_port: PORT_SCR_ERR  = 0x%x\n", status);
   writel(port_mmio + PORT_SCR_ERR, status);
 
@@ -849 +874 @@
   ahci_start_engine(ai, p);
 
-  if (ei) {
+  if (ei)
+  {
     /* clear any pending interrupts on this port */
-    if ((status = readl(port_mmio + PORT_IRQ_STAT)) != 0) {
+    if ((status = readl(port_mmio + PORT_IRQ_STAT)) != 0)
+    {
       writel(port_mmio + PORT_IRQ_STAT, status);
     }
@@ -867 +894 @@
                                       PORT_IRQ_PIOS_FIS |
                                       PORT_IRQ_D2H_REG_FIS);
-  } else {
+  }
+  else
+  {
     writel(port_mmio + PORT_IRQ_MASK, 0);
   }
@@ -881 +910 @@
 void ahci_start_fis_rx(AD_INFO *ai, int p)
 {
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
   u32 port_dma = port_dma_base_phys(ai, p);
   u32 tmp;
@@ -905 +934 @@
 void ahci_start_engine(AD_INFO *ai, int p)
 {
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
   u32 tmp;
 
@@ -920 +949 @@
 int ahci_stop_port(AD_INFO *ai, int p)
 {
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
   u32 tmp;
   int rc;
 
-  ddprintf("ahci_stop_port %d.%d\n", ad_no(ai), p);
+  DPRINTF(3,"ahci_stop_port %d.%d\n", ad_no(ai), p);
 
   /* disable port interrupts */
@@ -930 +959 @@
 
   /* disable FIS reception */
-  if ((rc = ahci_stop_fis_rx(ai, p)) != 0) {
-    dprintf("error: failed to stop FIS receive (%d)\n", rc);
+  if ((rc = ahci_stop_fis_rx(ai, p)) != 0)
+  {
+    DPRINTF(0,"error: failed to stop FIS receive (%d)\n", rc);
     return(rc);
   }
 
   /* disable command engine */
-  if ((rc = ahci_stop_engine(ai, p)) != 0) {
-    dprintf("error: failed to stop port HW engine (%d)\n", rc);
+  if ((rc = ahci_stop_engine(ai, p)) != 0)
+  {
+    DPRINTF(0,"error: failed to stop port HW engine (%d)\n", rc);
     return(rc);
   }
@@ -943 +974 @@
   /* clear any pending port IRQs */
   tmp = readl(port_mmio + PORT_IRQ_STAT);
-  if (tmp) {
-    writel(port_mmio + PORT_IRQ_STAT, tmp);
-  }
+  if (tmp) writel(port_mmio + PORT_IRQ_STAT, tmp);
   writel(ai->mmio + HOST_IRQ_STAT, 1UL << p);
 
@@ -965 +994 @@
 int ahci_stop_fis_rx(AD_INFO *ai, int p)
 {
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
   TIMER Timer;
   u32 tmp;
@@ -977 +1006 @@
   /* wait for completion, spec says 500ms, give it 1000ms */
   status = 0;
-  timer_init(&Timer, 1000);
-  while (readl(port_mmio + PORT_CMD) & PORT_CMD_FIS_ON) {
-    status = timer_check_and_block(&Timer);
+  TimerInit(&Timer, 1000);
+  while (readl(port_mmio + PORT_CMD) & PORT_CMD_FIS_ON)
+  {
+    status = TimerCheckAndBlock(&Timer);
     if (status) break;
   }
@@ -995 +1025 @@
 int ahci_stop_engine(AD_INFO *ai, int p)
 {
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
   TIMER Timer;
   int status;
@@ -1003 +1033 @@
 
   /* check if the port is already stopped */
-  if ((tmp & (PORT_CMD_START | PORT_CMD_LIST_ON)) == 0) {
-    return 0;
-  }
+  if ((tmp & (PORT_CMD_START | PORT_CMD_LIST_ON)) == 0) return 0;
 
   /* set port to idle */
@@ -1013 +1041 @@
   /* wait for engine to stop. This could be as long as 500 msec */
   status = 0;
-  timer_init(&Timer, 500);
-  while (readl(port_mmio + PORT_CMD) & PORT_CMD_LIST_ON) {
-    status = timer_check_and_block(&Timer);
+  TimerInit(&Timer, 500);
+  while (readl(port_mmio + PORT_CMD) & PORT_CMD_LIST_ON)
+  {
+    status = TimerCheckAndBlock(&Timer);
     if (status) break;
   }
@@ -1027 +1056 @@
 int ahci_port_busy(AD_INFO *ai, int p)
 {
-  u8 _far *port_mmio = port_base(ai, p);
-
-  return(readl(port_mmio + PORT_SCR_ACT) != 0 ||
-         readl(port_mmio + PORT_CMD_ISSUE) != 0);
+  u8 *port_mmio = port_base(ai, p);
+
+  return(readl(port_mmio + PORT_SCR_ACT) != 0 || readl(port_mmio + PORT_CMD_ISSUE) != 0);
 }
 
@@ -1043 +1071 @@
  *       involve delays), we're going with the spinlock for the time being.
  */
-void ahci_exec_iorb(IORBH _far *iorb, int ncq_capable,
-                    int (*func)(IORBH _far *, int))
+void ahci_exec_iorb(IORBH FAR16DATA *vIorb, IORBH *pIorb, int ncq_capable, int (*func)(IORBH FAR16DATA *, IORBH *pIorb, int))
 {
   volatile u32 *cmds;
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-  P_INFO *port = ai->ports + iorb_unit_port(iorb);
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
+  AD_INFO *ai = &ad_infos[iorb_unit_adapter(pIorb)];
+  P_INFO *port = &ai->ports[iorb_unit_port(pIorb)];
   ULONG timeout;
-  u8 _far *port_mmio = port_base(ai, iorb_unit_port(iorb));
+  u8 *port_mmio = port_base(ai, iorb_unit_port(pIorb));
   u16 cmd_max = ai->cmd_max;
   int i;
 
   /* determine timeout in milliseconds */
-  switch (iorb->Timeout) {
+  switch (pIorb->Timeout)
+  {
   case 0:
     timeout = DEFAULT_TIMEOUT;
@@ -1064 +1092 @@
     break;
   default:
-    timeout = iorb->Timeout * 1000;
+    timeout = pIorb->Timeout * 1000;
     break;
   }
+
+  DPRINTF(1,"---------- ahci_exec_iorb: iorb=%x\n", vIorb);
 
   /* Enable AHCI mode; apparently, the AHCI mode may end up becoming
@@ -1078 +1108 @@
   /* determine whether this will be an NCQ request */
   aws->is_ncq = 0;
-  if (ncq_capable && port->devs[iorb_unit_device(iorb)].ncq_max > 1 &&
-      (ai->cap & HOST_CAP_NCQ) && !aws->no_ncq && init_complete) {
+  if (ncq_capable && port->devs[iorb_unit_device(pIorb)].ncq_max > 1 &&
+      (ai->cap & HOST_CAP_NCQ) && !aws->no_ncq && init_complete)
+  {
 
     /* We can make this an NCQ request; limit command slots to the maximum
@@ -1087 +1118 @@
      */
     aws->is_ncq = 1;
-    if ((cmd_max = port->devs[iorb_unit_device(iorb)].ncq_max - 1) > ai->cmd_max) {
+    if ((cmd_max = port->devs[iorb_unit_device(pIorb)].ncq_max - 1) > ai->cmd_max)
+    {
       cmd_max = ai->cmd_max;
     }
-    ddprintf("NCQ command; cmd_max = %d->%d\n", (u16) ai->cmd_max, cmd_max);
+    DPRINTF(3,"NCQ command; cmd_max = %d->%d\n", ai->cmd_max, cmd_max);
   }
 
   /* make sure adapter is available */
   spin_lock(drv_lock);
-  if (!ai->busy) {
-
-    if (!init_complete) {
+  if (!ai->busy)
+  {
+
+    if (!init_complete)
+    {
       /* no IRQ handlers or context hooks availabe at this point */
       ai->busy = 1;
       spin_unlock(drv_lock);
-      ahci_exec_polled_iorb(iorb, func, timeout);
+      ahci_exec_polled_iorb(vIorb, pIorb, func, timeout);
       ai->busy = 0;
       return;
@@ -1107 +1141 @@
 
     /* make sure we don't mix NCQ and regular commands */
-    if (aws->is_ncq && port->reg_cmds == 0 || !aws->is_ncq && port->ncq_cmds == 0) {
-
+    if (aws->is_ncq && port->reg_cmds == 0 || !aws->is_ncq && port->ncq_cmds == 0)
+    {
       /* Find next available command slot. We use a simple round-robin
        * algorithm for this to prevent commands with higher slot indexes
@@ -1114 +1148 @@
        */
       cmds = (aws->is_ncq) ? &port->ncq_cmds : &port->reg_cmds;
-      for (i = 0; i <= cmd_max; i++) {
-        if (++(port->cmd_slot) > cmd_max) {
-          port->cmd_slot = 0;
-        }
-        if ((*cmds & (1UL << port->cmd_slot)) == 0) {
-          break;
-        }
+      for (i = 0; i <= cmd_max; i++)
+      {
+        if (++(port->cmd_slot) > cmd_max) port->cmd_slot = 0;
+        if ((*cmds & (1UL << port->cmd_slot)) == 0) break;
       }
 
-      if ((*cmds & (1UL << port->cmd_slot)) == 0) {
+      if ((*cmds & (1UL << port->cmd_slot)) == 0)
+      {
         /* found idle command slot; prepare command */
-        if (func(iorb, port->cmd_slot)) {
+        if (func(vIorb, pIorb, port->cmd_slot))
+        {
           /* Command preparation failed, or no HW command required; IORB
            * will already have the error code if there was an error.
            */
           spin_unlock(drv_lock);
-          iorb_done(iorb);
+          iorb_done(vIorb, pIorb);
           return;
         }
 
         /* start timer for this IORB */
-        ADD_StartTimerMS(&aws->timer, timeout, (PFN) timeout_callback, iorb, 0);
+        Timer_StartTimerMS(&aws->timer, timeout, timeout_callback, CastFar16ToULONG(vIorb));
 
         /* issue command to hardware */
@@ -1142 +1175 @@
         aws->cmd_slot = port->cmd_slot;
 
-        ddprintf("issuing command on slot %d\n", port->cmd_slot);
-        if (aws->is_ncq) {
+        DPRINTF(1,"Issuing command Slot=%d cmds=%x\n", port->cmd_slot, *cmds);
+        if (aws->is_ncq)
+        {
           writel(port_mmio + PORT_SCR_ACT, (1UL << port->cmd_slot));
           readl(port_mmio + PORT_SCR_ACT); /* flush */
@@ -1178 +1212 @@
  *       without the driver-level spinlock held.
  */
-void ahci_exec_polled_iorb(IORBH _far *iorb, int (*func)(IORBH _far *, int),
-                           ULONG timeout)
+void ahci_exec_polled_iorb(IORBH FAR16DATA *vIorb, IORBH *pIorb, int (*func)(IORBH FAR16DATA *, IORBH *pIorb, int), ULONG timeout)
 {
   AHCI_PORT_CFG *pc = NULL;
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
-  u8 _far *port_mmio = port_base(ai, p);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(vIorb);
+  int p = iorb_unit_port(pIorb);
+  u8 *port_mmio = port_base(ai, p);
   TIMER Timer;
   int rc;
 
   /* enable AHCI mode */
-  if (ahci_enable_ahci(ai) != 0) {
-    iorb_seterr(iorb, IOERR_ADAPTER_NONSPECIFIC);
+  if (ahci_enable_ahci(ai) != 0)
+  {
+    iorb_seterr(pIorb, IOERR_ADAPTER_NONSPECIFIC);
     goto restore_bios_config;
   }
 
   /* check whether command slot 0 is available */
-  if ((readl(port_mmio + PORT_CMD_ISSUE) & 1) != 0) {
-    iorb_seterr(iorb, IOERR_DEVICE_BUSY);
+  if ((readl(port_mmio + PORT_CMD_ISSUE) & 1) != 0)
+  {
+    iorb_seterr(pIorb, IOERR_DEVICE_BUSY);
     goto restore_bios_config;
   }
 
   /* save port configuration */
-  if ((pc = ahci_save_port_config(ai, p)) == NULL) {
-    iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+  if ((pc = ahci_save_port_config(ai, p)) == NULL)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
     goto restore_bios_config;
   }
 
   /* restart/reset port (includes the necessary port configuration) */
-  if (init_reset) {
+  if (init_reset)
+  {
     /* As outlined in ahci_restore_bios_config(), switching back and
      * forth between SATA and AHCI mode requires a COMRESET to force
@@ -1214 +1251 @@
      * starting it.
      */
-    if (ahci_reset_port(ai, p, 0)) {
-      iorb_seterr(iorb, IOERR_ADAPTER_NONSPECIFIC);
+    if (ahci_reset_port(ai, p, 0))
+    {
+      iorb_seterr(pIorb, IOERR_ADAPTER_NONSPECIFIC);
       goto restore_bios_config;
     }
 
-  } else if (ahci_stop_port(ai, p) || ahci_start_port(ai, p, 0)) {
-    iorb_seterr(iorb, IOERR_ADAPTER_NONSPECIFIC);
+  }
+  else if (ahci_stop_port(ai, p) || ahci_start_port(ai, p, 0))
+  {
+    iorb_seterr(pIorb, IOERR_ADAPTER_NONSPECIFIC);
     goto restore_bios_config;
   }
 
   /* prepare command */
-  if (func(iorb, 0) == 0) {
+  if (func(vIorb, pIorb, 0) == 0)
+  {
     /* successfully prepared cmd; issue cmd and wait for completion */
-    ddprintf("executing polled cmd on slot 0...");
+    DPRINTF(3,"---------- executing polled cmd on slot 0...");
     writel(port_mmio + PORT_CMD_ISSUE, 1);
-    timer_init(&Timer, timeout);
-    while (readl(port_mmio + PORT_CMD_ISSUE) & 1) {
-      rc = timer_check_and_block(&Timer);
+    TimerInit(&Timer, timeout);
+    while (readl(port_mmio + PORT_CMD_ISSUE) & 1)
+    {
+      rc = TimerCheckAndBlock(&Timer);
       if (rc) break;
     }
 
     /* 0x89 = BSY(0x80) | DRQ(0x08) | ERR(0x01) */
-    if (rc) {
-      dprintf(" timeout for IORB %Fp", iorb);
-      iorb_seterr(iorb, IOERR_ADAPTER_TIMEOUT);
-    } else if (readl(port_mmio + PORT_SCR_ERR) != 0 || readl(port_mmio + PORT_TFDATA) & 0x89) {
-      dprintf(" polled cmd error for IORB %Fp", iorb);
-      iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
-      ahci_reset_port(ai, iorb_unit_port(iorb), 0);
-    } else {
+    if (rc)
+    {
+      DPRINTF(3," timeout for IORB %x", vIorb);
+      iorb_seterr(pIorb, IOERR_ADAPTER_TIMEOUT);
+    }
+    else if (readl(port_mmio + PORT_SCR_ERR) != 0 || readl(port_mmio + PORT_TFDATA) & 0x89)
+    {
+      DPRINTF(3," polled cmd error for IORB %x", vIorb);
+      iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
+      ahci_reset_port(ai, iorb_unit_port(pIorb), 0);
+    }
+    else
+    {
       /* successfully executed command */
-      if (add_workspace(iorb)->ppfunc != NULL) {
-        add_workspace(iorb)->ppfunc(iorb);
-      } else {
-        add_workspace(iorb)->complete = 1;
+      if (add_workspace(pIorb)->ppfunc != NULL)
+      {
+        add_workspace(pIorb)->ppfunc(vIorb, pIorb);
       }
-    }
-    ddprintf("\n");
+      else
+      {
+        add_workspace(pIorb)->complete = 1;
+      }
+    }
+    DPRINTF(3,"\n");
   }
 
 restore_bios_config:
   /* restore BIOS configuration */
-  if (pc != NULL) {
+  if (pc != NULL)
+  {
     ahci_restore_port_config(ai, p, pc);
   }
   ahci_restore_bios_config(ai);
 
-  if (add_workspace(iorb)->complete | (iorb->Status | IORB_ERROR)) {
-    iorb_done(iorb);
+  if (add_workspace(pIorb)->complete | (pIorb->Status | IORB_ERROR))
+  {
+    iorb_done(vIorb, pIorb);
   }
   return;
@@ -1279 +1331 @@
 {
   va_list va;
-  u8 _far *port_mmio = port_base(ai, p);
+  u8 *port_mmio = port_base(ai, p);
   u32 tmp;
   int rc;
@@ -1285 +1337 @@
 
   /* verify that command slot 0 is idle */
-  if (readl(port_mmio + PORT_CMD_ISSUE) & 1) {
-    ddprintf("port %d slot 0 is not idle; not executing polled cmd\n", p);
+  if (readl(port_mmio + PORT_CMD_ISSUE) & 1)
+  {
+    DPRINTF(3,"port %d slot 0 is not idle; not executing polled cmd\n", p);
     return(-1);
   }
@@ -1292 +1345 @@
   /* fill in command slot 0 */
   va_start(va, cmd);
-  if ((rc = v_ata_cmd(ai, p, d, 0, cmd, va)) != 0) {
-    return(rc);
-  }
+  if ((rc = v_ata_cmd(ai, p, d, 0, cmd, va)) != 0) return(rc);
 
   /* start command execution for slot 0 */
-  ddprintf("executing polled cmd...");
+  DPRINTF(3,"---------- executing polled cmd...");
   writel(port_mmio + PORT_CMD_ISSUE, 1);
 
   /* wait until command has completed */
-  timer_init(&Timer, timeout);
+  TimerInit(&Timer, timeout);
   rc = 0;
-  while (readl(port_mmio + PORT_CMD_ISSUE) & 1) {
-    rc = timer_check_and_block(&Timer);
-    if (rc) {
-      dprintf(" Timeout");
+  while (readl(port_mmio + PORT_CMD_ISSUE) & 1)
+  {
+    rc = TimerCheckAndBlock(&Timer);
+    if (rc)
+    {
+      DPRINTF(2," Timeout");
       break;
     }
@@ -1312 +1365 @@
 
   tmp = readl(port_mmio + PORT_SCR_ERR);
-  if (tmp & PORT_ERR_FAIL_BITS) {
-    dprintf(" SERR = 0x%08lx", tmp);
+  if (tmp & PORT_ERR_FAIL_BITS)
+  {
+    DPRINTF(2," SERR = 0x%08lx", tmp);
     rc = 1;
   }
   /* 0x89 = BSY(0x80) | DRQ(0x08) | ERR(0x01) */
-  if (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0) {
-    dprintf(" TFDATA = 0x%08lx", tmp);
+  if (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0)
+  {
+    DPRINTF(2," TFDATA = 0x%08lx", tmp);
     rc = 1;
   }
 
-  if (rc) {
-    ddprintf("failed\n");
+  if (rc)
+  {
+    DPRINTF(3,"failed\n");
     ahci_reset_port(ai, p, 0);
     return(-1);
   }
-  ddprintf("success\n");
+  DPRINTF(3,"success\n");
   return(0);
 }
@@ -1342 +1398 @@
 int ahci_flush_cache(AD_INFO *ai, int p, int d)
 {
-  if (!ai->ports[p].devs[d].atapi) {
-    dprintf("flushing cache on %d.%d.%d\n", ad_no(ai), p, d);
+  if (!ai->ports[p].devs[d].atapi)
+  {
+    DPRINTF(2,"flushing cache on %d.%d.%d\n", ad_no(ai), p, d);
     return(ahci_exec_polled_cmd(ai, p, d, 30000,
            ai->ports[p].devs[d].lba48 ? ATA_CMD_FLUSH_EXT : ATA_CMD_FLUSH, AP_END));
@@ -1360 +1417 @@
 int ahci_set_dev_idle(AD_INFO *ai, int p, int d, int idle)
 {
-  ddprintf("sending IDLE=%d command to port %d\n", idle, p);
-  return ahci_exec_polled_cmd(ai, p, d, 500, ATA_CMD_IDLE, AP_COUNT,
-                              idle ? 1 : 0, AP_END);
+  DPRINTF(3,"sending IDLE=%d command to port %d\n", idle, p);
+  return ahci_exec_polled_cmd(ai, p, d, 500, ATA_CMD_IDLE, AP_COUNT, idle ? 1 : 0, AP_END);
 }
 
@@ -1375 +1431 @@
  * the driver-level spinlock when actually changing the driver state (IORB
  * queues, ...)
- *
- * NOTE: OS/2 expects the carry flag set upon return from an interrupt
- *       handler if the interrupt has not been handled. We do this by
- *       shifting the return code from this function one bit to the right,
- *       thus the return code must set bit 0 in this case.
- */
+ */
+u32 DazCount = 0;
+
 int ahci_intr(u16 irq)
 {
@@ -1388 +1441 @@
   int p;
 
+  DPRINTF(1,"AI=%x",DazCount++);
+
   /* find adapter(s) with pending interrupts */
-  for (a = 0; a < ad_info_cnt; a++) {
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     AD_INFO *ai = ad_infos + a;
 
-    if (ai->irq == irq && (irq_stat = readl(ai->mmio + HOST_IRQ_STAT)) != 0) {
+    if (ai->irq == irq && (irq_stat = readl(ai->mmio + HOST_IRQ_STAT)) != 0)
+    {
       /* this adapter has interrupts pending */
       u32 irq_masked = irq_stat & ai->port_map;
 
-      for (p = 0; p <= ai->port_max; p++) {
-        if (irq_masked & (1UL << p)) {
+      for (p = 0; p <= ai->port_max; p++)
+      {
+        if (irq_masked & (1UL << p))
+        {
           ahci_port_intr(ai, p);
         }
@@ -1409 +1468 @@
   }
 
-  if (handled) {
+  if (handled)
+  {
     /* Trigger state machine to process next IORBs, if any. Due to excessive
      * IORB requeue operations (e.g. when processing large unaligned reads or
      * writes), we may be stacking interrupts on top of each other. If we
      * detect this, we'll pass this on to the engine context hook.
-     *
-     * Rousseau:
-     * The "Physycal Device Driver Reference" states that it's a good idea
-     * to disable interrupts before doing EOI so that it can proceed for this
-     * level without being interrupted, which could cause stacked interrupts,
-     * possibly exhausting the interrupt stack.
-     * (?:\IBMDDK\DOCS\PDDREF.INF->Device Helper (DevHlp) Services)->EOI)
-     *
-     * This is what seemed to happen when running in VirtualBox.
-     * Since in VBox the AHCI-controller is a software implementation, it is
-     * just not fast enough to handle a large bulk of requests, like when JFS
-     * flushes it's caches.
-     *
-     * Cross referencing with DANIS506 shows she does the same in the
-     * state-machine code in s506sm.c around line 244; disable interrupts
-     * before doing the EOI.
-     *
-     * Comments on the disable() function state that SMP systems should use
-     * a spinlock, but putting the EOI before spin_unlock() did not solve the
-     * VBox ussue. This is probably because spin_unlock() enables interrupts,
-     * which implies we need to return from this handler with interrupts
-     * disabled.
      */
-    if ((u16) (u32) (void _far *) &irq_stat < 0xf000) {
-      ddprintf("IRQ stack running low; arming engine context hook\n");
+    #if 0
+    if ((u32)&irq_stat < 0xf000)
+    {
+      DPRINTF(0,"IRQ stack running low; arming engine context hook\n");
       /* Rousseau:
        * A context hook cannot be re-armed before it has completed.
@@ -1453 +1493 @@
        * This needs some more investigation.
        */
-      DevHelp_ArmCtxHook(0, engine_ctxhook_h);
-    } else {
+      KernArmHook(engine_ctxhook_h, 0, 0);
+    }
+    else
+    #endif
+    {
       spin_lock(drv_lock);
       trigger_engine();
       spin_unlock(drv_lock);
     }
-    /* disable interrupts to prevent stacking. (See comments above) */
-    disable();
-    /* complete the interrupt */
-    DevHelp_EOI(irq);
-    return(0);
-  } else {
-    return(1);
-  }
+    DevCli();
+    Dev32Help_EOI(irq);
+    return(1); /* handled */
+  }
+
+  return(0); /* not handled */
 }
 
@@ -1477 +1518 @@
 {
   IORB_QUEUE done_queue;
-  IORBH _far *iorb;
-  IORBH _far *next = NULL;
-  u8 _far *port_mmio = port_base(ai, p);
+  IORBH FAR16DATA *vIorb;
+  IORBH FAR16DATA *vNext = NULL;
+  u8 *port_mmio = port_base(ai, p);
   u32 irq_stat;
   u32 active_cmds;
@@ -1489 +1530 @@
   readl(port_mmio + PORT_IRQ_STAT); /* flush */
 
-  ddprintf("port interrupt for adapter %d port %d stat %lx stack frame %Fp\n",
-        ad_no(ai), p, irq_stat, (void _far *)&done_queue);
+  DPRINTF(3,"port interrupt A=%d Port=%d stat=%x\n", ad_no(ai), p, irq_stat);
   memset(&done_queue, 0x00, sizeof(done_queue));
 
-  if (irq_stat & PORT_IRQ_ERROR) {
+  if (irq_stat & PORT_IRQ_ERROR)
+  {
     /* this is an error interrupt;
      * disable port interrupts to avoid IRQ storm until error condition
@@ -1511 +1552 @@
    * commands have completed, too.
    */
-  if (ai->ports[p].ncq_cmds != 0) {
+  if (ai->ports[p].ncq_cmds != 0)
+  {
     active_cmds = readl(port_mmio + PORT_SCR_ACT);
     done_mask = ai->ports[p].ncq_cmds ^ active_cmds;
-    ddprintf("[ncq_cmds]: active_cmds = 0x%08lx, done_mask = 0x%08lx\n",
-             active_cmds, done_mask);
-  } else {
+    DPRINTF(1,"[ncq_cmds]: active_cmds=0x%08x done_mask=0x%08x\n", active_cmds, done_mask);
+  }
+  else
+  {
     active_cmds = readl(port_mmio + PORT_CMD_ISSUE);
     done_mask = ai->ports[p].reg_cmds ^ active_cmds;
-    ddprintf("[reg_cmds]: active_cmds = 0x%08lx, done_mask = 0x%08lx\n",
-             active_cmds, done_mask);
+    DPRINTF(1,"[reg_cmds]: active_cmds=0x%08x  done_mask=0x%08x\n", active_cmds, done_mask);
   }
 
@@ -1535 +1577 @@
    *        processed after releasing the spinlock.
    */
-  for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
-    ADD_WORKSPACE _far *aws = (ADD_WORKSPACE _far *) &iorb->ADDWorkSpace;
-    next = iorb->pNxtIORB;
-    if (aws->queued_hw && (done_mask & (1UL << aws->cmd_slot))) {
+  for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != NULL; vIorb = vNext)
+  {
+    IORBH *pIorb = Far16ToFlat(vIorb);
+    ADD_WORKSPACE *aws = (ADD_WORKSPACE *) &pIorb->ADDWorkSpace;
+
+    vNext = pIorb->pNxtIORB;
+    if (aws->queued_hw && (done_mask & (1UL << aws->cmd_slot)))
+    {
       /* this hardware command has completed */
       ai->ports[p].ncq_cmds &= ~(1UL << aws->cmd_slot);
@@ -1544 +1590 @@
 
       /* call post-processing function, if any */
-      if (aws->ppfunc != NULL) {
-        aws->ppfunc(iorb);
-      } else {
-        aws->complete = 1;
+      if (aws->ppfunc != NULL) aws->ppfunc(vIorb, pIorb);
+      else aws->complete = 1;
+
+      if (aws->complete)
+      {
+        /* this IORB is complete; move IORB to our temporary done queue */
+        iorb_queue_del(&ai->ports[p].iorb_queue, vIorb);
+        iorb_queue_add(&done_queue, vIorb, pIorb);
+        aws_free(add_workspace(pIorb));
       }
-
-      if (aws->complete) {
-        /* this IORB is complete; move IORB to our temporary done queue */
-        iorb_queue_del(&ai->ports[p].iorb_queue, iorb);
-        iorb_queue_add(&done_queue, iorb);
-        aws_free(add_workspace(iorb));
-      }
     }
   }
@@ -1562 +1606 @@
 
   /* complete all IORBs in the done queue */
-  for (iorb = done_queue.root; iorb != NULL; iorb = next) {
-    next = iorb->pNxtIORB;
-    iorb_complete(iorb);
+  for (vIorb = done_queue.vRoot; vIorb != NULL; vIorb = vNext)
+  {
+    IORBH *pIorb = Far16ToFlat(vIorb);
+
+    vNext = pIorb->pNxtIORB;
+    iorb_complete(vIorb, pIorb);
   }
 }
@@ -1588 +1635 @@
    * reset, or worse.
    */
-  if (irq_stat & PORT_IRQ_UNK_FIS) {
+  if (irq_stat & PORT_IRQ_UNK_FIS)
+  {
     #ifdef DEBUG
-    u32 _far *unk = (u32 _far *) (port_dma_base(ai, p)->rx_fis + RX_FIS_UNK);
-    dprintf("warning: unknown FIS %08lx %08lx %08lx %08lx\n", unk[0], unk[1], unk[2], unk[3]);
+    u32 *unk = (u32 *) (port_dma_base(ai, p)->rx_fis + RX_FIS_UNK);
+    DPRINTF(0,"warning: unknown FIS %08lx %08lx %08lx %08lx\n", unk[0], unk[1], unk[2], unk[3]);
     #endif
     reset_port = 1;
   }
-  if (irq_stat & (PORT_IRQ_HBUS_ERR | PORT_IRQ_HBUS_DATA_ERR)) {
-    dprintf("warning: host bus [data] error for port #%d\n", p);
+  if (irq_stat & (PORT_IRQ_HBUS_ERR | PORT_IRQ_HBUS_DATA_ERR))
+  {
+    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("warning: interface fatal error for port #%d\n", p);
+  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);
     reset_port = 1;
   }
-  if (reset_port) {
+  if (reset_port)
+  {
     /* need to reset the port; leave this to the reset context hook */
 
     ports_to_reset[ad_no(ai)] |= 1UL << p;
-    DevHelp_ArmCtxHook(0, reset_ctxhook_h);
+    KernArmHook(reset_ctxhook_h, 0, 0);
 
     /* no point analyzing device errors after a reset... */
@@ -1613 +1664 @@
   }
 
-  dprintf("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
@@ -1621 +1671 @@
    */
   ports_to_restart[ad_no(ai)] |= 1UL << p;
-  DevHelp_ArmCtxHook(0, restart_ctxhook_h);
+  KernArmHook(restart_ctxhook_h, 0, 0);
 }
 
@@ -1628 +1678 @@
  * the same for non-removable devices.
  */
-void ahci_get_geometry(IORBH _far *iorb)
-{
-  dprintf("ahci_get_geometry(%d.%d.%d)\n", (int) iorb_unit_adapter(iorb),
-          (int) iorb_unit_port(iorb), (int) iorb_unit_device(iorb));
-
-  ahci_exec_iorb(iorb, 0, cmd_func(iorb, get_geometry));
+void ahci_get_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  #ifdef DEBUG
+  DPRINTF(2,"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));
 }
 
@@ -1639 +1691 @@
  * Test whether unit is ready.
  */
-void ahci_unit_ready(IORBH _far *iorb)
-{
-  dprintf("ahci_unit_ready(%d.%d.%d)\n", (int) iorb_unit_adapter(iorb),
-          (int) iorb_unit_port(iorb), (int) iorb_unit_device(iorb));
-
-  ahci_exec_iorb(iorb, 0, cmd_func(iorb, unit_ready));
+void ahci_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  #ifdef DEBUG
+  DPRINTF(2,"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));
 }
 
@@ -1650 +1704 @@
  * Read sectors from AHCI device.
  */
-void ahci_read(IORBH _far *iorb)
-{
-  dprintf("ahci_read(%d.%d.%d, %ld, %ld)\n", (int) iorb_unit_adapter(iorb),
-          (int) iorb_unit_port(iorb), (int) iorb_unit_device(iorb),
-          (long) ((IORB_EXECUTEIO _far *) iorb)->RBA,
-          (long) ((IORB_EXECUTEIO _far *) iorb)->BlockCount);
-
-  ahci_exec_iorb(iorb, 1, cmd_func(iorb, read));
+void ahci_read(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  #ifdef DEBUG
+  DPRINTF(2,"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));
 }
 
@@ -1663 +1719 @@
  * Verify readability of sectors on AHCI device.
  */
-void ahci_verify(IORBH _far *iorb)
-{
-  dprintf("ahci_verify(%d.%d.%d, %ld, %ld)\n", (int) iorb_unit_adapter(iorb),
-          (int) iorb_unit_port(iorb), (int) iorb_unit_device(iorb),
-          (long) ((IORB_EXECUTEIO _far *) iorb)->RBA,
-          (long) ((IORB_EXECUTEIO _far *) iorb)->BlockCount);
-
-  ahci_exec_iorb(iorb, 0, cmd_func(iorb, verify));
+void ahci_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  #ifdef DEBUG
+  DPRINTF(2,"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));
 }
 
@@ -1676 +1734 @@
  * Write sectors to AHCI device.
  */
-void ahci_write(IORBH _far *iorb)
-{
-  dprintf("ahci_write(%d.%d.%d, %ld, %ld)\n", (int) iorb_unit_adapter(iorb),
-          (int) iorb_unit_port(iorb), (int) iorb_unit_device(iorb),
-          (long) ((IORB_EXECUTEIO _far *) iorb)->RBA,
-          (long) ((IORB_EXECUTEIO _far *) iorb)->BlockCount);
-
-  ahci_exec_iorb(iorb, 1, cmd_func(iorb, write));
+void ahci_write(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  #ifdef DEBUG
+  DPRINTF(2,"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));
 }
 
@@ -1689 +1749 @@
  * Execute SCSI (ATAPI) command.
  */
-void ahci_execute_cdb(IORBH _far *iorb)
-{
-  int a = iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
-
-  dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
-        ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
+void ahci_execute_cdb(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  int a = iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
+
+  DHEXDUMP(0,Far16ToFlat(((IORB_ADAPTER_PASSTHRU *)pIorb)->pControllerCmd),
+        ((IORB_ADAPTER_PASSTHRU *)pIorb)->ControllerCmdLen,
         "ahci_execute_cdb(%d.%d.%d): ", a, p, d);
 
-  if (ad_infos[a].ports[p].devs[d].atapi) {
-    ahci_exec_iorb(iorb, 0, atapi_execute_cdb);
-  } else {
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    iorb_done(iorb);
+  if (ad_infos[a].ports[p].devs[d].atapi)
+  {
+    ahci_exec_iorb(vIorb, pIorb, 0, atapi_execute_cdb);
+  }
+  else
+  {
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_done(vIorb, pIorb);
   }
 }
@@ -1711 +1774 @@
  * ATAPI devices because ATAPI devices will process some ATA commands as well.
  */
-void ahci_execute_ata(IORBH _far *iorb)
+void ahci_execute_ata(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
   #ifdef DEBUG
-  int a = iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+  int a = iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
+
+  DHEXDUMP(0,Far16ToFlat(((IORB_ADAPTER_PASSTHRU *)pIorb)->pControllerCmd),
+        ((IORB_ADAPTER_PASSTHRU *)pIorb)->ControllerCmdLen,
+        "ahci_execute_ata(%d.%d.%d): ", a, p, d);
   #endif
 
-  dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
-        ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
-        "ahci_execute_ata(%d.%d.%d): ", a, p, d);
-
-  ahci_exec_iorb(iorb, 0, ata_execute_ata);
+  ahci_exec_iorb(vIorb, pIorb, 0, ata_execute_ata);
 }
 
@@ -1744 +1807 @@
   if (d >= AHCI_MAX_DEVS) return;
 
-  if (ai->port_max < p) {
-    ai->port_max = p;
-  }
-  if (ai->ports[p].dev_max < d) {
-    ai->ports[p].dev_max = d;
-  }
+  if (ai->port_max < p) ai->port_max = p;
+  if (ai->ports[p].dev_max < d) ai->ports[p].dev_max = d;
   memset(ai->ports[p].devs + d, 0x00, sizeof(*ai->ports[p].devs));
 
@@ -1757 +1816 @@
   ai->ports[p].devs[d].dev_type  = UIB_TYPE_DISK;
 
-  if (id_buf[ATA_ID_CONFIG] & 0x8000U) {
+  if (id_buf[ATA_ID_CONFIG] & 0x8000U)
+  {
     /* this is an ATAPI device; augment device information */
     ai->ports[p].devs[d].atapi     = 1;
@@ -1764 +1824 @@
     ai->ports[p].devs[d].ncq_max   = 1;
 
-  } else {
+  }
+  else
+  {
     /* complete ATA-specific device information */
-    if (enable_ncq[ad_no(ai)][p]) {
+    if (enable_ncq[ad_no(ai)][p])
+    {
       ai->ports[p].devs[d].ncq_max = id_buf[ATA_ID_QUEUE_DEPTH] & 0x001fU;
     }
-    if (ai->ports[p].devs[d].ncq_max < 1) {
+    if (ai->ports[p].devs[d].ncq_max < 1)
+    {
       /* NCQ not enabled for this device, or device doesn't support NCQ */
       ai->ports[p].devs[d].ncq_max = 1;
     }
-    if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x0400U) {
+    if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x0400U)
+    {
       ai->ports[p].devs[d].lba48   = 1;
     }
   }
 
-  dprintf("found device %d.%d.%d: removable = %d, dev_type = %d, atapi = %d, "
+  DPRINTF(2,"found device %d.%d.%d: removable = %d, dev_type = %d, atapi = %d, "
           "ncq_max = %d\n", ad_no(ai), p, d,
           ai->ports[p].devs[d].removable,
@@ -1798 +1863 @@
    * we distinguish only HDs and CD drives for now
    */
-  if (ai->ports[p].devs[d].removable) {
+  if (ai->ports[p].devs[d].removable)
+  {
     sprintf(dev_name, RM_CD_PREFIX "%s", p, d, ata_dev_name(id_buf));
-  } else {
+  }
+  else
+  {
     sprintf(dev_name, RM_HD_PREFIX "%s", p, d, ata_dev_name(id_buf));
   }
@@ -1816 +1884 @@
   /* try to detect virtualbox environment to enable a hack for IRQ routing */
   if (ai == ad_infos && ai->pci_vendor == 0x8086 && ai->pci_device == 0x2829 &&
-      !memcmp(ata_dev_name(id_buf), "VBOX HARDDISK", 13)) {
+      !memcmp(ata_dev_name(id_buf), "VBOX HARDDISK", 13))
+  {
     /* running inside virtualbox */
     pci_hack_virtualbox();

trunk/src/os2ahci/ahci.h

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen

trunk/src/os2ahci/apm.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Portions copyright (c) 2013-2015 David Azarewicz
+ * Portions copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -34 +34 @@
 
 #include <apmcalls.h>
-USHORT _far _cdecl apm_event    (APMEVENT _far *evt);
+USHORT _cdecl apm_event    (APMEVENT *evt);
 
 /******************************************************************************
@@ -45 +45 @@
   /* connect to APM driver */
   if ((rc = APMAttach()) != 0) {
-    dprintf("couldn't connect to APM driver (rc = %d)\n", rc);
+    DPRINTF(2,"couldn't connect to APM driver (rc = %d)\n", rc);
     return;
   }
@@ -53 +53 @@
                                    APM_NOTIFYNORMRESUME |
                                    APM_NOTIFYCRITRESUME, 0)) != 0) {
-    dprintf("couldn't register for power event notificatins (rc = %d)\n", rc);
+    DPRINTF(2,"couldn't register for power event notificatins (rc = %d)\n", rc);
     return;
   }
@@ -61 +61 @@
  * APM event handler
  */
-USHORT _far _cdecl apm_event(APMEVENT _far *evt)
+USHORT _cdecl apm_event(APMEVENT *evt)
 {
   USHORT msg = (USHORT) evt->ulParm1;
 
-  dprintf("received APM event: 0x%lx/0x%lx\n");
+  DPRINTF(2,"received APM event: 0x%x/0x%x\n");
 
   switch (msg) {
@@ -83 +83 @@
 
   default:
-    dprintf("unknown APM event; ignoring...\n");
+    DPRINTF(2,"unknown APM event; ignoring...\n");
     break;
   }
@@ -103 +103 @@
 
   if (suspended) return;
-  dprintf("suspend()\n");
+  DPRINTF(2,"suspend()\n");
 
   /* restart all ports with interrupts disabled */
@@ -112 +112 @@
     for (p = 0; p <= ai->port_max; p++) {
       /* wait until all active commands have completed on this port */
-      timer_init(&Timer, 250);
+      TimerInit(&Timer, 250);
       while (ahci_port_busy(ai, p)) {
-        if (timer_check_and_block(&Timer)) break;
+        if (TimerCheckAndBlock(&Timer)) break;
       }
 
@@ -142 +142 @@
 
   suspended = 1;
-  dprintf("suspend() finished\n");
+  DPRINTF(2,"suspend() finished\n");
 }
 
@@ -154 +154 @@
 
   if (!suspended) return;
-  dprintf("resume()\n");
+  DPRINTF(2,"resume()\n");
 
   for (a = 0; a < ad_info_cnt; a++) {
@@ -188 +188 @@
    */
   resume_sleep_flag = 5000;
-  DevHelp_ArmCtxHook(0, engine_ctxhook_h);
-
-  dprintf("resume() finished\n");
+  KernArmHook(engine_ctxhook_h, 0, 0);
+
+  DPRINTF(2,"resume() finished\n");
 }
 
@@ -207 +207 @@
   //int d;
 
-  dprintf("shutdown_driver() enter\n");
-
-  for (a = 0; a < ad_info_cnt; a++) {
+  DPRINTF(1,"shutdown_driver() enter\n");
+
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     AD_INFO *ai = ad_infos + a;
 
@@ -217 +218 @@
     for (i=0; i<50000 && ai->busy; i++) udelay(1000);
 
-    for (p = 0; p <= ai->port_max; p++) {
-      u8 _far *port_mmio = port_base(ai, p);
+    for (p = 0; p <= ai->port_max; p++)
+    {
+      u8 *port_mmio = port_base(ai, p);
 
       /* Wait up to 50ms for port to go not busy. Again stop it
@@ -246 +248 @@
 
       /* flush cache on all attached devices */
-      for (d = 0; d <= ai->ports[p].dev_max; d++) {
-        if (ai->ports[p].devs[d].present) {
+      for (d = 0; d <= ai->ports[p].dev_max; d++)
+      {
+        if (ai->ports[p].devs[d].present)
+        {
           ahci_flush_cache(ai, p, d);
         }
@@ -258 +262 @@
 
   /* restore BIOS configuration for each adapter */
-  for (a = 0; a < ad_info_cnt; a++) {
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     ahci_restore_bios_config(ad_infos + a);
   }
 
-  dprintf("shutdown_driver() finished\n");
-}
-
+  DPRINTF(1,"shutdown_driver() finished\n");
+}
+

trunk/src/os2ahci/ata.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Portions copyright (c) 2013-2015 David Azarewicz
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -35 +35 @@
 /* -------------------------- function prototypes -------------------------- */
 
-static int ata_cmd_read (IORBH _far *iorb, AD_INFO *ai, int p, int d, int slot,
-                         ULONG sector, ULONG count, SCATGATENTRY _far *sg_list,
-                         ULONG sg_cnt);
-
-static int ata_cmd_write(IORBH _far *iorb, AD_INFO *ai, int p, int d, int slot,
-                         ULONG sector, ULONG count, SCATGATENTRY _far *sg_list,
+static int ata_cmd_read(IORBH *pIorb, AD_INFO *ai, int p, int d, int slot,
+                        ULONG sector, ULONG count, SCATGATENTRY *sg_list,
+                        ULONG sg_cnt);
+
+static int ata_cmd_write(IORBH *pIorb, AD_INFO *ai, int p, int d, int slot,
+                         ULONG sector, ULONG count, SCATGATENTRY *sg_list,
                          ULONG sg_cnt, int write_through);
 
@@ -81 +81 @@
 int v_ata_cmd(AD_INFO *ai, int p, int d, int slot, int cmd, va_list va)
 {
-  AHCI_PORT_DMA _far *dma_base_virt;
-  AHCI_CMD_HDR _far *cmd_hdr;
-  AHCI_CMD_TBL _far *cmd_tbl;
-  SCATGATENTRY _far *sg_list = NULL;
+  AHCI_PORT_DMA *dma_base_virt;
+  AHCI_CMD_HDR *cmd_hdr;
+  AHCI_CMD_TBL *cmd_tbl;
+  SCATGATENTRY *sg_list = NULL;
   SCATGATENTRY sg_single;
   ATA_PARM ap;
   ATA_CMD ata_cmd;
-  void _far *atapi_cmd = NULL;
+  void *atapi_cmd = NULL;
   u32 dma_base_phys;
-  u16 atapi_cmd_len = 0;
-  u16 ahci_flags = 0;
-  u16 sg_cnt = 0;
-  int i;
-  int n;
+  u32 atapi_cmd_len = 0;
+  u32 ahci_flags = 0;
+  u32 sg_cnt = 0;
+  u32 i;
+  u32 n;
 
   /* --------------------------------------------------------------------------
@@ -102 +102 @@
    */
   memset(&ata_cmd, 0x00, sizeof(ata_cmd));
-  ata_cmd.cmd = (u8) cmd;
+  ata_cmd.cmd = cmd;
 
   /* parse variable arguments */
-  do {
-    switch ((ap = va_arg(va, ATA_PARM))) {
+  do
+  {
+    switch ((ap = va_arg(va, ATA_PARM)))
+    {
 
     case AP_AHCI_FLAGS:
-      ahci_flags |= va_arg(va, u16);
+      ahci_flags |= va_arg(va, u32);
       break;
 
     case AP_WRITE:
-      if (va_arg(va, u16) != 0) {
+      if (va_arg(va, u32) != 0)
+      {
         ahci_flags |= AHCI_CMD_WRITE;
       }
@@ -120 +123 @@
     case AP_FEATURES:
       /* ATA features word */
-      ata_cmd.features |= va_arg(va, u16);
+      ata_cmd.features |= va_arg(va, u32);
       break;
 
     case AP_COUNT:
       /* transfer count */
-      ata_cmd.count = va_arg(va, u16);
+      ata_cmd.count = va_arg(va, u32);
       break;
 
@@ -131 +134 @@
       /* 28-bit sector address */
       ata_cmd.lba_l = va_arg(va, u32);
-      if (ata_cmd.lba_l & 0xf0000000UL) {
-        dprintf("error: LBA-28 address %ld has more than 28 bits\n", ata_cmd.lba_l);
+      if (ata_cmd.lba_l & 0xf0000000UL)
+      {
+        DPRINTF(0,"error: LBA-28 address %d has more than 28 bits\n", ata_cmd.lba_l);
         return(ATA_CMD_INVALID_PARM);
       }
@@ -144 +148 @@
       /* 48-bit sector address */
       ata_cmd.lba_l = va_arg(va, u32);
-      ata_cmd.lba_h = va_arg(va, u16);
+      ata_cmd.lba_h = va_arg(va, u32);
       break;
 
@@ -150 +154 @@
       /* ATA device byte; note that this byte contains the highest
        * 4 bits of LBA-28 address; we have to leave them alone here. */
-      ata_cmd.device |= va_arg(va, u16) & 0xf0U;
+      ata_cmd.device |= va_arg(va, u32) & 0xf0;
       break;
 
     case AP_SGLIST:
       /* scatter/gather list in SCATGATENTRY/count format */
-      sg_list = va_arg(va, void _far *);
-      sg_cnt = va_arg(va, u16);
+      sg_list = va_arg(va, void *);
+      sg_cnt = va_arg(va, u32);
       break;
 
     case AP_VADDR:
       /* virtual buffer address in addr/len format (up to 4K) */
-      sg_single.ppXferBuf = virt_to_phys(va_arg(va, void _far *));
-      sg_single.XferBufLen = va_arg(va, u16);
+      sg_single.ppXferBuf = MemPhysAdr(va_arg(va, void *));
+      sg_single.XferBufLen = va_arg(va, u32);
       sg_list = &sg_single;
       sg_cnt = 1;
@@ -169 +173 @@
     case AP_ATAPI_CMD:
       /* ATAPI command */
-      atapi_cmd = va_arg(va, void _far *);
-      atapi_cmd_len = va_arg(va, u16);
+      atapi_cmd = va_arg(va, void *);
+      atapi_cmd_len = va_arg(va, u32);
       ahci_flags |= AHCI_CMD_ATAPI;
       break;
@@ -176 +180 @@
     case AP_ATA_CMD:
       /* ATA command "pass-through" */
-      memcpy(&ata_cmd, va_arg(va, void _far *), sizeof(ATA_CMD));
+      memcpy(&ata_cmd, va_arg(va, void *), sizeof(ATA_CMD));
       break;
 
@@ -183 +187 @@
 
     default:
-      dprintf("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);
     }
@@ -212 +216 @@
 
   /* AHCI command header */
-  cmd_hdr = dma_base_virt->cmd_hdr + slot;
+  cmd_hdr = &dma_base_virt->cmd_hdr[slot];
   memset(cmd_hdr, 0x00, sizeof(*cmd_hdr));
   cmd_hdr->options  = ((d & 0x0f) << 12);
@@ -218 +222 @@
   cmd_hdr->options |= 5;           /* length of command FIS in 32-bit words */
   cmd_hdr->tbl_addr = dma_base_phys + offsetof(AHCI_PORT_DMA, cmd_tbl[slot]);
+  /* DAZ can use MemPhysAdr(&dma_base_virt->cmd_tbl[slot]), but is probably slower. */
 
   /* AHCI command table */
-  cmd_tbl = dma_base_virt->cmd_tbl + slot;
+  cmd_tbl = &dma_base_virt->cmd_tbl[slot];
   memset(cmd_tbl, 0x00, sizeof(*cmd_tbl));
   ata_cmd_to_fis(cmd_tbl->cmd_fis, &ata_cmd, d);
 
-  if (atapi_cmd != NULL) {
+  if (atapi_cmd != NULL)
+  {
     /* copy ATAPI command */
     memcpy(cmd_tbl->atapi_cmd, atapi_cmd, atapi_cmd_len);
@@ -250 +256 @@
    *    successfully mapped.
    */
-  for (i = n = 0; i < sg_cnt; i++) {
+  for (i = n = 0; i < sg_cnt; i++)
+  {
     u32 sg_addr = sg_list[i].ppXferBuf;
     u32 sg_size = sg_list[i].XferBufLen;
 
-    do {
+    do
+    {
       u32 chunk = (sg_size > AHCI_MAX_SG_ELEMENT_LEN) ? AHCI_MAX_SG_ELEMENT_LEN
                                                       : sg_size;
-      if (n >= AHCI_MAX_SG) {
+      if (n >= AHCI_MAX_SG)
+      {
         /* couldn't store all S/G elements in our DMA buffer */
-        ddprintf("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)) {
-        ddprintf("error: ata_cmd() called with unaligned S/G element(s)\n");
+      if ((sg_addr & 1) || (chunk & 1))
+      {
+        DPRINTF(0,"error: ata_cmd() called with unaligned S/G element(s)\n");
         return(ATA_CMD_UNALIGNED_ADDR);
       }
@@ -275 +285 @@
 
   /* set final S/G count in AHCI command header */
-  cmd_hdr->options |= (u32) n << 16;
-
-  if (debug >= 2) {
-    aprintf("ATA command for %d.%d.%d, slot %d:\n", ad_no(ai), p, d, slot);
-    phex(cmd_hdr, offsetof(AHCI_CMD_HDR, reserved), "cmd_hdr:   ");
-    phex(&ata_cmd, sizeof(ata_cmd), "ata_cmd:   ");
-    if (atapi_cmd != NULL) {
-      phex(atapi_cmd, atapi_cmd_len, "atapi_cmd: ");
-    }
-    if (n > 0) {
-      phex(cmd_tbl->sg_list, sizeof(*cmd_tbl->sg_list) * n, "sg_list:   ");
+  cmd_hdr->options |= n << 16;
+
+  if (D32g_DbgLevel >= 2)
+  {
+    DPRINTF(2,"ATA command for %d.%d.%d, slot %d:\n", ad_no(ai), p, d, slot);
+    dHexDump(0,cmd_hdr, offsetof(AHCI_CMD_HDR, reserved), "cmd_hdr: ");
+    dHexDump(0,&ata_cmd, sizeof(ata_cmd), "ata_cmd: ");
+    if (atapi_cmd != NULL)
+    {
+      dHexDump(0,atapi_cmd, atapi_cmd_len, "atapi_cmd: ");
+    }
+    if (n > 0)
+    {
+      dHexDump(0,cmd_tbl->sg_list, sizeof(*cmd_tbl->sg_list) * n, "sg_list: ");
     }
   }
@@ -312 +325 @@
  *       +----------------+----------------+----------------+----------------+
  */
-void ata_cmd_to_fis(u8 _far *fis, ATA_CMD _far *ata_cmd, int d)
+void ata_cmd_to_fis(u8 *fis, ATA_CMD *ata_cmd, int d)
 {
   fis[0]  = 0x27;                  /* register - host to device FIS */
@@ -344 +357 @@
  *       lists.
  */
-u16 ata_get_sg_indx(IORB_EXECUTEIO _far *io)
+u16 ata_get_sg_indx(IORB_EXECUTEIO *io)
 {
   ULONG offset = io->BlocksXferred * io->BlockSize;
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
   USHORT i;
 
-  for (i = 0; i < io->cSGList && offset > 0; i++) {
-    offset -= io->pSGList[i].XferBufLen;
+  for (i = 0; i < io->cSGList && offset > 0; i++)
+  {
+    offset -= pSGList[i].XferBufLen;
   }
 
@@ -380 +395 @@
  *       boundaries which will still fit into our HW S/G list.
  */
-void ata_max_sg_cnt(IORB_EXECUTEIO _far *io, USHORT sg_indx, USHORT sg_max,
-                    USHORT _far *sg_cnt, USHORT _far *sector_cnt)
+void ata_max_sg_cnt(IORB_EXECUTEIO *io, USHORT sg_indx, USHORT sg_max,
+                    USHORT *sg_cnt, USHORT *sector_cnt)
 {
   ULONG max_sector_cnt = 0;
@@ -387 +402 @@
   ULONG offset = 0;
   USHORT i;
-
-  for (i = sg_indx; i < io->cSGList; i++) {
-    if (i - sg_indx >= sg_max) {
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+
+  for (i = sg_indx; i < io->cSGList; i++)
+  {
+    if (i - sg_indx >= sg_max)
+    {
       /* we're beyond the number of S/G elements we can map */
       break;
     }
 
-    offset += io->pSGList[i].XferBufLen;
-    if (offset % io->BlockSize == 0) {
+    offset += pSGList[i].XferBufLen;
+    if (offset % io->BlockSize == 0)
+    {
       /* this S/G element ends on a sector boundary */
       max_sector_cnt = offset / io->BlockSize;
@@ -414 +433 @@
  * and handled by atapi_get_geometry().
  */
-int ata_get_geometry(IORBH _far *iorb, int slot)
-{
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
+int ata_get_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
   int rc;
 
   /* allocate buffer for ATA identify information */
-  if ((aws->buf = malloc(ATA_ID_WORDS * sizeof(u16))) == NULL) {
-    iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+  if ((aws->buf = MemAlloc(ATA_ID_WORDS * sizeof(u16))) == NULL)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
     return(-1);
   }
@@ -427 +447 @@
   /* request ATA identify information */
   aws->ppfunc = ata_get_geometry_pp;
-  rc = ata_cmd(ad_infos + iorb_unit_adapter(iorb),
-               iorb_unit_port(iorb),
-               iorb_unit_device(iorb),
+  rc = ata_cmd(ad_infos + iorb_unit_adapter(pIorb),
+               iorb_unit_port(pIorb),
+               iorb_unit_device(pIorb),
                slot,
                ATA_CMD_ID_ATA,
-               AP_VADDR, (void _far *) aws->buf, ATA_ID_WORDS * sizeof(u16),
+               AP_VADDR, (void *) aws->buf, ATA_ID_WORDS * sizeof(u16),
                AP_END);
 
-  if (rc != 0) {
-    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+  if (rc != 0)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
   }
 
@@ -445 +466 @@
  * geometry to the last full cylinder.
  */
-int adjust_cylinders(GEOMETRY _far *geometry, ULONG TotalSectors) {
+int adjust_cylinders(GEOMETRY *geometry, ULONG TotalSectors)
+{
   USHORT SecPerCyl;
   int rc = FALSE;
@@ -451 +473 @@
   geometry->TotalSectors = TotalSectors;
   SecPerCyl = geometry->SectorsPerTrack * geometry->NumHeads;
-  if (SecPerCyl > 0) {
+  if (SecPerCyl > 0)
+  {
     ULONG TotalCylinders  = TotalSectors / SecPerCyl;
 
     geometry->TotalSectors   = TotalCylinders * SecPerCyl;
     geometry->TotalCylinders = TotalCylinders;
-    if (TotalCylinders >> 16) {
+    if (TotalCylinders >> 16)
+    {
       geometry->TotalCylinders = 65535;
       rc = TRUE;
@@ -470 +494 @@
 #define BIOS_MAX_NUMHEADS         255
 #define BIOS_MAX_SECTORSPERTRACK   63
-void log_geom_calculate_LBA_assist(GEOMETRY _far *geometry, ULONG TotalSectors)
+void log_geom_calculate_LBA_assist(GEOMETRY *geometry, ULONG TotalSectors)
 {
   UCHAR numSpT   = BIOS_MAX_SECTORSPERTRACK;
@@ -476 +500 @@
   ULONG Cylinders;
 
-  if (TotalSectors <= (BIOS_MAX_CYLINDERS * 128 * BIOS_MAX_SECTORSPERTRACK)) {
+  if (TotalSectors <= (BIOS_MAX_CYLINDERS * 128 * BIOS_MAX_SECTORSPERTRACK))
+  {
     USHORT temp = (TotalSectors - 1) / (BIOS_MAX_CYLINDERS * BIOS_MAX_SECTORSPERTRACK);
 
@@ -485 +510 @@
   }
 
-  do {
+  do
+  {
     Cylinders = TotalSectors / (USHORT)(numHeads * numSpT);
-    if (Cylinders >> 16) {
+    if (Cylinders >> 16)
+    {
       if (numSpT < 128)
         numSpT = (numSpT << 1) | 1;
@@ -500 +527 @@
 }
 
-int check_lvm(IORBH _far *iorb, ULONG sector)
-{
-  DLA_Table_Sector *pDLA = (DLA_Table_Sector*)add_workspace(iorb)->buf;
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-  GEOMETRY _far *geometry = ((IORB_GEOMETRY _far *) iorb)->pGeometry;
-  int p = iorb_unit_port(iorb);
+int check_lvm(IORBH *pIorb, ULONG sector)
+{
+  DLA_Table_Sector *pDLA = (DLA_Table_Sector*)add_workspace(pIorb)->buf;
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
+  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->pGeometry;
+  int p = iorb_unit_port(pIorb);
   int rc;
 
   rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_READ,
-         AP_SECTOR_28, (u32) sector-1,
-         AP_COUNT, (u16) 1,
-         AP_VADDR, (void _far *) pDLA, 512,
+         AP_SECTOR_28, sector-1,
+         AP_COUNT, 1,
+         AP_VADDR, (void *)pDLA, 512,
          AP_DEVICE, 0x40,
          AP_END);
   if (rc) return 0;
 
-  ddphex(pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
+  DHEXDUMP(3,pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
 
   if ((pDLA->DLA_Signature1 == DLA_TABLE_SIGNATURE1) && (pDLA->DLA_Signature2 == DLA_TABLE_SIGNATURE2)) {
-    ddprintf("is_lvm_geometry found at sector %d\n", sector-1);
+    DPRINTF(3,"is_lvm_geometry found at sector %d\n", sector-1);
     geometry->TotalCylinders = pDLA->Cylinders;
     geometry->NumHeads = pDLA->Heads_Per_Cylinder;
@@ -536 +563 @@
  * return the saved values when ata_get_geometry() is called.
  */
-int is_lvm_geometry(IORBH _far *iorb)
-{
-  GEOMETRY _far *geometry = ((IORB_GEOMETRY _far *) iorb)->pGeometry;
+int is_lvm_geometry(IORBH *pIorb)
+{
+  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->pGeometry;
   ULONG sector;
 
   if (init_complete) return 0; /* We cannot use ahci_exec_polled_cmd() after init_complete */
 
-  if (use_lvm_info) {
+  if (use_lvm_info)
+  {
     #ifdef DEBUG
-    AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-    int p = iorb_unit_port(iorb);
-    int d = iorb_unit_device(iorb);
-    ddprintf("is_lvm_geometry (%d.%d.%d)\n", ad_no(ai), p, d);
+    AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
+    int p = iorb_unit_port(pIorb);
+    int d = iorb_unit_device(pIorb);
+    DPRINTF(3,"is_lvm_geometry (%d.%d.%d)\n", ad_no(ai), p, d);
     #endif
 
     /* First check the sector reported by the hardware */
-    if (check_lvm(iorb, geometry->SectorsPerTrack)) return 1;
-
-    for (sector = 255; sector >= 63; sector >>= 1) {
+    if (check_lvm(pIorb, geometry->SectorsPerTrack)) return 1;
+
+    for (sector = 255; sector >= 63; sector >>= 1)
+    {
       if (sector == geometry->SectorsPerTrack) continue;
-      if (check_lvm(iorb, sector)) return 1;
+      if (check_lvm(pIorb, sector)) return 1;
     }
   }
@@ -567 +596 @@
  * information to OS/2 IOCC_GEOMETRY information.
  */
-void ata_get_geometry_pp(IORBH _far *iorb)
-{
-  GEOMETRY _far *geometry = ((IORB_GEOMETRY _far *) iorb)->pGeometry;
-  USHORT geometry_len =  ((IORB_GEOMETRY _far *) iorb)->GeometryLen;
-  u16 *id_buf = add_workspace(iorb)->buf;
-  int a = iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
+void ata_get_geometry_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->pGeometry;
+  USHORT geometry_len =  ((IORB_GEOMETRY *)pIorb)->GeometryLen;
+  u16 *id_buf = add_workspace(pIorb)->buf;
+  int a = iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
   char *Method;
 
@@ -607 +636 @@
 
   /* extract total number of sectors */
-  if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x400) {
+  if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x400)
+  {
     /* 48-bit LBA supported */
-    if (ATA_CAPACITY48_H(id_buf) != 0) {
+    if (ATA_CAPACITY48_H(id_buf) != 0)
+    {
       /* more than 32 bits for number of sectors */
-      dprintf("warning: limiting disk %d.%d.%d to 2TB\n",
-              iorb_unit_adapter(iorb), iorb_unit_port(iorb),
-              iorb_unit_device(iorb));
+      DPRINTF(0,"warning: limiting disk %d.%d.%d to 2TB\n",
+              iorb_unit_adapter(pIorb), iorb_unit_port(pIorb),
+              iorb_unit_device(pIorb));
       geometry->TotalSectors = 0xffffffffUL;
-    } else {
+    }
+    else
+    {
       geometry->TotalSectors = ATA_CAPACITY48_L(id_buf);
     }
-  } else {
+  }
+  else
+  {
     /* 28-bit LBA */
     geometry->TotalSectors = ATA_CAPACITY(id_buf) & 0x0fffffffUL;
@@ -625 +660 @@
   Method = "None";
   /* fabricate the remaining geometry fields */
-  if (track_size[a][p] != 0) {
+  if (track_size[a][p] != 0)
+  {
     /* A specific track size has been requested for this port; this is
      * typically done for disks with 4K sectors to make sure partitions
@@ -634 +670 @@
     geometry->TotalCylinders  = geometry->TotalSectors / ((u32) geometry->NumHeads * (u32) geometry->SectorsPerTrack);
     Method = "Custom";
-  } else if (CUR_HEADS(id_buf) > 0 && CUR_CYLS(id_buf) > 0 && CUR_SECTORS(id_buf) > 0 &&
-             CUR_CAPACITY(id_buf) == (u32) CUR_HEADS(id_buf) * (u32) CUR_CYLS(id_buf) * (u32) CUR_SECTORS(id_buf)) {
+  }
+  else if (CUR_HEADS(id_buf) > 0 && CUR_CYLS(id_buf) > 0 && CUR_SECTORS(id_buf) > 0 &&
+             CUR_CAPACITY(id_buf) == (u32) CUR_HEADS(id_buf) * (u32) CUR_CYLS(id_buf) * (u32) CUR_SECTORS(id_buf))
+  {
     /* BIOS-supplied (aka "current") geometry values look valid */
     geometry->NumHeads        = CUR_HEADS(id_buf);
@@ -641 +679 @@
     geometry->TotalCylinders  = CUR_CYLS(id_buf);
     Method = "BIOS";
-  } else if (ATA_HEADS(id_buf) > 0 && ATA_CYLS(id_buf) > 0 && ATA_SECTORS(id_buf) > 0) {
+  }
+  else if (ATA_HEADS(id_buf) > 0 && ATA_CYLS(id_buf) > 0 && ATA_SECTORS(id_buf) > 0)
+  {
     /* ATA-supplied values for geometry look valid */
     geometry->NumHeads        = ATA_HEADS(id_buf);
@@ -647 +687 @@
     geometry->TotalCylinders  = ATA_CYLS(id_buf);
     Method = "ATA";
-  } else {
+  }
+  else
+  {
     /* use typical SCSI geometry */
     geometry->NumHeads        = 255;
@@ -655 +697 @@
   }
 
-  dprintf("Physical geometry: %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
-      (u32) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
-      (u32) (geometry->TotalSectors / 2048), Method);
+  DPRINTF(2,"Physical geometry: %d cylinders, %d heads, %d sectors per track (%dMB) (%s)\n",
+      geometry->TotalCylinders, geometry->NumHeads, geometry->SectorsPerTrack,
+      (geometry->TotalSectors / 2048), Method);
 
   /* Fixup the geometry in case the geometry reported by the BIOS is bad */
-  if (adjust_cylinders(geometry, geometry->TotalSectors)) { // cylinder overflow
+  if (adjust_cylinders(geometry, geometry->TotalSectors))
+  { // cylinder overflow
     log_geom_calculate_LBA_assist(geometry, geometry->TotalSectors);
     geometry->TotalSectors = (USHORT)(geometry->NumHeads * geometry->SectorsPerTrack) * (ULONG)geometry->TotalCylinders;
@@ -666 +709 @@
   adjust_cylinders(geometry, geometry->TotalSectors);
 
-  dprintf("Logical geometry: %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
-      (u32) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
-      (u32) (geometry->TotalSectors / 2048), Method);
-
-  if (is_lvm_geometry(iorb)) Method = "LVM";
+  DPRINTF(2,"Logical geometry: %d cylinders, %d heads, %d sectors per track (%dMB) (%s)\n",
+      geometry->TotalCylinders, geometry->NumHeads, geometry->SectorsPerTrack,
+      (geometry->TotalSectors / 2048), Method);
+
+  if (is_lvm_geometry(pIorb)) Method = "LVM";
   ad_infos[a].ports[p].devs[0].dev_info.Cylinders = geometry->TotalCylinders;
   ad_infos[a].ports[p].devs[0].dev_info.HeadsPerCylinder = geometry->NumHeads;
@@ -677 +720 @@
   ad_infos[a].ports[p].devs[0].dev_info.Method = Method;
 
-  dprintf("Reported geometry: %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
-      (u32) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
-      (u32) (geometry->TotalSectors / 2048), Method);
+  DPRINTF(2,"Reported geometry: %d cylinders, %d heads, %d sectors per track (%dMB) (%s)\n",
+      geometry->TotalCylinders, geometry->NumHeads, geometry->SectorsPerTrack,
+      (geometry->TotalSectors / 2048), Method);
 
   /* tell interrupt handler that this IORB is complete */
-  add_workspace(iorb)->complete = 1;
+  add_workspace(pIorb)->complete = 1;
 }
 
@@ -688 +731 @@
  * Test whether unit is ready.
  */
-int ata_unit_ready(IORBH _far *iorb, int slot)
+int ata_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
 {
   /* This is a NOP for ATA devices (at least right now); returning an error
@@ -694 +737 @@
    * HW command and the IORB will complete successfully.
    */
-  ((IORB_UNIT_STATUS _far *) iorb)->UnitStatus = US_READY | US_POWER;
+  ((IORB_UNIT_STATUS *)pIorb)->UnitStatus = US_READY | US_POWER;
   return(-1);
 }
@@ -701 +744 @@
  * Read sectors from AHCI device.
  */
-int ata_read(IORBH _far *iorb, int slot)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+int ata_read(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   ULONG sector = io->RBA + io->BlocksXferred;
   USHORT count = io->BlockCount - io->BlocksXferred;
   USHORT sg_indx;
   USHORT sg_cnt;
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
   int rc;
 
-  if (io->BlockCount == 0) {
+  if (io->BlockCount == 0)
+  {
     /* NOP; return -1 without error in IORB to indicate success */
     return(-1);
   }
 
-  if (add_workspace(iorb)->unaligned) {
+  if (add_workspace(pIorb)->unaligned)
+  {
     /* unaligned S/G addresses present; need to use double buffers */
-    return(ata_read_unaligned(iorb, slot));
+    return(ata_read_unaligned(pIorb, slot));
   }
 
@@ -729 +775 @@
    */
   if (io->BlocksXferred == 0 && io->cSGList == 1 &&
-      io->pSGList[0].XferBufLen > (ULONG) io->BlockCount * io->BlockSize) {
-    io->pSGList[0].XferBufLen = (ULONG) io->BlockCount * io->BlockSize;
+      pSGList[0].XferBufLen > (ULONG) io->BlockCount * io->BlockSize)
+  {
+    pSGList[0].XferBufLen = (ULONG) io->BlockCount * io->BlockSize;
   }
 
   /* prepare read command while keeping an eye on S/G count limitations */
-  do {
+  do
+  {
     sg_indx = ata_get_sg_indx(io);
     sg_cnt = io->cSGList - sg_indx;
-    if ((rc = ata_cmd_read(iorb, ai, p, d, slot, sector, count,
-                           io->pSGList + sg_indx, sg_cnt)) > 0) {
+    if ((rc = ata_cmd_read(pIorb, ai, p, d, slot, sector, count,
+                           pSGList + sg_indx, sg_cnt)) > 0)
+    {
       /* couldn't map all S/G elements */
-      ata_max_sg_cnt(io, sg_indx, (USHORT) rc, &sg_cnt, &count);
+      ata_max_sg_cnt(io, sg_indx, rc, &sg_cnt, &count);
     }
   } while (rc > 0 && sg_cnt > 0);
 
-  if (rc == 0) {
-    add_workspace(iorb)->blocks = count;
-    add_workspace(iorb)->ppfunc = ata_read_pp;
-
-  } else if (rc > 0) {
-    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
-
-  } else if (rc == ATA_CMD_UNALIGNED_ADDR) {
+  if (rc == 0)
+  {
+    add_workspace(pIorb)->blocks = count;
+    add_workspace(pIorb)->ppfunc = ata_read_pp;
+  }
+  else if (rc > 0)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SGLIST_BAD);
+  }
+  else if (rc == ATA_CMD_UNALIGNED_ADDR)
+  {
     /* unaligned S/G addresses detected; need to use double buffers */
-    add_workspace(iorb)->unaligned = 1;
-    return(ata_read_unaligned(iorb, slot));
-
-  } else {
-    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+    add_workspace(pIorb)->unaligned = 1;
+    return(ata_read_unaligned(pIorb, slot));
+
+  }
+  else
+  {
+    iorb_seterr(pIorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
   }
 
@@ -769 +823 @@
  * use a transfer buffer and copy the data manually.
  */
-int ata_read_unaligned(IORBH _far *iorb, int slot)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+int ata_read_unaligned(IORBH *pIorb, int slot)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   ULONG sector = io->RBA + io->BlocksXferred;
   SCATGATENTRY sg_single;
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
   int rc;
 
-  ddprintf("ata_read_unaligned(%d.%d.%d, %ld)\n", ad_no(ai), p, d, sector);
+  DPRINTF(3,"ata_read_unaligned(%d.%d.%d, %d)\n", ad_no(ai), p, d, sector);
 
   /* allocate transfer buffer */
-  if ((aws->buf = malloc(io->BlockSize)) == NULL) {
-    iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+  if ((aws->buf = MemAlloc(io->BlockSize)) == NULL)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
     return(-1);
   }
 
   /* prepare read command using transfer buffer */
-  sg_single.ppXferBuf = virt_to_phys(aws->buf);
+  sg_single.ppXferBuf = MemPhysAdr(aws->buf);
   sg_single.XferBufLen = io->BlockSize;
-  rc = ata_cmd_read(iorb, ai, p, d, slot, sector, 1, &sg_single, 1);
+  rc = ata_cmd_read(pIorb, ai, p, d, slot, sector, 1, &sg_single, 1);
 
   if (rc == 0) {
-    add_workspace(iorb)->blocks = 1;
-    add_workspace(iorb)->ppfunc = ata_read_pp;
+    add_workspace(pIorb)->blocks = 1;
+    add_workspace(pIorb)->ppfunc = ata_read_pp;
 
   } else if (rc > 0) {
-    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
+    iorb_seterr(pIorb, IOERR_CMD_SGLIST_BAD);
 
   } else {
-    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+    iorb_seterr(pIorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
   }
 
@@ -813 +868 @@
  * takes care of copying data from the transfer buffer for unaligned reads.
  */
-void ata_read_pp(IORBH _far *iorb)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
-
-  if (aws->unaligned) {
+void ata_read_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
+
+  if (aws->unaligned)
+  {
     /* copy transfer buffer to corresponding physical address in S/G list */
-    sg_memcpy(io->pSGList, io->cSGList,
+    sg_memcpy(pSGList, io->cSGList,
               (ULONG) io->BlocksXferred * (ULONG) io->BlockSize,
               aws->buf, io->BlockSize, BUF_TO_SG);
   }
 
-  io->BlocksXferred += add_workspace(iorb)->blocks;
-  ddprintf("ata_read_pp(): blocks transferred = %d\n", (int) io->BlocksXferred);
-
-  if (io->BlocksXferred >= io->BlockCount) {
+  io->BlocksXferred += add_workspace(pIorb)->blocks;
+  DPRINTF(3,"ata_read_pp(): blocks transferred = %d\n", io->BlocksXferred);
+
+  if (io->BlocksXferred >= io->BlockCount)
+  {
     /* we're done; tell IRQ handler the IORB is complete */
-    add_workspace(iorb)->complete = 1;
-  } else {
+    add_workspace(pIorb)->complete = 1;
+  }
+  else
+  {
     /* requeue this IORB for next iteration */
-    iorb_requeue(iorb);
+    iorb_requeue(pIorb);
   }
 }
@@ -840 +900 @@
  * Verify readability of sectors on ATA device.
  */
-int ata_verify(IORBH _far *iorb, int slot)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+int ata_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
   int rc;
 
-  if (io->BlockCount == 0) {
+  if (io->BlockCount == 0)
+  {
     /* NOP; return -1 without error in IORB to indicate success */
     return(-1);
@@ -854 +915 @@
 
   /* prepare verify command */
-  if (io->RBA >= (1UL << 28) || io->BlockCount > 256) {
+  if (io->RBA >= (1UL << 28) || io->BlockCount > 256)
+  {
     /* need LBA48 for this command */
     if (!ai->ports[p].devs[d].lba48) {
-      iorb_seterr(iorb, IOERR_RBA_LIMIT);
+      iorb_seterr(pIorb, IOERR_RBA_LIMIT);
       return(-1);
     }
     rc = ata_cmd(ai, p, d, slot, ATA_CMD_VERIFY_EXT,
-                 AP_SECTOR_48, (u32) io->RBA, (u16) 0,
-                 AP_COUNT,     (u16) io->BlockCount,
+                 AP_SECTOR_48, io->RBA, 0,
+                 AP_COUNT,     io->BlockCount,
                  AP_DEVICE,    0x40,
                  AP_END);
   } else {
     rc = ata_cmd(ai, p, d, slot, ATA_CMD_VERIFY,
-                 AP_SECTOR_28, (u32) io->RBA,
-                 AP_COUNT,     (u16) io->BlockCount & 0xffU,
+                 AP_SECTOR_28, io->RBA,
+                 AP_COUNT,     io->BlockCount & 0xffU,
                  AP_DEVICE,    0x40,
                  AP_END);
@@ -879 +941 @@
  * Write sectors to AHCI device.
  */
-int ata_write(IORBH _far *iorb, int slot)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+int ata_write(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   ULONG sector = io->RBA + io->BlocksXferred;
   USHORT count = io->BlockCount - io->BlocksXferred;
   USHORT sg_indx;
   USHORT sg_cnt;
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
   int rc;
 
-  if (io->BlockCount == 0) {
+  if (io->BlockCount == 0)
+  {
     /* NOP; return -1 without error in IORB to indicate success */
     return(-1);
   }
 
-  if (add_workspace(iorb)->unaligned) {
+  if (add_workspace(pIorb)->unaligned)
+  {
     /* unaligned S/G addresses present; need to use double buffers */
-    return(ata_write_unaligned(iorb, slot));
+    return(ata_write_unaligned(pIorb, slot));
   }
 
@@ -905 +970 @@
     sg_indx = ata_get_sg_indx(io);
     sg_cnt = io->cSGList - sg_indx;
-    if ((rc = ata_cmd_write(iorb, ai, p, d, slot, sector, count,
-                            io->pSGList + sg_indx, sg_cnt,
-                            io->Flags & XIO_DISABLE_HW_WRITE_CACHE)) > 0) {
+    if ((rc = ata_cmd_write(pIorb, ai, p, d, slot, sector, count,
+                            pSGList + sg_indx, sg_cnt,
+                            io->Flags & XIO_DISABLE_HW_WRITE_CACHE)) > 0)
+    {
       /* couldn't map all S/G elements */
       ata_max_sg_cnt(io, sg_indx, (USHORT) rc, &sg_cnt, &count);
@@ -913 +979 @@
   } while (rc > 0 && sg_cnt > 0);
 
-  if (rc == 0) {
-    add_workspace(iorb)->blocks = count;
-    add_workspace(iorb)->ppfunc = ata_write_pp;
-
-  } else if (rc > 0) {
-    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
-
-  } else if (rc == ATA_CMD_UNALIGNED_ADDR) {
+  if (rc == 0)
+  {
+    add_workspace(pIorb)->blocks = count;
+    add_workspace(pIorb)->ppfunc = ata_write_pp;
+  }
+  else if (rc > 0)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SGLIST_BAD);
+  }
+  else if (rc == ATA_CMD_UNALIGNED_ADDR)
+  {
     /* unaligned S/G addresses detected; need to use double buffers */
-    add_workspace(iorb)->unaligned = 1;
-    return(ata_write_unaligned(iorb, slot));
-
-  } else {
-    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+    add_workspace(pIorb)->unaligned = 1;
+    return(ata_write_unaligned(pIorb, slot));
+  }
+  else
+  {
+    iorb_seterr(pIorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
   }
 
@@ -938 +1008 @@
  * use a transfer buffer and copy the data manually.
  */
-int ata_write_unaligned(IORBH _far *iorb, int slot)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+int ata_write_unaligned(IORBH *pIorb, int slot)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   ULONG sector = io->RBA + io->BlocksXferred;
   SCATGATENTRY sg_single;
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
   int rc;
 
-  ddprintf("ata_write_unaligned(%d.%d.%d, %ld)\n", ad_no(ai), p, d, sector);
+  DPRINTF(3,"ata_write_unaligned(%d.%d.%d, %d)\n", ad_no(ai), p, d, sector);
 
   /* allocate transfer buffer */
-  if ((aws->buf = malloc(io->BlockSize)) == NULL) {
-    iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+  if ((aws->buf = MemAlloc(io->BlockSize)) == NULL)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
     return(-1);
   }
 
   /* copy next sector from S/G list to transfer buffer */
-  sg_memcpy(io->pSGList, io->cSGList,
+  sg_memcpy(pSGList, io->cSGList,
             (ULONG) io->BlocksXferred * (ULONG) io->BlockSize,
             aws->buf, io->BlockSize, SG_TO_BUF);
 
   /* prepare write command using transfer buffer */
-  sg_single.ppXferBuf = virt_to_phys(aws->buf);
+  sg_single.ppXferBuf = MemPhysAdr(aws->buf);
   sg_single.XferBufLen = io->BlockSize;
-  rc = ata_cmd_write(iorb, ai, p, d, slot, sector, 1, &sg_single, 1,
+  rc = ata_cmd_write(pIorb, ai, p, d, slot, sector, 1, &sg_single, 1,
                      io->Flags & XIO_DISABLE_HW_WRITE_CACHE);
 
-  if (rc == 0) {
-    add_workspace(iorb)->blocks = 1;
-    add_workspace(iorb)->ppfunc = ata_write_pp;
-
-  } else if (rc > 0) {
-    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
-
-  } else {
-    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+  if (rc == 0)
+  {
+    add_workspace(pIorb)->blocks = 1;
+    add_workspace(pIorb)->ppfunc = ata_write_pp;
+  }
+  else if (rc > 0)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SGLIST_BAD);
+  }
+  else
+  {
+    iorb_seterr(pIorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
   }
 
@@ -988 +1063 @@
  * transferred, requeues the IORB to process the remaining sectors.
  */
-void ata_write_pp(IORBH _far *iorb)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
-
-  io->BlocksXferred += add_workspace(iorb)->blocks;
-  ddprintf("ata_write_pp(): blocks transferred = %d\n", (int) io->BlocksXferred);
-
-  if (io->BlocksXferred >= io->BlockCount) {
+void ata_write_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+
+  io->BlocksXferred += add_workspace(pIorb)->blocks;
+  DPRINTF(3,"ata_write_pp(): blocks transferred = %d\n", io->BlocksXferred);
+
+  if (io->BlocksXferred >= io->BlockCount)
+  {
     /* we're done; tell IRQ handler the IORB is complete */
-    add_workspace(iorb)->complete = 1;
-  } else {
+    add_workspace(pIorb)->complete = 1;
+  }
+  else
+  {
     /* requeue this IORB for next iteration */
-    iorb_requeue(iorb);
+    iorb_requeue(pIorb);
   }
 }
@@ -1007 +1085 @@
  * Execute ATA command.
  */
-int ata_execute_ata(IORBH _far *iorb, int slot)
-{
-  IORB_ADAPTER_PASSTHRU _far *apt = (IORB_ADAPTER_PASSTHRU _far *) iorb;
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+int ata_execute_ata(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  IORB_ADAPTER_PASSTHRU *apt = (IORB_ADAPTER_PASSTHRU *)pIorb;
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(apt->pSGList);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
   int rc;
 
-  if (apt->ControllerCmdLen != sizeof(ATA_CMD)) {
-    iorb_seterr(iorb, IOERR_CMD_SYNTAX);
+  if (apt->ControllerCmdLen != sizeof(ATA_CMD))
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SYNTAX);
     return(-1);
   }
 
   rc = ata_cmd(ai, p, d, slot, 0,
-               AP_SGLIST,   apt->pSGList, apt->cSGList,
-               AP_ATA_CMD,  apt->pControllerCmd,
+               AP_SGLIST,   pSGList, apt->cSGList,
+               AP_ATA_CMD,  Far16ToFlat(apt->pControllerCmd),
                AP_WRITE,    !(apt->Flags & PT_DIRECTION_IN),
                AP_END);
 
-  if (rc == 0) {
-    add_workspace(iorb)->ppfunc = ata_execute_ata_pp;
+  if (rc == 0)
+  {
+    add_workspace(pIorb)->ppfunc = ata_execute_ata_pp;
   }
 
@@ -1040 +1121 @@
  * See ata_cmd_to_fis() for an explanation of the mapping.
  */
-void ata_execute_ata_pp(IORBH _far *iorb)
-{
-  AHCI_PORT_DMA _far *dma_base;
-  ATA_CMD _far *cmd;
+void ata_execute_ata_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  AHCI_PORT_DMA *dma_base;
+  ATA_CMD *cmd;
   AD_INFO *ai;
-  u8 _far *fis;
+  u8 *fis;
   int p;
 
   /* get address of D2H FIS */
-  ai = ad_infos + iorb_unit_adapter(iorb);
-  p = iorb_unit_port(iorb);
+  ai = ad_infos + iorb_unit_adapter(pIorb);
+  p = iorb_unit_port(pIorb);
   dma_base = port_dma_base(ai, p);
   fis = dma_base->rx_fis + 0x40;
 
-  if (fis[0] != 0x34) {
+  if (fis[0] != 0x34)
+  {
     /* this is not a D2H FIS - give up silently */
-    ddprintf("ata_execute_ata_pp(): D2H FIS type incorrect: %d\n", fis[0]);
-    add_workspace(iorb)->complete = 1;
+    DPRINTF(3,"ata_execute_ata_pp(): D2H FIS type incorrect: %d\n", fis[0]);
+    add_workspace(pIorb)->complete = 1;
     return;
   }
 
   /* map D2H FIS to the original ATA controller command structure */
-  cmd = (ATA_CMD _far *) ((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd;
+  cmd = (ATA_CMD *)Far16ToFlat(((IORB_ADAPTER_PASSTHRU*)pIorb)->pControllerCmd);
 
   cmd->cmd      = fis[2];
@@ -1077 +1159 @@
                 | ((u16) fis[13] << 8);
 
-  dphex(cmd, sizeof(*cmd), "ahci_execute_ata_pp(): cmd after completion:\n");
+  DHEXDUMP(0,cmd, sizeof(*cmd), "ahci_execute_ata_pp(): cmd after completion:\n");
 
   /* signal completion to interrupt handler */
-  add_workspace(iorb)->complete = 1;
+  add_workspace(pIorb)->complete = 1;
 }
 
@@ -1099 +1181 @@
  *     else with a generic error code.
  */
-int ata_req_sense(IORBH _far *iorb, int slot)
-{
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-  u8 _far *port_mmio = port_base(ai, iorb_unit_port(iorb));
+int ata_req_sense(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
+  u8 *port_mmio = port_base(ai, iorb_unit_port(pIorb));
   u32 tf_data = readl(port_mmio + PORT_TFDATA);
-  u8 err = (u8) (tf_data >> 8);
-  u8 sts = (u8) (tf_data);
-
-  if (sts & ATA_ERR) {
-    if (sts & ATA_DF) {
+  u8 err = (tf_data >> 8);
+  u8 sts = (tf_data);
+
+  if (sts & ATA_ERR)
+  {
+    if (sts & ATA_DF)
+    {
       /* there is a device-specific error condition */
-      if (err & ATA_ICRC) {
-        iorb_seterr(iorb, IOERR_ADAPTER_DEVICEBUSCHECK);
-      } else if (err & ATA_UNC) {
-        iorb_seterr(iorb, IOERR_MEDIA);
-      } else if (err & ATA_IDNF) {
-        iorb_seterr(iorb, IOERR_RBA_ADDRESSING_ERROR);
-      } else {
-        iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
+      if (err & ATA_ICRC)
+      {
+        iorb_seterr(pIorb, IOERR_ADAPTER_DEVICEBUSCHECK);
       }
-
-    } else {
-      iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
-    }
-  } else {
+      else if (err & ATA_UNC)
+      {
+        iorb_seterr(pIorb, IOERR_MEDIA);
+      }
+      else if (err & ATA_IDNF)
+      {
+        iorb_seterr(pIorb, IOERR_RBA_ADDRESSING_ERROR);
+      }
+      else
+      {
+        iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
+      }
+
+    }
+    else
+    {
+      iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
+    }
+  }
+  else
+  {
     /* this function only gets called when we received an error interrupt */
-    iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
+    iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
   }
 
@@ -1162 +1257 @@
  * device and the paramters set from above (NCQ, etc).
  */
-static int ata_cmd_read(IORBH _far *iorb, AD_INFO *ai, int p, int d, int slot,
-                        ULONG sector, ULONG count, SCATGATENTRY _far *sg_list,
+static int ata_cmd_read(IORBH *pIorb, AD_INFO *ai, int p, int d, int slot,
+                        ULONG sector, ULONG count, SCATGATENTRY *sg_list,
                         ULONG sg_cnt)
 {
   int rc;
 
-  if (sector >= (1UL << 28) || count > 256 || add_workspace(iorb)->is_ncq) {
+  if (sector >= (1UL << 28) || count > 256 || add_workspace(pIorb)->is_ncq)
+  {
     /* need LBA48 for this command */
-    if (!ai->ports[p].devs[d].lba48) {
-      iorb_seterr(iorb, IOERR_RBA_LIMIT);
+    if (!ai->ports[p].devs[d].lba48)
+    {
+      iorb_seterr(pIorb, IOERR_RBA_LIMIT);
       return(-1);
     }
-    if (add_workspace(iorb)->is_ncq) {
+    if (add_workspace(pIorb)->is_ncq)
+    {
       /* use NCQ read; count goes into feature register, tag into count! */
       rc = ata_cmd(ai, p, d, slot, ATA_CMD_FPDMA_READ,
-                   AP_SECTOR_48, (u32) sector, (u16) 0,
-                   AP_FEATURES,  (u16) count,
-                   AP_COUNT,     (u16) (slot << 3), /* tag == slot */
-                   AP_SGLIST,    sg_list, (u16) sg_cnt,
+                   AP_SECTOR_48, sector, 0,
+                   AP_FEATURES,  count,
+                   AP_COUNT,     (slot << 3), /* tag == slot */
+                   AP_SGLIST,    sg_list, sg_cnt,
                    AP_DEVICE,    0x40,
                    AP_END);
-    } else {
+    }
+    else
+    {
       rc = ata_cmd(ai, p, d, slot, ATA_CMD_READ_EXT,
-                   AP_SECTOR_48, (u32) sector, (u16) 0,
-                   AP_COUNT,     (u16) count,
-                   AP_SGLIST,    sg_list, (u16) sg_cnt,
+                   AP_SECTOR_48, sector, 0,
+                   AP_COUNT,     count,
+                   AP_SGLIST,    sg_list, sg_cnt,
                    AP_DEVICE,    0x40,
                    AP_END);
     }
 
-  } else {
+  }
+  else
+  {
     rc = ata_cmd(ai, p, d, slot, ATA_CMD_READ,
-                 AP_SECTOR_28, (u32) sector,
-                 AP_COUNT,     (u16) count & 0xffU,
-                 AP_SGLIST,    sg_list, (u16) sg_cnt,
+                 AP_SECTOR_28, sector,
+                 AP_COUNT,     count & 0xffU,
+                 AP_SGLIST,    sg_list, sg_cnt,
                  AP_DEVICE,    0x40,
                  AP_END);
@@ -1208 +1310 @@
  * device and the paramters set from above (NCQ, etc)
  */
-static int ata_cmd_write(IORBH _far *iorb, AD_INFO *ai, int p, int d, int slot,
-                         ULONG sector, ULONG count, SCATGATENTRY _far *sg_list,
+static int ata_cmd_write(IORBH *pIorb, AD_INFO *ai, int p, int d, int slot,
+                         ULONG sector, ULONG count, SCATGATENTRY *sg_list,
                          ULONG sg_cnt, int write_through)
 {
   int rc;
 
-  if (sector >= (1UL << 28) || count > 256 || add_workspace(iorb)->is_ncq) {
+  if (sector >= (1UL << 28) || count > 256 || add_workspace(pIorb)->is_ncq)
+  {
     /* need LBA48 for this command */
-    if (!ai->ports[p].devs[d].lba48) {
-      iorb_seterr(iorb, IOERR_RBA_LIMIT);
+    if (!ai->ports[p].devs[d].lba48)
+    {
+      iorb_seterr(pIorb, IOERR_RBA_LIMIT);
       return(-1);
     }
-    if (add_workspace(iorb)->is_ncq) {
+    if (add_workspace(pIorb)->is_ncq)
+    {
       /* use NCQ write; count goes into feature register, tag into count! */
       rc = ata_cmd(ai, p, d, slot, ATA_CMD_FPDMA_WRITE,
-                   AP_SECTOR_48, (u32) sector, (u16) 0,
-                   AP_FEATURES,  (u16) count,
+                   AP_SECTOR_48, sector, 0,
+                   AP_FEATURES,  count,
                    /* tag = slot */
-                   AP_COUNT,     (u16) (slot << 3),
-                   AP_SGLIST,    sg_list, (u16) sg_cnt,
+                   AP_COUNT,     (slot << 3),
+                   AP_SGLIST,    sg_list, sg_cnt,
                    AP_DEVICE,    0x40,
                    /* force unit access */
@@ -1233 +1338 @@
                    AP_WRITE,     1,
                    AP_END);
-    } else {
+    }
+    else
+    {
       rc = ata_cmd(ai, p, d, slot, ATA_CMD_WRITE_EXT,
-                   AP_SECTOR_48, (u32) sector, (u16) 0,
-                   AP_COUNT,     (u16) count,
-                   AP_SGLIST,    sg_list, (u16) sg_cnt,
+                   AP_SECTOR_48, sector, 0,
+                   AP_COUNT,     count,
+                   AP_SGLIST,    sg_list, sg_cnt,
                    AP_DEVICE,    0x40,
                    AP_WRITE,     1,
                    AP_END);
     }
-
-  } else {
+  }
+  else
+  {
     rc = ata_cmd(ai, p, d, slot, ATA_CMD_WRITE,
-                 AP_SECTOR_28, (u32) sector,
-                 AP_COUNT,     (u16) count & 0xffU,
-                 AP_SGLIST,    sg_list, (u16) sg_cnt,
+                 AP_SECTOR_28, sector,
+                 AP_COUNT,     count & 0xffU,
+                 AP_SGLIST,    sg_list, sg_cnt,
                  AP_DEVICE,    0x40,
                  AP_WRITE,     1,
@@ -1255 +1363 @@
   return(rc);
 }
+
+/******************************************************************************
+ * Copy block from S/G list to virtual address or vice versa.
+ */
+void sg_memcpy(SCATGATENTRY *sg_list, USHORT sg_cnt, ULONG sg_off,
+               void *buf, USHORT len, SG_MEMCPY_DIRECTION dir)
+{
+  USHORT i;
+  USHORT l;
+  ULONG phys_addr;
+  ULONG pos = 0;
+  char *p;
+
+  /* walk through S/G list to find the elements involved in the operation */
+  for (i = 0; i < sg_cnt && len > 0; i++)
+  {
+    if (pos <= sg_off && pos + sg_list[i].XferBufLen > sg_off)
+    {
+      /* this S/G element intersects with the block to be copied */
+      phys_addr = sg_list[i].ppXferBuf + (sg_off - pos);
+      if ((l = sg_list[i].XferBufLen - (sg_off - pos)) > len)
+      {
+        l = len;
+      }
+
+      if (Dev32Help_PhysToLin(phys_addr, l, (PVOID) &p))
+      {
+        panic("sg_memcpy(): DevHelp_PhysToLin() failed");
+      }
+      if (dir == SG_TO_BUF)
+      {
+        memcpy(buf, p, l);
+      }
+      else
+      {
+        memcpy(p, buf, l);
+      }
+      sg_off += l;
+      buf = (char *) buf + l;
+      len -= l;
+    }
+
+    pos += sg_list[i].XferBufLen;
+  }
+}
+
+/******************************************************************************
+ * Halt processing by submitting an internal error. This is a last resort and
+ * should only be called when the system state is corrupt.
+ */
+void panic(char *msg)
+{
+  Dev32Help_InternalError(msg, strlen(msg));
+}
+

trunk/src/os2ahci/ata.h

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -431 +432 @@
   AP_SECTOR_48,    /* [u32, u16]          48-bit sector address              */
   AP_DEVICE,       /* [u16]               ATA cmd "device" field             */
-  AP_SGLIST,       /* [void _far *, u16]  buffer S/G (SCATGATENTRY/count)    */
-  AP_VADDR,        /* [void _far *, u16]  buffer virtual address (buf/len)   */
+  AP_SGLIST,       /* [void *, u16]  buffer S/G (SCATGATENTRY/count)    */
+  AP_VADDR,        /* [void *, u16]  buffer virtual address (buf/len)   */
   AP_WRITE,        /* [u16]               if != 0, data is written to device */
   AP_AHCI_FLAGS,   /* [u16]               AHCI command header flags          */
-  AP_ATAPI_CMD,    /* [void _far *, u16]  ATAPI command (CDB) and length     */
-  AP_ATA_CMD,      /* [void _far *]       ATA command (fixed len)            */
+  AP_ATAPI_CMD,    /* [void *, u16]  ATAPI command (CDB) and length     */
+  AP_ATA_CMD,      /* [void *]       ATA command (fixed len)            */
   AP_END           /* []                  end of variable argument list      */
 } ATA_PARM;
@@ -494 +495 @@
 extern int       v_ata_cmd                (AD_INFO *ai, int port, int device,
                                            int slot, int cmd, va_list va);
-extern void      ata_cmd_to_fis           (u8 _far *fis, ATA_CMD _far *cmd,
+extern void      ata_cmd_to_fis           (u8 *fis, ATA_CMD *cmd,
                                            int device);
-extern USHORT    ata_get_sg_indx          (IORB_EXECUTEIO _far *io);
-extern void      ata_max_sg_cnt           (IORB_EXECUTEIO _far *io,
+extern USHORT    ata_get_sg_indx          (IORB_EXECUTEIO *io);
+extern void      ata_max_sg_cnt           (IORB_EXECUTEIO *io,
                                            USHORT sg_indx, USHORT sg_max,
-                                           USHORT _far *sg_cnt,
-                                           USHORT _far *sector_cnt);
-
-extern int       ata_get_geometry         (IORBH _far *iorb, int slot);
-extern void      ata_get_geometry_pp      (IORBH _far *iorb);
-extern int       ata_unit_ready           (IORBH _far *iorb, int slot);
-extern int       ata_read                 (IORBH _far *iorb, int slot);
-extern int       ata_read_unaligned       (IORBH _far *iorb, int slot);
-extern void      ata_read_pp              (IORBH _far *iorb);
-extern int       ata_verify               (IORBH _far *iorb, int slot);
-extern int       ata_write                (IORBH _far *iorb, int slot);
-extern int       ata_write_unaligned      (IORBH _far *iorb, int slot);
-extern void      ata_write_pp             (IORBH _far *iorb);
-extern int       ata_execute_ata          (IORBH _far *iorb, int slot);
-extern void      ata_execute_ata_pp       (IORBH _far *iorb);
-extern int       ata_req_sense            (IORBH _far *iorb, int slot);
+                                           USHORT *sg_cnt,
+                                           USHORT *sector_cnt);
+
+extern int ata_get_geometry(IORBH FAR16DATA *iorb, IORBH *pIorb, int slot);
+extern void ata_get_geometry_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern int ata_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int ata_read(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int ata_read_unaligned(IORBH *pIorb, int slot);
+extern void ata_read_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern int ata_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int ata_write(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int ata_write_unaligned(IORBH *pIorb, int slot);
+extern void ata_write_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern int ata_execute_ata(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern void ata_execute_ata_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern int ata_req_sense(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
 
 extern char     *ata_dev_name             (u16 *id_buf);

trunk/src/os2ahci/atapi.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -38 +39 @@
 /* -------------------------- function prototypes -------------------------- */
 
-static void atapi_req_sense_pp      (IORBH _far *iorb);
-static int atapi_pad_cdb            (u8 _far *cmd_in, u16 cmd_in_len,
-                                     u8 _far *cmd_out, u16 _far *cmd_out_len);
+static void atapi_req_sense_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+static int atapi_pad_cdb(u8 *cmd_in, u16 cmd_in_len, u8 *cmd_out, u16 *cmd_out_len);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -49 +49 @@
  * Get device or media geometry. This function is not expected to be called.
  */
-int atapi_get_geometry(IORBH _far *iorb, int slot)
-{
-  dprintf("atapi_get_geometry called\n");
-  iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
+int atapi_get_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  DPRINTF(2,"atapi_get_geometry called\n");
+  iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
 }
@@ -59 +59 @@
  * Test whether unit is ready. This function is not expected to be called.
  */
-int atapi_unit_ready(IORBH _far *iorb, int slot)
-{
-  dprintf("atapi_unit_ready called\n");
-  iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
+int atapi_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  DPRINTF(2,"atapi_unit_ready called\n");
+  iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
 }
@@ -69 +69 @@
  * Read sectors from AHCI device.
  */
-int atapi_read(IORBH _far *iorb, int slot)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
+int atapi_read(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
   ATAPI_CDB_12 cdb;
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   USHORT count = io->BlockCount - io->BlocksXferred;
   USHORT sg_indx;
   USHORT sg_cnt;
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
   int rc;
 
-  if (io->BlockCount == 0) {
+  if (io->BlockCount == 0)
+  {
     /* NOP; return -1 without error in IORB to indicate success */
     return(-1);
   }
 
-  if (add_workspace(iorb)->unaligned) {
+  if (add_workspace(pIorb)->unaligned)
+  {
     /* unaligned S/G addresses present; need to use double buffers */
-    return(atapi_read_unaligned(iorb, slot));
+    return(atapi_read_unaligned(pIorb, slot));
   }
 
@@ -101 +104 @@
   do {
     /* update sector count (might have been updated due to S/G limitations) */
-    SET_CDB_32(cdb.trans_len, (u32) count);
+    SET_CDB_32(cdb.trans_len, count);
 
     /* update S/G count and index */
@@ -109 +112 @@
     /* issue command */
     rc = ata_cmd(ai, p, d, slot, ATA_CMD_PACKET,
-                 AP_ATAPI_CMD, (void _far *) &cdb, sizeof(cdb),
-                 AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
+                 AP_ATAPI_CMD, (void *) &cdb, sizeof(cdb),
+                 AP_SGLIST,    pSGList + sg_indx, sg_cnt,
                  AP_DEVICE,    0x40,
                  AP_FEATURES,  ATAPI_FEAT_DMA | ATAPI_FEAT_DMA_TO_HOST,
                  AP_END);
 
-    if (rc > 0) {
+    if (rc > 0)
+    {
       /* couldn't map all S/G elements */
       ata_max_sg_cnt(io, sg_indx, (USHORT) rc, &sg_cnt, &count);
@@ -121 +125 @@
   } while (rc > 0 && sg_cnt > 0);
 
-  if (rc == 0) {
-    add_workspace(iorb)->blocks = count;
-    add_workspace(iorb)->ppfunc = ata_read_pp;
-
-  } else if (rc > 0) {
-    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
-
-  } else if (rc == ATA_CMD_UNALIGNED_ADDR) {
+  if (rc == 0)
+  {
+    add_workspace(pIorb)->blocks = count;
+    add_workspace(pIorb)->ppfunc = ata_read_pp;
+  }
+  else if (rc > 0)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SGLIST_BAD);
+  }
+  else if (rc == ATA_CMD_UNALIGNED_ADDR)
+  {
     /* unaligned S/G addresses detected; need to use double buffers */
-    add_workspace(iorb)->unaligned = 1;
-    return(atapi_read_unaligned(iorb, slot));
-
-  } else {
-    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+    add_workspace(pIorb)->unaligned = 1;
+    return(atapi_read_unaligned(pIorb, slot));
+  }
+  else
+  {
+    iorb_seterr(pIorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
   }
 
@@ -146 +154 @@
  * use a transfer buffer and copy the data manually.
  */
-int atapi_read_unaligned(IORBH _far *iorb, int slot)
-{
-  IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
+int atapi_read_unaligned(IORBH *pIorb, int slot)
+{
+  IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
   ATAPI_CDB_12 cdb;
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
   int rc;
 
@@ -166 +174 @@
 
   /* allocate transfer buffer */
-  if ((aws->buf = malloc(io->BlockSize)) == NULL) {
-    iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+  if ((aws->buf = MemAlloc(io->BlockSize)) == NULL)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
     return(-1);
   }
 
   rc = ata_cmd(ai, p, d, slot, ATA_CMD_PACKET,
-               AP_ATAPI_CMD, (void _far *) &cdb, sizeof(cdb),
-               AP_VADDR,     (void _far *) aws->buf, (u16) io->BlockSize,
+               AP_ATAPI_CMD, (void *) &cdb, sizeof(cdb),
+               AP_VADDR,     (void *) aws->buf, io->BlockSize,
                AP_DEVICE,    0x40,
                AP_FEATURES,  ATAPI_FEAT_DMA | ATAPI_FEAT_DMA_TO_HOST,
                AP_END);
 
-  if (rc == 0) {
-    add_workspace(iorb)->blocks = 1;
-    add_workspace(iorb)->ppfunc = ata_read_pp;
-
-  } else if (rc > 0) {
-    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
-
-  } else {
-    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+  if (rc == 0)
+  {
+    add_workspace(pIorb)->blocks = 1;
+    add_workspace(pIorb)->ppfunc = ata_read_pp;
+
+  }
+  else if (rc > 0)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SGLIST_BAD);
+
+  }
+  else
+  {
+    iorb_seterr(pIorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
   }
 
@@ -196 +210 @@
  * to be called.
  */
-int atapi_verify(IORBH _far *iorb, int slot)
-{
-  ddprintf("atapi_verify called\n");
-  iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
+int atapi_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  DPRINTF(3,"atapi_verify called\n");
+  iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
 }
@@ -206 +220 @@
  * Write sectors to AHCI device. This function is not expected to be called.
  */
-int atapi_write(IORBH _far *iorb, int slot)
-{
-  ddprintf("atapi_write called\n");
-  iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
+int atapi_write(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  DPRINTF(3,"atapi_write called\n");
+  iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
 }
@@ -216 +230 @@
  * Execute ATAPI command.
  */
-int atapi_execute_cdb(IORBH _far *iorb, int slot)
-{
-  IORB_ADAPTER_PASSTHRU _far *pt = (IORB_ADAPTER_PASSTHRU _far *) iorb;
+int atapi_execute_cdb(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  IORB_ADAPTER_PASSTHRU *pt = (IORB_ADAPTER_PASSTHRU *)pIorb;
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(pt->pSGList);
   int rc;
   u8 cdb[ATAPI_MAX_CDB_LEN];
   u16 cdb_len;
 
-  if (pt->ControllerCmdLen > ATAPI_MAX_CDB_LEN) {
-    iorb_seterr(iorb, IOERR_CMD_SYNTAX);
+  if (pt->ControllerCmdLen > ATAPI_MAX_CDB_LEN)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SYNTAX);
     return -1;
   }
   /* AHCI requires 12 or 16 byte commands */
-  atapi_pad_cdb(pt->pControllerCmd, pt->ControllerCmdLen,
-                (u8 _far *) cdb, (u16 _far *) &cdb_len);
-
-  if (cdb[0] == 0x12 || cdb[0] == 0x5a) {
+  atapi_pad_cdb(Far16ToFlat(pt->pControllerCmd), pt->ControllerCmdLen,
+                (u8 *) cdb, (u16 *) &cdb_len);
+
+  if (cdb[0] == 0x12 || cdb[0] == 0x5a)
+  {
     /* somebody sets the direction flag incorrectly for those commands */
     pt->Flags |= PT_DIRECTION_IN;
@@ -240 +257 @@
    * mechanism:" -- Storage Device Driver Reference, Scatter/Gather Lists
    */
-  rc = ata_cmd(ad_infos + iorb_unit_adapter(iorb), iorb_unit_port(iorb),
-               iorb_unit_device(iorb), slot, ATA_CMD_PACKET,
-               AP_ATAPI_CMD, (void _far *) cdb, cdb_len,
-               AP_SGLIST, pt->pSGList, pt->cSGList,
+  rc = ata_cmd(ad_infos + iorb_unit_adapter(pIorb), iorb_unit_port(pIorb),
+               iorb_unit_device(pIorb), slot, ATA_CMD_PACKET,
+               AP_ATAPI_CMD, (void *)cdb, cdb_len,
+               AP_SGLIST, pSGList, pt->cSGList,
                AP_WRITE, !(pt->Flags & PT_DIRECTION_IN),
                AP_FEATURES, ATAPI_FEAT_DMA,
@@ -249 +266 @@
                AP_END);
 
-  if (rc) {
-    iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
+  if (rc)
+  {
+    iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
   }
 
@@ -266 +284 @@
  *
  */
-int atapi_req_sense(IORBH _far *iorb, int slot)
-{
-  SCSI_STATUS_BLOCK _far *ssb;
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
+int atapi_req_sense(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
+{
+  SCSI_STATUS_BLOCK *ssb;
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
   int rc;
   u8 cdb[ATAPI_MIN_CDB_LEN];
-  ATAPI_CDB_6 _far *pcdb = (ATAPI_CDB_6 _far *) cdb;
+  ATAPI_CDB_6 *pcdb = (ATAPI_CDB_6 *) cdb;
   size_t sense_buf_len = ATAPI_SENSE_LEN;
 
-  dprintf("atapi_req_sense\n");
-
-  if ((iorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
-      iorb->StatusBlockLen >= sizeof(*ssb) && iorb->pStatusBlock != 0) {
+  DPRINTF(2,"atapi_req_sense\n");
+
+  if ((pIorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
+      pIorb->StatusBlockLen >= sizeof(*ssb) && pIorb->pStatusBlock != 0)
+  {
+    ULONG ulTmp;
+
+    ulTmp = (CastFar16ToULONG(vIorb) & 0xffff0000) + pIorb->pStatusBlock;
+    ssb = (SCSI_STATUS_BLOCK *)Far16ToFlat(CastULONGToFar16(ulTmp));
 
     /* don't request sense data if caller asked us not to; the flag
      * STATUS_DISABLE_REQEST_SENSE is not defined in the old DDK we've been
      * using so we'll use the hard-coded value (0x0008) */
-    ssb = (SCSI_STATUS_BLOCK _far *) (((u32) iorb & 0xffff0000U) +
-                                       (u16) iorb->pStatusBlock);
-    if (ssb->Flags & 0x0008U) {
-      iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
+    if (ssb->Flags & 0x0008U)
+    {
+      iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
       return(-1);
     }
@@ -292 +314 @@
     /* if the sense buffer requested is larger than our default, adjust
      * the length accordingly to satisfy the caller's requirements. */
-    if (ssb->SenseData != NULL && ssb->ReqSenseLen > sense_buf_len) {
+    if (ssb->SenseData != NULL && ssb->ReqSenseLen > sense_buf_len)
+    {
       sense_buf_len = ssb->ReqSenseLen;
     }
@@ -298 +321 @@
 
   /* allocate sense buffer in ADD workspace */
-  if ((aws->buf = malloc(sense_buf_len)) == NULL) {
-    iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+  if ((aws->buf = MemAlloc(sense_buf_len)) == NULL)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
     return(-1);
   }
@@ -310 +334 @@
 
   aws->ppfunc = atapi_req_sense_pp;
-  rc = ata_cmd(ad_infos + iorb_unit_adapter(iorb),
-               iorb_unit_port(iorb),
-               iorb_unit_device(iorb),
+  rc = ata_cmd(ad_infos + iorb_unit_adapter(pIorb),
+               iorb_unit_port(pIorb),
+               iorb_unit_device(pIorb),
                slot,
                ATA_CMD_PACKET,
-               AP_ATAPI_CMD, (void _far*) cdb, sizeof(cdb),
-               AP_VADDR, (void _far *) aws->buf, sense_buf_len,
+               AP_ATAPI_CMD, (void *)cdb, sizeof(cdb),
+               AP_VADDR, (void *)aws->buf, sense_buf_len,
                AP_FEATURES,  ATAPI_FEAT_DMA,
                AP_END);
 
-  if (rc > 0) {
-    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
-
-  } else if (rc < 0) {
+  if (rc > 0)
+  {
+    iorb_seterr(pIorb, IOERR_CMD_SGLIST_BAD);
+  }
+  else if (rc < 0)
+  {
     /* we failed to get info about an error -> return
      * non specific device error
      */
-    iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
+    iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
   }
 
@@ -337 +363 @@
  * data returned and maps sense info to IORB error info.
  */
-static void atapi_req_sense_pp(IORBH _far *iorb)
-{
-  SCSI_STATUS_BLOCK _far *ssb;
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
+static void atapi_req_sense_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  SCSI_STATUS_BLOCK *ssb;
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
   ATAPI_SENSE_DATA *psd = (ATAPI_SENSE_DATA *) aws->buf;
 
-  dphex(psd, sizeof(*psd), "sense buffer:\n");
-
-  if ((iorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
-      iorb->StatusBlockLen >= sizeof(*ssb) && iorb->pStatusBlock != 0) {
+  DHEXDUMP(0,psd, sizeof(*psd), "sense buffer:\n");
+
+  if ((pIorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
+      pIorb->StatusBlockLen >= sizeof(*ssb) && pIorb->pStatusBlock != 0)
+  {
+    ULONG ulTmp;
 
     /* copy sense data to IORB */
-    ssb = (SCSI_STATUS_BLOCK _far *) (((u32) iorb & 0xffff0000U) +
-                                       (u16) iorb->pStatusBlock);
+    ulTmp = (CastFar16ToULONG(vIorb) & 0xffff0000) + pIorb->pStatusBlock;
+    ssb = (SCSI_STATUS_BLOCK *)Far16ToFlat(CastULONGToFar16(ulTmp));
     ssb->AdapterErrorCode = 0;
     ssb->TargetStatus = SCSI_STAT_CHECKCOND;
@@ -356 +384 @@
     memset(ssb->AdapterDiagInfo, 0x00, sizeof(ssb->AdapterDiagInfo));
 
-    if (ssb->SenseData != NULL) {
+    if (ssb->SenseData != NULL)
+    {
       memcpy(ssb->SenseData, psd, ssb->ReqSenseLen);
       ssb->Flags |= STATUS_SENSEDATA_VALID;
     }
-    iorb->Status |= IORB_STATUSBLOCK_AVAIL;
+    pIorb->Status |= IORB_STATUSBLOCK_AVAIL;
   }
 
   /* map sense data to some IOERR_ value */
-  switch (ATAPI_GET_SENSE(psd)) {
-
+  switch (ATAPI_GET_SENSE(psd))
+  {
   case ASENSE_NO_SENSE:
   case ASENSE_RECOVERED_ERROR:
     /* no error; this shouldn't happen because we'll only call
      * atapi_req_sense() if we received an error interrupt */
-    iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
+    iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
     break;
 
   case ASENSE_NOT_READY:
-    iorb_seterr(iorb, IOERR_UNIT_NOT_READY);
+    iorb_seterr(pIorb, IOERR_UNIT_NOT_READY);
     break;
 
   case ASENSE_UNIT_ATTENTION:
-    iorb_seterr(iorb, IOERR_MEDIA_CHANGED);
+    iorb_seterr(pIorb, IOERR_MEDIA_CHANGED);
     break;
 
   case ASENSE_MEDIUM_ERROR:
-    iorb_seterr(iorb, IOERR_MEDIA);
+    iorb_seterr(pIorb, IOERR_MEDIA);
     break;
 
   case ASENSE_ILLEGAL_REQUEST:
-    iorb_seterr(iorb, IOERR_CMD_SYNTAX);
+    iorb_seterr(pIorb, IOERR_CMD_SYNTAX);
     break;
 
   case ASENSE_DATA_PROTECT:
-    iorb_seterr(iorb, IOERR_MEDIA_WRITE_PROTECT);
+    iorb_seterr(pIorb, IOERR_MEDIA_WRITE_PROTECT);
     break;
 
   case ASENSE_BLANK_CHECK:
-    iorb_seterr(iorb, IOERR_MEDIA_NOT_FORMATTED);
+    iorb_seterr(pIorb, IOERR_MEDIA_NOT_FORMATTED);
     break;
 
   case ASENSE_ABORTED_COMMAND:
   case ASENSE_COPY_ABORTED:
-    iorb_seterr(iorb, IOERR_CMD_ABORTED);
+    iorb_seterr(pIorb, IOERR_CMD_ABORTED);
     break;
 
   default:
-    iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
+    iorb_seterr(pIorb, IOERR_DEVICE_NONSPECIFIC);
     break;
   }
@@ -418 +447 @@
  * returns 0 on success, != 0 if the command can't be converted.
  */
-int atapi_pad_cdb(u8 _far *cmd_in, u16 cmd_in_len,
-                  u8 _far *cmd_out, u16 _far *cmd_out_len)
-{
-  ATAPI_CDB_12 _far *p12;
+int atapi_pad_cdb(u8 *cmd_in, u16 cmd_in_len, u8 *cmd_out, u16 *cmd_out_len)
+{
+  ATAPI_CDB_12 *p12;
   u32 tmp;
 
-  if (cmd_in_len == ATAPI_MIN_CDB_LEN || cmd_in_len == ATAPI_MAX_CDB_LEN) {
+  if (cmd_in_len == ATAPI_MIN_CDB_LEN || cmd_in_len == ATAPI_MAX_CDB_LEN)
+  {
     /* command does not need to be converted */
     memcpy(cmd_out, cmd_in, cmd_in_len);
@@ -432 +461 @@
 
   memset(cmd_out, 0x00, ATAPI_MAX_CDB_LEN);
-  p12 = (ATAPI_CDB_12 _far *) cmd_out;
+  p12 = (ATAPI_CDB_12 *) cmd_out;
   /* we always convert to 12 byte CDBs */
   *cmd_out_len = ATAPI_MIN_CDB_LEN;
 
   /* check if command can be converted */
-  switch (cmd_in[0]) {
-
+  switch (cmd_in[0])
+  {
   case ATAPI_CMD_READ_6:
   case ATAPI_CMD_WRITE_6:
@@ -446 +475 @@
     tmp = GET_CDB_24(cmd_in + 1) & 0x1fffffUL;
     SET_CDB_32(p12->lba, tmp);
-    SET_CDB_32(p12->trans_len, (u32)(cmd_in[4]));
+    SET_CDB_32(p12->trans_len, (cmd_in[4]));
     p12->control = cmd_in[5];
     break;

trunk/src/os2ahci/atapi.h

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -166 +167 @@
 /* -------------------------- function prototypes -------------------------- */
 
-extern int     atapi_get_geometry     (IORBH _far *iorb, int slot);
-extern int     atapi_unit_ready       (IORBH _far *iorb, int slot);
-extern int     atapi_read             (IORBH _far *iorb, int slot);
-extern int     atapi_read_unaligned   (IORBH _far *iorb, int slot);
-extern int     atapi_verify           (IORBH _far *iorb, int slot);
-extern int     atapi_write            (IORBH _far *iorb, int slot);
-extern int     atapi_execute_cdb      (IORBH _far *iorb, int slot);
-extern int     atapi_req_sense        (IORBH _far *iorb, int slot);
+extern int atapi_get_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int atapi_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int atapi_read(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int atapi_read_unaligned(IORBH *pIorb, int slot);
+extern int atapi_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int atapi_write(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int atapi_execute_cdb(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
+extern int atapi_req_sense(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot);
 

trunk/src/os2ahci/ctxhook.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -87 +88 @@
  * in the interrupt and error handlers.
  */
-void restart_ctxhook(ULONG parm)
+void _Syscall restart_ctxhook(ULONG parm)
 {
   IORB_QUEUE done_queue;
   AD_INFO *ai;
-  IORBH _far *problem_iorb;
-  IORBH _far *iorb;
-  IORBH _far *next = NULL;
-  u8 _far *port_mmio;
+  IORBH FAR16DATA *vProblemIorb;
+  IORBH FAR16DATA *vIorb;
+  IORBH FAR16DATA *vNext = NULL;
+  u8 *port_mmio;
   int rearm_ctx_hook = 0;
   int need_reset;
@@ -101 +102 @@
   int p;
 
-  dprintf("restart_ctxhook() started\n");
+  DPRINTF(2,"restart_ctxhook() started\n");
   memset(&done_queue, 0x00, sizeof(done_queue));
 
   spin_lock(drv_lock);
 
-  for (a = 0; a < ad_info_cnt; a++) {
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     ai = ad_infos + a;
 
-    if (ai->busy) {
+    if (ai->busy)
+    {
       /* this adapter is busy; leave it alone for now */
       rearm_ctx_hook = 1;
@@ -115 +118 @@
     }
 
-    for (p = 0; p <= ai->port_max; p++) {
-      if (ports_to_restart[a] & (1UL << p)) {
+    for (p = 0; p <= ai->port_max; p++)
+    {
+      if (ports_to_restart[a] & (1UL << p))
+      {
         ports_to_restart[a] &= ~(1UL << p);
 
         /* restart this port */
         port_mmio = port_base(ai, p);
-        problem_iorb = NULL;
+        vProblemIorb = NULL;
         need_reset = 0;
 
-        dprintf("port %d, TF_DATA: 0x%lx\n", p, readl(port_mmio + PORT_TFDATA));
+        DPRINTF(2,"port %d, TF_DATA: 0x%x\n", p, readl(port_mmio + PORT_TFDATA));
 
         /* get "current command slot"; only valid if there are no NCQ cmds */
         ccs = (int) ((readl(port_mmio + PORT_CMD) >> 8) & 0x1f);
-        ddprintf(" PORT_CMD      = 0x%x\n", ccs);
-
-        for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
-          ADD_WORKSPACE _far *aws = add_workspace(iorb);
-          next = iorb->pNxtIORB;
-
-          if (aws->queued_hw) {
-            if (ai->ports[p].ncq_cmds & (1UL << aws->cmd_slot)) {
+        DPRINTF(3," PORT_CMD      = 0x%x\n", ccs);
+
+        for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != NULL; vIorb = vNext)
+        {
+          IORBH *pIorb = Far16ToFlat(vIorb);
+          ADD_WORKSPACE *aws = add_workspace(pIorb);
+          vNext = pIorb->pNxtIORB;
+
+          if (aws->queued_hw)
+          {
+            if (ai->ports[p].ncq_cmds & (1UL << aws->cmd_slot))
+            {
               /* NCQ command; force non-NCQ mode and trigger port reset */
               ai->ports[p].ncq_cmds &= ~(1UL << aws->cmd_slot);
               aws->no_ncq = 1;
               need_reset = 1;
-            } else {
+            }
+            else
+            {
               /* regular command; clear cmd bit and identify problem IORB */
               ai->ports[p].reg_cmds &= ~(1UL << aws->cmd_slot);
-              if (aws->cmd_slot == ccs) {
+              if (aws->cmd_slot == ccs)
+              {
                 /* this is the non-NCQ command that failed */
-                ddprintf("failing IORB: %Fp\n", iorb);
-                problem_iorb = iorb;
+                DPRINTF(0,"failing IORB: %x\n", vIorb);
+                vProblemIorb = vIorb;
               }
             }
             /* we can requeue all IORBs unconditionally (see function comment) */
-            if (aws->retries++ < MAX_RETRIES) {
-              iorb_requeue(iorb);
-
-            } else {
+            if (aws->retries++ < MAX_RETRIES)
+            {
+              iorb_requeue(pIorb);
+            }
+            else
+            {
               /* retry count exceeded; consider IORB aborted */
-              iorb_seterr(iorb, IOERR_CMD_ABORTED);
-              iorb_queue_del(&ai->ports[p].iorb_queue, iorb);
-              iorb_queue_add(&done_queue, iorb);
-              if (iorb == problem_iorb) {
+              iorb_seterr(pIorb, IOERR_CMD_ABORTED);
+              iorb_queue_del(&ai->ports[p].iorb_queue, vIorb);
+              iorb_queue_add(&done_queue, vIorb, pIorb);
+              if (vIorb == vProblemIorb)
+              {
                 /* no further analysis -- we're done with this one */
-                problem_iorb = NULL;
+                vProblemIorb = NULL;
               }
             }
@@ -167 +182 @@
 
         /* sanity check: issued command bitmaps should be 0 now */
-        if (ai->ports[p].ncq_cmds != 0 || ai->ports[p].reg_cmds != 0) {
-          dprintf("warning: commands issued not 0 (%08lx/%08lx); resetting...\n",
+        if (ai->ports[p].ncq_cmds != 0 || ai->ports[p].reg_cmds != 0)
+        {
+          DPRINTF(0,"warning: commands issued not 0 (%08lx/%08lx); resetting...\n",
                   ai->ports[p].ncq_cmds, ai->ports[p].reg_cmds);
           need_reset = 1;
         }
 
-        if (!need_reset) {
-          if ((readl(port_mmio + PORT_TFDATA) & 0x88) != 0) {
+        if (!need_reset)
+        {
+          if ((readl(port_mmio + PORT_TFDATA) & 0x88) != 0)
+          {
             /* device is not in an idle state */
             need_reset = 1;
@@ -183 +201 @@
         ai->busy = 1;
         spin_unlock(drv_lock);
-        if (need_reset) {
+        if (need_reset)
+        {
           ahci_reset_port(ai, p, 1);
-        } else {
+        }
+        else
+        {
           ahci_stop_port(ai, p);
           ahci_start_port(ai, p, 1);
@@ -197 +218 @@
         ai->ports[p].cmd_slot = 0;
 
-        if (problem_iorb != NULL) {
+        if (vProblemIorb != NULL)
+        {
+          IORBH *pProblemIorb = Far16ToFlat(vProblemIorb);
           /* get details about the error that caused this IORB to fail */
-          if (need_reset) {
+          if (need_reset)
+          {
             /* no way to retrieve error details after a reset */
-            iorb_seterr(problem_iorb, IOERR_DEVICE_NONSPECIFIC);
-            iorb_queue_del(&ai->ports[p].iorb_queue, problem_iorb);
-            iorb_queue_add(&done_queue, problem_iorb);
-
-          } else {
+            iorb_seterr(pProblemIorb, IOERR_DEVICE_NONSPECIFIC);
+            iorb_queue_del(&ai->ports[p].iorb_queue, vProblemIorb);
+            iorb_queue_add(&done_queue, vProblemIorb, pProblemIorb);
+
+          }
+          else
+          {
             /* get sense information */
-            ADD_WORKSPACE _far *aws = add_workspace(problem_iorb);
-            int d = iorb_unit_device(problem_iorb);
-            int (*req_sense)(IORBH _far *, int) = (ai->ports[p].devs[d].atapi) ?
+            ADD_WORKSPACE *aws = add_workspace(pProblemIorb);
+            int d = iorb_unit_device(pProblemIorb);
+            int (*req_sense)(IORBH FAR16DATA *, IORBH *, int) = (ai->ports[p].devs[d].atapi) ?
                                                    atapi_req_sense : ata_req_sense;
 
@@ -215 +241 @@
             aws->queued_hw = 1;
 
-            if (req_sense(problem_iorb, 0) == 0) {
+            if (req_sense(vProblemIorb, pProblemIorb, 0) == 0)
+            {
               /* execute request sense on slot #0 before anything else comes along */
-              ADD_StartTimerMS(&aws->timer, 5000, (PFN) timeout_callback,
-                               problem_iorb, 0);
+              Timer_StartTimerMS(&aws->timer, 5000, timeout_callback, CastFar16ToULONG(vProblemIorb));
               aws->cmd_slot = 0;
               ai->ports[p].reg_cmds = 1;
@@ -224 +250 @@
               readl(port_mmio); /* flush */
 
-            } else {
+            }
+            else
+            {
               /* IORB is expected to contain the error code; just move to done queue */
-              iorb_queue_del(&ai->ports[p].iorb_queue, problem_iorb);
-              iorb_queue_add(&done_queue, problem_iorb);
+              iorb_queue_del(&ai->ports[p].iorb_queue, vProblemIorb);
+              iorb_queue_add(&done_queue, vProblemIorb, pProblemIorb);
             }
           }
@@ -238 +266 @@
 
   /* call notification routine on all IORBs which have completed */
-  for (iorb = done_queue.root; iorb != NULL; iorb = next) {
-    next = iorb->pNxtIORB;
+  for (vIorb = done_queue.vRoot; vIorb != NULL; vIorb = vNext)
+  {
+    IORBH *pIorb = Far16ToFlat(vIorb);
+    vNext = pIorb->pNxtIORB;
 
     spin_lock(drv_lock);
-    aws_free(add_workspace(iorb));
+    aws_free(add_workspace(pIorb));
     spin_unlock(drv_lock);
 
-    iorb_complete(iorb);
+    iorb_complete(vIorb, pIorb);
   }
 
@@ -253 +283 @@
   spin_unlock(drv_lock);
 
-  dprintf("restart_ctxhook() completed\n");
+  DPRINTF(2,"restart_ctxhook() completed\n");
 
   /* Check whether we have to rearm ourselves because some adapters were busy
    * when we wanted to restart ports on them.
    */
-  if (rearm_ctx_hook) {
+  if (rearm_ctx_hook)
+  {
     msleep(250);
-    DevHelp_ArmCtxHook(0, restart_ctxhook_h);
+    KernArmHook(restart_ctxhook_h, 0, 0);
   }
 }
@@ -290 +321 @@
  * the upstream code might reuse the IORBs before we're done with them.
  */
-void reset_ctxhook(ULONG parm)
+void _Syscall reset_ctxhook(ULONG parm)
 {
   IORB_QUEUE done_queue;
   AD_INFO *ai;
-  IORBH _far *iorb;
-  IORBH _far *next = NULL;
+  IORBH FAR16DATA *vIorb;
+  IORBH FAR16DATA *vNext = NULL;
   int rearm_ctx_hook = 0;
   int a;
   int p;
 
-  dprintf("reset_ctxhook() started\n");
+  DPRINTF(2,"reset_ctxhook() started\n");
   memset(&done_queue, 0x00, sizeof(done_queue));
 
   spin_lock(drv_lock);
 
-  if (th_reset_watchdog != 0) {
+  if (th_reset_watchdog != 0)
+  {
     /* watchdog timer still active -- just reset it */
-    ADD_CancelTimer(th_reset_watchdog);
+    Timer_CancelTimer(th_reset_watchdog);
     th_reset_watchdog = 0;
   }
 
   /* add ports of active IORBs from the abort queue to ports_to_reset[] */
-  for (iorb = abort_queue.root; iorb != NULL; iorb = next) {
-    next = iorb->pNxtIORB;
-    a = iorb_unit_adapter(iorb);
-    p = iorb_unit_port(iorb);
+  for (vIorb = abort_queue.vRoot; vIorb != NULL; vIorb = vNext)
+  {
+    IORBH *pIorb = Far16ToFlat(vIorb);
+    vNext = pIorb->pNxtIORB;
+    a = iorb_unit_adapter(pIorb);
+    p = iorb_unit_port(pIorb);
     ai = ad_infos + a;
 
-    if (ai->busy) {
+    if (ai->busy)
+    {
       /* this adapter is busy; leave it alone for now */
       rearm_ctx_hook = 1;
@@ -325 +360 @@
 
     /* move IORB to the local 'done' queue */
-    iorb_queue_del(&abort_queue, iorb);
-    iorb_queue_add(&done_queue, iorb);
+    iorb_queue_del(&abort_queue, vIorb);
+    iorb_queue_add(&done_queue, vIorb, pIorb);
 
     /* reset port if the IORB has already been queued to hardware */
-    if (add_workspace(iorb)->queued_hw) {
+    if (add_workspace(pIorb)->queued_hw)
+    {
       /* prepare port reset */
       ports_to_reset[a] |= (1UL << p);
@@ -336 +372 @@
 
   /* reset all ports in 'ports_to_reset[]' */
-  for (a = 0; a < ad_info_cnt; a++) {
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     ai = ad_infos + a;
 
-    if (ai->busy) {
+    if (ai->busy)
+    {
       /* this adapter is busy; leave it alone for now */
       rearm_ctx_hook = 1;
@@ -345 +383 @@
     }
 
-    for (p = 0; p <= ai->port_max; p++) {
-      if (ports_to_reset[a] & (1UL << p)) {
+    for (p = 0; p <= ai->port_max; p++)
+    {
+      if (ports_to_reset[a] & (1UL << p))
+      {
         ports_to_reset[a] &= ~(1UL << p);
 
@@ -366 +406 @@
 
         /* retry or abort all remaining active commands on this port */
-        for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
-          ADD_WORKSPACE _far *aws = add_workspace(iorb);
-          next = iorb->pNxtIORB;
-
-          if (aws->queued_hw) {
+        for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != NULL; vIorb = vNext)
+        {
+          IORBH *pIorb = Far16ToFlat(vIorb);
+          ADD_WORKSPACE *aws = add_workspace(pIorb);
+          vNext = pIorb->pNxtIORB;
+
+          if (aws->queued_hw)
+          {
             /* this IORB had already been queued to HW when we reset the port */
-            if (aws->idempotent && aws->retries++ < MAX_RETRIES) {
+            if (aws->idempotent && aws->retries++ < MAX_RETRIES)
+            {
               /* we can retry this IORB */
-              iorb_requeue(iorb);
-
-            } else {
+              iorb_requeue(pIorb);
+
+            }
+            else
+            {
               /* we cannot retry this IORB; consider it aborted */
-              iorb->ErrorCode = IOERR_CMD_ABORTED;
-              iorb_queue_del(&ai->ports[p].iorb_queue, iorb);
-              iorb_queue_add(&done_queue, iorb);
+              pIorb->ErrorCode = IOERR_CMD_ABORTED;
+              iorb_queue_del(&ai->ports[p].iorb_queue, vIorb);
+              iorb_queue_add(&done_queue, vIorb, pIorb);
             }
           }
@@ -391 +437 @@
 
   /* complete all aborted IORBs */
-  for (iorb = done_queue.root; iorb != NULL; iorb = next) {
-    next = iorb->pNxtIORB;
+  for (vIorb = done_queue.vRoot; vIorb != NULL; vIorb = vNext)
+  {
+    IORBH *pIorb = Far16ToFlat(vIorb);
+    vNext = pIorb->pNxtIORB;
 
     spin_lock(drv_lock);
-    aws_free(add_workspace(iorb));
+    aws_free(add_workspace(pIorb));
     spin_unlock(drv_lock);
 
-    iorb->Status |= IORB_ERROR;
-    iorb_complete(iorb);
+    pIorb->Status |= IORB_ERROR;
+    iorb_complete(vIorb, pIorb);
   }
 
@@ -407 +455 @@
   spin_unlock(drv_lock);
 
-  dprintf("reset_ctxhook() completed\n");
+  DPRINTF(2,"reset_ctxhook() completed\n");
 
   /* Check whether we have to rearm ourselves because some adapters were busy
    * when we wanted to reset ports on them.
    */
-  if (rearm_ctx_hook) {
+  if (rearm_ctx_hook)
+  {
     msleep(250);
-    DevHelp_ArmCtxHook(0, reset_ctxhook_h);
+    KernArmHook(reset_ctxhook_h, 0, 0);
   }
 }
@@ -424 +473 @@
  * busy system. Either way, this requires some task-time help.
  */
-void engine_ctxhook(ULONG parm)
+void _Syscall engine_ctxhook(ULONG parm)
 {
   int iorbs_sent;
   int i;
 
-  dprintf("engine_ctxhook() started\n");
-  if (resume_sleep_flag) {
+  DPRINTF(2,"engine_ctxhook() started\n");
+  if (resume_sleep_flag)
+  {
     msleep(resume_sleep_flag);
     resume_sleep_flag = 0;
@@ -436 +486 @@
 
   spin_lock(drv_lock);
-  for (i = 0; i < 10; i++) {
-    if ((iorbs_sent = trigger_engine_1()) == 0) {
-      break;
-    }
+  for (i = 0; i < 10; i++)
+  {
+    if ((iorbs_sent = trigger_engine_1()) == 0) break;
   }
   spin_unlock(drv_lock);
 
-  dprintf("engine_ctxhook() completed\n");
-
-  if (iorbs_sent != 0) {
+  DPRINTF(2,"engine_ctxhook() completed\n");
+
+  if (iorbs_sent != 0)
+  {
     /* need to rearm ourselves for another run */
     msleep(250);
-    DevHelp_ArmCtxHook(0, engine_ctxhook_h);
+    KernArmHook(engine_ctxhook_h, 0, 0);
   }
 }

trunk/src/os2ahci/ioctl.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -54 +55 @@
   SCATGATENTRY        sg_lst[AHCI_MAX_SG / 2]; /* scatter/gather list */
   ULONG               sg_cnt;                  /* number of S/G elements */
-  UCHAR               lh[16];                  /* lock handle for VMLock() */
+  struct _KernVMLock_t *lh;                  /* lock handle for VMLock() */
 } IOCTL_CONTEXT;
 
@@ -60 +61 @@
 
 static USHORT do_smart  (BYTE unit, BYTE sub_func, BYTE cnt, BYTE lba_l,
-                         void _far *buf);
-static int    map_unit  (BYTE unit, USHORT _far *a, USHORT _far *p,
-                         USHORT _far *d);
-static LIN    lin       (void _far *p);
-
-IORBH _far * _far _cdecl ioctl_wakeup(IORBH _far *iorb);
+                         void *buf);
+static int    map_unit  (BYTE unit, USHORT *a, USHORT *p,
+                         USHORT *d);
+
+IORBH *IoctlWakeup(ULONG ulArg);
+extern IORBH FAR16DATA * __far16 IoctlWakeup16(IORBH FAR16DATA*);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -75 +76 @@
  * adapter/port/device combinations are available.
  */
-USHORT ioctl_get_devlist(RP_GENIOCTL _far *ioctl)
-{
-  OS2AHCI_DEVLIST _far *devlst = (OS2AHCI_DEVLIST _far *) ioctl->DataPacket;
+USHORT ioctl_get_devlist(REQPACKET *ioctl)
+{
+  OS2AHCI_DEVLIST *devlst = (OS2AHCI_DEVLIST*)Far16ToFlat(ioctl->ioctl.pvData);
   USHORT maxcnt = 0;
   USHORT cnt = 0;
@@ -84 +85 @@
   USHORT d;
 
-  /* verify addressability of parm buffer (number of devlst elements) */
-  if (DevHelp_VerifyAccess((SEL) ((ULONG) ioctl->ParmPacket >> 16),
-                            sizeof(USHORT),
-                            (USHORT) (ULONG) ioctl->ParmPacket,
-                            VERIFY_READONLY) != 0) {
-    return(STDON | STERR | 0x05);
-  }
-
-  maxcnt = *((USHORT _far *) ioctl->ParmPacket);
-
-  /* verify addressability of return buffer (OS2AHCI_DEVLIST) */
-  if (DevHelp_VerifyAccess((SEL) ((ULONG) devlst >> 16),
-                            offsetof(OS2AHCI_DEVLIST, devs) +
-                              sizeof(devlst->devs) * maxcnt,
-                            (USHORT) (ULONG) devlst,
-                            VERIFY_READWRITE) != 0) {
-    return(STDON | STERR | 0x05);
+  if (KernCopyIn(&maxcnt, ioctl->ioctl.pvParm, sizeof(maxcnt)))
+  {
+    return(RPDONE | RPERR_PARAMETER);
   }
 
   /* fill-in device list */
-  for (a = 0; a < ad_info_cnt; a++) {
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     AD_INFO *ai = ad_infos + a;
 
-    for (p = 0; p <= ai->port_max; p++) {
+    for (p = 0; p <= ai->port_max; p++)
+    {
       P_INFO *pi = ai->ports + p;
 
-      for (d = 0; d <= pi->dev_max; d++) {
-        if (pi->devs[d].present) {
+      for (d = 0; d <= pi->dev_max; d++)
+      {
+        if (pi->devs[d].present)
+        {
           /* add this device to the device list */
-          if (cnt >= maxcnt) {
+          if (cnt >= maxcnt)
+          {
             /* not enough room in devlst */
             goto ioctl_get_device_done;
@@ -136 +128 @@
 ioctl_get_device_done:
   devlst->cnt = cnt;
-  return(STDON);
+  return(RPDONE);
 }
 
@@ -143 +135 @@
  * requests.
  */
-USHORT ioctl_passthrough(RP_GENIOCTL _far *ioctl)
-{
-  OS2AHCI_PASSTHROUGH _far *req = (OS2AHCI_PASSTHROUGH _far *) ioctl->ParmPacket;
-  char _far *sense_buf = (char _far *) ioctl->DataPacket;
+USHORT ioctl_passthrough(REQPACKET *ioctl)
+{
+  OS2AHCI_PASSTHROUGH *req = (OS2AHCI_PASSTHROUGH *)Far16ToFlat(ioctl->ioctl.pvParm);
+  char *sense_buf = (char *)Far16ToFlat(ioctl->ioctl.pvData);
   IOCTL_CONTEXT *ic;
   USHORT ret;
@@ -152 +144 @@
   USHORT p;
   USHORT d;
-
-  /* verify addressability of parm buffer (OS2AHCI_PASSTHROUGH) */
-  if (DevHelp_VerifyAccess((SEL) ((ULONG) req >> 16),
-                            sizeof(OS2AHCI_PASSTHROUGH),
-                            (USHORT) (ULONG) req,
-                            VERIFY_READWRITE) != 0) {
-    return(STDON | STERR | 0x05);
-  }
-
-  /* verify addressability of data buffer (sense data) */
-  if (req->sense_len > 0) {
-    if (DevHelp_VerifyAccess((SEL) ((ULONG) sense_buf >> 16),
-                              req->sense_len,
-                              (USHORT) (ULONG) sense_buf,
-                              VERIFY_READWRITE) != 0) {
-      return(STDON | STERR | 0x05);
-    }
-  }
 
   /* Verify basic request parameters such as adapter/port/device, size of
@@ -178 +152 @@
   d = req->device;
   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) {
-    return(STDON | STERR | ERROR_I24_BAD_UNIT);
+      d > ad_infos[a].ports[p].dev_max || !ad_infos[a].ports[p].devs[d].present)
+  {
+    return(RPDONE | RPERR_UNIT);
   }
   if ((req->buflen + 4095) / 4096 + 1 > AHCI_MAX_SG / 2 ||
-      req->cmdlen < 6 || req->cmdlen > sizeof(req->cmd)) {
-    return(STDON | STERR | ERROR_I24_INVALID_PARAMETER);
+      req->cmdlen < 6 || req->cmdlen > sizeof(req->cmd))
+  {
+    return(RPDONE | RPERR_PARAMETER);
   }
 
   /* allocate IOCTL context data */
-  if ((ic = malloc(sizeof(*ic))) == NULL) {
-    return(STDON | STERR | ERROR_I24_GEN_FAILURE);
+  if ((ic = MemAlloc(sizeof(*ic))) == NULL)
+  {
+    return(RPDONE | RPERR_GENERAL);
   }
   memset(ic, 0x00, sizeof(*ic));
-
-  /* lock DMA transfer buffer into memory and construct S/G list */
-  if (req->buflen > 0) {
-    if (DevHelp_VMLock(VMDHL_LONG | !((req->flags & PT_WRITE) ? VMDHL_WRITE : 0),
-                       req->buf, req->buflen, lin(ic->sg_lst), lin(&ic->lh),
-                       &ic->sg_cnt) != 0) {
-      /* couldn't lock buffer and/or produce a S/G list */
-      free(ic);
-      return(STDON | STERR | ERROR_I24_INVALID_PARAMETER);
-    }
-  }
 
   /* fill in adapter passthrough fields */
@@ -210 +176 @@
   ic->iorb.iorbh.RequestControl   = IORB_ASYNC_POST;
   ic->iorb.iorbh.Timeout          = req->timeout;
-  ic->iorb.iorbh.NotifyAddress    = ioctl_wakeup;
-
-  ic->iorb.cSGList          = ic->sg_cnt;
-  ic->iorb.pSGList          = ic->sg_lst;
-  ic->iorb.ppSGLIST         = virt_to_phys(ic->sg_lst);
+  ic->iorb.iorbh.NotifyAddress    = IoctlWakeup16;
+
+  ic->iorb.cSGList = ic->sg_cnt;
+  ic->iorb.pSGList = MemFar16Adr(ic->sg_lst);
+  ic->iorb.ppSGLIST = MemPhysAdr(ic->sg_lst);
 
   memcpy(ic->cmd, req->cmd.cdb, sizeof(ic->cmd));
   ic->iorb.ControllerCmdLen = req->cmdlen;
-  ic->iorb.pControllerCmd   = ic->cmd;
+  ic->iorb.pControllerCmd   = MemFar16Adr(ic->cmd);
   ic->iorb.Flags            = (req->flags & PT_WRITE) ? 0 : PT_DIRECTION_IN;
 
-  if (req->sense_len > 0) {
+  if (req->sense_len > 0)
+  {
     /* initialize SCSI status block to allow getting sense data */
-    ic->iorb.iorbh.pStatusBlock     = (BYTE *) &ic->ssb;
+    ic->iorb.iorbh.pStatusBlock     = CastFar16ToULONG(MemFar16Adr(&ic->ssb));
     ic->iorb.iorbh.StatusBlockLen   = sizeof(ic->ssb);
-    ic->ssb.SenseData               = (SCSI_REQSENSE_DATA _far *) ic->sense;
+    ic->ssb.SenseData               = (SCSI_REQSENSE_DATA *) ic->sense;
     ic->ssb.ReqSenseLen             = sizeof(ic->sense);
     ic->iorb.iorbh.RequestControl  |= IORB_REQ_STATUSBLOCK;
@@ -231 +198 @@
 
   /* send IORB on its way */
-  add_entry(&ic->iorb.iorbh);
+  add_entry(MemFar16Adr(&ic->iorb.iorbh));
 
   /* Wait for IORB completion. */
   spin_lock(drv_lock);
-  while (!(ic->iorb.iorbh.Status & IORB_DONE)) {
-    DevHelp_ProcBlock((ULONG) (void _far *) &ic->iorb.iorbh, 30000, 1);
+  while (!(ic->iorb.iorbh.Status & IORB_DONE))
+  {
+    KernBlock((ULONG)&ic->iorb.iorbh, 30000, 0, NULL, NULL);
   }
   spin_unlock(drv_lock);
 
-  ret = STDON;
+  ret = RPDONE;
 
   /* map IORB error codes to device driver error codes */
-  if (ic->iorb.iorbh.Status & IORB_ERROR) {
-    ret |= STERR;
-
-    switch (ic->iorb.iorbh.ErrorCode) {
-
+  if (ic->iorb.iorbh.Status & IORB_ERROR)
+  {
+    ret |= RPERR;
+
+    switch (ic->iorb.iorbh.ErrorCode)
+    {
     case IOERR_UNIT_NOT_READY:
-      ret |= ERROR_I24_NOT_READY;
+      ret |= RPERR_NOTREADY;
       break;
 
     case IOERR_MEDIA_CHANGED:
-      ret |= ERROR_I24_DISK_CHANGE;
+      ret |= RPERR_DISK;
       break;
 
     case IOERR_MEDIA:
     case IOERR_MEDIA_NOT_FORMATTED:
-      ret |= ERROR_I24_CRC;
+      ret |= RPERR_CRC;
       break;
 
     case IOERR_CMD_SYNTAX:
     case IOERR_CMD_NOT_SUPPORTED:
-      ret |= ERROR_I24_BAD_COMMAND;
+      ret |= RPERR_BADCOMMAND;
       break;
 
     case IOERR_MEDIA_WRITE_PROTECT:
-      ret |= ERROR_I24_WRITE_PROTECT;
+      ret |= RPERR_PROTECT;
       break;
 
     case IOERR_CMD_ABORTED:
-      ret |= ERROR_I24_CHAR_CALL_INTERRUPTED;
+      ret |= RPERR_INTERRUPTED;
       break;
 
     case IOERR_RBA_ADDRESSING_ERROR:
-      ret |= ERROR_I24_SEEK;
+      ret |= RPERR_SEEK;
       break;
 
     case IOERR_RBA_LIMIT:
-      ret |= ERROR_I24_SECTOR_NOT_FOUND;
+      ret |= RPERR_SECTOR;
       break;
 
     case IOERR_CMD_SGLIST_BAD:
-      ret |= ERROR_I24_INVALID_PARAMETER;
+      ret |= RPERR_PARAMETER;
       break;
 
@@ -292 +261 @@
     case IOERR_CMD_SW_RESOURCE:
     default:
-      ret |= ERROR_I24_GEN_FAILURE;
+      ret |= RPERR_GENERAL;
       break;
     }
@@ -298 +267 @@
     /* copy sense information, if there is any */
     if ((ic->iorb.iorbh.Status & IORB_STATUSBLOCK_AVAIL) &&
-        (ic->ssb.Flags | STATUS_SENSEDATA_VALID)) {
-      memcpy(sense_buf, ic->ssb.SenseData,
-             min(ic->ssb.ReqSenseLen, req->sense_len));
+        (ic->ssb.Flags | STATUS_SENSEDATA_VALID))
+    {
+      memcpy(sense_buf, ic->ssb.SenseData, min(ic->ssb.ReqSenseLen, req->sense_len));
     }
 
-  } else if ((req->flags & PT_ATAPI) == 0) {
+  }
+  else if ((req->flags & PT_ATAPI) == 0)
+  {
     /* Copy ATA cmd back to IOCTL request (ATA commands are effectively
      * registers which are sometimes used to indicate return conditions,
@@ -311 +282 @@
   }
 
-  free(ic);
-  if (req->buflen > 0) {
-    DevHelp_VMUnLock(lin(ic->lh));
-  }
+  MemFree(ic);
   return(ret);
 }
@@ -325 +293 @@
  *       point, basically those calls required to get HDMON working.
  */
-USHORT ioctl_gen_dsk(RP_GENIOCTL _far *ioctl)
-{
-  DSKSP_CommandParameters _far *cp = (DSKSP_CommandParameters _far *) ioctl->ParmPacket;
-  UnitInformationData _far *ui;
+USHORT ioctl_gen_dsk(REQPACKET *ioctl)
+{
+  DSKSP_CommandParameters *cp = (DSKSP_CommandParameters*)Far16ToFlat(ioctl->ioctl.pvParm);
+  UnitInformationData *ui;
   OS2AHCI_PASSTHROUGH pt;
-  RP_GENIOCTL tmp_ioctl;
+  REQPACKET tmp_ioctl;
   USHORT size = 0;
   USHORT ret;
@@ -338 +306 @@
   UCHAR unit;
 
-  /* verify addressability of parm buffer (DSKSP_CommandParameters) */
-  if (DevHelp_VerifyAccess((SEL) ((ULONG) cp >> 16),
-                            sizeof(DSKSP_CommandParameters),
-                            (USHORT) (ULONG) cp,
-                            VERIFY_READONLY) != 0) {
-    return(STDON | STERR | 0x05);
-  }
   unit = cp->byPhysicalUnit;
 
   /* verify addressability of data buffer (depends on function code) */
-  switch (ioctl->Function) {
-
+  switch (ioctl->ioctl.bFunction)
+  {
   case DSKSP_GEN_GET_COUNTERS:
     size = sizeof(DeviceCountersData);
@@ -363 +324 @@
   }
 
-  if (size > 0) {
-    if (DevHelp_VerifyAccess((SEL) ((ULONG) ioctl->DataPacket >> 16),
-                             size, (USHORT) (ULONG) ioctl->DataPacket,
-                             VERIFY_READWRITE) != 0) {
-      return(STDON | STERR | 0x05);
-    }
-  }
-
-  if (map_unit(unit, &a, &p, &d)) {
-    return(STDON | STERR | ERROR_I24_BAD_UNIT);
+  if (map_unit(unit, &a, &p, &d))
+  {
+    return(RPDONE | RPERR | RPERR_UNIT);
   }
 
   /* execute generic disk request */
-  switch (ioctl->Function) {
-
+  switch (ioctl->ioctl.bFunction)
+  {
   case DSKSP_GEN_GET_COUNTERS:
     /* Not supported, yet; we would need dynamically allocated device
@@ -383 +337 @@
      * statistics buffer. For the time being, we'll return an empty buffer.
      */
-    memset(ioctl->DataPacket, 0x00, sizeof(DeviceCountersData));
-    ret = STDON;
+    memset(Far16ToFlat(ioctl->ioctl.pvData), 0x00, sizeof(DeviceCountersData));
+    ret = RPDONE;
     break;
 
@@ -391 +345 @@
      * even bother returning those.
      */
-    ui = (UnitInformationData _far *) ioctl->DataPacket;
+    ui = (UnitInformationData*)Far16ToFlat(ioctl->ioctl.pvData);
     memset(ui, 0x00, sizeof(*ui));
 
@@ -402 +356 @@
     ui->wFlags         |= UIF_SATA;
 
-    ret = STDON;
+    ret = RPDONE;
     break;
 
@@ -408 +362 @@
     /* return ATA ID buffer */
     memset(&tmp_ioctl, 0x00, sizeof(tmp_ioctl));
-    tmp_ioctl.Category   = OS2AHCI_IOCTL_CATEGORY;
-    tmp_ioctl.Function   = OS2AHCI_IOCTL_PASSTHROUGH;
-    tmp_ioctl.ParmPacket = (void _far *) &pt;
+    tmp_ioctl.ioctl.bCategory   = OS2AHCI_IOCTL_CATEGORY;
+    tmp_ioctl.ioctl.bFunction   = OS2AHCI_IOCTL_PASSTHROUGH;
+    tmp_ioctl.ioctl.pvParm = FlatToFar16(&pt);
 
     memset(&pt, 0x00, sizeof(pt));
@@ -420 +374 @@
                            ATA_CMD_ID_ATAPI : ATA_CMD_ID_ATA;
     pt.buflen           = size;
-    pt.buf              = lin(ioctl->DataPacket);
+    pt.buf              = Far16ToFlat(ioctl->ioctl.pvData);
 
     ret = gen_ioctl(&tmp_ioctl);
@@ -426 +380 @@
 
   default:
-    ret = STDON | STATUS_ERR_UNKCMD;
+    ret = RPDONE | RPERR_BADCOMMAND;
     break;
   }
@@ -437 +391 @@
  * IBM1S506; the code has been more or less copied from DANIS506.
  */
-USHORT ioctl_smart(RP_GENIOCTL _far *ioctl)
-{
-  DSKSP_CommandParameters _far *cp = (DSKSP_CommandParameters _far *) ioctl->ParmPacket;
+USHORT ioctl_smart(REQPACKET *ioctl)
+{
+  DSKSP_CommandParameters *cp = (DSKSP_CommandParameters *)Far16ToFlat(ioctl->ioctl.pvParm);
   USHORT size = 0;
   USHORT ret;
@@ -445 +399 @@
   UCHAR parm;
 
-  /* verify addressability of parm buffer (DSKSP_CommandParameters) */
-  if (DevHelp_VerifyAccess((SEL) ((ULONG) cp >> 16),
-                            sizeof(DSKSP_CommandParameters),
-                            (USHORT) (ULONG) cp,
-                            VERIFY_READONLY) != 0) {
-    return(STDON | STERR | 0x05);
-  }
   unit = cp->byPhysicalUnit;
 
   /* verify addressability of data buffer (depends on SMART function) */
-  switch (ioctl->Function) {
+  switch (ioctl->ioctl.bFunction)
+  {
 
   case DSKSP_SMART_GETSTATUS:
@@ -468 +416 @@
   }
 
-  if (size > 0) {
-    if (DevHelp_VerifyAccess((SEL) ((ULONG) ioctl->DataPacket >> 16),
-                             size, (USHORT) (ULONG) ioctl->DataPacket,
-                             VERIFY_READWRITE) != 0) {
-      return(STDON | STERR | 0x05);
-    }
-    parm = ioctl->DataPacket[0];
+  if (size > 0)
+  {
+    parm = *(UCHAR*)Far16ToFlat(ioctl->ioctl.pvData);
   }
 
   /* execute SMART request */
-  switch (ioctl->Function) {
-
+  switch (ioctl->ioctl.bFunction)
+  {
   case DSKSP_SMART_ONOFF:
     ret = do_smart(unit, (BYTE) ((parm) ? ATA_SMART_ENABLE : ATA_SMART_DISABLE), 0, 0, NULL);
@@ -501 +445 @@
 
   case DSKSP_SMART_GETSTATUS:
-    ret = do_smart(unit, ATA_SMART_STATUS, 0, 0, ioctl->DataPacket);
+    ret = do_smart(unit, ATA_SMART_STATUS, 0, 0, Far16ToFlat(ioctl->ioctl.pvData));
     break;
 
   case DSKSP_SMART_GET_ATTRIBUTES:
-    ret = do_smart(unit, ATA_SMART_READ_VALUES, 0, 0, ioctl->DataPacket);
+    ret = do_smart(unit, ATA_SMART_READ_VALUES, 0, 0, Far16ToFlat(ioctl->ioctl.pvData));
     break;
 
   case DSKSP_SMART_GET_THRESHOLDS:
-    ret = do_smart(unit, ATA_SMART_READ_THRESHOLDS, 0, 0, ioctl->DataPacket);
+    ret = do_smart(unit, ATA_SMART_READ_THRESHOLDS, 0, 0, Far16ToFlat(ioctl->ioctl.pvData));
     break;
 
   case DSKSP_SMART_GET_LOG:
-    ret = do_smart(unit, ATA_SMART_READ_LOG, 1, parm, ioctl->DataPacket);
+    ret = do_smart(unit, ATA_SMART_READ_LOG, 1, parm, Far16ToFlat(ioctl->ioctl.pvData));
     break;
 
   default:
-    ret = STDON | STATUS_ERR_UNKCMD;
+    ret = RPDONE | RPERR_BADCOMMAND;
   }
 
@@ -526 +470 @@
  * Perform SMART request. The code has been more or less copied from DANIS506.
  */
-static USHORT do_smart(BYTE unit, BYTE sub_func, BYTE cnt, BYTE lba_l, void _far *buf)
+static USHORT do_smart(BYTE unit, BYTE sub_func, BYTE cnt, BYTE lba_l, void *buf)
 {
   OS2AHCI_PASSTHROUGH pt;
-  RP_GENIOCTL ioctl;
+  REQPACKET ioctl;
   USHORT ret;
   USHORT a;
@@ -535 +479 @@
   USHORT d;
 
-  if (map_unit(unit, &a, &p, &d)) {
-    return(STDON | STERR | ERROR_I24_BAD_UNIT);
+  if (map_unit(unit, &a, &p, &d))
+  {
+    return(RPDONE | RPERR_UNIT);
   }
 
@@ -543 +488 @@
    */
   memset(&ioctl, 0x00, sizeof(ioctl));
-  ioctl.Category   = OS2AHCI_IOCTL_CATEGORY;
-  ioctl.Function   = OS2AHCI_IOCTL_PASSTHROUGH;
-  ioctl.ParmPacket = (void _far *) &pt;
+  ioctl.ioctl.bCategory   = OS2AHCI_IOCTL_CATEGORY;
+  ioctl.ioctl.bFunction   = OS2AHCI_IOCTL_PASSTHROUGH;
+  ioctl.ioctl.pvParm = FlatToFar16(&pt);
 
   memset(&pt, 0x00, sizeof(pt));
@@ -557 +502 @@
   pt.cmd.ata.cmd      = ATA_CMD_SMART;
 
-  if (buf != NULL && sub_func != ATA_SMART_STATUS) {
+  if (buf != NULL && sub_func != ATA_SMART_STATUS)
+  {
     pt.buflen         = 512;
-    pt.buf            = lin(buf);
-  }
-
-  if (((ret = gen_ioctl(&ioctl)) & STERR) == 0 && sub_func == ATA_SMART_STATUS) {
-
+    pt.buf            = buf;
+  }
+
+  if (((ret = gen_ioctl(&ioctl)) & RPERR) == 0 && sub_func == ATA_SMART_STATUS)
+  {
     /* ATA_SMART_STATUS doesn't transfer anything but instead relies on the
      * returned D2H FIS, mapped to the ATA CMD, to have a certain value
@@ -569 +515 @@
      * the data buffer.
      */
-    if (((pt.cmd.ata.lba_l >> 8) & 0xffff) == 0xf42c) {
-      *((ULONG _far *) buf) = 1;
+    if (((pt.cmd.ata.lba_l >> 8) & 0xffff) == 0xf42c)
+    {
+      *((ULONG *) buf) = 1;
     } else {
-      *((ULONG _far *) buf) = 0;
+      *((ULONG *) buf) = 0;
     }
   }
@@ -585 +532 @@
  * ATA/ATAPI units sequentially.
  */
-static int map_unit(BYTE unit, USHORT _far *a, USHORT _far *p, USHORT _far *d)
+static int map_unit(BYTE unit, USHORT *a, USHORT *p, USHORT *d)
 {
   USHORT _a;
@@ -592 +539 @@
 
   /* map unit to adapter/port/device */
-  for (_a = 0; _a < ad_info_cnt; _a++) {
+  for (_a = 0; _a < ad_info_cnt; _a++)
+  {
     AD_INFO *ai = ad_infos + _a;
 
-    for (_p = 0; _p <= ai->port_max; _p++) {
+    for (_p = 0; _p <= ai->port_max; _p++)
+    {
       P_INFO *pi = ai->ports + _p;
 
-      for (_d = 0; _d <= pi->dev_max; _d++) {
-        if (pi->devs[_d].present) {
-          if (unit-- == 0) {
+      for (_d = 0; _d <= pi->dev_max; _d++)
+      {
+        if (pi->devs[_d].present)
+        {
+          if (unit-- == 0)
+          {
             /* found the device */
             *a = _a;
@@ -617 +569 @@
 
 /******************************************************************************
- * Get linear address for specified virtual address.
- */
-static LIN lin(void _far *p)
-{
-  LIN l;
-
-  if (DevHelp_VirtToLin((SEL) ((ULONG) p >> 16), (USHORT) (ULONG) p, &l) != 0) {
-    return(0);
-  }
-
-  return(l);
-}
-
-/******************************************************************************
  * IORB notification routine; used to wake up the sleeping application thread
  * when the IOCTL IORB is complete.
  */
-IORBH _far * _far _cdecl ioctl_wakeup(IORBH _far *iorb)
-{
-  USHORT awake_count;
-
-  DevHelp_ProcRun((ULONG) iorb, &awake_count);
-
+IORBH *IoctlWakeup(ULONG ulArg)
+{
+  KernWakeup(ulArg, 0, NULL, 0);
   return(NULL);
 }

trunk/src/os2ahci/ioctl.h

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -137 +138 @@
 
   ULONG   buflen;         /* length of buffer for data transfers */
-  LIN     buf;            /* buffer for data transfers (32-bit linear address) */
+  void *buf;              /* buffer for data transfers (32-bit linear address) */
   USHORT  sense_len;      /* length of sense data in IOCTL DataPacket */
 } OS2AHCI_PASSTHROUGH;

trunk/src/os2ahci/os2ahci.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013-2015 David Azarewicz
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -29 +29 @@
 #include "ioctl.h"
 #include "version.h"
+#include "devhdr.h"
 
 /* -------------------------- macros and constants ------------------------- */
-
-/* parse integer command line parameter */
-#define drv_parm_int(s, value, type, radix)                         \
-  {                                                                 \
-    char _far *_ep;                                                 \
-    if ((s)[1] != ':') {                                            \
-      cprintf("%s: missing colon (:) after /%c\n", drv_name, *(s)); \
-      goto init_fail;                                               \
-    }                                                               \
-    value = (type) strtol((s) + 2,                                  \
-                          (const char _far* _far*) &_ep,            \
-                          radix);                                   \
-    s = _ep;                                                        \
-  }
-
-#define drv_parm_int_optional(s, value, type, radix) \
-  { \
-    char _far *_ep; \
-    if ((s)[1] == ':') { \
-      value = (type) strtol((s) + 2, (const char _far* _far*) &_ep, radix); \
-      s = _ep; \
-    } else { \
-      value++; \
-    } \
-  }
 
 /* set two-dimensional array of port options */
@@ -70 +46 @@
   }
 
-/* constants for undefined kernel exit routine;
- * see register_krnl_exit() func */
-#define DevHlp_RegisterKrnlExit   0x006f
-
 #define FLAG_KRNL_EXIT_ADD        0x1000
 #define FLAG_KRNL_EXIT_REMOVE     0x2000
@@ -87 +59 @@
 /* -------------------------- function prototypes -------------------------- */
 
-void _cdecl  small_code_        (void);
-
-static int   add_unit_info      (IORB_CONFIGURATION _far *iorb_conf, int dt_ai,
-                                 int a, int p, int d, int scsi_id);
-
-static void  register_krnl_exit (void);
+extern int SetPsdPutc(void);
+static int add_unit_info(IORB_CONFIGURATION *iorb_conf, int dt_ai, int a, int p, int d, int scsi_id);
 
 /* ------------------------ global/static variables ------------------------ */
-
-int             debug = 0;         /* if > 0, print debug messages to COM1 */
-int             thorough_scan = 1; /* if != 0, perform thorough PCI scan */
-int             init_reset = 1;    /* if != 0, reset ports during init */
-int             force_write_cache; /* if != 0, force write cache */
-int             verbosity = 0;     /* default is quiet. 1=show sign on banner, >1=show adapter info during boot */
-int             use_lvm_info = 1;
-int             wrap_trace_buffer = 0;
-long            com_baud = 0;
-
-PFN             Device_Help = 0;   /* pointer to device helper entry point */
-ULONG           RMFlags = 0;       /* required by resource manager library */
-PFN             RM_Help0 = NULL;   /* required by resource manager library */
-PFN             RM_Help3 = NULL;   /* required by resource manager library */
-HDRIVER         rm_drvh;           /* resource manager driver handle */
-char            rm_drvname[80];    /* driver name as returned by RM */
-USHORT          add_handle;        /* driver handle (RegisterDeviceClass) */
-UCHAR           timer_pool[TIMER_POOL_SIZE]; /* timer pool */
-char            drv_name[] = "OS2AHCI"; /* driver name as string */
+int thorough_scan = 1; /* if != 0, perform thorough PCI scan */
+int init_reset = 1;    /* if != 0, reset ports during init */
+int force_write_cache; /* if != 0, force write cache */
+int verbosity = 0;     /* default is quiet. 1=show sign on banner, >1=show adapter info during boot */
+int use_lvm_info = 1;
+long com_baud = 0;
+
+HDRIVER rm_drvh;           /* resource manager driver handle */
+USHORT add_handle;        /* driver handle (RegisterDeviceClass) */
+char drv_name[] = "OS2AHCI"; /* driver name as string */
 
 /* resource manager driver information structure */
-DRIVERSTRUCT rm_drvinfo = {
-  drv_name,                        /* driver name */
-  "AHCI SATA Driver",              /* driver description */
-  DVENDOR,                         /* vendor name */
-  DMAJOR,                          /* RM interface version major */
-  DMINOR,                          /* RM interface version minor */
-  BLD_YEAR, BLD_MONTH, BLD_DAY,    /* date */
-  0,                               /* driver flags */
-  DRT_ADDDM,                       /* driver type */
-  DRS_ADD,                         /* driver sub type */
-  NULL                             /* driver callback */
+static DRIVERSTRUCT rm_drvinfo =
+{
+  NULL, /* We cannot do Flat to Far16 conversion at compile time */
+  NULL, /* so we put NULLs in all the Far16 fields and then fill */
+  NULL, /* them in at run time                                   */
+  DMAJOR,
+  DMINOR,
+  BLD_YEAR, BLD_MONTH, BLD_DAY,
+  0,
+  DRT_ADDDM,
+  DRS_ADD,
+  NULL
 };
 
-ULONG           drv_lock;          /* driver-level spinlock */
-IORB_QUEUE      driver_queue;      /* driver-level IORB queue */
-AD_INFO         ad_infos[MAX_AD];  /* adapter information list */
-int             ad_info_cnt;       /* number of entries in ad_infos[] */
-u16             ad_ignore;         /* bitmap with adapter indexes to ignore */
-int             init_complete;     /* if != 0, initialization has completed */
-int             suspended;
-int             resume_sleep_flag;
+SpinLock_t drv_lock;          /* driver-level spinlock */
+IORB_QUEUE driver_queue;      /* driver-level IORB queue */
+AD_INFO ad_infos[MAX_AD];  /* adapter information list */
+int ad_info_cnt;       /* number of entries in ad_infos[] */
+u16 ad_ignore;         /* bitmap with adapter indexes to ignore */
+int init_complete;     /* if != 0, initialization has completed */
+int suspended;
+int resume_sleep_flag;
 
 /* apapter/port-specific options saved when parsing the command line */
-u8              emulate_scsi[MAX_AD][AHCI_MAX_PORTS];
-u8              enable_ncq[MAX_AD][AHCI_MAX_PORTS];
-u8              link_speed[MAX_AD][AHCI_MAX_PORTS];
-u8              link_power[MAX_AD][AHCI_MAX_PORTS];
-u8              track_size[MAX_AD][AHCI_MAX_PORTS];
-u8              port_ignore[MAX_AD][AHCI_MAX_PORTS];
-
-static char     init_msg[] = "%s driver version %d.%02d\n";
-static char     exit_msg[] = "%s driver *not* installed\n";
+u8 emulate_scsi[MAX_AD][AHCI_MAX_PORTS];
+u8 enable_ncq[MAX_AD][AHCI_MAX_PORTS];
+u8 link_speed[MAX_AD][AHCI_MAX_PORTS];
+u8 link_power[MAX_AD][AHCI_MAX_PORTS];
+u8 track_size[MAX_AD][AHCI_MAX_PORTS];
+u8 port_ignore[MAX_AD][AHCI_MAX_PORTS];
+
 char BldLevel[] = BLDLEVEL;
 
@@ -158 +116 @@
  *       packet for IDC calls, so they can be handled by gen_ioctl.
  */
-USHORT _cdecl c_strat(RPH _far *req)
+void StrategyHandler(REQPACKET *prp)
 {
   u16 rc;
 
-  switch (req->Cmd) {
-
-  case CMDInitBase:
-    rc = init_drv((RPINITIN _far *) req);
-    break;
-
-  case CMDShutdown:
-    rc = exit_drv(((RPSAVERESTORE _far *) req)->FuncCode);
-    break;
-
-  case CMDGenIOCTL:
-    rc = gen_ioctl((RP_GENIOCTL _far *) req);
-    break;
-
-  case CMDOpen:
-    build_user_info(1);
-    rc = STDON;
-    break;
-
-  case CMDINPUT:
-    rc = char_dev_input((RP_RWV _far *) req);
-    break;
-
-  case CMDSaveRestore:
-    rc = sr_drv(((RPSAVERESTORE _far *) req)->FuncCode);
-    break;
-
-  case CMDClose:
-  case CMDInputS:
-  case CMDInputF:
+  switch (prp->bCommand)
+  {
+  case STRATEGY_BASEDEVINIT:
+    rc = init_drv(prp);
+    break;
+
+  case STRATEGY_SHUTDOWN:
+    rc = exit_drv(prp->save_restore.Function);
+    break;
+
+  case STRATEGY_GENIOCTL:
+    rc = gen_ioctl(prp);
+    break;
+
+  case STRATEGY_OPEN:
+    build_user_info();
+    rc = RPDONE;
+    break;
+
+  case STRATEGY_READ:
+    rc = char_dev_input(prp);
+    break;
+
+  case STRATEGY_SAVERESTORE:
+    rc = sr_drv(prp->save_restore.Function);
+    break;
+
+  case STRATEGY_INITCOMPLETE:
+  case STRATEGY_CLOSE:
+  case STRATEGY_INPUTSTATUS:
+  case STRATEGY_FLUSHINPUT:
     /* noop */
-    rc = STDON;
+    rc = RPDONE;
     break;
 
   default:
-    rc = STDON | STATUS_ERR_UNKCMD;
-    break;
-  }
-
-  return(rc);
+    rc = RPDONE | RPERR_BADCOMMAND;
+    break;
+  }
+
+  prp->usStatus = rc;
+}
+
+void IdcHandler(REQPACKET *prp)
+{
+  StrategyHandler(prp);
 }
 
@@ -208 +172 @@
  * the PCI bus for supported AHCI adapters, etc.
  */
-USHORT init_drv(RPINITIN _far *req)
+USHORT init_drv(REQPACKET *req)
 {
   static int init_drv_called;
   static int init_drv_failed;
-  RPINITOUT _far *rsp = (RPINITOUT _far *) req;
-  DDD_PARM_LIST _far *ddd_pl = (DDD_PARM_LIST _far *) req->InitArgs;
   APIRET rmrc;
-  char _far *cmd_line;
-  char _far *s;
+  const char *pszCmdLine, *cmd_line;
   int adapter_index = -1;
   int port_index = -1;
-  int invert_option;
-  int optval;
-  u16 vendor;
-  u16 device;
-
-  if (init_drv_called) {
-    /* This is the init call for the second (legacy IBMS506$) character
+  int iInvertOption;
+  int iStatus;
+
+  if (init_drv_called)
+  {
+    /* This is the init call for the second (IBMS506$) character
      * device driver. If the main driver failed initialization, fail this
      * one as well.
      */
-    rsp->CodeEnd = (u16) end_of_code;
-    rsp->DataEnd = (u16) &end_of_data;
-    return(STDON | ((init_drv_failed) ? ERROR_I24_QUIET_INIT_FAIL : 0));
-  }
+    return(RPDONE | ((init_drv_failed) ? RPERR_INITFAIL : 0));
+  }
+  D32g_DbgLevel = 0;
   init_drv_called = 1;
   suspended = 0;
@@ -238 +197 @@
   memset(ad_infos, 0, sizeof(ad_infos));
   memset(emulate_scsi, 1, sizeof(emulate_scsi)); /* set default enabled */
-
-  /* set device helper entry point */
-  Device_Help = req->DevHlpEP;
+  UtSetDriverName("OS2AHCI$");
+  Header.ulCaps |= DEV_ADAPTER_DD; /* DAZ This flag is not really needed. */
 
   /* create driver-level spinlock */
-  DevHelp_CreateSpinLock(&drv_lock);
-
-  /* initialize libc code */
-  init_libc();
+  KernAllocSpinLock(&drv_lock);
 
   /* register driver with resource manager */
-  if ((rmrc = RMCreateDriver(&rm_drvinfo, &rm_drvh)) != RMRC_SUCCESS) {
-    cprintf("%s: failed to register driver with resource manager (rc = %d)\n",
-            drv_name, rmrc);
+  rm_drvinfo.DrvrName = drv_name;
+  rm_drvinfo.DrvrDescript = "AHCI SATA Driver";
+  rm_drvinfo.VendorName = DVENDOR;
+  if ((rmrc = RMCreateDriver(&rm_drvinfo, &rm_drvh)) != RMRC_SUCCESS)
+  {
+    iprintf("%s: failed to register driver with resource manager (rc = %d)", drv_name, rmrc);
     goto init_fail;
   }
 
-  /* parse command line parameters */
-  cmd_line = (char _far *) ((u32) ddd_pl & 0xffff0000l) + ddd_pl->cmd_line_args;
-
-  for (s = cmd_line; *s != 0; s++) {
-    if (*s == '/') {
-      if ((invert_option = (s[1] == '!')) != 0) {
-        s++;
-      }
-      s++;
-      switch (tolower(*s)) {
-
-      case '\0':
-        /* end of command line; can only happen if command line is incorrect */
-        cprintf("%s: incomplete command line option\n", drv_name);
-        goto init_fail;
-
-      case 'b':
-        drv_parm_int(s, com_baud, u32, 10);
-        break;
-
-      case 'c':
-        /* set COM port base address for debug messages */
-        drv_parm_int(s, com_base, u16, 16);
-        if (com_base == 1) com_base = 0x3f8;
-        if (com_base == 2) com_base = 0x2f8;
-        break;
-
-      case 'd':
-        /* increase debug level */
-        drv_parm_int_optional(s, debug, int, 10);
-        break;
-
-      case 'g':
-        /* add specfied PCI ID as a supported generic AHCI adapter  */
-        drv_parm_int(s, vendor, u16, 16);
-        s--;
-        drv_parm_int(s, device, u16, 16);
-        if (add_pci_id(vendor, device)) {
-          cprintf("%s: failed to add PCI ID %04x:%04x\n", drv_name, vendor, device);
-          goto init_fail;
-        }
-        thorough_scan = 1;
-        break;
-
-      case 't':
-        /* perform thorough PCI scan (i.e. look for individual supported PCI IDs) */
-        thorough_scan = !invert_option;
-        break;
-
-      case 'r':
-        /* reset ports during initialization */
-        init_reset = !invert_option;
-        break;
-
-      case 'f':
-        /* force write cache regardless of IORB flags */
-        force_write_cache = 1;
-        break;
-
-      case 'a':
-        /* set adapter index for adapter and port-related options */
-        drv_parm_int(s, adapter_index, int, 10);
-        if (adapter_index < 0 || adapter_index >= MAX_AD) {
-          cprintf("%s: invalid adapter index (%d)\n", drv_name, adapter_index);
-          goto init_fail;
-        }
-        break;
-
-      case 'p':
-        /* set port index for port-related options */
-        drv_parm_int(s, port_index, int, 10);
-        if (port_index < 0 || port_index >= AHCI_MAX_PORTS) {
-          cprintf("%s: invalid port index (%d)\n", drv_name, port_index);
-          goto init_fail;
-        }
-        break;
-
-      case 'i':
-        /* ignore current adapter index */
-        if (adapter_index >= 0) {
-          if (port_index >= 0) port_ignore[adapter_index][port_index] = !invert_option;
-          else ad_ignore |= 1U << adapter_index;
-        }
-        break;
-
-      case 's':
-        /* enable SCSI emulation for ATAPI devices */
-        set_port_option(emulate_scsi, !invert_option);
-        break;
-
-      case 'n':
-        /* enable NCQ */
-        set_port_option(enable_ncq, !invert_option);
-        break;
-
-      case 'l':
-        /* set link speed or power savings */
-        s++;
-        switch (tolower(*s)) {
-        case 's':
-          /* set link speed */
-          drv_parm_int(s, optval, int, 10);
-          set_port_option(link_speed, optval);
-          break;
-        case 'p':
-          /* set power management */
-          drv_parm_int(s, optval, int, 10);
-          set_port_option(link_power, optval);
-          break;
-        default:
-          cprintf("%s: invalid link parameter (%c)\n", drv_name, *s);
-          goto init_fail;
-        }
-        /* need to reset the port in order to establish link settings */
-        init_reset = 1;
-        break;
-
-      case '4':
-        /* enable 4K sector geometry enhancement (track size = 56) */
-        if (!invert_option) {
-          set_port_option(track_size, 56);
-        }
-        break;
-
-      case 'z':
-        /* Specify to not use the LVM information. There is no reason why anyone would
-         * want to do this, but previous versions of this driver did not have LVM capability,
-         * so this switch is here temporarily just in case.
-         */
-        use_lvm_info = !invert_option;
-        break;
-
-      case 'v':
-        /* be verbose during boot */
-        drv_parm_int_optional(s, verbosity, int, 10);
-        break;
-
-      case 'w':
-        /* Specify to allow the trace buffer to wrap when full. */
-        wrap_trace_buffer = !invert_option;
-        break;
-
-      case 'q':
-        /* Temporarily output a non-fatal message to get anyone using this
-         * undocumented switch to stop using it. This will be removed soon
-         * and the error will become fatal.
-         */
-        cprintf("%s: unknown option: /%c\n", drv_name, *s);
-        break;
-
-      default:
-        cprintf("%s: unknown option: /%c\n", drv_name, *s);
-        goto init_fail;
-      }
-    }
-  }
-
-  if (com_baud) init_com(com_baud); /* initialize com port for debug output */
-
-  /* initialize trace buffer if applicable */
-  if (debug > 0 && com_base == 0) {
-    /* debug is on, but COM port is off -> use our trace buffer */
-    trace_init(AHCI_DEBUG_BUF_SIZE);
-  } else {
-    trace_init(AHCI_INFO_BUF_SIZE);
-  }
-
-  ntprintf("BldLevel: %s\n", BldLevel);
-  ntprintf("CmdLine: %Fs\n", cmd_line);
+  pszCmdLine = cmd_line = req->init_in.szArgs;
+  iStatus = 0;
+  while (*pszCmdLine)
+  {
+    if (*pszCmdLine++ != '/') continue; /* Ignore anything that doesn't start with '/' */
+    /* pszCmdLine now points to first char of argument */
+
+    if ((iInvertOption = (*pszCmdLine == '!')) != 0) pszCmdLine++;
+
+    if (ArgCmp(pszCmdLine, "B:"))
+    {
+      pszCmdLine += 2;
+      com_baud = strtol(pszCmdLine, &pszCmdLine, 0);
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "C:"))
+    {
+      pszCmdLine += 2;
+      /* set COM port base address for debug messages */
+      D32g_ComBase = strtol(pszCmdLine, &pszCmdLine, 0);
+      if (D32g_ComBase == 1) D32g_ComBase = 0x3f8;
+      if (D32g_ComBase == 2) D32g_ComBase = 0x2f8;
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "D"))
+    {
+      pszCmdLine++;
+      if (*pszCmdLine == ':')
+      {
+        pszCmdLine++;
+        D32g_DbgLevel = strtol(pszCmdLine, &pszCmdLine, 0);
+      }
+      else D32g_DbgLevel++; /* increase debug level */
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "G:"))
+    {
+      u16 usVendor;
+      u16 usDevice;
+
+      pszCmdLine += 2;
+      /* add specfied PCI ID as a supported generic AHCI adapter  */
+      usVendor = strtol(pszCmdLine, &pszCmdLine, 16);
+      if (*pszCmdLine != ':') break;
+      pszCmdLine++;
+      usDevice = strtol(pszCmdLine, &pszCmdLine, 16);
+      if (add_pci_id(usVendor, usDevice))
+      {
+        iprintf("%s: failed to add PCI ID %04x:%04x", drv_name, usVendor, usDevice);
+        iStatus = 1;
+      }
+      thorough_scan = 1;
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "T"))
+    {
+      pszCmdLine++;
+      /* perform thorough PCI scan (i.e. look for individual supported PCI IDs) */
+      thorough_scan = !iInvertOption;
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "R"))
+    {
+      pszCmdLine++;
+      /* reset ports during initialization */
+      init_reset = !iInvertOption;
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "F"))
+    {
+      pszCmdLine++;
+      /* force write cache regardless of IORB flags */
+      force_write_cache = 1;
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "A:"))
+    {
+      pszCmdLine += 2;
+      /* set adapter index for adapter and port-related options */
+      adapter_index = strtol(pszCmdLine, &pszCmdLine, 0);
+      if (adapter_index < 0 || adapter_index >= MAX_AD)
+      {
+        iprintf("%s: invalid adapter index (%d)", drv_name, adapter_index);
+        iStatus = 1;
+      }
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "P:"))
+    {
+      pszCmdLine += 2;
+      /* set port index for port-related options */
+      port_index = strtol(pszCmdLine, &pszCmdLine, 0);
+      if (port_index < 0 || port_index >= AHCI_MAX_PORTS)
+      {
+        iprintf("%s: invalid port index (%d)", drv_name, port_index);
+        iStatus = 1;
+      }
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "I"))
+    {
+      pszCmdLine++;
+      /* ignore current adapter index */
+      if (adapter_index >= 0)
+      {
+        if (port_index >= 0) port_ignore[adapter_index][port_index] = !iInvertOption;
+        else ad_ignore |= 1U << adapter_index;
+      }
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "S"))
+    {
+      pszCmdLine++;
+      /* enable SCSI emulation for ATAPI devices */
+      set_port_option(emulate_scsi, !iInvertOption);
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "N"))
+    {
+      pszCmdLine++;
+      /* enable NCQ */
+      set_port_option(enable_ncq, !iInvertOption);
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "LS:"))
+    {
+      int optval;
+
+      pszCmdLine += 3;
+      /* set link speed */
+      optval = strtol(pszCmdLine, &pszCmdLine, 0);
+      set_port_option(link_speed, optval);
+      /* need to reset the port in order to establish link settings */
+      init_reset = 1;
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "LP:"))
+    {
+      int optval;
+
+      pszCmdLine += 3;
+      /* set power management */
+      optval = strtol(pszCmdLine, &pszCmdLine, 0);
+      set_port_option(link_power, optval);
+      /* need to reset the port in order to establish link settings */
+      init_reset = 1;
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "4"))
+    {
+      pszCmdLine++;
+      /* enable 4K sector geometry enhancement (track size = 56) */
+      if (!iInvertOption) set_port_option(track_size, 56);
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "Z"))
+    {
+      pszCmdLine++;
+      /* Specify to not use the LVM information. There is no reason why anyone would
+       * want to do this, but previous versions of this driver did not have LVM capability,
+       * so this switch is here temporarily just in case.
+       */
+      use_lvm_info = !iInvertOption;
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "V"))
+    {
+      pszCmdLine++;
+      if (*pszCmdLine == ':')
+      {
+        pszCmdLine++;
+        verbosity = strtol(pszCmdLine, &pszCmdLine, 0);
+      }
+      else verbosity++; /* increase verbosity level */
+      continue;
+    }
+
+    if (ArgCmp(pszCmdLine, "W"))
+    {
+      pszCmdLine++;
+      /* Specify to allow the trace buffer to wrap when full. */
+      D32g_DbgBufWrap = !iInvertOption;
+      continue;
+    }
+
+    iprintf("Unrecognized switch: %s", pszCmdLine-1);
+    iStatus = 1; /* unrecognized argument */
+  }
+
+  if (iStatus) goto init_fail;
+
+  if (com_baud) InitComPort(com_baud);
+
+  NTPRINTF("BldLevel: %s\n", BldLevel);
+  NTPRINTF("CmdLine: %s\n", cmd_line);
+  /*
+  if (sizeof(ADD_WORKSPACE) > ADD_WORKSPACE_SIZE)
+  {
+    dprintf(0,"ADD_WORKSPACE size is too big! %d>16\n", sizeof(ADD_WORKSPACE));
+    goto init_fail;
+  }
+  */
 
   /* print initialization message */
-  ciprintf(init_msg, drv_name, DMAJOR, DMINOR);
+  ciprintf("%s driver version %d.%02d", drv_name, DMAJOR, DMINOR);
 
   #ifdef TESTVER
@@ -435 +442 @@
   scan_pci_bus();
 
-  if (ad_info_cnt > 0) {
+  if (ad_info_cnt > 0)
+  {
     /* initialization succeeded and we found at least one AHCI adapter */
-    ADD_InitTimer(timer_pool, sizeof(timer_pool));
-
-    if (DevHelp_RegisterDeviceClass(drv_name, (PFN) add_entry, 0, 1, &add_handle)) {
-      cprintf("%s: couldn't register device class\n", drv_name);
+
+    if (Dev32Help_RegisterDeviceClass(drv_name, add_entry, 0, 1, &add_handle))
+    {
+      iprintf("%s: couldn't register device class", drv_name);
       goto init_fail;
     }
 
+    Timer_InitTimer(TIMER_COUNT);
+
     /* allocate context hooks */
-    if (DevHelp_AllocateCtxHook(mk_NPFN(restart_hook), &restart_ctxhook_h) != 0 ||
-        DevHelp_AllocateCtxHook(mk_NPFN(reset_hook), &reset_ctxhook_h) != 0 ||
-        DevHelp_AllocateCtxHook(mk_NPFN(engine_hook), &engine_ctxhook_h)) {
-      cprintf("%s: failed to allocate task-time context hooks\n", drv_name);
-      goto init_fail;
-    }
-
-    rsp->CodeEnd = (u16) end_of_code;
-    rsp->DataEnd = (u16) &end_of_data;
+    KernAllocateContextHook(restart_ctxhook, 0, &restart_ctxhook_h);
+    KernAllocateContextHook(reset_ctxhook, 0, &reset_ctxhook_h);
+    KernAllocateContextHook(engine_ctxhook, 0, &engine_ctxhook_h);
 
     /* register kernel exit routine for trap dumps */
-    register_krnl_exit();
-
-    return(STDON);
-
-  } else {
+    Dev32Help_RegisterKrnlExit(shutdown_driver, FLAG_KRNL_EXIT_ADD, TYPE_KRNL_EXIT_INT13);
+
+    return(RPDONE);
+
+  }
+  else
+  {
     /* no adapters found */
-    ciprintf(" No adapters found.\n");
+    ciprintf("%s: No adapters found.", drv_name);
   }
 
 init_fail:
   /* initialization failed; set segment sizes to 0 and return error */
-  rsp->CodeEnd = 0;
-  rsp->DataEnd = 0;
   init_drv_failed = 1;
 
-  /* free context hooks */
-  if (engine_ctxhook_h != 0)  DevHelp_FreeCtxHook(engine_ctxhook_h);
-  if (reset_ctxhook_h != 0)   DevHelp_FreeCtxHook(reset_ctxhook_h);
-  if (restart_ctxhook_h != 0) DevHelp_FreeCtxHook(restart_ctxhook_h);
-
-  if (rm_drvh != 0) {
+  if (rm_drvh != 0)
+  {
     /* remove driver from resource manager */
     RMDestroyDriver(rm_drvh);
   }
 
-  ciprintf(exit_msg, drv_name);
-  return(STDON | ERROR_I24_QUIET_INIT_FAIL);
+  ciprintf("%s driver *not* installed", drv_name);
+  return(RPDONE | RPERR_INITFAIL);
 }
 
@@ -491 +491 @@
  * commands for ATA disks) are implemented here.
  */
-USHORT gen_ioctl(RP_GENIOCTL _far *ioctl)
-{
-  dprintf("IOCTL 0x%x/0x%x\n", (u16) ioctl->Category, (u16) ioctl->Function);
-
-  switch (ioctl->Category) {
-
+USHORT gen_ioctl(REQPACKET *ioctl)
+{
+  DPRINTF(2,"IOCTL 0x%x/0x%x\n", ioctl->ioctl.bCategory, ioctl->ioctl.bFunction);
+
+  switch (ioctl->ioctl.bCategory)
+  {
   case OS2AHCI_IOCTL_CATEGORY:
-    switch (ioctl->Function) {
+    switch (ioctl->ioctl.bFunction)
+    {
 
     case OS2AHCI_IOCTL_GET_DEVLIST:
@@ -514 +515 @@
   case DSKSP_CAT_SMART:
     return(ioctl_smart(ioctl));
-
-  }
-
-  return(STDON | STATUS_ERR_UNKCMD);
+  }
+
+  return(RPDONE | RPERR_BADCOMMAND);
 }
 
@@ -525 +525 @@
  * dump similar to IBM1S506.ADD/DANIS506.ADD (TODO).
  */
-USHORT char_dev_input(RP_RWV _far *rwrb)
-{
-  return(trace_char_dev(rwrb));
+USHORT char_dev_input(REQPACKET *pPacket)
+{
+  void *LinAdr;
+
+  if (Dev32Help_PhysToLin(pPacket->io.ulAddress, pPacket->io.usCount, &LinAdr))
+  {
+    pPacket->io.usCount = 0;
+    return RPDONE | RPERR_GENERAL;
+  }
+
+  pPacket->io.usCount = dCopyToUser(LinAdr, pPacket->io.usCount);
+
+  return RPDONE;
 }
 
@@ -542 +552 @@
 USHORT exit_drv(int func)
 {
-  dprintf("exit_drv(%d) called\n", func);
-
-  if (func == 0) {
+  DPRINTF(2,"exit_drv(%d) called\n", func);
+
+  if (func == 0)
+  {
     /* we're only interested in the second phase of the shutdown */
-    return(STDON);
+    return(RPDONE);
   }
 
   suspend();
-  return(STDON);
+  return(RPDONE);
 }
 
@@ -559 +570 @@
 USHORT sr_drv(int func)
 {
-  dprintf("sr_drv(%d) called\n", func);
+  DPRINTF(2,"sr_drv(%d) called\n", func);
 
   if (func) resume();
   else suspend();
 
-  return(STDON);
+  return(RPDONE);
 }
 
@@ -578 +589 @@
  *       details.
  */
-void _cdecl _far _loadds add_entry(IORBH _far *first_iorb)
-{
-  IORBH _far *iorb;
-  IORBH _far *next = NULL;
+void add_entry(IORBH FAR16DATA *vFirstIorb)
+{
+  IORBH FAR16DATA *vIorb;
+  IORBH FAR16DATA *vNext = NULL;
 
   spin_lock(drv_lock);
 
-  for (iorb = first_iorb; iorb != NULL; iorb = next) {
+  for (vIorb=vFirstIorb; vIorb!=NULL; vIorb=vNext)
+  {
+    IORBH *pIorb = Far16ToFlat(vIorb);
+
     /* Queue this IORB. Queues primarily exist on port level but there are
      * some requests which affect the whole driver, most notably
      * IOCC_CONFIGURATION. In either case, adding the IORB to the driver or
      * port queue will change the links, thus we need to save the original
-     * link in 'next'.
+     * link in 'vNext'.
      */
-    next = (iorb->RequestControl | IORB_CHAIN) ? iorb->pNxtIORB : 0;
-
-    iorb->Status = 0;
-    iorb->ErrorCode = 0;
-    memset(&iorb->ADDWorkSpace, 0x00, sizeof(ADD_WORKSPACE));
-
-    if (iorb_driver_level(iorb)) {
+    vNext = (pIorb->RequestControl | IORB_CHAIN) ? pIorb->pNxtIORB : NULL;
+
+    pIorb->Status = 0;
+    pIorb->ErrorCode = 0;
+    memset(&pIorb->ADDWorkSpace, 0x00, sizeof(ADD_WORKSPACE));
+
+    if (iorb_driver_level(pIorb))
+    {
       /* driver-level IORB */
-      iorb->UnitHandle = 0;
-      iorb_queue_add(&driver_queue, iorb);
-
-    } else {
+      pIorb->UnitHandle = 0;
+      iorb_queue_add(&driver_queue, vIorb, pIorb);
+
+    }
+    else
+    {
       /* port-level IORB */
-      int a = iorb_unit_adapter(iorb);
-      int p = iorb_unit_port(iorb);
-      int d = iorb_unit_device(iorb);
+      int a = iorb_unit_adapter(pIorb);
+      int p = iorb_unit_port(pIorb);
+      int d = iorb_unit_device(pIorb);
 
       if (a >= ad_info_cnt ||
           p > ad_infos[a].port_max ||
           d > ad_infos[a].ports[p].dev_max ||
-          (ad_infos[a].port_map & (1UL << p)) == 0) {
+          (ad_infos[a].port_map & (1UL << p)) == 0)
+      {
 
         /* unit handle outside of the allowed range */
-        dprintf("warning: IORB for %d.%d.%d out of range\n", a, p, d);
-        iorb->Status = IORB_ERROR;
-        iorb->ErrorCode = IOERR_CMD_SYNTAX;
-        iorb_complete(iorb);
+        DPRINTF(0,"warning: IORB for %d.%d.%d out of range\n", a, p, d);
+        pIorb->Status = IORB_ERROR;
+        pIorb->ErrorCode = IOERR_CMD_SYNTAX;
+        iorb_complete(vIorb, pIorb);
         continue;
       }
 
-      iorb_queue_add(&ad_infos[a].ports[p].iorb_queue, iorb);
+      iorb_queue_add(&ad_infos[a].ports[p].iorb_queue, vIorb, pIorb);
     }
   }
@@ -649 +667 @@
   int i;
 
-  for (i = 0; i < 3 || !init_complete; i++) {
-    if (trigger_engine_1() == 0) {
+  for (i = 0; i < 3 || !init_complete; i++)
+  {
+    if (trigger_engine_1() == 0)
+    {
       /* done -- all IORBs have been sent on their way */
       return;
@@ -659 +679 @@
    * keep trying in the background.
    */
-  DevHelp_ArmCtxHook(0, engine_ctxhook_h);
+  KernArmHook(engine_ctxhook_h, 0, 0);
 }
 
@@ -710 +730 @@
 int trigger_engine_1(void)
 {
-  IORBH _far *iorb;
-  IORBH _far *next;
+  IORBH FAR16DATA *vIorb;
+  IORBH *pIorb;
+  IORBH FAR16DATA *vNext;
   int iorbs_sent = 0;
   int a;
@@ -719 +740 @@
 
   /* process driver-level IORBs */
-  if ((iorb = driver_queue.root) != NULL && !add_workspace(iorb)->processing) {
-    send_iorb(iorb);
-    iorbs_sent++;
+  if ((vIorb = driver_queue.vRoot) != NULL)
+  {
+    pIorb = Far16ToFlat(vIorb);
+
+    if (!add_workspace(pIorb)->processing)
+    {
+      send_iorb(vIorb, pIorb);
+      iorbs_sent++;
+    }
   }
 
   /* process port-level IORBs */
-  for (a = 0; a < ad_info_cnt; a++) {
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     AD_INFO *ai = ad_infos + a;
-    if (ai->busy) {
+    if (ai->busy)
+    {
       /* adapter is busy; don't process any IORBs */
       continue;
     }
-    for (p = 0; p <= ai->port_max; p++) {
+    for (p = 0; p <= ai->port_max; p++)
+    {
       /* send all queued IORBs on this port */
-      next = NULL;
-      for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
-        next = iorb->pNxtIORB;
-        if (!add_workspace(iorb)->processing) {
-          send_iorb(iorb);
+      vNext = NULL;
+      for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != NULL; vIorb = vNext)
+      {
+        pIorb = Far16ToFlat(vIorb);
+
+        vNext = pIorb->pNxtIORB;
+        if (!add_workspace(pIorb)->processing)
+        {
+          send_iorb(vIorb, pIorb);
           iorbs_sent++;
         }
@@ -755 +789 @@
  *       functions and re-aquire it when done.
  */
-void send_iorb(IORBH _far *iorb)
+void send_iorb(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
   /* Mark IORB as "processing" before doing anything else. Once the IORB is
@@ -762 +796 @@
    * IORB.
    */
-  add_workspace(iorb)->processing = 1;
+  add_workspace(pIorb)->processing = 1;
   spin_unlock(drv_lock);
 
-  switch (iorb->CommandCode) {
-
+  switch (pIorb->CommandCode)
+  {
   case IOCC_CONFIGURATION:
-    iocc_configuration(iorb);
+    iocc_configuration(vIorb, pIorb);
     break;
 
   case IOCC_DEVICE_CONTROL:
-    iocc_device_control(iorb);
+    iocc_device_control(vIorb, pIorb);
     break;
 
   case IOCC_UNIT_CONTROL:
-    iocc_unit_control(iorb);
+    iocc_unit_control(vIorb, pIorb);
     break;
 
   case IOCC_GEOMETRY:
-    iocc_geometry(iorb);
+    iocc_geometry(vIorb, pIorb);
     break;
 
   case IOCC_EXECUTE_IO:
-    iocc_execute_io(iorb);
+    iocc_execute_io(vIorb, pIorb);
     break;
 
   case IOCC_UNIT_STATUS:
-    iocc_unit_status(iorb);
+    iocc_unit_status(vIorb, pIorb);
     break;
 
   case IOCC_ADAPTER_PASSTHRU:
-    iocc_adapter_passthru(iorb);
+    iocc_adapter_passthru(vIorb, pIorb);
     break;
 
   default:
     /* unsupported call */
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    iorb_done(iorb);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_done(vIorb, pIorb);
     break;
   }
@@ -809 +843 @@
  * Handle IOCC_CONFIGURATION requests.
  */
-void iocc_configuration(IORBH _far *iorb)
+void iocc_configuration(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
   int a;
 
-  switch (iorb->CommandModifier) {
+  switch (pIorb->CommandModifier)
+  {
 
   case IOCM_COMPLETE_INIT:
@@ -820 +855 @@
      * use interrupts, timers and context hooks instead of polling).
      */
-    if (!init_complete) {
-      dprintf("leaving initialization mode\n");
-      for (a = 0; a < ad_info_cnt; a++) {
+    if (!init_complete)
+    {
+      DPRINTF(1,"leaving initialization mode\n");
+      for (a = 0; a < ad_info_cnt; a++)
+      {
         lock_adapter(ad_infos + a);
         ahci_complete_init(ad_infos + a);
@@ -828 +865 @@
       init_complete = 1;
 
-      /* DAZ turn off COM port output if on */
-      //com_base = 0;
-
       /* release all adapters */
-      for (a = 0; a < ad_info_cnt; a++) {
+      for (a = 0; a < ad_info_cnt; a++)
+      {
         unlock_adapter(ad_infos + a);
       }
+      DPRINTF(1,"leaving initialization mode 2\n");
 
       #ifdef LEGACY_APM
@@ -840 +876 @@
       apm_init();
       #endif
-
-      build_user_info(0);
-    }
-    iorb_done(iorb);
+    }
+    iorb_done(vIorb, pIorb);
     break;
 
   case IOCM_GET_DEVICE_TABLE:
     /* construct a device table */
-    iocm_device_table(iorb);
+    iocm_device_table(vIorb, pIorb);
     break;
 
   default:
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    iorb_done(iorb);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_done(vIorb, pIorb);
     break;
   }
@@ -861 +895 @@
  * Handle IOCC_DEVICE_CONTROL requests.
  */
-void iocc_device_control(IORBH _far *iorb)
-{
-  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
-  IORBH _far *ptr;
-  IORBH _far *next = NULL;
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
-
-  switch (iorb->CommandModifier) {
+void iocc_device_control(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
+  IORBH FAR16DATA *vPtr;
+  IORBH FAR16DATA *vNext = NULL;
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
+
+  switch (pIorb->CommandModifier)
+  {
 
   case IOCM_ABORT:
     /* abort all pending commands on specified port and device */
     spin_lock(drv_lock);
-    for (ptr = ai->ports[p].iorb_queue.root; ptr != NULL; ptr = next) {
-      next = ptr->pNxtIORB;
+    for (vPtr = ai->ports[p].iorb_queue.vRoot; vPtr != NULL; vPtr = vNext)
+    {
+      IORBH *pPtr = Far16ToFlat(vPtr);
+
+      vNext = pPtr->pNxtIORB;
       /* move all matching IORBs to the abort queue */
-      if (ptr != iorb && iorb_unit_device(ptr) == d) {
-        iorb_queue_del(&ai->ports[p].iorb_queue, ptr);
-        iorb_queue_add(&abort_queue, ptr);
-        ptr->ErrorCode = IOERR_CMD_ABORTED;
+      if (vPtr != vIorb && iorb_unit_device(pPtr) == d)
+      {
+        iorb_queue_del(&ai->ports[p].iorb_queue, vPtr);
+        iorb_queue_add(&abort_queue, vPtr, pPtr);
+        pPtr->ErrorCode = IOERR_CMD_ABORTED;
       }
     }
@@ -886 +925 @@
 
     /* trigger reset context hook which will finish the abort processing */
-    DevHelp_ArmCtxHook(0, reset_ctxhook_h);
+    KernArmHook(reset_ctxhook_h, 0, 0);
     break;
 
@@ -896 +935 @@
      * and ATAPI in the same driver, this won't be required.
      */
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
     break;
 
@@ -904 +943 @@
     /* unit control commands to lock, unlock and eject media */
     /* will be supported later... */
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
     break;
 
   default:
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    break;
-  }
-
-  iorb_done(iorb);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
+    break;
+  }
+
+  iorb_done(vIorb, pIorb);
 }
 
@@ -918 +957 @@
  * Handle IOCC_UNIT_CONTROL requests.
  */
-void iocc_unit_control(IORBH _far *iorb)
-{
-  IORB_UNIT_CONTROL _far *iorb_uc = (IORB_UNIT_CONTROL _far *) iorb;
-  int a = iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
-  int d = iorb_unit_device(iorb);
+void iocc_unit_control(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  IORB_UNIT_CONTROL *pIorb_uc = (IORB_UNIT_CONTROL *)pIorb;
+  int a = iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
+  int d = iorb_unit_device(pIorb);
 
   spin_lock(drv_lock);
-  switch (iorb->CommandModifier) {
-
+  switch (pIorb->CommandModifier)
+  {
   case IOCM_ALLOCATE_UNIT:
     /* allocate unit for exclusive access */
-    if (ad_infos[a].ports[p].devs[d].allocated) {
-      iorb_seterr(iorb, IOERR_UNIT_ALLOCATED);
-    } else {
+    if (ad_infos[a].ports[p].devs[d].allocated)
+    {
+      iorb_seterr(pIorb, IOERR_UNIT_ALLOCATED);
+    }
+    else
+    {
       ad_infos[a].ports[p].devs[d].allocated = 1;
     }
@@ -939 +981 @@
   case IOCM_DEALLOCATE_UNIT:
     /* deallocate exclusive access to unit */
-    if (!ad_infos[a].ports[p].devs[d].allocated) {
-      iorb_seterr(iorb, IOERR_UNIT_NOT_ALLOCATED);
-    } else {
+    if (!ad_infos[a].ports[p].devs[d].allocated)
+    {
+      iorb_seterr(pIorb, IOERR_UNIT_NOT_ALLOCATED);
+    }
+    else
+    {
       ad_infos[a].ports[p].devs[d].allocated = 0;
     }
@@ -954 +999 @@
      * IOCC_CONFIGURATION/IOCM_GET_DEVICE_TABLE calls.
      */
-    if (!ad_infos[a].ports[p].devs[d].allocated) {
-      iorb_seterr(iorb, IOERR_UNIT_NOT_ALLOCATED);
+    if (!ad_infos[a].ports[p].devs[d].allocated)
+    {
+      iorb_seterr(pIorb, IOERR_UNIT_NOT_ALLOCATED);
       break;
     }
-    ad_infos[a].ports[p].devs[d].unit_info = iorb_uc->pUnitInfo;
+    ad_infos[a].ports[p].devs[d].unit_info = pIorb_uc->pUnitInfo;
     break;
 
   default:
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
     break;
   }
 
   spin_unlock(drv_lock);
-  iorb_done(iorb);
+  iorb_done(vIorb, pIorb);
 }
 
@@ -993 +1039 @@
  *         1..n  emulated devices; SCSI target ID increments sequentially
  */
-void iocm_device_table(IORBH _far *iorb)
-{
-  IORB_CONFIGURATION _far *iorb_conf;
-  DEVICETABLE _far *dt;
-  char _far *pos;
+void iocm_device_table(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  IORB_CONFIGURATION *pIorb_conf;
+  DEVICETABLE FAR16DATA *vDt;
+  DEVICETABLE *pDt;
+  char *pPos;
   int scsi_units = 0;
   int scsi_id = 1;
@@ -1006 +1053 @@
   int d;
 
-  iorb_conf = (IORB_CONFIGURATION _far *) iorb;
-  dt = iorb_conf->pDeviceTable;
+  pIorb_conf = (IORB_CONFIGURATION *)pIorb;
+  vDt = pIorb_conf->pDeviceTable;
+  pDt = Far16ToFlat(vDt);
 
   spin_lock(drv_lock);
 
   /* initialize device table header */
-  dt->ADDLevelMajor = ADD_LEVEL_MAJOR;
-  dt->ADDLevelMinor = ADD_LEVEL_MINOR;
-  dt->ADDHandle     = add_handle;
-  dt->TotalAdapters = ad_info_cnt + 1;
+  pDt->ADDLevelMajor = ADD_LEVEL_MAJOR;
+  pDt->ADDLevelMinor = ADD_LEVEL_MINOR;
+  pDt->ADDHandle     = add_handle;
+  pDt->TotalAdapters = ad_info_cnt + 1;
 
   /* set start of adapter and device information tables */
-  pos = (char _far *) (dt->pAdapter + dt->TotalAdapters);
+  pPos = (char*)&pDt->pAdapter[pDt->TotalAdapters];
 
   /* go through all adapters, including the virtual SCSI adapter */
-  for (dta = 0; dta < dt->TotalAdapters; dta++) {
-    ADAPTERINFO _far *ptr = (ADAPTERINFO _far *) pos;
+  for (dta = 0; dta < pDt->TotalAdapters; dta++)
+  {
+    ADAPTERINFO *pPtr = (ADAPTERINFO *)pPos;
 
     /* sanity check for sufficient space in device table */
-    if ((u32) (ptr + 1) - (u32) dt > iorb_conf->DeviceTableLen) {
-      dprintf("error: device table provided by DASD too small\n");
-      iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+    if ((u32)(pPtr + 1) - (u32)pDt > pIorb_conf->DeviceTableLen)
+    {
+      DPRINTF(0,"error: device table provided by DASD too small\n");
+      iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
       goto iocm_device_table_done;
     }
 
-    dt->pAdapter[dta] = (ADAPTERINFO _near *) ((u32) ptr & 0xffff);
-    memset(ptr, 0x00, sizeof(*ptr));
-
-    ptr->AdapterIOAccess = AI_IOACCESS_BUS_MASTER;
-    ptr->AdapterHostBus  = AI_HOSTBUS_OTHER | AI_BUSWIDTH_32BIT;
-    ptr->AdapterFlags    = AF_16M | AF_HW_SCATGAT;
-    ptr->MaxHWSGList     = AHCI_MAX_SG / 2;   /* AHCI S/G elements are 22 bits */
-
-    if (dta < ad_info_cnt) {
+    pDt->pAdapter[dta] = MakeNear16PtrFromDiff(pIorb_conf->pDeviceTable, pDt, pPtr);
+
+    //DPRINTF(2,"iocm_device_table: ptr=%x dta=%x pAdapter[dta]=%x pDeviceTable=%x\n",
+    //  ptr, dta, dt->pAdapter[dta], iorb_conf->pDeviceTable);
+    memset(pPtr, 0x00, sizeof(*pPtr));
+
+    pPtr->AdapterIOAccess = AI_IOACCESS_BUS_MASTER;
+    pPtr->AdapterHostBus  = AI_HOSTBUS_OTHER | AI_BUSWIDTH_32BIT;
+    pPtr->AdapterFlags    = AF_16M | AF_HW_SCATGAT;
+    pPtr->MaxHWSGList     = AHCI_MAX_SG / 2;   /* AHCI S/G elements are 22 bits */
+
+    if (dta < ad_info_cnt)
+    {
       /* this is a physical AHCI adapter */
       AD_INFO *ad_info = ad_infos + dta;
 
-      ptr->AdapterDevBus = AI_DEVBUS_ST506 | AI_DEVBUS_32BIT;
-      sprintf(ptr->AdapterName, "AHCI_%d", dta);
-
-      if (!ad_info->port_scan_done) {
+      pPtr->AdapterDevBus = AI_DEVBUS_ST506 | AI_DEVBUS_32BIT;
+      sprintf(pPtr->AdapterName, "AHCI_%d", dta);
+
+      if (!ad_info->port_scan_done)
+      {
         /* first call; need to scan AHCI hardware for devices */
-        if (ad_info->busy) {
-          dprintf("error: port scan requested while adapter was busy\n");
-          iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+        if (ad_info->busy)
+        {
+          DPRINTF(0,"error: port scan requested while adapter was busy\n");
+          iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
           goto iocm_device_table_done;
         }
@@ -1059 +1115 @@
         ad_info->busy = 0;
 
-        if (rc != 0) {
-          dprintf("error: port scan failed on adapter #%d\n", dta);
-          iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
+        if (rc != 0)
+        {
+          DPRINTF(0,"error: port scan failed on adapter #%d\n", dta);
+          iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
           goto iocm_device_table_done;
         }
@@ -1068 +1125 @@
 
       /* insert physical (i.e. AHCI) devices into the device table */
-      for (p = 0; p <= ad_info->port_max; p++) {
-        for (d = 0; d <= ad_info->ports[p].dev_max; d++) {
-          if (ad_info->ports[p].devs[d].present) {
-            if (ad_info->ports[p].devs[d].atapi && emulate_scsi[dta][p]) {
+      for (p = 0; p <= ad_info->port_max; p++)
+      {
+        for (d = 0; d <= ad_info->ports[p].dev_max; d++)
+        {
+          if (ad_info->ports[p].devs[d].present)
+          {
+            if (ad_info->ports[p].devs[d].atapi && emulate_scsi[dta][p])
+            {
               /* report this unit as SCSI unit */
               scsi_units++;
               //continue;
             }
-            if (add_unit_info(iorb_conf, dta, dta, p, d, 0)) {
+            if (add_unit_info(pIorb_conf, dta, dta, p, d, 0))
+            {
               goto iocm_device_table_done;
             }
@@ -1082 +1144 @@
         }
       }
-
-    } else {
+    }
+    else
+    {
       /* this is the virtual SCSI adapter */
-      if (scsi_units == 0) {
+      if (scsi_units == 0)
+      {
         /* not a single unit to be emulated via SCSI */
-        dt->TotalAdapters--;
+        pDt->TotalAdapters--;
         break;
       }
 
       /* set adapter name and bus type to mimic a SCSI controller */
-      ptr->AdapterDevBus = AI_DEVBUS_SCSI_2 | AI_DEVBUS_16BIT;
-      sprintf(ptr->AdapterName, "AHCI_SCSI_0");
+      pPtr->AdapterDevBus = AI_DEVBUS_SCSI_2 | AI_DEVBUS_16BIT;
+      sprintf(pPtr->AdapterName, "AHCI_SCSI_0");
 
       /* add all ATAPI units to be emulated by this virtual adaper */
-      for (a = 0; a < ad_info_cnt; a++) {
+      for (a = 0; a < ad_info_cnt; a++)
+      {
         AD_INFO *ad_info = ad_infos + a;
 
-        for (p = 0; p <= ad_info->port_max; p++) {
-          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].atapi && emulate_scsi[a][p]) {
-              if (add_unit_info(iorb_conf, dta, a, p, d, scsi_id++)) {
+        for (p = 0; p <= ad_info->port_max; p++)
+        {
+          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].atapi && emulate_scsi[a][p])
+            {
+              if (add_unit_info(pIorb_conf, dta, a, p, d, scsi_id++))
+              {
                 goto iocm_device_table_done;
               }
@@ -1112 +1181 @@
 
     /* calculate offset for next adapter */
-    pos = (char _far *) (ptr->UnitInfo + ptr->AdapterUnits);
+    pPos = (char *)(pPtr->UnitInfo + pPtr->AdapterUnits);
   }
 
 iocm_device_table_done:
   spin_unlock(drv_lock);
-  iorb_done(iorb);
+  iorb_done(vIorb, pIorb);
 }
 
@@ -1123 +1192 @@
  * Handle IOCC_GEOMETRY requests.
  */
-void iocc_geometry(IORBH _far *iorb)
-{
-  switch (iorb->CommandModifier) {
-
+void iocc_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  switch (pIorb->CommandModifier)
+  {
   case IOCM_GET_MEDIA_GEOMETRY:
   case IOCM_GET_DEVICE_GEOMETRY:
-    add_workspace(iorb)->idempotent = 1;
-    ahci_get_geometry(iorb);
+    add_workspace(pIorb)->idempotent = 1;
+    ahci_get_geometry(vIorb, pIorb);
     break;
 
   default:
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    iorb_done(iorb);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_done(vIorb, pIorb);
   }
 }
@@ -1142 +1211 @@
  * Handle IOCC_EXECUTE_IO requests.
  */
-void iocc_execute_io(IORBH _far *iorb)
-{
-  switch (iorb->CommandModifier) {
-
+void iocc_execute_io(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  switch (pIorb->CommandModifier)
+  {
   case IOCM_READ:
-    add_workspace(iorb)->idempotent = 1;
-    ahci_read(iorb);
+    add_workspace(pIorb)->idempotent = 1;
+    ahci_read(vIorb, pIorb);
     break;
 
   case IOCM_READ_VERIFY:
-    add_workspace(iorb)->idempotent = 1;
-    ahci_verify(iorb);
+    add_workspace(pIorb)->idempotent = 1;
+    ahci_verify(vIorb, pIorb);
     break;
 
   case IOCM_WRITE:
-    add_workspace(iorb)->idempotent = 1;
-    ahci_write(iorb);
+    add_workspace(pIorb)->idempotent = 1;
+    ahci_write(vIorb, pIorb);
     break;
 
   case IOCM_WRITE_VERIFY:
-    add_workspace(iorb)->idempotent = 1;
-    ahci_write(iorb);
+    add_workspace(pIorb)->idempotent = 1;
+    ahci_write(vIorb, pIorb);
     break;
 
   default:
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    iorb_done(iorb);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_done(vIorb, pIorb);
   }
 }
@@ -1175 +1244 @@
  * Handle IOCC_UNIT_STATUS requests.
  */
-void iocc_unit_status(IORBH _far *iorb)
-{
-  switch (iorb->CommandModifier) {
-
+void iocc_unit_status(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  switch (pIorb->CommandModifier)
+  {
   case IOCM_GET_UNIT_STATUS:
-    add_workspace(iorb)->idempotent = 1;
-    ahci_unit_ready(iorb);
+    add_workspace(pIorb)->idempotent = 1;
+    ahci_unit_ready(vIorb, pIorb);
     break;
 
   default:
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    iorb_done(iorb);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_done(vIorb, pIorb);
   }
 }
@@ -1193 +1262 @@
  * Handle IOCC_ADAPTER_PASSTHROUGH requests.
  */
-void iocc_adapter_passthru(IORBH _far *iorb)
-{
-  switch (iorb->CommandModifier) {
+void iocc_adapter_passthru(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  switch (pIorb->CommandModifier)
+  {
 
   case IOCM_EXECUTE_CDB:
-    add_workspace(iorb)->idempotent = 0;
-    ahci_execute_cdb(iorb);
+    add_workspace(pIorb)->idempotent = 0;
+    ahci_execute_cdb(vIorb, pIorb);
     break;
 
   case IOCM_EXECUTE_ATA:
-    add_workspace(iorb)->idempotent = 0;
-    ahci_execute_ata(iorb);
+    add_workspace(pIorb)->idempotent = 0;
+    ahci_execute_ata(vIorb, pIorb);
     break;
 
   default:
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    iorb_done(iorb);
+    iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
+    iorb_done(vIorb, pIorb);
   }
 }
@@ -1217 +1287 @@
  * adapter-level spinlock aquired.
  */
-void iorb_queue_add(IORB_QUEUE _far *queue, IORBH _far *iorb)
-{
-  if (iorb_priority(iorb) {
+void iorb_queue_add(IORB_QUEUE *queue, IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  if (iorb_priority(pIorb)
+  {
     /* priority IORB; insert at first position */
-    iorb->pNxtIORB = queue->root;
-    queue->root = iorb;
-
-  } else {
+    pIorb->pNxtIORB = queue->vRoot;
+    queue->vRoot = vIorb;
+  }
+  else
+  {
     /* append IORB to end of queue */
-    iorb->pNxtIORB = NULL;
-
-    if (queue->root == NULL) {
-      queue->root = iorb;
-    } else {
-      queue->tail->pNxtIORB = iorb;
-    }
-    queue->tail = iorb;
-  }
-
-  if (debug) {
+    pIorb->pNxtIORB = NULL;
+
+    if (queue->vRoot == NULL)
+    {
+      queue->vRoot = vIorb;
+    }
+    else
+    {
+      ((IORBH *)Far16ToFlat(queue->vTail))->pNxtIORB = vIorb;
+    }
+    queue->vTail = vIorb;
+  }
+
+  if (D32g_DbgLevel)
+  {
     /* determine queue type (local, driver, abort or port) and minimum debug
      * level; otherwise, queue debug prints can become really confusing.
@@ -1243 +1319 @@
     int min_debug = 1;
 
-    if ((u32) queue >> 16 == (u32) (void _far *) &queue >> 16) {
+    if ((u32)queue >> 16 == (u32)&queue >> 16) /* DAZ this is bogus */
+    {
       /* this queue is on the stack */
       queue_type = "local";
       min_debug = 2;
 
-    } else if (queue == &driver_queue) {
+    }
+    else if (queue == &driver_queue)
+    {
       queue_type = "driver";
 
-    } else if (queue == &abort_queue) {
+    }
+    else if (queue == &abort_queue)
+    {
       queue_type = "abort";
       min_debug = 2;
 
-    } else {
+    }
+    else
+    {
       queue_type = "port";
     }
 
-    if (debug > min_debug) {
-      aprintf("IORB %Fp queued (cmd = %d/%d, queue = %Fp [%s], timeout = %ld)\n",
-             iorb, iorb->CommandCode, iorb->CommandModifier, queue, queue_type,
-             iorb->Timeout);
-    }
+    DPRINTF(min_debug,"IORB %x queued (cmd=%d/%d queue=%x [%s], timeout=%d)\n",
+           vIorb, pIorb->CommandCode, pIorb->CommandModifier, queue, queue_type,
+           pIorb->Timeout);
   }
 }
@@ -1271 +1352 @@
  * the adapter-level spinlock aquired.
  */
-int iorb_queue_del(IORB_QUEUE _far *queue, IORBH _far *iorb)
-{
-  IORBH _far *_iorb;
-  IORBH _far *_prev = NULL;
+int iorb_queue_del(IORB_QUEUE *queue, IORBH FAR16DATA *vIorb)
+{
+  IORBH FAR16DATA *_vIorb;
+  IORBH FAR16DATA *_vPrev = NULL;
   int found = 0;
 
-  for (_iorb = queue->root; _iorb != NULL; _iorb = _iorb->pNxtIORB) {
-    if (_iorb == iorb) {
+  for (_vIorb = queue->vRoot; _vIorb != NULL; )
+  {
+    IORBH *_pIorb = Far16ToFlat(_vIorb);
+    if (_vIorb == vIorb)
+    {
+
       /* found the IORB to be removed */
-      if (_prev != NULL) {
-        _prev->pNxtIORB = _iorb->pNxtIORB;
-      } else {
-        queue->root = _iorb->pNxtIORB;
-      }
-      if (_iorb == queue->tail) {
-        queue->tail = _prev;
+      if (_vPrev != NULL)
+      {
+        ((IORBH*)Far16ToFlat(_vPrev))->pNxtIORB = _pIorb->pNxtIORB;
+      }
+      else
+      {
+        queue->vRoot = _pIorb->pNxtIORB;
+      }
+      if (_vIorb == queue->vTail)
+      {
+        queue->vTail = _vPrev;
       }
       found = 1;
       break;
     }
-    _prev = _iorb;
-  }
-
-  if (found) {
-    ddprintf("IORB %Fp removed (queue = %Fp)\n", iorb, queue);
-  } else {
-    dprintf("IORB %Fp not found in queue %Fp\n", iorb, queue);
+    _vPrev = _vIorb;
+    _vIorb = _pIorb->pNxtIORB;
+  }
+
+  if (found)
+  {
+    DPRINTF(3,"IORB %x removed (queue = %x)\n", vIorb, queue);
+  }
+  else
+  {
+    DPRINTF(2,"IORB %x not found in queue %x\n", vIorb, queue);
   }
 
@@ -1309 +1402 @@
  *       status to the specified error code.
  */
-void iorb_seterr(IORBH _far *iorb, USHORT error_code)
-{
-  iorb->ErrorCode = error_code;
-  iorb->Status |= IORB_ERROR;
+void iorb_seterr(IORBH *pIorb, USHORT error_code)
+{
+  pIorb->ErrorCode = error_code;
+  pIorb->Status |= IORB_ERROR;
 }
 
@@ -1333 +1426 @@
  *        See abort_ctxhook() for an example.
  */
-void iorb_done(IORBH _far *iorb)
-{
-  int a = iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
+void iorb_done(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  int a = iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
 
   /* remove IORB from corresponding queue */
   spin_lock(drv_lock);
-  if (iorb_driver_level(iorb)) {
-    iorb_queue_del(&driver_queue, iorb);
-  } else {
-    iorb_queue_del(&ad_infos[a].ports[p].iorb_queue, iorb);
-  }
-  aws_free(add_workspace(iorb));
+  if (iorb_driver_level(pIorb))
+  {
+    iorb_queue_del(&driver_queue, vIorb);
+  }
+  else
+  {
+    iorb_queue_del(&ad_infos[a].ports[p].iorb_queue, vIorb);
+  }
+  aws_free(add_workspace(pIorb));
   spin_unlock(drv_lock);
 
-  iorb_complete(iorb);
+  iorb_complete(vIorb, pIorb);
 }
 
@@ -1358 +1454 @@
  * the next request to us before even returning from this function.
  */
-void iorb_complete(IORBH _far *iorb)
-{
-  iorb->Status |= IORB_DONE;
-
-  ddprintf("IORB %Fp complete (status = 0x%04x, error = 0x%04x)\n",
-          iorb, iorb->Status, iorb->ErrorCode);
-
-  if (iorb->RequestControl & IORB_ASYNC_POST) {
-    iorb->NotifyAddress(iorb);
+void iorb_complete(IORBH FAR16DATA *vIorb, IORBH *pIorb)
+{
+  pIorb->Status |= IORB_DONE;
+
+  DPRINTF(1,"IORB %x complete status=0x%04x error=0x%04x\n",
+          vIorb, pIorb->Status, pIorb->ErrorCode);
+
+  if (pIorb->RequestControl & IORB_ASYNC_POST)
+  {
+    Dev32Help_CallFar16((PFNFAR16)pIorb->NotifyAddress, vIorb);
   }
 }
@@ -1379 +1476 @@
  *  - no_ncq
  */
-void iorb_requeue(IORBH _far *iorb)
-{
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
+void iorb_requeue(IORBH *pIorb)
+{
+  ADD_WORKSPACE *aws = add_workspace(pIorb);
   u16 no_ncq = aws->no_ncq;
   u16 unaligned = aws->unaligned;
@@ -1398 +1495 @@
  * be called with the spinlock held to prevent race conditions.
  */
-void aws_free(ADD_WORKSPACE _far *aws)
-{
-  if (aws->timer != 0) {
-    ADD_CancelTimer(aws->timer);
+void aws_free(ADD_WORKSPACE *aws)
+{
+  if (aws->timer != 0)
+  {
+    Timer_CancelTimer(aws->timer);
     aws->timer = 0;
   }
 
-  if (aws->buf != NULL) {
-    free(aws->buf);
+  if (aws->buf != NULL)
+  {
+    MemFree(aws->buf);
     aws->buf = NULL;
   }
@@ -1421 +1520 @@
 
   spin_lock(drv_lock);
-  while (ai->busy) {
+  while (ai->busy)
+  {
     spin_unlock(drv_lock);
-    timer_init(&Timer, 250);
-    while (!timer_check_and_block(&Timer));
+    TimerInit(&Timer, 250);
+    while (!TimerCheckAndBlock(&Timer));
     spin_lock(drv_lock);
   }
@@ -1444 +1544 @@
  * separate function which is invoked via a context hook.
  */
-void _cdecl _far timeout_callback(ULONG timer_handle, ULONG p1, ULONG p2)
-{
-  IORBH _far *iorb = (IORBH _far *) p1;
-  int a = iorb_unit_adapter(iorb);
-  int p = iorb_unit_port(iorb);
-
-  ADD_CancelTimer(timer_handle);
-  dprintf("timeout for IORB %Fp\n", iorb);
+void __syscall timeout_callback(ULONG timer_handle, ULONG p1)
+{
+  IORBH FAR16DATA *vIorb = (IORBH FAR16DATA *)CastULONGToFar16(p1);
+  IORBH *pIorb = Far16ToFlat(vIorb);
+  int a = iorb_unit_adapter(pIorb);
+  int p = iorb_unit_port(pIorb);
+
+  Timer_CancelTimer(timer_handle);
+  DPRINTF(0,"timeout for IORB %x\n", vIorb);
 
   /* Move the timed-out IORB to the abort queue. Since it's possible that the
@@ -1460 +1561 @@
    */
   spin_lock(drv_lock);
-  if (iorb_queue_del(&ad_infos[a].ports[p].iorb_queue, iorb) == 0) {
-    iorb_queue_add(&abort_queue, iorb);
-    iorb->ErrorCode = IOERR_ADAPTER_TIMEOUT;
+  if (iorb_queue_del(&ad_infos[a].ports[p].iorb_queue, vIorb) == 0)
+  {
+    iorb_queue_add(&abort_queue, vIorb, pIorb);
+    pIorb->ErrorCode = IOERR_ADAPTER_TIMEOUT;
   }
   spin_unlock(drv_lock);
@@ -1477 +1579 @@
    *    will process our IORB as well.
    */
-  DevHelp_ArmCtxHook(0, reset_ctxhook_h);
+  KernArmHook(reset_ctxhook_h, 0, 0);
 
   /* Set up a watchdog timer which calls the context hook manually in case
@@ -1485 +1587 @@
    * does in the early boot phase.
    */
-  ADD_StartTimerMS(&th_reset_watchdog, 5000, (PFN) reset_watchdog, 0, 0);
+  Timer_StartTimerMS(&th_reset_watchdog, 5000, reset_watchdog, 0);
 }
 
@@ -1499 +1601 @@
  * problems during the early boot phase.
  */
-void _cdecl _far reset_watchdog(ULONG timer_handle, ULONG p1, ULONG p2)
+void __syscall reset_watchdog(ULONG timer_handle, ULONG p1)
 {
   /* reset watchdog timer */
-  ADD_CancelTimer(timer_handle);
-  dprintf("reset watchdog invoked\n");
+  Timer_CancelTimer(timer_handle);
+  DPRINTF(0,"reset watchdog invoked\n");
 
   /* call context hook manually */
   reset_ctxhook(0);
-}
-
-/******************************************************************************
- * small_code_ - this dummy func resolves the undefined reference linker
- * error that occurrs when linking WATCOM objects with DDK's link.exe
- */
-void _cdecl small_code_(void)
-{
 }
 
@@ -1528 +1622 @@
  * index of the virtual SCSI adapter.
  */
-static int add_unit_info(IORB_CONFIGURATION _far *iorb_conf, int dta,
+static int add_unit_info(IORB_CONFIGURATION *pIorb_conf, int dta,
                          int a, int p, int d, int scsi_id)
 {
-  DEVICETABLE _far *dt = iorb_conf->pDeviceTable;
-  ADAPTERINFO _far *ptr = (ADAPTERINFO _far *) (((u32) dt & 0xffff0000U) +
-                                                 (u16) dt->pAdapter[dta]);
-  UNITINFO _far *ui = ptr->UnitInfo + ptr->AdapterUnits;
+  DEVICETABLE *pDt = Far16ToFlat(pIorb_conf->pDeviceTable);
+  ADAPTERINFO *pPtr;
+  UNITINFO *pUi;
   AD_INFO *ai = ad_infos + a;
 
-  if ((u32) (ui + 1) - (u32) dt > iorb_conf->DeviceTableLen) {
-    dprintf("error: device table provided by DASD too small\n");
-    iorb_seterr(&iorb_conf->iorbh, IOERR_CMD_SW_RESOURCE);
+  pPtr = (ADAPTERINFO *)MakeFlatFromNear16(pIorb_conf->pDeviceTable, pDt->pAdapter[dta]);
+  //DPRINTF(2,"add_unit_info: ptr=%x dta=%x pAdapter[dta]=%x pDeviceTable=%x\n",
+  //    ptr, dta, dt->pAdapter[dta], iorb_conf->pDeviceTable);
+
+  pUi = &pPtr->UnitInfo[pPtr->AdapterUnits];
+
+  if ((u32)(pUi + 1) - (u32)pDt > pIorb_conf->DeviceTableLen)
+  {
+    DPRINTF(0,"error: device table provided by DASD too small\n");
+    iorb_seterr(&pIorb_conf->iorbh, IOERR_CMD_SW_RESOURCE);
     return(-1);
   }
 
-  if (ai->ports[p].devs[d].unit_info == NULL) {
+  if (ai->ports[p].devs[d].unit_info == NULL)
+  {
     /* provide original information about this device (unit) */
-    memset(ui, 0x00, sizeof(*ui));
-    ui->AdapterIndex = dta;                 /* device table adapter index */
-    ui->UnitHandle   = iorb_unit(a, p, d);  /* physical adapter index */
-    ui->UnitIndex    = ptr->AdapterUnits;
-    ui->UnitType     = ai->ports[p].devs[d].dev_type;
-    ui->QueuingCount = ai->ports[p].devs[d].ncq_max;;
-    if (ai->ports[p].devs[d].removable) {
-      ui->UnitFlags |= UF_REMOVABLE;
+    memset(pUi, 0x00, sizeof(*pUi));
+    pUi->AdapterIndex = dta;                 /* device table adapter index */
+    pUi->UnitHandle   = iorb_unit(a, p, d);  /* physical adapter index */
+    pUi->UnitIndex    = pPtr->AdapterUnits;
+    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 */
-      ui->UnitSCSITargetID = scsi_id;
-    }
-  } else {
+      pUi->UnitSCSITargetID = scsi_id;
+    }
+  }
+  else
+  {
     /* copy updated device (unit) information (IOCM_CHANGE_UNITINFO) */
-    memcpy(ui, ai->ports[p].devs[d].unit_info, sizeof(*ui));
-  }
-
-  ptr->AdapterUnits++;
+    memcpy(pUi, ai->ports[p].devs[d].unit_info, sizeof(*pUi));
+  }
+
+  pPtr->AdapterUnits++;
   return(0);
 }
 
-/*******************************************************************************
- * Register kernel exit handler for trap dumps. Our exit handler will be called
- * right before the kernel starts a dump; that's where we reset the controller
- * so it supports BIOS int13 I/O calls.
- */
-static void register_krnl_exit(void)
-{
-  _asm {
-    push ds
-    push es
-    push bx
-    push si
-    push di
-
-    mov ax, FLAG_KRNL_EXIT_ADD
-    mov cx, TYPE_KRNL_EXIT_INT13
-    mov bx, SEG asm_krnl_exit
-    mov si, OFFSET asm_krnl_exit
-    mov dl, DevHlp_RegisterKrnlExit
-
-    call dword ptr [Device_Help]
-
-    pop  di
-    pop  si
-    pop  bx
-    pop  es
-    pop  ds
-  }
-
-  dprintf("Registered kernel exit routine for INT13 mode\n");
-}
-

trunk/src/os2ahci/os2ahci.h

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013-2015 David Azarewicz
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -43 +43 @@
 //#define LEGACY_APM
 
-#define INCL_NOPMAPI
-#define INCL_DOSINFOSEG
-#define INCL_NO_SCB
-#define INCL_DOSERRORS
-#include <os2.h>
-#include <dos.h>
-#include <bseerr.h>
-#include <dskinit.h>
-#include <scb.h>
-
-#include <devhdr.h>
-#include <iorb.h>
-#include <strat2.h>
-#include <reqpkt.h>
-
-/* NOTE: (Rousseau)
- * The regular dhcalls.h from $(DDK)\base\h also works.
- * The devhelp.h from $(DDK)\base\h produces inline assembler errors.
- * The modified devhelp.h from ..\include works OK and is used because it
- * generates a slightly smaller driver image.
- */
-#ifdef __WATCOMC__
-/* include WATCOM specific DEVHELP stubs */
-#include <devhelp.h>
-#else
-#include <dhcalls.h>
-#endif
-
-#include <addcalls.h>
-#include <rmcalls.h>
-#include <devclass.h>
-#include <devcmd.h>
-#include <rmbase.h>
-
+#include "Dev32lib.h"
+#include "Dev32rmcalls.h"
+#include <Dev32iorb.h>
 #include "ahci.h"
 #include "ahci-idc.h"
@@ -82 +51 @@
 /* -------------------------- macros and constants ------------------------- */
 
-#define MAX_AD               8       /* maximum number of adapters */
-
-/* Timer pool size. In theory, we need one timer per outstanding command plus
- * a few miscellaneous timers but it's unlikely we'll ever have outstanding
- * commands on all devices on all ports on all apapters -- this would be
- * 8 * 32 * 32 = 8192 outstanding commands on a maximum of 8 * 32 * 15 = 3840
- * devices and that's a bit of an exaggeration. It should be more than enough
- * to have 128 timers.
- */
-#define TIMER_COUNT        128
-#define TIMER_POOL_SIZE    (sizeof(ADD_TIMER_POOL) + \
-                            TIMER_COUNT * sizeof(ADD_TIMER_DATA))
+#define MAX_AD 8 /* maximum number of adapters */
+
+#define TIMER_COUNT 128
 
 /* default command timeout (can be overwritten in the IORB) */
-#define DEFAULT_TIMEOUT  30000
+#define DEFAULT_TIMEOUT 30000
 
 /* Maximum number of retries for commands in the restart/reset context hooks.
@@ -106 +66 @@
  * bit left before the ADD workspace structure would become too large...
  */
-#define MAX_RETRIES          3
-
-/* max/min macros */
-#define max(a, b)  (a) > (b) ? (a) : (b)
-#define min(a, b)  (a) < (b) ? (a) : (b)
+#define MAX_RETRIES 3
 
 /* debug output macros */
 #ifdef DEBUG
-#define dprintf   if (debug > 0) printf
-#define dphex     if (debug > 0) phex
-#define ddprintf  if (debug > 1) printf
-#define ddphex    if (debug > 1) phex
-#define dddprintf if (debug > 2) printf
-#define dddphex   if (debug > 2) phex
-#define ntprintf printf_nts
-#define aprintf printf
+#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);}
 #else
-#define dprintf(a,...)
-#define dphex(a,b,c,...)
-#define ddprintf(a,...)
-#define ddphex(a,b,c,...)
-#define dddprintf(a,...)
-#define dddphex(a,b,c,...)
-#define ntprintf(a,...)
-#define aprintf(a,...)
+#define DPRINTF(a,b,...)
+#define DHEXDUMP(a,b,c,d,...)
+#define NTPRINTF(a,...)
+#define DUMP_HOST_REGS(a,b)
+#define DUMP_PORT_REGS(l,a,b)
 #endif
 
@@ -137 +87 @@
  * with vprintf-like funcs)
  */
-#define ciprintf  if (verbosity > 0) cprintf
-#define ciiprintf if (verbosity > 1) cprintf
-
-/* TRACE macros (for our internal ring buffer trace) */
-#define AHCI_DEBUG_BUF_SIZE  0x10000UL /* 64k must be a power of 2 */
-#define AHCI_INFO_BUF_SIZE  0x1000UL /* 4k must be a power of 2 */
+#define ciprintf(a,...)  {if (verbosity > 0) iprintf(a, ##__VA_ARGS__);}
+#define ciiprintf(a,...) {if (verbosity > 1) iprintf(a, ##__VA_ARGS__);}
 
 /* adapter number from AD_INFO pointer; mainly for dprintf() purposes */
-#define ad_no(ai) (((u16) ai - (u16) ad_infos) / sizeof(*ai))
-
-/* Convert far function address into NPFN (the DDK needs this all over the
- * place and just casting to NPFN will produce a "segment lost in conversion"
- * warning. Since casting to a u32 is a bit nasty for function pointers and
- * might have to be revised for different compilers, we'll use a central
- * macro for this crap.
- */
-#define mk_NPFN(func)      (NPFN) (u32) (func)
-
-/* stdarg.h macros with explicit far pointers
- *
- * NOTE: The compiler pushes fixed arguments with 16 bits minimum, thus
- *       the last fixed argument (i.e. the one passed to va_start) must
- *       have at least 16 bits. Otherwise, the address calculation in
- *       va_start() will fail.
- */
-typedef char _far *va_list;
+#define ad_no(ai) ( ( (u32)ai - (u32)ad_infos ) / sizeof(*ai))
+
+#define MakeNear16PtrFromDiff(Base16, Base32, New32) \
+  ( ( CastFar16ToULONG(Base16) + ( (ULONG)(New32) - (ULONG)(Base32) ) ) & 0xffff)
+
+#define MakeFar16PtrFromDiff(Base16, Base32, New32) \
+  CastULONGToFar16(CastFar16ToULONG(Base16) + ((ULONG)(New32) - (ULONG)(Base32))))
+
+/* Takes the selector from the first parameter, and the offset specified
+ * in the second parameter, and returns a flat pointer
+ */
+extern void *MakeFlatFromNear16(void __far16 *, USHORT);
+#pragma aux MakeFlatFromNear16 = \
+  "mov ax, bx" \
+  "call Far16ToFlat" \
+  parm nomemory [eax] [bx] value [eax] modify nomemory exact [eax];
+
+/* stdarg.h macros with explicit far pointers */
+typedef char *va_list;
 #define va_start(va, last)    va = (va_list) (&last + 1)
-#define va_arg(va, type)      ((type _far *) (va += sizeof(type)))[-1]
+#define va_arg(va, type)      ((type *) (va += sizeof(type)))[-1]
 #define va_end(va)            va = 0
 
-/* ctype macros */
-#define isupper(ch)           ((ch) >= 'A' && (ch) <= 'Z')
-#define tolower(ch)           (isupper(ch) ? (ch) + ('a' - 'A') : (ch))
-
 /* stddef macros */
-#define offsetof(s, e)        ((u16) &((s *) 0)->e)
-
-/* SMP spinlock compatibility macros for older DDKs using CLI/STI */
-#ifdef SPINLOCK_EMULATION
-#define DevHelp_CreateSpinLock(p_sph)  *(p_sph) = 0
-#define DevHelp_FreeSpinLock(sph)      0
-
-#define DevHelp_AcquireSpinLock(sph)    if ((sph) != 0)                \
-                                         panic("recursive spinlock"); \
-                                       (sph) = disable()
-
-#define DevHelp_ReleaseSpinLock(sph)   if (sph) {                     \
-                                         (sph) = 0;                   \
-                                         enable();                    \
-                                       }
-#endif
+#define offsetof(s, e) ((u32)&((s *)0)->e)
 
 /* shortcut macros */
-#define spin_lock(sl)     DevHelp_AcquireSpinLock(sl)
-#define spin_unlock(sl)   DevHelp_ReleaseSpinLock(sl)
-
-/* Get AHCI port MMIO base from AD_INFO and port number. For the time being,
- * MMIO addresses are assumed to be valid 16:16 pointers which implies
- * that one GDT selector is allocated per adapter.
- */
-#define port_base(ai, p)   ((u8 _far *) (ai)->mmio + 0x100 + (p) * 0x80)
-
-/* Get address of port-specific DMA scratch buffer. The total size of all DMA
- * buffers required for 32 ports exceeds 65536 bytes, thus we need multiple
- * GDT selectors to access all port DMA scratch buffers and some logic to map
- * a port number to the corresponding DMA scratch buffer address.
- */
-#define PORT_DMA_BUFS_PER_SEG  ((size_t) (65536UL / AHCI_PORT_PRIV_DMA_SZ))
-#define PORT_DMA_BUF_SEGS      ((AHCI_MAX_PORTS + PORT_DMA_BUFS_PER_SEG - 1) \
-                                / PORT_DMA_BUFS_PER_SEG)
-#define PORT_DMA_SEG_SIZE      ((u32) PORT_DMA_BUFS_PER_SEG * \
-                                (u32) AHCI_PORT_PRIV_DMA_SZ)
-
-#define port_dma_base(ai, p) \
-  ((AHCI_PORT_DMA _far *) ((ai)->dma_buf[(p) / PORT_DMA_BUFS_PER_SEG] + \
-                           ((p) % PORT_DMA_BUFS_PER_SEG) * AHCI_PORT_PRIV_DMA_SZ))
-
-#define port_dma_base_phys(ai, p) \
-  ((ai)->dma_buf_phys + (u32) (p) * AHCI_PORT_PRIV_DMA_SZ)
+#define spin_lock(sl)     KernAcquireSpinLock(&sl)
+#define spin_unlock(sl)   KernReleaseSpinLock(&sl)
+
+/* Get AHCI port MMIO base from AD_INFO and port number. */
+#define port_base(ai, p) ((u8 *) (ai)->mmio + 0x100 + (p) * 0x80)
+#define port_dma_base(ai, p) ((AHCI_PORT_DMA *) ((ai)->dma_buf[(p)]))
+#define port_dma_base_phys(ai, p) ((ai)->dma_buf_phys[(p)])
 
 /* Convert an SATA adapter/port/device address into a 16-bit IORB unit handle
@@ -229 +138 @@
                                   (((u16) (p) & 0x0fU) << 4) | \
                                   (((u16) (d) & 0x0fU)))
-#define iorb_unit_adapter(iorb)  (((u16) (iorb)->UnitHandle >> 8) & 0x07U)
-#define iorb_unit_port(iorb)     (((u16) (iorb)->UnitHandle >> 4) & 0x0fU)
-#define iorb_unit_device(iorb)   ((u16)  (iorb)->UnitHandle       & 0x0fU)
+#define iorb_unit_adapter(iorb)  (((iorb)->UnitHandle >> 8) & 0x07)
+#define iorb_unit_port(iorb)     (((iorb)->UnitHandle >> 4) & 0x0f)
+#define iorb_unit_device(iorb)   ((iorb)->UnitHandle & 0x0f)
 
 /*******************************************************************************
@@ -244 +153 @@
 
 /* access IORB ADD workspace */
-#define add_workspace(iorb)     ((ADD_WORKSPACE _far *) &(iorb)->ADDWorkSpace)
+#define add_workspace(iorb)     ((ADD_WORKSPACE *) &(iorb)->ADDWorkSpace)
 
 
@@ -303 +212 @@
 /* ------------------------ typedefs and structures ------------------------ */
 
-typedef unsigned int     size_t;
-
-typedef struct {
-  u32 Start;
-  u32 End;
-} TIMER;
-
 /* PCI device information structure; this is used both for scanning and for
  * identification purposes in 'AD_INFO'; based on the Linux pci_device_id
@@ -329 +231 @@
  */
 typedef struct {
-  IORBH _far *volatile root;           /* root of request list */
-  IORBH _far *volatile tail;           /* tail of request list */
+  IORBH FAR16DATA *volatile vRoot;           /* root of request list */
+  IORBH FAR16DATA *volatile vTail;           /* tail of request list */
 } IORB_QUEUE;
 
@@ -352 +254 @@
 
   struct {
-    unsigned    allocated : 1;         /* if != 0, device is allocated */
-    unsigned    present   : 1;         /* if != 0, device is present */
-    unsigned    lba48     : 1;         /* if != 0, device supports 48-bit LBA */
-    unsigned    atapi     : 1;         /* if != 0, this is an ATAPI device */
-    unsigned    atapi_16  : 1;         /* if != 0, device suports 16-byte cmds */
-    unsigned    removable : 1;         /* if != 0, device has removable media */
-    unsigned    dev_type  : 5;         /* device type (UIB_TYPE_* in iorb.h) */
-    unsigned    ncq_max   : 5;         /* maximum tag number for queued commands */
-    UNITINFO _far *unit_info;          /* pointer to modified unit info */
-    DEV_INFO    dev_info;
+    unsigned allocated :1;        /* if != 0, device is allocated */
+    unsigned present   :1;        /* if != 0, device is present */
+    unsigned lba48     :1;        /* if != 0, device supports 48-bit LBA */
+    unsigned atapi     :1;        /* if != 0, this is an ATAPI device */
+    unsigned atapi_16  :1;        /* if != 0, device suports 16-byte cmds */
+    unsigned removable :1;        /* if != 0, device has removable media */
+    unsigned dev_type  :5;        /* device type (UIB_TYPE_* in iorb.h) */
+    unsigned ncq_max   :5;        /* maximum tag number for queued commands */
+    UNITINFO *unit_info;          /* pointer to modified unit info */
+    DEV_INFO dev_info;
   } devs[AHCI_MAX_DEVS];
 } P_INFO;
@@ -391 +293 @@
   HRESOURCE     rm_irq;                /* resource handle for IRQ */
 
-  u8            bus;                   /* PCI bus number */
-  u8            dev_func;              /* PCI device and function number */
+  u16           bus_dev_func;          /* PCI bus number PCI device and function number */
   u16           irq;                   /* interrupt number */
 
   u32           mmio_phys;             /* physical address of MMIO region */
   u32           mmio_size;             /* size of MMIO region */
-  u8      _far *mmio;                  /* pointer to this adapter's MMIO region */
-
-  u32           dma_buf_phys;          /* physical address of DMA scratch buffer */
-  u8      _far *dma_buf[PORT_DMA_BUF_SEGS]; /* DMA scatch buffer */
+  u8           *mmio;                  /* pointer to this adapter's MMIO region */
+
+  u32           dma_buf_phys[AHCI_MAX_PORTS];          /* physical address of DMA scratch buffer */
+  u8         *dma_buf[AHCI_MAX_PORTS]; /* DMA scatch buffers */
 
   P_INFO        ports[AHCI_MAX_PORTS]; /* SATA ports on this adapter */
@@ -407 +308 @@
 /* ADD workspace in IORB (must not exceed 16 bytes) */
 typedef struct {
-  void (*ppfunc)(IORBH _far *iorb);    /* post-processing function */
-  void         *buf;                   /* response buffer (e.g. for identify cmds) */
-  ULONG         timer;                 /* timer for timeout procesing */
-  USHORT        blocks;                /* number of blocks to be transferred */
-  unsigned      processing    : 1;     /* IORB is being processd */
-  unsigned      idempotent    : 1;     /* IORB is idempotent (can be retried) */
-  unsigned      queued_hw     : 1;     /* IORB has been queued to hardware */
-  unsigned      no_ncq        : 1;     /* must not use native command queuing */
-  unsigned      is_ncq        : 1;     /* should use native command queueing */
-  unsigned      complete      : 1;     /* IORB has completed processing */
-  unsigned      unaligned     : 1;     /* unaligned S/G; need to use transfer buffer */
-  unsigned      retries       : 2;     /* number of retries for this command */
-  unsigned      cmd_slot      : 5;     /* AHCI command slot for this IORB */
-} ADD_WORKSPACE;
+  void (*ppfunc)(IORBH FAR16DATA *vIorb, IORBH *pIorb);         /* 00 post-processing function */
+  void         *buf;                   /* 04 response buffer (e.g. for identify cmds) */
+  ULONG         timer;                 /* 08 timer for timeout procesing */
+  USHORT        blocks;                /* 0c number of blocks to be transferred */
+  unsigned short processing    :1;     /* 0e IORB is being processd */
+  unsigned short idempotent    :1;     /*    IORB is idempotent (can be retried) */
+  unsigned short queued_hw     :1;     /*    IORB has been queued to hardware */
+  unsigned short no_ncq        :1;     /*    must not use native command queuing */
+  unsigned short is_ncq        :1;     /*    should use native command queueing */
+  unsigned short complete      :1;     /*    IORB has completed processing */
+  unsigned short unaligned     :1;     /*    unaligned S/G; need to use transfer buffer */
+  unsigned short retries       :2;     /*    number of retries for this command */
+  unsigned short cmd_slot      :5;     /*    AHCI command slot for this IORB */
+} ADD_WORKSPACE;                       /* 10 */
 
 /* sg_memcpy() direction */
@@ -457 +358 @@
 /* -------------------------- function prototypes -------------------------- */
 
-/* init.asm */
-extern u32  _cdecl        readl       (void _far *addr);
-extern u32  _cdecl        writel      (void _far *addr, u32 val);
-extern void _far * _cdecl memcpy      (void _far *v_dst, void _far *v_src, int len);
-extern void _far * _cdecl memset      (void _far *p, int ch, size_t len);
-extern void _cdecl _far restart_hook  (void);
-extern void _cdecl _far reset_hook    (void);
-extern void _cdecl _far engine_hook   (void);
-extern void _cdecl _far asm_krnl_exit (void);
-extern void _cdecl udelay             (u16 microseconds);
+static inline unsigned long readl(void *a)
+{
+  return *(volatile unsigned long*)a;
+}
+
+static inline void writel(void *a, unsigned long v)
+{
+  *(volatile unsigned long*)a = v;
+}
+
+extern void shutdown_driver(void);
 
 /* os2ahci.c */
-extern USHORT  init_drv               (RPINITIN _far *req);
-extern USHORT  gen_ioctl              (RP_GENIOCTL _far *ioctl);
-extern USHORT  char_dev_input         (RP_RWV _far *rwrb);
-extern USHORT  exit_drv               (int func);
-extern USHORT  sr_drv                 (int func);
-extern void _cdecl _far _loadds add_entry    (IORBH _far *iorb);
-extern void    trigger_engine         (void);
-extern int     trigger_engine_1       (void);
-extern void    send_iorb              (IORBH _far *iorb);
-extern void    iocc_configuration     (IORBH _far *iorb);
-extern void    iocc_device_control    (IORBH _far *iorb);
-extern void    iocc_unit_control      (IORBH _far *iorb);
-extern void    iocm_device_table      (IORBH _far *iorb);
-extern void    iocc_geometry          (IORBH _far *iorb);
-extern void    iocc_execute_io        (IORBH _far *iorb);
-extern void    iocc_unit_status       (IORBH _far *iorb);
-extern void    iocc_adapter_passthru  (IORBH _far *iorb);
-extern void    iorb_queue_add         (IORB_QUEUE _far *queue, IORBH _far *iorb);
-extern int     iorb_queue_del         (IORB_QUEUE _far *queue, IORBH _far *iorb);
-extern void    iorb_seterr            (IORBH _far *iorb, USHORT error_code);
-extern void    iorb_done              (IORBH _far *iorb);
-extern void    iorb_complete          (IORBH _far *iorb);
-extern void    iorb_requeue           (IORBH _far *iorb);
-extern void    aws_free               (ADD_WORKSPACE _far *aws);
-extern void    lock_adapter           (AD_INFO *ai);
-extern void    unlock_adapter         (AD_INFO *ai);
-extern void _cdecl _far timeout_callback    (ULONG timer_handle, ULONG p1, ULONG p2);
-extern void _cdecl _far reset_watchdog      (ULONG timer_handle, ULONG p1, ULONG p2);
+extern USHORT init_drv(REQPACKET *req);
+extern USHORT gen_ioctl(REQPACKET *ioctl);
+extern USHORT char_dev_input(REQPACKET *rwrb);
+extern USHORT exit_drv(int func);
+extern USHORT sr_drv(int func);
+extern void add_entry(IORBH FAR16DATA *vIorb);
+extern void trigger_engine(void);
+extern int trigger_engine_1(void);
+extern void send_iorb(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iocc_configuration (IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iocc_device_control(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iocc_unit_control(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iocm_device_table(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iocc_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iocc_execute_io(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iocc_unit_status(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iocc_adapter_passthru(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iorb_queue_add(IORB_QUEUE *queue, IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern int iorb_queue_del(IORB_QUEUE *queue, IORBH FAR16DATA *vIorb);
+extern void iorb_seterr(IORBH *pIorb, USHORT error_code);
+extern void iorb_done(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iorb_complete(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void iorb_requeue(IORBH *pIorb);
+extern void aws_free(ADD_WORKSPACE *aws);
+extern void lock_adapter(AD_INFO *ai);
+extern void unlock_adapter(AD_INFO *ai);
+extern void __syscall timeout_callback(ULONG timer_handle, ULONG p1);
+extern void __syscall reset_watchdog(ULONG timer_handle, ULONG p1);
 
 /* ahci.c */
-extern int     ahci_save_bios_config        (AD_INFO *ai);
-extern int     ahci_restore_bios_config     (AD_INFO *ai);
-extern int     ahci_restore_initial_config  (AD_INFO *ai);
-extern AHCI_PORT_CFG *ahci_save_port_config (AD_INFO *ai, int p);
-extern void    ahci_restore_port_config     (AD_INFO *ai, int p,
-                                             AHCI_PORT_CFG *pc);
-extern int     ahci_enable_ahci             (AD_INFO *ai);
-extern int     ahci_scan_ports              (AD_INFO *ai);
-extern int     ahci_complete_init           (AD_INFO *ai);
-extern int     ahci_reset_port              (AD_INFO *ai, int p, int ei);
-extern int     ahci_start_port              (AD_INFO *ai, int p, int ei);
-extern void    ahci_start_fis_rx            (AD_INFO *ai, int p);
-extern void    ahci_start_engine            (AD_INFO *ai, int p);
-extern int     ahci_stop_port               (AD_INFO *ai, int p);
-extern int     ahci_stop_fis_rx             (AD_INFO *ai, int p);
-extern int     ahci_stop_engine             (AD_INFO *ai, int p);
-extern int     ahci_port_busy               (AD_INFO *ai, int p);
-extern void    ahci_exec_iorb               (IORBH _far *iorb, int ncq_capable,
-                                             int (*func)(IORBH _far *, int));
-extern void    ahci_exec_polled_iorb        (IORBH _far *iorb,
-                                             int (*func)(IORBH _far *, int),
-                                             ULONG timeout);
-extern int     ahci_exec_polled_cmd         (AD_INFO *ai, int p, int d,
-                                             int timeout, int cmd, ...);
-extern int     ahci_set_dev_idle            (AD_INFO *ai, int p, int d, int idle);
-extern int     ahci_flush_cache             (AD_INFO *ai, int p, int d);
-
-extern int     ahci_intr                    (u16 irq);
-extern void    ahci_port_intr               (AD_INFO *ai, int p);
-extern void    ahci_error_intr              (AD_INFO *ai, int p, u32 irq_stat);
-
-extern void    ahci_get_geometry            (IORBH _far *iorb);
-extern void    ahci_unit_ready              (IORBH _far *iorb);
-extern void    ahci_read                    (IORBH _far *iorb);
-extern void    ahci_verify                  (IORBH _far *iorb);
-extern void    ahci_write                   (IORBH _far *iorb);
-extern void    ahci_execute_cdb             (IORBH _far *iorb);
-extern void    ahci_execute_ata             (IORBH _far *iorb);
+extern int ahci_save_bios_config(AD_INFO *ai);
+extern int ahci_restore_bios_config(AD_INFO *ai);
+extern int ahci_restore_initial_config(AD_INFO *ai);
+extern AHCI_PORT_CFG *ahci_save_port_config(AD_INFO *ai, int p);
+extern void ahci_restore_port_config(AD_INFO *ai, int p, AHCI_PORT_CFG *pc);
+extern int ahci_enable_ahci(AD_INFO *ai);
+extern int ahci_scan_ports(AD_INFO *ai);
+extern int ahci_complete_init(AD_INFO *ai);
+extern int ahci_reset_port(AD_INFO *ai, int p, int ei);
+extern int ahci_start_port(AD_INFO *ai, int p, int ei);
+extern void ahci_start_fis_rx(AD_INFO *ai, int p);
+extern void ahci_start_engine(AD_INFO *ai, int p);
+extern int ahci_stop_port(AD_INFO *ai, int p);
+extern int ahci_stop_fis_rx(AD_INFO *ai, int p);
+extern int ahci_stop_engine(AD_INFO *ai, int p);
+extern int ahci_port_busy(AD_INFO *ai, int p);
+extern void ahci_exec_iorb(IORBH FAR16DATA *vIorb, IORBH *pIorb, int ncq_capable, int (*func)(IORBH FAR16DATA *, IORBH *pIorb, int));
+extern void ahci_exec_polled_iorb(IORBH FAR16DATA *vIorb, IORBH *pIorb, int (*func)(IORBH FAR16DATA *, IORBH *pIorb, int), ULONG timeout);
+extern int ahci_exec_polled_cmd(AD_INFO *ai, int p, int d, int timeout, int cmd, ...);
+extern int ahci_set_dev_idle(AD_INFO *ai, int p, int d, int idle);
+extern int ahci_flush_cache(AD_INFO *ai, int p, int d);
+
+extern int ahci_intr(u16 irq);
+extern void ahci_port_intr(AD_INFO *ai, int p);
+extern void ahci_error_intr(AD_INFO *ai, int p, u32 irq_stat);
+
+extern void ahci_get_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void ahci_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void ahci_read(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void ahci_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void ahci_write(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void ahci_execute_cdb(IORBH FAR16DATA *vIorb, IORBH *pIorb);
+extern void ahci_execute_ata(IORBH FAR16DATA *vIorb, IORBH *pIorb);
 extern void ahci_dump_host_regs(AD_INFO *ai, int bios_regs);
 extern void ahci_dump_port_regs(AD_INFO *ai, int p);
 extern int ahci_reset_controller(AD_INFO *ai);
 
-/* libc.c */
-extern void        init_libc     (void);
-extern void        init_com      (long BaudRate);
-extern int         vsprintf      (char _far *buf, const char *fmt, va_list va);
-extern int         sprintf       (char _far *buf, const char *fmt, ...);
-extern void        vfprintf      (const char *fmt, va_list va);
-extern void _cdecl printf        (const char *fmt, ...);
-extern void _cdecl printf_nts    (const char *fmt, ...);
-extern void        cprintf       (const char *fmt, ...);
-extern void        phex          (const void _far *p, int len, const char *fmt, ...);
-extern size_t      strlen        (const char _far *s);
-extern char _far  *strcpy        (char _far *dst, const char _far *src);
-extern int         memcmp        (void _far *p1, void _far *p2, size_t len);
-extern void        sg_memcpy     (SCATGATENTRY _far *sg_list, USHORT sg_cnt,
-                                  ULONG sg_off, void _far *buf, USHORT len,
-                                  SG_MEMCPY_DIRECTION dir);
-extern long        strtol        (const char _far *buf,
-                                  const char _far * _far *ep, int base);
-extern void       *malloc        (size_t len);
-extern void        free          (void *ptr);
-extern ULONG       virt_to_phys  (void _far *ptr);
-extern void        msleep        (u32 millies);
-extern void        panic         (char *msg);
-extern int         disable       (void);
-extern void        enable        (void);
-extern void timer_init(TIMER far *pTimer, u32 Milliseconds);
-extern int timer_check_and_block(TIMER far *pTimer);
+extern void sg_memcpy(SCATGATENTRY *sg_list, USHORT sg_cnt, ULONG sg_off, void *buf, USHORT len, SG_MEMCPY_DIRECTION dir);
+extern void panic(char *msg);
 
 /* trace.c */
-extern void        trace_init    (u32);
-extern void        trace_exit    (void);
-extern void        trace_write   (u8 _far *s, int len);
-extern u16         trace_read    (u8 _far *buf, u16 cb_buf);
-extern u16         trace_char_dev(RP_RWV _far *rwrb);
-extern void        build_user_info(int check);
+extern void build_user_info(void);
 
 /* pci.c */
-extern int       add_pci_id     (u16 vendor, u16 device);
-extern void      scan_pci_bus   (void);
-extern int       pci_enable_int (UCHAR bus, UCHAR dev_func);
-extern void      pci_hack_virtualbox(void);
-extern char     *vendor_from_id (u16 vendor);
-extern char     *device_from_id (u16 device);
-UCHAR pci_read_conf    (UCHAR bus, UCHAR dev_func, UCHAR indx,
-                        UCHAR size, ULONG _far *val);
-UCHAR pci_write_conf   (UCHAR bus, UCHAR dev_func, UCHAR indx, UCHAR size,
-                        ULONG val);
+extern int add_pci_id(u16 vendor, u16 device);
+extern void scan_pci_bus(void);
+extern int pci_enable_int(USHORT BusDevFunc);
+extern void pci_hack_virtualbox(void);
+extern char *vendor_from_id(u16 vendor);
+extern char *device_from_id(u16 device);
 
 /* ctxhook.c */
-extern void _cdecl restart_ctxhook    (ULONG parm);
-extern void _cdecl reset_ctxhook      (ULONG parm);
-extern void _cdecl engine_ctxhook     (ULONG parm);
+extern void _Syscall restart_ctxhook(ULONG parm);
+extern void _Syscall reset_ctxhook(ULONG parm);
+extern void _Syscall engine_ctxhook(ULONG parm);
 
 /* apm.c */
-extern void        apm_init           (void);
-extern void        suspend        (void);
-extern void        resume         (void);
+extern void apm_init(void);
+extern void suspend(void);
+extern void resume(void);
 
 /* ioctl.c */
-extern USHORT      ioctl_get_devlist  (RP_GENIOCTL _far *ioctl);
-extern USHORT      ioctl_passthrough  (RP_GENIOCTL _far *ioctl);
-extern USHORT      ioctl_gen_dsk      (RP_GENIOCTL _far *ioctl);
-extern USHORT      ioctl_smart        (RP_GENIOCTL _far *ioctl);
+extern USHORT ioctl_get_devlist(REQPACKET *ioctl);
+extern USHORT ioctl_passthrough(REQPACKET *ioctl);
+extern USHORT ioctl_gen_dsk(REQPACKET *ioctl);
+extern USHORT ioctl_smart(REQPACKET *ioctl);
 
 
 /* ---------------------------- global variables --------------------------- */
 
-extern char _cdecl       end_of_data;   /* label at the end of all data segments */
-extern void _cdecl _near end_of_code(); /* label at the end of all code segments */
-
-extern int           debug;         /* if != 0, print debug messages to COM1 */
-extern int           thorough_scan; /* if != 0, perform thorough PCI scan */
-extern int           init_reset;    /* if != 0, reset ports during init */
-extern int           force_write_cache; /* if != 0, force write cache */
-extern int           verbosity;     /* if != 0, show some info during boot */
-extern int           use_lvm_info;
-extern int           wrap_trace_buffer;
-
-extern HDRIVER       rm_drvh;       /* resource manager driver handle */
-extern USHORT        add_handle;    /* adapter device driver handle */
-extern UCHAR         timer_pool[];  /* timer pool */
-extern char          drv_name[];    /* driver name as string ("OS2AHCI") */
-
-extern PCI_ID        pci_ids[];     /* SATA adapter PCI IDs */
-extern ULONG         drv_lock;      /* driver-level spinlock */
-extern ULONG         com_lock;      /* debug log spinlock */
-extern volatile PGINFOSEG gis;
-extern IORB_QUEUE    driver_queue;  /* driver-level IORB queue */
-extern AD_INFO       ad_infos[];    /* adapter information list */
-extern int           ad_info_cnt;   /* number of entries in ad_infos[] */
-extern u16           ad_ignore;     /* bitmap with adapters to be ignored */
-extern int           init_complete; /* if != 0, initialization has completed */
-extern int           suspended;     /* indicates if the driver is suspended */
-extern int           resume_sleep_flag;
-
-extern u16           com_base;      /* debug COM port base address */
+extern int thorough_scan; /* if != 0, perform thorough PCI scan */
+extern int init_reset; /* if != 0, reset ports during init */
+extern int force_write_cache; /* if != 0, force write cache */
+extern int verbosity; /* if != 0, show some info during boot */
+extern int use_lvm_info;
+
+extern HDRIVER rm_drvh; /* resource manager driver handle */
+extern USHORT add_handle; /* adapter device driver handle */
+extern char drv_name[]; /* driver name as string ("OS2AHCI") */
+
+extern PCI_ID pci_ids[]; /* SATA adapter PCI IDs */
+extern SpinLock_t drv_lock; /* driver-level spinlock */
+extern ULONG com_lock; /* debug log spinlock */
+extern IORB_QUEUE driver_queue; /* driver-level IORB queue */
+extern AD_INFO ad_infos[]; /* adapter information list */
+extern int ad_info_cnt; /* number of entries in ad_infos[] */
+extern u16 ad_ignore; /* bitmap with adapters to be ignored */
+extern int init_complete; /* if != 0, initialization has completed */
+extern int suspended; /* indicates if the driver is suspended */
+extern int resume_sleep_flag;
 
 /* port restart context hook and input data */
-extern ULONG         restart_ctxhook_h;
-extern volatile u32  ports_to_restart[MAX_AD];
+extern ULONG restart_ctxhook_h;
+extern volatile u32 ports_to_restart[MAX_AD];
 
 /* port reset context hook and input data */
-extern ULONG         reset_ctxhook_h;
-extern ULONG         th_reset_watchdog;
-extern volatile u32  ports_to_reset[MAX_AD];
-extern IORB_QUEUE    abort_queue;
+extern ULONG reset_ctxhook_h;
+extern ULONG th_reset_watchdog;
+extern volatile u32 ports_to_reset[MAX_AD];
+extern IORB_QUEUE abort_queue;
 
 /* trigger engine context hook and input data */
-extern ULONG         engine_ctxhook_h;
+extern ULONG engine_ctxhook_h;
 
 /* apapter/port-specific options saved when parsing the command line */
-extern u8            emulate_scsi[MAX_AD][AHCI_MAX_PORTS];
-extern u8            enable_ncq[MAX_AD][AHCI_MAX_PORTS];
-extern u8            link_speed[MAX_AD][AHCI_MAX_PORTS];
-extern u8            link_power[MAX_AD][AHCI_MAX_PORTS];
-extern u8            track_size[MAX_AD][AHCI_MAX_PORTS];
-extern u8            port_ignore[MAX_AD][AHCI_MAX_PORTS];
-
+extern u8 emulate_scsi[MAX_AD][AHCI_MAX_PORTS];
+extern u8 enable_ncq[MAX_AD][AHCI_MAX_PORTS];
+extern u8 link_speed[MAX_AD][AHCI_MAX_PORTS];
+extern u8 link_power[MAX_AD][AHCI_MAX_PORTS];
+extern u8 track_size[MAX_AD][AHCI_MAX_PORTS];
+extern u8 port_ignore[MAX_AD][AHCI_MAX_PORTS];
+
+#ifdef DEBUG
+extern void DumpIorb(IORBH *pIorb);
+#endif
+

trunk/src/os2ahci/pci.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013-2015 David Azarewicz
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -33 +33 @@
 #define PCI_BAR(reg)   (UCHAR) (0x10 + (reg) * sizeof(u32))
 
-/******************************************************************************
- * OEMHLP constants for PCI access
- */
-#define GENERIC_IOCTL       0x10
-#define OH_CATEGORY         0x00
-#define OH_FUNC_PCI         0x0b
-
-/* subfunctions */
-#define OH_BIOS_INFO        0x00
-#define OH_FIND_DEVICE      0x01
-#define OH_FIND_CLASS       0x02
-#define OH_READ_CONFIG      0x03
-#define OH_WRITE_CONFIG     0x04
-
-/* return codes */
-#define OH_SUCCESS          0x00
-#define OH_NOT_SUPPORTED    0x81
-#define OH_BAD_VENDOR       0x83
-#define OH_NOT_FOUND        0x86
-#define OH_BAD_REGISTER     0x87
-
 /* ------------------------ typedefs and structures ------------------------ */
 
-/******************************************************************************
- * OEMHLP IOCtl parameter union. The parameter area is generally used as input
- * to the OEMHLP IOCtl calls.
- */
-typedef union {
-
-  /* query PCI BIOS information" */
-  struct {
-    UCHAR    subfunction;
-  } bios_info;
-
-  /* find PCI device */
-  struct {
-    UCHAR    subfunction;
-    USHORT   device;
-    USHORT   vendor;
-    UCHAR    index;
-  } find_device;
-
-  /* find PCI class code */
-  struct {
-    UCHAR    subfunction;
-    ULONG    class;
-    UCHAR    index;
-  } find_class;
-
-  /* read PCI configuration space */
-  struct {
-    UCHAR    subfunction;
-    UCHAR    bus;
-    UCHAR    dev_func;
-    UCHAR    reg;
-    UCHAR    size;
-  } read_config;
-
-  /* write PCI configuration space */
-  struct {
-    UCHAR    subfunction;
-    UCHAR    bus;
-    UCHAR    dev_func;
-    UCHAR    reg;
-    UCHAR    size;
-    ULONG    data;
-  } write_config;
-
-} OH_PARM;
-
-/******************************************************************************
- * OEMHLP IOCtl data union. The data area is generally used as output from the
- * OEMHLP IOCtl calls.
- */
-typedef union {
-
-  /* query PCI BIOS information" */
-  struct {
-    UCHAR    rc;
-    UCHAR    hw_mech;
-    UCHAR    major_version;
-    UCHAR    minor_version;
-    UCHAR    last_bus;
-  } bios_info;
-
-  /* find PCI device */
-  struct {
-    UCHAR    rc;
-    UCHAR    bus;
-    UCHAR    dev_func;
-  } find_device;
-
-  /* find PCI class code */
-  struct {
-    UCHAR    rc;
-    UCHAR    bus;
-    UCHAR    dev_func;
-  } find_class;
-
-  /* read PCI confguration space */
-  struct {
-    UCHAR    rc;
-    ULONG    data;
-  } read_config;
-
-  /* write PCI confguration space */
-  struct {
-    UCHAR    rc;
-  } write_config;
-
-} OH_DATA;
-
 /* -------------------------- function prototypes -------------------------- */
 
-static void  add_pci_device   (PCI_ID *pci_id, OH_DATA _far *data);
-static int   oemhlp_call      (UCHAR subfunction, OH_PARM _far *parm,
-                               OH_DATA _far *data);
-static long  bar_resource     (UCHAR bus, UCHAR dev_func,
-                               RESOURCESTRUCT _far *resource, int i);
-static char *rmerr            (APIRET ret);
+static void  add_pci_device(PCI_ID *pci_id, USHORT BusDevFunc);
+static long  bar_resource(USHORT BusDevFunc, RESOURCESTRUCT *resource, int i);
+static char *rmerr(APIRET ret);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -159 +46 @@
  * chipset/controller name strings
  */
-static char chip_esb2[]       = "ESB2";
-static char chip_ich8[]       = "ICH8";
-static char chip_ich8m[]      = "ICH8M";
-static char chip_ich9[]       = "ICH9";
-static char chip_ich9m[]      = "ICH9M";
-static char chip_ich10[]      = "ICH10";
-static char chip_pchahci[]    = "PCH AHCI";
-static char chip_pchraid[]    = "PCH RAID";
-static char chip_tolapai[]    = "Tolapai";
-static char chip_sb600[]      = "SB600";
-static char chip_sb700[]      = "SB700/800";
-static char chip_vt8251[]     = "VT8251";
-static char chip_mcp65[]      = "MCP65";
-static char chip_mcp67[]      = "MCP67";
-static char chip_mcp73[]      = "MCP73";
-static char chip_mcp77[]      = "MCP77";
-static char chip_mcp79[]      = "MCP79";
-static char chip_mcp89[]      = "MCP689";
-static char chip_sis968[]     = "968";
-
-static char s_generic[]       = "Generic";
-
+static char chip_esb2[]    = "ESB2";
+static char chip_ich8[]    = "ICH8";
+static char chip_ich8m[]   = "ICH8M";
+static char chip_ich9[]    = "ICH9";
+static char chip_ich9m[]   = "ICH9M";
+static char chip_ich10[]   = "ICH10";
+static char chip_pchahci[] = "PCH AHCI";
+static char chip_pchraid[] = "PCH RAID";
+static char chip_tolapai[] = "Tolapai";
+static char chip_sb600[]   = "SB600";
+static char chip_sb700[]   = "SB700/800";
+static char chip_vt8251[]  = "VT8251";
+static char chip_mcp65[]   = "MCP65";
+static char chip_mcp67[]   = "MCP67";
+static char chip_mcp73[]   = "MCP73";
+static char chip_mcp77[]   = "MCP77";
+static char chip_mcp79[]   = "MCP79";
+static char chip_mcp89[]   = "MCP689";
+static char chip_sis968[]  = "968";
+
+static char s_generic[]    = "Generic";
 
 
@@ -188 +74 @@
  */
 
-PCI_ID pci_ids[] = {
-
+PCI_ID pci_ids[] =
+{
   /* Intel
    * NOTE: ICH5 controller does NOT support AHCI, so we do
@@ -359 +245 @@
 };
 
-/******************************************************************************
- * OEMHLP$ is used by OS/2 to provide access to OEM-specific machine resources
- * like PCI BIOS access. We're using this to enumerate the PCI bus. Due to
- * BIOS bugs, it may be necessary to use I/O operations for this purpose but
- * so far I think this is only relevant for rather old PCs and SATA is not
- * expected to be a priority on those machines.
- */
-static IDCTABLE     oemhlp;            /* OEMHLP$ IDC entry point */
-
 /* ----------------------------- start of code ----------------------------- */
 
@@ -382 +259 @@
   /* search for last used slot in 'pci_ids' */
   for (i = max_slot; i >= 0 && pci_ids[i].vendor == 0; i--);
-  if (i >= max_slot) {
-    /* all slots in use */
-    return(-1);
-  }
+  if (i >= max_slot) return(-1); /* all slots in use */
 
   /* use slot after the last used slot */
@@ -401 +275 @@
 void scan_pci_bus(void)
 {
-  OH_PARM parm;
-  OH_DATA data;
   UCHAR index;
-  UCHAR rc;
   int ad_indx = 0;
   int i;
   int n;
-
-  ddprintf("scanning PCI bus...\n");
-
-  /* verify that we have a PCI system */
-  memset(&parm, 0x00, sizeof(parm));
-  if (oemhlp_call(OH_BIOS_INFO, &parm, &data) != OH_SUCCESS) {
-    cprintf("%s: couldn't get PCI BIOS information\n", drv_name);
-    return;
-  }
+  USHORT BusDevFunc;
+
+  DPRINTF(3,"scanning PCI bus...\n");
 
   /* Go through the list of PCI IDs and search for each device
@@ -434 +299 @@
    *    adapters have the correct class code (PCI_CLASS_STORAGE_SATA_AHCI).
    */
-  for (i = 0; pci_ids[i].vendor != 0; i++) {
+  for (i = 0; pci_ids[i].vendor != 0; i++)
+  {
     index = 0;
-    do {
-      if (pci_ids[i].device == PCI_ANY_ID || pci_ids[i].vendor == PCI_ANY_ID) {
+    do
+    {
+      if (pci_ids[i].device == PCI_ANY_ID || pci_ids[i].vendor == PCI_ANY_ID)
+      {
         /* look for class code */
-        memset(&parm, 0x00, sizeof(parm));
-        parm.find_class.class = pci_ids[i].class;
-        parm.find_class.index = index;
-        rc = oemhlp_call(OH_FIND_CLASS, &parm, &data);
-
-      } else if (thorough_scan) {
+        BusDevFunc = PciFindClass(pci_ids[i].class, index);
+      }
+      else if (thorough_scan)
+      {
         /* look for this specific vendor and device ID */
-        memset(&parm, 0x00, sizeof(parm));
-        parm.find_device.device = pci_ids[i].device;
-        parm.find_device.vendor = pci_ids[i].vendor;
-        parm.find_device.index = index;
-        rc = oemhlp_call(OH_FIND_DEVICE, &parm, &data);
-
-      } else {
-        rc = OH_NOT_FOUND;
+        BusDevFunc = PciFindDevice( pci_ids[i].vendor, pci_ids[i].device, index);
+
       }
-
-      if (rc == OH_SUCCESS) {
+      else
+      {
+        BusDevFunc = 0xffff;
+      }
+
+      if (BusDevFunc != 0xffff)
+      {
         /* found a device */
         int already_found = 0;
 
         /* increment index for next loop */
-        if (++index > 180) {
-          /* something's wrong here... */
-          return;
-        }
+        if (++index > 180) return; /* something's wrong here... */
 
         /* check whether we already found this device */
-        for (n = 0; n < ad_info_cnt; n++) {
-          if (ad_infos[n].bus == data.find_device.bus &&
-              ad_infos[n].dev_func == data.find_device.dev_func) {
+        for (n = 0; n < ad_info_cnt; n++)
+        {
+          if (ad_infos[n].bus_dev_func == BusDevFunc)
+          {
             /* this device has already been found (e.g. via thorough scan) */
             already_found = 1;
@@ -476 +339 @@
         }
 
-        if (already_found || (ad_ignore & (1U << ad_indx++))) {
+        if (already_found || (ad_ignore & (1U << ad_indx++)))
+        {
           /* ignore this device; it has either already been found via a
            * thorough scan or has been specified to be ignored via command
@@ -484 +348 @@
 
         /* add this PCI device to ad_infos[] */
-        add_pci_device(pci_ids + i, &data);
+        add_pci_device(pci_ids + i, BusDevFunc);
       }
 
-    } while (rc == OH_SUCCESS);
+    } while (BusDevFunc != 0xffff);
   }
 }
@@ -496 +360 @@
  * bit in the configuration space command register.
  */
-int pci_enable_int(UCHAR bus, UCHAR dev_func)
+int pci_enable_int(USHORT BusDevFunc)
 {
   ULONG tmp;
 
-  if (pci_read_conf (bus, dev_func, 4, sizeof(u32), &tmp) != OH_SUCCESS ||
-      pci_write_conf(bus, dev_func, 4, sizeof(u32), tmp & ~(1UL << 10)) != OH_SUCCESS) {
+  if (PciReadConfig(BusDevFunc, 4, sizeof(tmp), &tmp) ||
+      PciWriteConfig(BusDevFunc, 4, sizeof(tmp), tmp & ~(1UL << 10)))
+  {
     return(-1);
   }
@@ -514 +379 @@
 void pci_hack_virtualbox(void)
 {
-  ULONG irq = 0;
-
-  if (pci_read_conf(0, 0x08, 0x60, 1, &irq) == OH_SUCCESS && irq == 0x80) {
+  UCHAR irq = 0;
+
+  if (!PciReadConfig(0x0008, 0x60, sizeof(irq), &irq) && irq == 0x80)
+  {
     /* set IRQ for first device/func to 11 */
-    dprintf("hacking virtualbox PIIX3 PCI to ISA bridge IRQ mapping\n");
+    DPRINTF(1,"hacking virtualbox PIIX3 PCI to ISA bridge IRQ mapping\n");
     irq = ad_infos[0].irq;
-    pci_write_conf(0, 0x08, 0x60, 1, irq);
+    PciWriteConfig(0x0008, 0x60, sizeof(irq), irq);
   }
 }
@@ -527 +393 @@
  * Add a single PCI device to the list of adapters.
  */
-static void add_pci_device(PCI_ID *pci_id, OH_DATA _far *data)
+static void add_pci_device(PCI_ID *pci_id, USHORT BusDevFunc)
 {
   char rc_list_buf[sizeof(AHRESOURCE) + sizeof(HRESOURCE) * 15];
-  AHRESOURCE _far *rc_list = (AHRESOURCE _far *) rc_list_buf;
+  AHRESOURCE *rc_list = (AHRESOURCE *) rc_list_buf;
   RESOURCESTRUCT resource;
   ADAPTERSTRUCT adapter;
@@ -536 +402 @@
   AD_INFO *ad_info;
   APIRET ret;
-  UCHAR bus       = data->find_class.bus;
-  UCHAR dev_func  = data->find_class.dev_func;
   ULONG val;
-  SEL gdt[PORT_DMA_BUF_SEGS + 1];
   char tmp[40];
   u16 device;
@@ -551 +414 @@
    * Part 1: Get further information about the device to be added; PCI ID...
    */
-  if (pci_read_conf(bus, dev_func, 0x00, sizeof(ULONG), &val) != OH_SUCCESS) {
-    return;
-  }
-  device = (u16) (val >> 16);
-  vendor = (u16) (val & 0xffff);
+  if (PciReadConfig(BusDevFunc, 0x00, sizeof(ULONG), &val)) return;
+  device = (val >> 16);
+  vendor = (val & 0xffff);
 
   /* ... and class code */
-  if (pci_read_conf(bus, dev_func, 0x08, sizeof(ULONG), &val) != OH_SUCCESS) {
-    return;
-  }
-  class = (u32) (val >> 8);
-
-  if (pci_id->device == PCI_ANY_ID) {
+  if (PciReadConfig(BusDevFunc, 0x08, sizeof(ULONG), &val)) return;
+  class = (val >> 8);
+
+  if (pci_id->device == PCI_ANY_ID)
+  {
     /* We found this device in a wildcard search. There are two possible
      * reasons which require a different handling:
@@ -587 +447 @@
      *     based scan (unless overridden with the "/T" option).
      */
-    if (pci_id->vendor != PCI_ANY_ID) {
+    if (pci_id->vendor != PCI_ANY_ID)
+    {
       /* case 1: the vendor is known but we found the PCI device using a class
        * search; verify vendor matches the one in pci_ids[]
        */
-      if (pci_id->vendor != vendor) {
-        /* vendor doesn't match */
-        return;
-      }
-
-    } else {
+      if (pci_id->vendor != vendor) return; /* vendor doesn't match */
+    }
+    else
+    {
       /* case 2: we found this device using a generic class search; if the
        * device/vendor is listed in pci_ids[], use this entry in favor of the
        * one passed in 'pci_id'
        */
-      for (i = 0; pci_ids[i].vendor != 0; i++) {
-        if (pci_ids[i].device == device && pci_ids[i].vendor == vendor) {
+      for (i = 0; pci_ids[i].vendor != 0; i++)
+      {
+        if (pci_ids[i].device == device && pci_ids[i].vendor == vendor)
+        {
           pci_id = pci_ids + i;
           break;
@@ -611 +472 @@
 
   /* found a supported AHCI device */
-  ciiprintf("Found AHCI device %s %s (%d:%d:%d %04x:%04x) class:0x%06lx\n",
-            vendor_from_id(vendor), device_from_id(device),
-            bus, dev_func>>3, dev_func&7, vendor, device, class);
+
+  if (PciReadConfig(BusDevFunc, 0x3c, sizeof(u32), &val)) return;
+  irq = (int) (val & 0xff);
+  pin = (int) ((val >> 8) & 0xff);
+
+  i = 1;
+  if (irq==0 || irq==255) i = 0;
+
+  if (verbosity > i)
+  {
+    iprintf("%s AHCI device %s %s (%d:%d:%d %04x:%04x) class:0x%06x", i?"Found":"Ignoring",
+     vendor_from_id(vendor), device_from_id(device),
+     PCI_BUS_FROM_BDF(BusDevFunc), PCI_DEV_FROM_BDF(BusDevFunc), PCI_FUNC_FROM_BDF(BusDevFunc),
+     vendor, device, class);
+    if (i==0) iprintf("Invalid interrupt (IRQ=%d).", irq);
+  }
+  if (i==0) return;
 
   /* make sure we got room in the adapter information array */
-  if (ad_info_cnt >= MAX_AD - 1) {
-    cprintf("%s: too many AHCI devices\n", drv_name);
+  if (ad_info_cnt >= MAX_AD - 1)
+  {
+    iprintf("%s: too many AHCI devices", drv_name);
     return;
   }
@@ -637 +513 @@
   rc_list->NumResource = 0;
 
-  /* Register IRQ with resource manager
-   *
-   * NOTE: We rely on the IRQ number saved in the PCI config space by the PCI
-   *       BIOS. There's no reliable way to find out the IRQ number in any
-   *       other way unless we start using message-driven interrupts (which
-   *       is out of scope for the time being).
-   */
-  if (pci_read_conf(bus, dev_func, 0x3c, sizeof(u32), &val) != OH_SUCCESS) {
-    return;
-  }
-  irq = (int) (val & 0xff);
-  pin = (int) ((val >> 8) & 0xff);
-
-  memset(&resource, 0x00, sizeof(resource));
-  resource.ResourceType          = RS_TYPE_IRQ;
-  resource.IRQResource.IRQLevel  = irq;
-  resource.IRQResource.PCIIrqPin = pin;
-  resource.IRQResource.IRQFlags  = RS_IRQ_SHARED;
-
-  ret = RMAllocResource(rm_drvh, &ad_info->rm_irq, &resource);
-  if (ret != RMRC_SUCCESS) {
-    cprintf("%s: couldn't register IRQ %d (rc = %s)\n", drv_name, irq, rmerr(ret));
+  /* Register IRQ with resource manager */
+  ret = RmAddIrq(rm_drvh, &ad_info->rm_irq, irq, pin);
+  if (ret)
+  {
+    if (ret == RMRC_RES_ALREADY_CLAIMED)
+    {
+      ciiprintf("Device already claimed.");
+    }
+    else
+    {
+      iprintf("%s: couldn't register IRQ %d (rc = %s)", drv_name, irq, rmerr(ret));
+    }
     return;
   }
@@ -669 +535 @@
    */
 
-  ddprintf("Adapter %d PCI=%d:%d:%d ID=%04x:%04x\n", ad_info_cnt, bus, dev_func>>3, dev_func&7, vendor, device);
-
-  for (i = 0; i < sizeof(ad_info->rm_bars) / sizeof(*ad_info->rm_bars); i++) {
-    long len = bar_resource(bus, dev_func, &resource, i);
-
-    if (len < 0) {
+  DPRINTF(1,"Adapter %d PCI=%d:%d:%d ID=%04x:%04x\n", ad_info_cnt, PCI_BUS_FROM_BDF(BusDevFunc),
+    PCI_DEV_FROM_BDF(BusDevFunc), PCI_FUNC_FROM_BDF(BusDevFunc), vendor, device);
+
+  for (i = 0; i < sizeof(ad_info->rm_bars) / sizeof(*ad_info->rm_bars); i++)
+  {
+    long len = bar_resource(BusDevFunc, &resource, i);
+
+    if (len < 0)
+    {
       /* something went wrong */
       goto add_pci_fail;
     }
-    if (len == 0) {
+    if (len == 0)
+    {
       /* this BAR is unused */
       continue;
     }
 
-    if (i == AHCI_PCI_BAR) {
-      if (resource.ResourceType != RS_TYPE_MEM) {
-        cprintf("%s: BAR #5 must be an MMIO region\n", drv_name);
+    if (i == AHCI_PCI_BAR)
+    {
+      if (resource.ResourceType != RS_TYPE_MEM)
+      {
+        iprintf("%s: BAR #5 must be an MMIO region", drv_name);
         goto add_pci_fail;
       }
@@ -695 +567 @@
     /* register [MM]IO region with resource manager */
     ret = RMAllocResource(rm_drvh, ad_info->rm_bars + i, &resource);
-    if (ret != RMRC_SUCCESS) {
-      cprintf("%s: couldn't register [MM]IO region (rc = %s)\n",
-              drv_name, rmerr(ret));
+    if (ret != RMRC_SUCCESS)
+    {
+      if (ret == RMRC_RES_ALREADY_CLAIMED)
+      {
+        ciiprintf("Device already claimed.");
+      }
+      else
+      {
+        iprintf("%s: couldn't register [MM]IO region (rc = %s)", drv_name, rmerr(ret));
+      }
       goto add_pci_fail;
     }
@@ -703 +582 @@
   }
 
-  if (ad_info->mmio_phys == 0) {
-    cprintf("%s: couldn't determine MMIO base address\n", drv_name);
+  if (ad_info->mmio_phys == 0)
+  {
+    iprintf("%s: couldn't determine MMIO base address", drv_name);
     goto add_pci_fail;
   }
@@ -716 +596 @@
   ad_info->pci_vendor = vendor;
   ad_info->pci_device = device;
-  ad_info->bus = bus;
-  ad_info->dev_func = dev_func;
+  ad_info->bus_dev_func = BusDevFunc;
   ad_info->irq = irq;
 
-  /* allocate memory for port-specific DMA scratch buffers */
-  if (DevHelp_AllocPhys((long) AHCI_PORT_PRIV_DMA_SZ * AHCI_MAX_PORTS,
-                        MEMTYPE_ABOVE_1M, &ad_info->dma_buf_phys) != 0) {
-    cprintf("%s: couldn't allocate DMA scratch buffers for AHCI ports\n", drv_name);
-    ad_info->dma_buf_phys = 0;
-    goto add_pci_fail;
-  }
-
-  /* allocate GDT selectors for memory-mapped I/O and DMA scratch buffers */
-  if (DevHelp_AllocGDTSelector(gdt, PORT_DMA_BUF_SEGS + 1) != 0) {
-    cprintf("%s: couldn't allocate GDT selectors\n", drv_name);
-    memset(gdt, 0x00, sizeof(gdt));
-    goto add_pci_fail;
-  }
-
-  /* map MMIO address to first GDT selector */
-  if (DevHelp_PhysToGDTSelector(ad_info->mmio_phys,
-                                (USHORT) ad_info->mmio_size, gdt[0]) != 0) {
-    cprintf("%s: couldn't map MMIO address to GDT selector\n", drv_name);
-    goto add_pci_fail;
-  }
-
-  /* map DMA scratch buffers to remaining GDT selectors */
-  for (i = 0; i < PORT_DMA_BUF_SEGS; i++) {
-    ULONG addr = ad_info->dma_buf_phys + i * PORT_DMA_SEG_SIZE;
-    USHORT len = AHCI_PORT_PRIV_DMA_SZ * PORT_DMA_BUFS_PER_SEG;
-
-    if (DevHelp_PhysToGDTSelector(addr, len, gdt[i+1]) != 0) {
-      cprintf("%s: couldn't map DMA scratch buffer to GDT selector\n", drv_name);
-      goto add_pci_fail;
-    }
-  }
-
-  /* fill in MMIO and DMA scratch buffer addresses in adapter info */
-  ad_info->mmio = (u8 _far *) ((u32) gdt[0] << 16);
-  for (i = 0; i < PORT_DMA_BUF_SEGS; i++) {
-    ad_info->dma_buf[i] = (u8 _far *) ((u32) gdt[i+1] << 16);
+  ad_info->mmio = MapPhysToLin(ad_info->mmio_phys, ad_info->mmio_size);
+  if (!ad_info->mmio) goto add_pci_fail;
+
+  /* fill in DMA scratch buffer addresses in adapter info */
+  for (i = 0; i < AHCI_MAX_PORTS; i++)
+  {
+    ad_info->dma_buf[i] = MemAlloc(AHCI_PORT_PRIV_DMA_SZ);
+    ad_info->dma_buf_phys[i] = MemPhysAdr(ad_info->dma_buf[i]);
   }
 
   /* register adapter with resource manager */
   memset(&adj, 0x00, sizeof(adj));
-  adj.pNextAdj             = NULL;
-  adj.AdjLength            = sizeof(adj);
-  adj.AdjType              = ADJ_ADAPTER_NUMBER;
-  adj.Adapter_Number       = ad_info_cnt;
+  adj.pNextAdj       = NULL;
+  adj.AdjLength      = sizeof(adj);
+  adj.AdjType        = ADJ_ADAPTER_NUMBER;
+  adj.Adapter_Number = ad_info_cnt;
 
   memset(&adapter, 0x00, sizeof(adapter));
@@ -778 +628 @@
 
   ret = RMCreateAdapter(rm_drvh, &ad_info->rm_adh, &adapter, NULL, rc_list);
-  if (ret != RMRC_SUCCESS) {
-    cprintf("%s: couldn't register adapter (rc = %s)\n", drv_name, rmerr(ret));
+  if (ret != RMRC_SUCCESS)
+  {
+    iprintf("%s: couldn't register adapter (rc = %s)", drv_name, rmerr(ret));
     goto add_pci_fail;
   }
@@ -790 +641 @@
   return;
 
+
 add_pci_fail:
   /* something went wrong; try to clean up as far as possible */
-  for (i = 0; i < sizeof(ad_info->rm_bars) / sizeof(*ad_info->rm_bars); i++) {
-    if (ad_info->rm_bars[i] != 0) {
-      RMDeallocResource(rm_drvh, ad_info->rm_bars[i]);
-    }
-  }
-  if (ad_info->rm_irq != 0) {
-    RMDeallocResource(rm_drvh, ad_info->rm_irq);
-  }
-  for (i = 0; i < sizeof(gdt) / sizeof(*gdt); i++) {
-    if (gdt[i] != 0) {
-      DevHelp_FreeGDTSelector(gdt[i]);
-    }
-  }
-  if (ad_info->dma_buf_phys != 0) {
-    DevHelp_FreePhys(ad_info->dma_buf_phys);
-  }
-}
-
-/******************************************************************************
- * Read PCI configuration space register
- */
-UCHAR pci_read_conf(UCHAR bus, UCHAR dev_func, UCHAR indx, UCHAR size,
-                           ULONG _far *val)
-{
-  OH_PARM parm;
-  OH_DATA data;
-  UCHAR rc;
-
-  memset(&parm, 0x00, sizeof(parm));
-  parm.read_config.bus      = bus;
-  parm.read_config.dev_func = dev_func;
-  parm.read_config.reg      = indx;
-  parm.read_config.size     = size;
-  if ((rc = oemhlp_call(OH_READ_CONFIG, &parm, &data) != OH_SUCCESS)) {
-    cprintf("%s: couldn't read config space (bus = %d, dev_func = 0x%02x, indx = 0x%02x, rc = %d)\n",
-            drv_name, bus, dev_func, indx,  rc);
-    return(rc);
-  }
-
-  *val = data.read_config.data;
-  return(OH_SUCCESS);
-}
-
-/******************************************************************************
- * Write PCI configuration space register
- */
-UCHAR pci_write_conf(UCHAR bus, UCHAR dev_func, UCHAR indx, UCHAR size,
-                            ULONG val)
-{
-  OH_PARM parm;
-  OH_DATA data;
-  UCHAR rc;
-
-  memset(&parm, 0x00, sizeof(parm));
-  parm.write_config.bus      = bus;
-  parm.write_config.dev_func = dev_func;
-  parm.write_config.reg      = indx;
-  parm.write_config.size     = size;
-  parm.write_config.data     = val;
-
-  if ((rc = oemhlp_call(OH_WRITE_CONFIG, &parm, &data) != OH_SUCCESS)) {
-    cprintf("%s: couldn't write config space (bus = %d, dev_func = 0x%02x, indx = 0x%02x, rc = %d)\n",
-            drv_name, bus, dev_func, indx, rc);
-    return(rc);
-  }
-
-  return(OH_SUCCESS);
-}
-/******************************************************************************
- * Call OEMHLP$ IDC entry point with the specified IOCtl parameter and data
- * packets.
- */
-static int oemhlp_call(UCHAR subfunction, OH_PARM _far *parm,
-                       OH_DATA _far *data)
-{
-  void (_far *func)(void);
-  RP_GENIOCTL ioctl;
-  unsigned short prot_idc_ds;
-
-  if (oemhlp.ProtIDCEntry == NULL || oemhlp.ProtIDC_DS == 0) {
-    /* attach to OEMHLP$ device driver */
-    if (DevHelp_AttachDD("OEMHLP$ ", (NPBYTE) &oemhlp) ||
-        oemhlp.ProtIDCEntry == NULL ||
-        oemhlp.ProtIDC_DS == 0) {
-      cprintf("%s: couldn't attach to OEMHLP$\n", drv_name);
-      return(OH_NOT_SUPPORTED);
-    }
-  }
-
-  /* store subfuntion in first byte of pararameter packet */
-  parm->bios_info.subfunction = subfunction;
-  memset(data, 0x00, sizeof(*data));
-
-  /* assemble IOCtl request */
-  memset(&ioctl, 0x00, sizeof(ioctl));
-  ioctl.rph.Len     = sizeof(ioctl);
-  ioctl.rph.Unit    = 0;
-  ioctl.rph.Cmd     = GENERIC_IOCTL;
-  ioctl.rph.Status  = 0;
-
-  ioctl.Category    = OH_CATEGORY;
-  ioctl.Function    = OH_FUNC_PCI;
-  ioctl.ParmPacket  = (PUCHAR) parm;
-  ioctl.DataPacket  = (PUCHAR) data;
-  ioctl.ParmLen     = sizeof(*parm);
-  ioctl.DataLen     = sizeof(*data);
-
-  /* Call OEMHLP's IDC routine. Before doing so, we need to assign the address
-   * to be called to a stack variable because the inter-device driver calling
-   * convention forces us to set DS to the device driver's data segment and ES
-   * to the segment of the request packet.
-   */
-  func = oemhlp.ProtIDCEntry;
-
-  /* The WATCOM compiler does not support struct references in inline
-   * assembler code, so we pass it in a stack variable
-   */
-  prot_idc_ds = oemhlp.ProtIDC_DS;
-
-  _asm {
-    push ds;
-    push es;
-    push bx;
-    push si;
-    push di;
-
-    push ss
-    pop  es
-    lea  bx, ioctl;
-    mov  ds, prot_idc_ds;
-    call dword ptr [func];
-
-    pop  di;
-    pop  si;
-    pop  bx;
-    pop  es;
-    pop  ds;
-  }
-
-  //dddphex(parm, sizeof(*parm), "oemhlp_parm: ");
-  //dddphex(data, sizeof(*data), "oemhlp_data: ");
-
-  if (ioctl.rph.Status & STERR) {
-    return(OH_NOT_SUPPORTED);
-  }
-  return(data->bios_info.rc);
+  for (i = 0; i < sizeof(ad_info->rm_bars) / sizeof(*ad_info->rm_bars); i++)
+  {
+    if (ad_info->rm_bars[i] != 0) RMDeallocResource(rm_drvh, ad_info->rm_bars[i]);
+  }
+  if (ad_info->rm_irq != 0) RMDeallocResource(rm_drvh, ad_info->rm_irq);
 }
 
@@ -960 +671 @@
  *  I = I/O (1) or memory (0)
  */
-static long bar_resource(UCHAR bus, UCHAR dev_func,
-                         RESOURCESTRUCT _far *resource, int i)
+static long bar_resource(USHORT BusDevFunc, RESOURCESTRUCT *resource, int i)
 {
   u32 bar_addr = 0;
@@ -967 +677 @@
 
   /* temporarily write 1s to this BAR to determine the address range */
-  if (pci_read_conf (bus, dev_func, PCI_BAR(i), sizeof(u32), &bar_addr) != OH_SUCCESS ||
-      pci_write_conf(bus, dev_func, PCI_BAR(i), sizeof(u32), ~(0UL))    != OH_SUCCESS ||
-      pci_read_conf (bus, dev_func, PCI_BAR(i), sizeof(u32), &bar_size) != OH_SUCCESS ||
-      pci_write_conf(bus, dev_func, PCI_BAR(i), sizeof(u32), bar_addr)  != OH_SUCCESS) {
-
-    cprintf("%s: couldn't determine [MM]IO size\n", drv_name);
-    if (bar_addr != 0) {
-      pci_write_conf(bus, dev_func, PCI_BAR(i), sizeof(u32), bar_addr);
+  if (PciReadConfig (BusDevFunc, PCI_BAR(i), sizeof(u32), &bar_addr) ||
+      PciWriteConfig(BusDevFunc, PCI_BAR(i), sizeof(u32), ~(0UL))    ||
+      PciReadConfig (BusDevFunc, PCI_BAR(i), sizeof(u32), &bar_size) ||
+      PciWriteConfig(BusDevFunc, PCI_BAR(i), sizeof(u32), bar_addr) )
+  {
+    iprintf("%s: couldn't determine [MM]IO size", drv_name);
+    if (bar_addr != 0)
+    {
+      PciWriteConfig(BusDevFunc, PCI_BAR(i), sizeof(u32), bar_addr);
     }
     return(-1);
   }
 
-  if (bar_size == 0 || bar_size == 0xffffffffUL) {
-    /* bar not implemented or device not working properly */
-    return(0);
-  }
+  /* bar not implemented or device not working properly */
+  if (bar_size == 0 || bar_size == 0xffffffffUL) return(0);
 
   /* prepare resource allocation structure */
   memset(resource, 0x00, sizeof(*resource));
-  if (bar_addr & 1) {
+  if (bar_addr & 1)
+  {
     bar_size = ~(bar_size & 0xfffffffcUL) + 1;
     bar_size &= 0xffffUL;  /* I/O address space is 16 bits on x86 */
@@ -997 +707 @@
     resource->IOResource.IOAddressLines = 16;
 
-  } else {
+  }
+  else
+  {
     bar_size = ~(bar_size & 0xfffffff0UL) + 1;
     bar_addr &= 0xfffffff0UL;
@@ -1007 +719 @@
   }
 
-  ddprintf("BAR #%d: type = %s, addr = 0x%08lx, size = %ld\n", i,
+  DPRINTF(3,"BAR #%d: type = %s, addr = 0x%08lx, size = %d\n", i,
            (resource->ResourceType == RS_TYPE_IO) ? "I/O" : "MEM",
            bar_addr, bar_size);
@@ -1020 +732 @@
 {
 
-  switch(id) {
-
+  switch(id)
+  {
     case PCI_VENDOR_ID_AL:
       return "Ali";
@@ -1056 +768 @@
 
   return "Generic";
-
 }
 
@@ -1067 +778 @@
   int i;
 
-  for (i = 0; pci_ids[i].vendor != 0; i++) {
-
-    if (pci_ids[i].device == device) {
+  for (i = 0; pci_ids[i].vendor != 0; i++)
+  {
+    if (pci_ids[i].device == device)
+    {
       return pci_ids[i].chipname;
     }
-
   }
 

trunk/src/os2ahci/trace.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013-2015 David Azarewicz
+ * Copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -36 +36 @@
 /* ------------------------ global/static variables ------------------------ */
 
-struct {
-  u32 phys_addr;   /* physical address of allocated buffer */
-  u8 _far *tbuf;   /* mapped address of trace buffer */
-  u16 writep;      /* current write offset in buffer */
-  u16 readp;       /* current read offset in buffer */
-  u16 mask;        /* The mask for wrapping the buffer pointers */
-} ahci_trace_buf;
-
 /* ----------------------------- start of code ----------------------------- */
-
-/******************************************************************************
- * initialize AHCI circular trace buffer
- *
- * NOTE: this func must be called during INIT time since it allocates
- *       a GDT selector for the trace ring buffer
- */
-void trace_init(u32 ulBufSize)
-{
-  SEL sel = 0;
-
-  if (ahci_trace_buf.phys_addr) return;
-
-  /* initialize ring buffer logic */
-  ahci_trace_buf.writep = 0;
-  ahci_trace_buf.readp = 0;
-  ahci_trace_buf.mask = ulBufSize - 1;
-
-  if (ahci_trace_buf.phys_addr == 0) {
-    /* allocate buffer */
-    if (DevHelp_AllocPhys(ulBufSize, MEMTYPE_ABOVE_1M,
-                         &(ahci_trace_buf.phys_addr))) {
-      /* failed above 1MB, try below */
-      if (DevHelp_AllocPhys(ulBufSize, MEMTYPE_BELOW_1M,
-                            &(ahci_trace_buf.phys_addr))) {
-        /* failed, too. Give up */
-        ahci_trace_buf.phys_addr = 0;
-        cprintf("%s warning: failed to allocate %dk trace buffer\n",
-                drv_name, ulBufSize / 1024);
-        return;
-      }
-    }
-
-    /* allocate GDT selector and map our physical trace buffer to it */
-    if (DevHelp_AllocGDTSelector(&sel, 1) ||
-        DevHelp_PhysToGDTSelector(ahci_trace_buf.phys_addr,
-                                  ulBufSize, sel)) {
-      /* failed; free GDT selector and physical memory we allocated before */
-      if (sel) {
-        DevHelp_FreeGDTSelector(sel);
-        sel = 0;
-      }
-      DevHelp_FreePhys(ahci_trace_buf.phys_addr);
-      ahci_trace_buf.phys_addr = 0;
-      return;
-    }
-
-    /* create ring buffer address */
-    ahci_trace_buf.tbuf = (u8 _far *) ((u32) sel << 16);
-  }
-}
-
-/******************************************************************************
- * cleanup trace buffer
- *
- * NOTE: this function is here for completeness; the trace buffer should not
- *       be deallocated and then reallocated.
- */
-void trace_exit(void)
-{
-  /* free physical address */
-  if (ahci_trace_buf.phys_addr) {
-    DevHelp_FreePhys(ahci_trace_buf.phys_addr);
-    ahci_trace_buf.phys_addr = 0;
-  }
-
-  /* free GDT selector */
-  if (ahci_trace_buf.tbuf) {
-    DevHelp_FreeGDTSelector((SEL) ((u32) (ahci_trace_buf.tbuf) >> 16));
-    ahci_trace_buf.tbuf = NULL;
-  }
-}
-
-
-/******************************************************************************
- * write a string to the circular trace buffer
- *
- * Note: This func wraps the buffer if necessary, so the caller does not
- *       need to call repeatedly until everything is written.
- *
- */
-void trace_write(u8 _far *s, int len)
-{
-  //NOT USED USHORT awake_cnt;
-
-  if (ahci_trace_buf.phys_addr == 0) {
-    /* tracing not active */
-    return;
-  }
-
-  while (len) {
-    if ( !wrap_trace_buffer && (((ahci_trace_buf.writep+1) & ahci_trace_buf.mask) == ahci_trace_buf.readp) ) break; /* buffer is full */
-
-    ahci_trace_buf.tbuf[ahci_trace_buf.writep] = *s++;
-    ahci_trace_buf.writep++;
-    ahci_trace_buf.writep &= ahci_trace_buf.mask;
-
-    /* keep the latest full buffer of information */
-    if (ahci_trace_buf.writep == ahci_trace_buf.readp)
-      ahci_trace_buf.readp = (ahci_trace_buf.readp+1) & ahci_trace_buf.mask;
-
-    len--;
-  }
-
-  /* wake up processes waiting for data from trace buffer */
-  //NOT_USED DevHelp_ProcRun(ahci_trace_buf.phys_addr, &awake_cnt);
-
-}
-
-/******************************************************************************
- * read data from circular trace buffer
- * returns the number of bytes written to the caller's buffer
- *
- * NOTE: the caller is expected to call this func repeatedly
- *       (up to two times) until it returns 0
- */
-u16 trace_read(u8 _far *buf, u16 cb_buf)
-{
-  u16 cb_read;
-
-  if (ahci_trace_buf.phys_addr == NULL) return 0;
-
-  for (cb_read = 0; cb_read < cb_buf && ( ahci_trace_buf.readp != ahci_trace_buf.writep ); cb_read++)
-  {
-    *buf++ = ahci_trace_buf.tbuf[ahci_trace_buf.readp];
-    ahci_trace_buf.readp++;
-    ahci_trace_buf.readp &= ahci_trace_buf.mask;
-  }
-
-  return cb_read;
-}
-
-/******************************************************************************
- * copy trace buffer content to character device reader (request block buffer)
- */
-u16 trace_char_dev(RP_RWV _far *rwrb)
-{
-  u8 _far *to_buf;
-  u16 cb_read = 0;
-  u16 cb;
-  USHORT mode = 0;
-
-  spin_lock(com_lock);
-
-  /* get pointer to caller's buffer */
-  if (DevHelp_PhysToVirt(rwrb->XferAddr, rwrb->NumSectors, &to_buf, &mode)) {
-    spin_unlock(com_lock);
-    return (STATUS_DONE | STERR);
-  }
-
-  /* loop until caller's buffer is full or no more data in trace buffer */
-  do {
-    cb = trace_read(to_buf + cb_read, rwrb->NumSectors - cb_read);
-    cb_read += cb;
-  } while (cb > 0 && cb_read < rwrb->NumSectors);
-
-  spin_unlock(com_lock);
-  rwrb->NumSectors = cb_read;
-
-  return(STDON);
-}
 
 /******************************************************************************
  * Create adapter/port/device list for user output.
  */
-void build_user_info(int check)
+void build_user_info(void)
 {
   int a;
@@ -216 +47 @@
   int d;
 
-  if ( check && (ahci_trace_buf.readp != ahci_trace_buf.writep)) return;
-
-  for (a = 0; a < ad_info_cnt; a++) {
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     AD_INFO *ai = ad_infos + a;
 
-    ntprintf("Adapter %d: PCI=%d:%d:%d ID=%04x:%04x %s %s irq=%d addr=0x%lx version=%lx\n", a,
-      ai->bus, ai->dev_func>>3, ai->dev_func&7,
+    NTPRINTF("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),
       ai->pci_vendor, ai->pci_device, vendor_from_id(ai->pci_vendor), ai->pci->chipname,
       ai->irq, ai->mmio_phys,
       ai->bios_config[HOST_VERSION / sizeof(u32)]);
 
-    for (p = 0; p < ai->hw_ports; p++) {
+    for (p = 0; p < ai->hw_ports; p++)
+    {
       P_INFO *pi = &ai->ports[p];
 
-      ntprintf("  Port %d:\n", p);
+      NTPRINTF("  Port %d:\n", p);
 
-      for (d = 0; d <= pi->dev_max; d++) {
-        if (!pi->devs[d].present) {
-          ntprintf("    No drive present\n");
+      for (d = 0; d <= pi->dev_max; d++)
+      {
+        if (!pi->devs[d].present)
+        {
+          NTPRINTF("    No drive present\n");
         } else {
-          ntprintf("    Drive %d:", d);
-          if (pi->devs[d].atapi) ntprintf(" atapi");
-          if (pi->devs[d].removable) ntprintf(" removable");
-          if (pi->devs[d].dev_info.Method != NULL) {
-            ntprintf(" %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)",
-              (u32)pi->devs[d].dev_info.Cylinders, pi->devs[d].dev_info.HeadsPerCylinder, pi->devs[d].dev_info.SectorsPerTrack,
+          NTPRINTF("    Drive %d:", d);
+          if (pi->devs[d].atapi) NTPRINTF(" atapi");
+          if (pi->devs[d].removable) NTPRINTF(" removable");
+          if (pi->devs[d].dev_info.Method != NULL)
+          {
+            NTPRINTF(" %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);
-          } else ntprintf(" Drive present but no information available. Not queried by OS.");
-          ntprintf("\n");
+          } else NTPRINTF(" Drive present but no information available.");
+          NTPRINTF("\n");
         } /* if */
       } /* for d */
@@ -251 +86 @@
 }
 
+#ifdef DEBUG
+void DumpIorb(IORBH *pIorb)
+{
+  DPRINTF(2,"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",
+      pIorb->CommandModifier, pIorb->RequestControl, pIorb->Status, pIorb->ErrorCode);
+  DPRINTF(2,"  Timeout=%x StatusBlkLen=%x pStatusBlk=%x Res=%x pNxtIORB=%x\n",
+      pIorb->Timeout, pIorb->StatusBlockLen, pIorb->pStatusBlock, pIorb->Reserved_1,
+      pIorb->pNxtIORB);
+}
+#endif
+