7 files changed, 11 insertions, 27 deletions

diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c
index 834cbe813556..07fd5de0b465 100644
--- a/sys/dev/aic7xxx/ahd_pci.c
+++ b/sys/dev/aic7xxx/ahd_pci.c
@@ -50,32 +50,12 @@ static device_method_t ahd_pci_device_methods[] = {
 	{ 0, 0 }
 };
 
-#if __FreeBSD_version >= 500027
-
-DEVINTERFACE(ahd_pci_device, ahd_pci_device_methods, device);
-
-static device_interface_t *ahd_pci_interfaces[] = {
-	&ahd_pci_device_interface,
-
-	NULL
-};
-
-static driver_t ahd_pci_driver = {
-	"ahd",
-	ahd_pci_interfaces,
-	sizeof(struct ahd_softc)
-};
-
-#else /* FreeBSD 4.X */
-
 static driver_t ahd_pci_driver = {
 	"ahd",
 	ahd_pci_device_methods,
 	sizeof(struct ahd_softc)
 };
 
-#endif /* __FreeBSD_version */
-
 static devclass_t ahd_devclass;
 
 DRIVER_MODULE(ahd, pci, ahd_pci_driver, ahd_devclass, 0, 0);
diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
index fe8881ec3cd9..99763abd5f25 100644
--- a/sys/dev/aic7xxx/aic79xx.c
+++ b/sys/dev/aic7xxx/aic79xx.c
@@ -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.c#79 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#80 $
  *
  * $FreeBSD$
  */
diff --git a/sys/dev/aic7xxx/aic79xx.h b/sys/dev/aic7xxx/aic79xx.h
index 06cb11bc8590..e19710ce9eff 100644
--- a/sys/dev/aic7xxx/aic79xx.h
+++ b/sys/dev/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#46 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#47 $
  *
  * $FreeBSD$
  */
diff --git a/sys/dev/aic7xxx/aic79xx_inline.h b/sys/dev/aic7xxx/aic79xx_inline.h
index 5d0c79dcfe6a..880cf8817b6a 100644
--- a/sys/dev/aic7xxx/aic79xx_inline.h
+++ b/sys/dev/aic7xxx/aic79xx_inline.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_inline.h#27 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#29 $
  *
  * $FreeBSD$
  */
@@ -342,8 +342,8 @@ ahd_setup_data_scb(struct ahd_softc *ahd, struct scb *scb)
 		if ((ahd->flags & AHD_39BIT_ADDRESSING) != 0) {
 			uint64_t high_addr;
 
-			high_addr = (ahd_le32toh(sg->len) & 0x7F000000) << 8;
-			scb->hscb->dataptr |= ahd_htole64(high_addr);
+			high_addr = ahd_le32toh(sg->len) & 0x7F000000;
+			scb->hscb->dataptr |= ahd_htole64(high_addr << 8);
 		}
 		scb->hscb->datacnt = sg->len;
 	}
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index 51071e68cbc8..2d6f466818ee 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.c
+++ b/sys/dev/aic7xxx/aic79xx_osm.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.c#15 $
  *
  * $FreeBSD$
  */
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index 4012aa79dea6..83c1706c7182 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -206,7 +206,11 @@ typedef struct callout ahd_timer_t;
 #include <dev/aic7xxx/aic79xx.h>
 
 /***************************** Timer Facilities *******************************/
+#if __FreeBSD_version >= 500000
+#define ahd_timer_init(timer) callout_init(timer, /*mpsafe*/0)
+#else
 #define ahd_timer_init callout_init
+#endif
 #define ahd_timer_stop callout_stop
 
 static __inline void
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index f4fd82681ee4..e27d22d1d072 100644
--- a/sys/dev/aic7xxx/aic79xx_pci.c
+++ b/sys/dev/aic7xxx/aic79xx_pci.c
@@ -38,7 +38,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_pci.c#32 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#33 $
  *
  * $FreeBSD$
  */