summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2010-01-14 00:32:47 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2010-01-14 00:32:47 +0000
commit2d74ac57a79cf13264f080dc0c450370cbc1d8c2 (patch)
tree9569e7179e5c0568ae39ccb44b44561748b2ad8a /sys
parent44b814d96d359e0f26046e89588f07e6b5a5c0d1 (diff)
Tweak names a bit. show_mem -> scsi_show_mem, show_scsi_xs ->
scsi_xs_show. No functional change.
Diffstat (limited to 'sys')
-rw-r--r--sys/scsi/scsi_base.c14
-rw-r--r--sys/scsi/scsiconf.h6
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 14bf67c406a..60e980e7bef 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_base.c,v 1.162 2010/01/13 10:53:11 krw Exp $ */
+/* $OpenBSD: scsi_base.c,v 1.163 2010/01/14 00:32:46 krw Exp $ */
/* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
/*
@@ -726,9 +726,9 @@ scsi_xs_exec(struct scsi_xfer *xs)
#ifdef SCSIDEBUG
if (xs->sc_link->flags & SDEV_DB1) {
- show_scsi_xs(xs);
+ scsi_xs_show(xs);
if (xs->datalen && (xs->flags & SCSI_DATA_OUT))
- show_mem(xs->data, min(64, xs->datalen));
+ scsi_show_mem(xs->data, min(64, xs->datalen));
}
#endif /* SCSIDEBUG */
@@ -762,9 +762,9 @@ scsi_done(struct scsi_xfer *xs)
#ifdef SCSIDEBUG
if (xs->sc_link->flags & SDEV_DB1) {
if (xs->datalen && (xs->flags & SCSI_DATA_IN))
- show_mem(xs->data, min(64, xs->datalen));
+ scsi_show_mem(xs->data, min(64, xs->datalen));
if (xs->status == XS_SENSE || xs->status == XS_SHORTSENSE)
- show_mem((u_char *)&xs->sense, sizeof(xs->sense));
+ scsi_show_mem((u_char *)&xs->sense, sizeof(xs->sense));
}
#endif /* SCSIDEBUG */
@@ -1889,7 +1889,7 @@ scsi_decode_sense(struct scsi_sense_data *sense, int flag)
* Given a scsi_xfer, dump the request, in all its glory
*/
void
-show_scsi_xs(struct scsi_xfer *xs)
+scsi_xs_show(struct scsi_xfer *xs)
{
u_char *b = (u_char *)xs->cmd;
int i = 0;
@@ -1924,7 +1924,7 @@ show_scsi_xs(struct scsi_xfer *xs)
}
void
-show_mem(u_char *address, int num)
+scsi_show_mem(u_char *address, int num)
{
int x;
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 46419776443..d6e016320f9 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.h,v 1.117 2010/01/04 00:45:58 dlg Exp $ */
+/* $OpenBSD: scsiconf.h,v 1.118 2010/01/14 00:32:46 krw Exp $ */
/* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */
/*
@@ -555,9 +555,9 @@ int scsi_report_luns(struct scsi_link *, int,
void scsi_minphys(struct buf *, struct scsi_link *);
int scsi_interpret_sense(struct scsi_xfer *);
-void show_scsi_xs(struct scsi_xfer *);
+void scsi_xs_show(struct scsi_xfer *);
void scsi_print_sense(struct scsi_xfer *);
-void show_mem(u_char *, int);
+void scsi_show_mem(u_char *, int);
void scsi_strvis(u_char *, u_char *, int);
int scsi_delay(struct scsi_xfer *, int);