diff options
| author | cube <cube@NetBSD.org> | 2008-03-18 20:46:35 +0000 |
|---|---|---|
| committer | cube <cube@NetBSD.org> | 2008-03-18 20:46:35 +0000 |
| commit | 7aa6248cdfde8d80960cbcd5742d38e5423761de (patch) | |
| tree | 2eb35c7a40d288793365d11d66727bc210920b60 /sys/dev/ata/sata_subr.c | |
| parent | 0db6a6b0230a7ce748cf08924d67ae6b109f4b0f (diff) | |
Split device_t and softc for ATA devices, as well as wd(4). Other
cosmetic changes where appropriate.
Diffstat (limited to 'sys/dev/ata/sata_subr.c')
| -rw-r--r-- | sys/dev/ata/sata_subr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ata/sata_subr.c b/sys/dev/ata/sata_subr.c index 6cbfe781d02..91929662635 100644 --- a/sys/dev/ata/sata_subr.c +++ b/sys/dev/ata/sata_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: sata_subr.c,v 1.9 2007/12/11 11:38:15 lukem Exp $ */ +/* $NetBSD: sata_subr.c,v 1.10 2008/03/18 20:46:36 cube Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ * Common functions for Serial ATA. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sata_subr.c,v 1.9 2007/12/11 11:38:15 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sata_subr.c,v 1.10 2008/03/18 20:46:36 cube Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -121,22 +121,22 @@ sata_reset_interface(struct ata_channel *chp, bus_space_tag_t sata_t, case SStatus_DET_DEV_NE: aprint_error("%s port %d: device connected, but " "communication not established\n", - chp->ch_atac->atac_dev.dv_xname, chp->ch_channel); + device_xname(chp->ch_atac->atac_dev), chp->ch_channel); break; case SStatus_DET_OFFLINE: aprint_error("%s port %d: PHY offline\n", - chp->ch_atac->atac_dev.dv_xname, chp->ch_channel); + device_xname(chp->ch_atac->atac_dev), chp->ch_channel); break; case SStatus_DET_DEV: aprint_normal("%s port %d: device present, speed: %s\n", - chp->ch_atac->atac_dev.dv_xname, chp->ch_channel, + device_xname(chp->ch_atac->atac_dev), chp->ch_channel, sata_speed(sstatus)); break; default: aprint_error("%s port %d: unknown SStatus: 0x%08x\n", - chp->ch_atac->atac_dev.dv_xname, chp->ch_channel, + device_xname(chp->ch_atac->atac_dev), chp->ch_channel, sstatus); } return(sstatus & SStatus_DET_mask); |
