diff options
| author |   deraadt <deraadt@openbsd.org> | 1996-05-06 11:33:35 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1996-05-06 11:33:35 +0000 |
| commit | 7259af13185fd1baf278c1639c5ce5dd0a7f5f63 (patch) | |
| tree | 643133b0d77f74aece4727ffc599c102bf195cf2 | |
| parent | shinaken cd has lun problem (diff) | |
| download | wireguard-openbsd-7259af13185fd1baf278c1639c5ce5dd0a7f5f63.tar.xz wireguard-openbsd-7259af13185fd1baf278c1639c5ce5dd0a7f5f63.zip | |
from netbsd; SCSIDEBUG printf() fixes
| -rw-r--r-- | sys/scsi/scsi_base.c | 14 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 8d187c99f58..c607a0cb41d 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,5 +1,5 @@ -/* $OpenBSD: scsi_base.c,v 1.8 1996/05/02 13:17:52 deraadt Exp $ */ -/* $NetBSD: scsi_base.c,v 1.35 1996/04/22 01:46:05 christos Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.9 1996/05/06 11:33:35 deraadt Exp $ */ +/* $NetBSD: scsi_base.c,v 1.36 1996/05/03 19:48:20 christos Exp $ */ /* * Copyright (c) 1994, 1995 Charles Hannum. All rights reserved. @@ -798,18 +798,18 @@ void show_scsi_xs(xs) struct scsi_xfer *xs; { - printf("xs(0x%x): ", xs); + printf("xs(%p): ", xs); printf("flg(0x%x)", xs->flags); - printf("sc_link(0x%x)", xs->sc_link); + printf("sc_link(%p)", xs->sc_link); printf("retr(0x%x)", xs->retries); printf("timo(0x%x)", xs->timeout); - printf("cmd(0x%x)", xs->cmd); + printf("cmd(%p)", xs->cmd); printf("len(0x%x)", xs->cmdlen); - printf("data(0x%x)", xs->data); + printf("data(%p)", xs->data); printf("len(0x%x)", xs->datalen); printf("res(0x%x)", xs->resid); printf("err(0x%x)", xs->error); - printf("bp(0x%x)", xs->bp); + printf("bp(%p)", xs->bp); show_scsi_cmd(xs); } diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 4a9def2c5c2..114a284adf9 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,5 +1,5 @@ -/* $OpenBSD: sd.c,v 1.8 1996/05/02 13:17:55 deraadt Exp $ */ -/* $NetBSD: sd.c,v 1.96 1996/04/22 01:46:14 christos Exp $ */ +/* $OpenBSD: sd.c,v 1.9 1996/05/06 11:33:37 deraadt Exp $ */ +/* $NetBSD: sd.c,v 1.97 1996/05/03 19:48:22 christos Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -270,8 +270,8 @@ sdopen(dev, flag, fmt, p) sc_link = sd->sc_link; SC_DEBUG(sc_link, SDEV_DB1, - ("sdopen: dev=0x%x (unit %d (of %d), partition %d)\n", dev, unit, - sd_cd.cd_ndevs, part)); + ("sdopen: dev=0x%x (unit %d (of %d))\n", dev, unit, + sd_cd.cd_ndevs)); if ((error = sdlock(sd)) != 0) return error; @@ -419,7 +419,7 @@ sdstrategy(bp) SC_DEBUG(sd->sc_link, SDEV_DB2, ("sdstrategy ")); SC_DEBUG(sd->sc_link, SDEV_DB1, - ("%d bytes @ blk %d\n", bp->b_bcount, bp->b_blkno)); + ("%ld bytes @ blk %d\n", bp->b_bcount, bp->b_blkno)); /* * The transfer must be a whole number of blocks. */ |