Changeset 183 for trunk/src/os2ahci/os2ahci.h

Timestamp:

Dec 13, 2016, 10:52:53 PM (9 years ago)

Author:

David Azarewicz

Message:

Moved dma buffer pointers.

File:

• trunk/src/os2ahci/os2ahci.h (modified) (3 diffs)

trunk/src/os2ahci/os2ahci.h

@@ -124 +124 @@
 /* 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)])
+#define port_dma_base(ai, p) ((AHCI_PORT_DMA *) ((ai)->ports[(p)].dma_buf))
+#define port_dma_base_phys(ai, p) ((ai)->ports[p].dma_buf_phys)
 
 /* Convert an SATA adapter/port/device address into a 16-bit IORB unit handle
@@ -253 +253 @@
   volatile u32  ncq_cmds;              /* bitmap for NCQ commands issued */
   volatile u32  reg_cmds;              /* bitmap for regular commands issued */
+  u32           dma_buf_phys;          /* physical address of DMA scratch buffer */
+  u8           *dma_buf;               /* DMA scatch buffers */
 
   struct {
@@ -300 +302 @@
   u32           mmio_size;             /* size of MMIO region */
   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 */