--- src/sys/dev/disk/aic7xxx/aic79xx.c	2007/07/06 05:17:17	1.23
+++ src/sys/dev/disk/aic7xxx/aic79xx.c	2007/07/06 05:58:26	1.24
@@ -37,9 +37,9 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic79xx.c,v 1.23 2007/07/06 05:17:17 pavalos Exp $
+ * $Id: aic79xx.c,v 1.24 2007/07/06 05:58:26 pavalos Exp $
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.32 2004/08/18 16:35:52 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.33 2004/11/18 20:22:30 gibbs Exp $
  * $DragonFly$
  */
 
@@ -6448,7 +6448,7 @@ ahd_init(struct ahd_softc *ahd)
 	}
 init_done:
 	ahd_restart(ahd);
-	aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US,
+	aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_MS,
 			ahd_stat_timer, ahd);
 	return (0);
 }
@@ -8016,7 +8016,7 @@ ahd_reset_channel(struct ahd_softc *ahd,
 }
 
 
-#define AHD_RESET_POLL_US 1000
+#define AHD_RESET_POLL_MS 1
 static void
 ahd_reset_poll(void *arg)
 {
@@ -8034,7 +8034,7 @@ ahd_reset_poll(void *arg)
 	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
 	ahd_outb(ahd, CLRSINT1, CLRSCSIRSTI);
 	if ((ahd_inb(ahd, SSTAT1) & SCSIRSTI) != 0) {
-		aic_timer_reset(&ahd->reset_timer, AHD_RESET_POLL_US,
+		aic_timer_reset(&ahd->reset_timer, AHD_RESET_POLL_MS,
 				ahd_reset_poll, ahd);
 		ahd_unpause(ahd);
 		ahd_unlock();
@@ -8086,7 +8086,7 @@ ahd_stat_timer(void *arg)
 	ahd->cmdcmplt_bucket = (ahd->cmdcmplt_bucket+1) & (AHD_STAT_BUCKETS-1);
 	ahd->cmdcmplt_total -= ahd->cmdcmplt_counts[ahd->cmdcmplt_bucket];
 	ahd->cmdcmplt_counts[ahd->cmdcmplt_bucket] = 0;
-	aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US,
+	aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_MS,
 			ahd_stat_timer, ahd);
 	ahd_unlock();
 }
@@ -8308,7 +8308,7 @@ ahd_handle_scsi_status(struct ahd_softc
 		 */
 		if (ahd->scb_data.recovery_scbs == 0
 		 || (scb->flags & SCB_RECOVERY_SCB) != 0)
-			aic_scb_timer_reset(scb, 5 * 1000000);
+			aic_scb_timer_reset(scb, 5 * 1000);
 		break;
 	}
 	case SCSI_STATUS_OK:
@@ -9352,7 +9352,7 @@ bus_reset:
 			ahd_outb(ahd, SCSISIGO, last_phase|ATNO);
 			ahd_print_path(ahd, active_scb);
 			kprintf("BDR message in message buffer\n");
-			aic_scb_timer_reset(scb, 2 * 1000000);
+			aic_scb_timer_reset(scb, 2 * 1000);
 			break;
 		} else if (last_phase != P_BUSFREE
 			&& ahd_inb(ahd, SCSIPHASE) == 0) {
@@ -9444,7 +9444,7 @@ bus_reset:
 			ahd_set_scbptr(ahd, active_scbptr);
 			ahd_print_path(ahd, scb);
 			kprintf("Queuing a BDR SCB\n");
-			aic_scb_timer_reset(scb, 2 * 1000000);
+			aic_scb_timer_reset(scb, 2 * 1000);
 			break;
 		}
 	}