diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-10-24 04:28:34 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-10-24 04:28:34 +0000 |
| commit | 10473c5dd07cc508055717dff73133e6484646cb (patch) | |
| tree | 3d2be814b8adfb2386a7c8afc59dbb5e7e45c902 /sys/dev/ic/aic7xxx_seeprom.c | |
| parent | a4d587e7f6817b629a844da6991326ee9e9aa706 (diff) | |
Shuffle defines around so that ahc and ahd use the aic_ names that
come with the freebsd sources, rather than duplicating those names in
the ahd_ and ahc_ namespaces. Big reduction in delta to freebsd
sources, which reduces noise when updating the code.
No .o differences found on i386.
ok marco@.
Diffstat (limited to 'sys/dev/ic/aic7xxx_seeprom.c')
| -rw-r--r-- | sys/dev/ic/aic7xxx_seeprom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/aic7xxx_seeprom.c b/sys/dev/ic/aic7xxx_seeprom.c index 7bfeeb6c567..1e8e231c8d3 100644 --- a/sys/dev/ic/aic7xxx_seeprom.c +++ b/sys/dev/ic/aic7xxx_seeprom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_seeprom.c,v 1.2 2004/10/12 22:09:37 krw Exp $ */ +/* $OpenBSD: aic7xxx_seeprom.c,v 1.3 2004/10/24 04:28:33 krw Exp $ */ /* $NetBSD: aic7xxx_seeprom.c,v 1.8 2003/05/02 19:12:19 dyoung Exp $ */ /* @@ -47,7 +47,7 @@ * from the FreeBSD source file aic7xxx_pci.c by Frank van der Linden * <fvdl@netbsd.org> * - * $Id: aic7xxx_seeprom.c,v 1.2 2004/10/12 22:09:37 krw Exp $ + * $Id: aic7xxx_seeprom.c,v 1.3 2004/10/24 04:28:33 krw Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.22 2003/01/20 20:44:55 gibbs Exp $ */ @@ -683,7 +683,7 @@ ahc_acquire_seeprom(struct ahc_softc *ahc, struct seeprom_descriptor *sd) SEEPROM_OUTB(sd, sd->sd_MS); wait = 1000; /* 1 second timeout in msec */ while (--wait && ((SEEPROM_STATUS_INB(sd) & sd->sd_RDY) == 0)) { - ahc_delay(1000); /* delay 1 msec */ + aic_delay(1000); /* delay 1 msec */ } if ((SEEPROM_STATUS_INB(sd) & sd->sd_RDY) == 0) { SEEPROM_OUTB(sd, 0); |