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

Timestamp:

Dec 20, 2016, 9:35:27 PM (9 years ago)

Author:

David Azarewicz

Message:

Fix for sparse port hardware

File:

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

trunk/src/os2ahci/os2ahci.h

@@ -243 +243 @@
 /* port information structure */
 typedef struct {
-  IORB_QUEUE    iorb_queue;            /* IORB queue for this port */
-  unsigned      dev_max     : 4;       /* maximum device number on this port (0..AHCI_MAX_DEVS-1) */
-  unsigned      cmd_slot    : 5;       /* current command slot index (using round-
-                                        * robin indexes to prevent starvation) */
-
-  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 {
+  IORB_QUEUE    iorb_queue;            /* 00 IORB queue for this port */
+  unsigned      dev_max     : 4;       /* 08 maximum device number on this port (0..AHCI_MAX_DEVS-1) */
+  unsigned      cmd_slot    : 5;       /*    current command slot index (using round-
+                                        *    robin indexes to prevent starvation) */
+
+  volatile u32  ncq_cmds;              /* 0c bitmap for NCQ commands issued */
+  volatile u32  reg_cmds;              /* 10 bitmap for regular commands issued */
+  u32           dma_buf_phys;          /* 14 physical address of DMA scratch buffer */
+  u8           *dma_buf;               /* 18 DMA scatch buffers */
+
+  struct {                             /* 1c */
     unsigned allocated :1;        /* if != 0, device is allocated */
     unsigned present   :1;        /* if != 0, device is present */
@@ -264 +264 @@
     UNITINFO *unit_info;          /* pointer to modified unit info */
     DEV_INFO dev_info;
+    char dev_name[AHCI_DEV_NAME_LEN];
   } devs[AHCI_MAX_DEVS];
 
@@ -272 +273 @@
 /* adapter information structure */
 typedef struct {
-  PCI_ID       *pci;                   /* pointer to corresponding PCI ID */
-
-  unsigned      port_max : 5;          /* maximum port number (0..AHCI_MAX_PORTS-1) */
-  unsigned      cmd_max : 5;           /* maximum cmd slot number (0-31) */
-  unsigned      port_scan_done : 1;    /* if != 0, port scan already done */
-  unsigned      busy : 1;              /* if != 0, adapter is busy */
-
-  unsigned      hw_ports : 6;          /* number of ports as reported by the hardware */
-
-  u32           port_map;              /* bitmap of active ports */
-  u16           pci_vendor;
-  u16           pci_device;
+  PCI_ID       *pci;                   /* 00 pointer to corresponding PCI ID */
+
+  unsigned      port_max : 5;          /* 04 maximum port number (0..AHCI_MAX_PORTS-1) */
+  unsigned      cmd_max : 5;           /*    maximum cmd slot number (0-31) */
+  unsigned      port_scan_done : 1;    /*    if != 0, port scan already done */
+  unsigned      busy : 1;              /*    if != 0, adapter is busy */
+  unsigned      hw_ports : 6;          /*    number of ports as reported by the hardware */
+
+  u32           port_map;              /* 08   bitmap of active ports */
+  u16           pci_vendor;            /* 0c */
+  u16           pci_device;            /* 0e */
 
   /* initial adapter configuration from BIOS */
-  u32           bios_config[HOST_CAP2 / sizeof(u32) + 1];
-
-  u32           cap;                   /* working copy of CAP register */
-  u32           cap2;                  /* working copy of CAP2 register */
-  u32           flags;                 /* adapter flags */
-
-  HRESOURCE     rm_adh;                /* resource handle for adapter */
-  HRESOURCE     rm_bars[6];            /* resource handle for MMIO and I/O BARs */
-  HRESOURCE     rm_irq;                /* resource handle for IRQ */
-
-  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           *mmio;                  /* pointer to this adapter's MMIO region */
-
-  P_INFO        ports[AHCI_MAX_PORTS]; /* SATA ports on this adapter */
+  u32           bios_config[HOST_CAP2 / sizeof(u32) + 1];  /* 10  0x24 / 4 + 1 = 0x0a dwords = 0x28 bytes*/
+
+  u32           cap;                   /* 38 working copy of CAP register */
+  u32           cap2;                  /* 3c working copy of CAP2 register */
+  u32           flags;                 /* 40 adapter flags */
+
+  HRESOURCE     rm_adh;                /* 44 resource handle for adapter */
+  HRESOURCE     rm_bars[6];            /* 48 resource handle for MMIO and I/O BARs */
+  HRESOURCE     rm_irq;                /* 60 resource handle for IRQ */
+
+  u16           bus_dev_func;          /* 64 PCI bus number PCI device and function number */
+  u16           irq;                   /* 66 interrupt number */
+
+  u32           mmio_phys;             /* 68 physical address of MMIO region */
+  u32           mmio_size;             /* 6c size of MMIO region */
+  u8           *mmio;                  /* 70 pointer to this adapter's MMIO region */
+
+  P_INFO        ports[AHCI_MAX_PORTS]; /* 74 SATA ports on this adapter */
 } AD_INFO;