[SCSI] aic79xx: Use struct map_node

Use struct map_node instead of separate variables.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 17 insertions, 10 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 653fb0b42aea..ac3d07a2a286 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#95 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#108 $
  *
  * $FreeBSD$
  */
@@ -1062,6 +1062,7 @@ struct ahd_softc {
         struct scb_data           scb_data;
 
         struct hardware_scb      *next_queued_hscb;
+        struct map_node          *next_queued_hscb_map;
 
         /*
          * SCBs that have been sent to the controller
@@ -1140,10 +1141,6 @@ struct ahd_softc {
         ahd_flag                  flags;
         struct seeprom_config    *seep_config;
 
-        /* Values to store in the SEQCTL register for pause and unpause */
-        uint8_t                   unpause;
-        uint8_t                   pause;
-
         /* Command Queues */
         uint16_t                  qoutfifonext;
         uint16_t                  qoutfifonext_valid_tag;
@@ -1151,6 +1148,17 @@ struct ahd_softc {
         uint16_t                  qinfifo[AHD_SCB_MAX];
         uint16_t                 *qoutfifo;
 
+        /*
+         * Our qfreeze count.  The sequencer compares
+         * this value with its own counter to determine
+         * whether to allow selections to occur.
+         */
+        uint16_t                  qfreeze_cnt;
+
+        /* Values to store in the SEQCTL register for pause and unpause */
+        uint8_t                   unpause;
+        uint8_t                   pause;
+
         /* Critical Section Data */
         struct cs                *critical_sections;
         u_int                     num_critical_sections;
@@ -1197,8 +1205,7 @@ struct ahd_softc {
          */
         bus_dma_tag_t             parent_dmat;
         bus_dma_tag_t             shared_data_dmat;
-        bus_dmamap_t              shared_data_dmamap;
-        dma_addr_t                shared_data_busaddr;
+        struct map_node           shared_data_map;
 
         /* Information saved through suspend/resume cycles */
         struct ahd_suspend_state  suspend_state;
@@ -1296,9 +1303,9 @@ struct ahd_devinfo {
 };
 
 /****************************** PCI Structures ********************************/
-#define AHD_PCI_IOADDR0 PCIR_MAPS       /* I/O BAR*/
-#define AHD_PCI_MEMADDR (PCIR_MAPS + 4) /* Memory BAR */
-#define AHD_PCI_IOADDR1 (PCIR_MAPS + 12)/* Second I/O BAR */
+#define AHD_PCI_IOADDR0 PCIR_BAR(0)     /* I/O BAR*/
+#define AHD_PCI_MEMADDR PCIR_BAR(1)     /* Memory BAR */
+#define AHD_PCI_IOADDR1 PCIR_BAR(3)     /* Second I/O BAR */
 
 typedef int (ahd_device_setup_t)(struct ahd_softc *);