diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-12-28 16:30:09 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-12-28 16:30:09 +0000 |
| commit | 291ca5cd2af937611f37e394e8cd97fd9ebbd919 (patch) | |
| tree | a1f2ebe5258853e986251dff8df9db83bc1145d4 | |
| parent | 1c4205276f2aaa838d09b45bb7b9588157d73e23 (diff) | |
rename some functions to make it clear theyre used to emulate vpd responses
| -rw-r--r-- | sys/dev/ata/atascsi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c index 8e231a2ea2a..2dbd9f06425 100644 --- a/sys/dev/ata/atascsi.c +++ b/sys/dev/ata/atascsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.c,v 1.56 2007/12/28 16:21:06 dlg Exp $ */ +/* $OpenBSD: atascsi.c,v 1.57 2007/12/28 16:30:08 dlg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -74,8 +74,8 @@ int atascsi_disk_cmd(struct scsi_xfer *); void atascsi_disk_cmd_done(struct ata_xfer *); int atascsi_disk_inq(struct scsi_xfer *); int atascsi_disk_inquiry(struct scsi_xfer *); -int atascsi_disk_serial(struct scsi_xfer *); -int atascsi_disk_ident(struct scsi_xfer *); +int atascsi_disk_vpd_serial(struct scsi_xfer *); +int atascsi_disk_vpd_ident(struct scsi_xfer *); int atascsi_disk_capacity(struct scsi_xfer *); int atascsi_disk_sync(struct scsi_xfer *); void atascsi_disk_sync_done(struct ata_xfer *); @@ -476,9 +476,9 @@ atascsi_disk_inq(struct scsi_xfer *xs) if (ISSET(inq->flags, SI_EVPD)) { switch (inq->pagecode) { case SI_PG_SERIAL: - return (atascsi_disk_serial(xs)); + return (atascsi_disk_vpd_serial(xs)); case SI_PG_DEVID: - return (atascsi_disk_ident(xs)); + return (atascsi_disk_vpd_ident(xs)); default: return (atascsi_done(xs, XS_DRIVER_STUFFUP)); } @@ -551,7 +551,7 @@ atascsi_disk_inquiry(struct scsi_xfer *xs) } int -atascsi_disk_serial(struct scsi_xfer *xs) +atascsi_disk_vpd_serial(struct scsi_xfer *xs) { struct scsi_link *link = xs->sc_link; struct atascsi *as = link->adapter_softc; @@ -572,7 +572,7 @@ atascsi_disk_serial(struct scsi_xfer *xs) } int -atascsi_disk_ident(struct scsi_xfer *xs) +atascsi_disk_vpd_ident(struct scsi_xfer *xs) { struct scsi_link *link = xs->sc_link; struct atascsi *as = link->adapter_softc; |