patch-2.4.21 linux-2.4.21/drivers/scsi/aic7xxx/aic7xxx_osm.h

• Lines: 31
• Date: 2003-06-13 07:51:36.000000000 -0700
• Orig file: linux-2.4.20/drivers/scsi/aic7xxx/aic7xxx_osm.h
• Orig date: 2002-08-02 17:39:44.000000000 -0700

diff -urN linux-2.4.20/drivers/scsi/aic7xxx/aic7xxx_osm.h linux-2.4.21/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -635,6 +635,7 @@
 
 static __inline uint8_t ahc_inb(struct ahc_softc * ahc, long port);
 static __inline void ahc_outb(struct ahc_softc * ahc, long port, uint8_t val);
+static __inline void ahc_outb_reset(struct ahc_softc * ahc, long port, uint8_t val);
 static __inline void ahc_outsb(struct ahc_softc * ahc, long port,
 			       uint8_t *, int count);
 static __inline void ahc_insb(struct ahc_softc * ahc, long port,
@@ -664,6 +665,22 @@
 #ifdef MMAPIO
 	if (ahc->tag == BUS_SPACE_MEMIO) {
 		writeb(val, ahc->bsh.maddr + port);
+		readb(ahc->bsh.maddr + HCNTRL); /* flush PCI posting */
+	} else {
+		outb(val, ahc->bsh.ioport + port);
+	}
+#else
+	outb(val, ahc->bsh.ioport + port);
+#endif
+	mb();
+}
+
+static __inline void
+ahc_outb_reset(struct ahc_softc * ahc, long port, uint8_t val)
+{
+#ifdef MMAPIO
+	if (ahc->tag == BUS_SPACE_MEMIO) {
+		writeb(val, ahc->bsh.maddr + port);
 	} else {
 		outb(val, ahc->bsh.ioport + port);
 	}