summaryrefslogtreecommitdiff
path: root/sys/dev/ata
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2007-02-09 21:55:00 +0000
committerad <ad@NetBSD.org>2007-02-09 21:55:00 +0000
commitb07ec3fc388a5aeae51e8871aa89eefea3ce1e53 (patch)
treec93d3b23a29f98ac0e26c9d43afb509219d0ea42 /sys/dev/ata
parent5c1aad3ad0b9d2403784bd52128e8e8399e22254 (diff)
Merge newlock2 to head.
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/ata.c42
-rw-r--r--sys/dev/ata/wd.c12
2 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index 48e76f34421..ade1dab8040 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.84 2006/12/25 18:36:05 wiz Exp $ */
+/* $NetBSD: ata.c,v 1.85 2007/02/09 21:55:27 ad Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.84 2006/12/25 18:36:05 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.85 2007/02/09 21:55:27 ad Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -1023,24 +1023,24 @@ ata_print_modes(struct ata_channel *chp)
drvp = &chp->ch_drive[drive];
if ((drvp->drive_flags & DRIVE) == 0 || drvp->drv_softc == NULL)
continue;
- aprint_normal("%s(%s:%d:%d): using PIO mode %d",
+ aprint_verbose("%s(%s:%d:%d): using PIO mode %d",
drvp->drv_softc->dv_xname,
atac->atac_dev.dv_xname,
chp->ch_channel, drvp->drive, drvp->PIO_mode);
#if NATA_DMA
if (drvp->drive_flags & DRIVE_DMA)
- aprint_normal(", DMA mode %d", drvp->DMA_mode);
+ aprint_verbose(", DMA mode %d", drvp->DMA_mode);
#if NATA_UDMA
if (drvp->drive_flags & DRIVE_UDMA) {
- aprint_normal(", Ultra-DMA mode %d", drvp->UDMA_mode);
+ aprint_verbose(", Ultra-DMA mode %d", drvp->UDMA_mode);
if (drvp->UDMA_mode == 2)
- aprint_normal(" (Ultra/33)");
+ aprint_verbose(" (Ultra/33)");
else if (drvp->UDMA_mode == 4)
- aprint_normal(" (Ultra/66)");
+ aprint_verbose(" (Ultra/66)");
else if (drvp->UDMA_mode == 5)
- aprint_normal(" (Ultra/100)");
+ aprint_verbose(" (Ultra/100)");
else if (drvp->UDMA_mode == 6)
- aprint_normal(" (Ultra/133)");
+ aprint_verbose(" (Ultra/133)");
}
#endif /* NATA_UDMA */
#endif /* NATA_DMA */
@@ -1054,9 +1054,9 @@ ata_print_modes(struct ata_channel *chp)
|| (atac->atac_cap & ATAC_CAP_PIOBM)
#endif
)
- aprint_normal(" (using DMA)");
+ aprint_verbose(" (using DMA)");
#endif /* NATA_DMA || NATA_PIOBM */
- aprint_normal("\n");
+ aprint_verbose("\n");
}
}
@@ -1151,7 +1151,7 @@ ata_probe_caps(struct ata_drive_datas *drvp)
drvp->drive_flags &= ~DRIVE_CAP32;
splx(s);
} else {
- aprint_normal("%s: 32-bit data port\n",
+ aprint_verbose("%s: 32-bit data port\n",
drv_dev->dv_xname);
}
}
@@ -1160,7 +1160,7 @@ ata_probe_caps(struct ata_drive_datas *drvp)
params.atap_ata_major != 0xffff) {
for (i = 14; i > 0; i--) {
if (params.atap_ata_major & (1 << i)) {
- aprint_normal("%s: ATA version %d\n",
+ aprint_verbose("%s: ATA version %d\n",
drv_dev->dv_xname, i);
drvp->ata_vers = i;
break;
@@ -1206,7 +1206,7 @@ ata_probe_caps(struct ata_drive_datas *drvp)
AT_WAIT) != CMD_OK)
continue;
if (!printed) {
- aprint_normal("%s: drive supports PIO mode %d",
+ aprint_verbose("%s: drive supports PIO mode %d",
drv_dev->dv_xname, i + 3);
sep = ",";
printed = 1;
@@ -1244,7 +1244,7 @@ ata_probe_caps(struct ata_drive_datas *drvp)
continue;
#endif
if (!printed) {
- aprint_normal("%s DMA mode %d", sep, i);
+ aprint_verbose("%s DMA mode %d", sep, i);
sep = ",";
printed = 1;
}
@@ -1276,16 +1276,16 @@ ata_probe_caps(struct ata_drive_datas *drvp)
continue;
#endif
if (!printed) {
- aprint_normal("%s Ultra-DMA mode %d",
+ aprint_verbose("%s Ultra-DMA mode %d",
sep, i);
if (i == 2)
- aprint_normal(" (Ultra/33)");
+ aprint_verbose(" (Ultra/33)");
else if (i == 4)
- aprint_normal(" (Ultra/66)");
+ aprint_verbose(" (Ultra/66)");
else if (i == 5)
- aprint_normal(" (Ultra/100)");
+ aprint_verbose(" (Ultra/100)");
else if (i == 6)
- aprint_normal(" (Ultra/133)");
+ aprint_verbose(" (Ultra/133)");
sep = ",";
printed = 1;
}
@@ -1304,7 +1304,7 @@ ata_probe_caps(struct ata_drive_datas *drvp)
break;
}
}
- aprint_normal("\n");
+ aprint_verbose("\n");
}
s = splbio();
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 5885d18aefb..8aecf8bdee1 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.335 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: wd.c,v 1.336 2007/02/09 21:55:27 ad Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.335 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.336 2007/02/09 21:55:27 ad Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -358,7 +358,7 @@ wdattach(struct device *parent, struct device *self, void *aux)
wd->sc_multi = 1;
}
- aprint_normal("%s: drive supports %d-sector PIO transfers,",
+ aprint_verbose("%s: drive supports %d-sector PIO transfers,",
wd->sc_dev.dv_xname, wd->sc_multi);
/* 48-bit LBA addressing */
@@ -376,19 +376,19 @@ wdattach(struct device *parent, struct device *self, void *aux)
#endif
if ((wd->sc_flags & WDF_LBA48) != 0) {
- aprint_normal(" LBA48 addressing\n");
+ aprint_verbose(" LBA48 addressing\n");
wd->sc_capacity =
((u_int64_t) wd->sc_params.__reserved6[11] << 48) |
((u_int64_t) wd->sc_params.__reserved6[10] << 32) |
((u_int64_t) wd->sc_params.__reserved6[9] << 16) |
((u_int64_t) wd->sc_params.__reserved6[8] << 0);
} else if ((wd->sc_flags & WDF_LBA) != 0) {
- aprint_normal(" LBA addressing\n");
+ aprint_verbose(" LBA addressing\n");
wd->sc_capacity =
((u_int64_t)wd->sc_params.atap_capacity[1] << 16) |
wd->sc_params.atap_capacity[0];
} else {
- aprint_normal(" chs addressing\n");
+ aprint_verbose(" chs addressing\n");
wd->sc_capacity =
wd->sc_params.atap_cylinders *
wd->sc_params.atap_heads *