SC_DEBUG cleanup

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index fa9d4d8..08ee387 100644 (file)
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd.c,v 1.91 1996/04/22 01:46:00 christos Exp $ */
+/*     $NetBSD: cd.c,v 1.92 1996/05/05 19:52:50 christos Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -262,7 +262,7 @@ cdopen(dev, flag, fmt, p)
 
        SC_DEBUG(sc_link, SDEV_DB1,
            ("cdopen: dev=0x%x (unit %d (of %d), partition %d)\n", dev, unit,
-           cd_cd.cd_ndevs, part));
+           cd_cd.cd_ndevs, CDPART(dev)));
 
        if ((error = cdlock(cd)) != 0)
                return error;
@@ -410,7 +410,7 @@ cdstrategy(bp)
 
        SC_DEBUG(cd->sc_link, SDEV_DB2, ("cdstrategy "));
        SC_DEBUG(cd->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.
         */

diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 114a284..b5833db 100644 (file)
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,5 +1,5 @@
-/*     $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 $ */
+/*     $OpenBSD: sd.c,v 1.10 1996/05/10 12:31:39 deraadt Exp $ */
+/*     $NetBSD: sd.c,v 1.98 1996/05/05 19:52:53 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))\n", dev, unit,
-           sd_cd.cd_ndevs));
+           ("sdopen: dev=0x%x (unit %d (of %d), partition %d)\n", dev, unit,
+           sd_cd.cd_ndevs, SDPART(dev)));
 
        if ((error = sdlock(sd)) != 0)
                return error;

diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c
index 7bbec36..580bbe2 100644 (file)
--- a/sys/scsi/ss.c
+++ b/sys/scsi/ss.c
@@ -1,5 +1,5 @@
-/*     $OpenBSD: ss.c,v 1.4 1996/05/07 09:34:31 niklas Exp $   */
-/*     $NetBSD: ss.c,v 1.9 1996/03/30 21:47:00 christos Exp $  */
+/*     $OpenBSD: ss.c,v 1.5 1996/05/10 12:31:39 deraadt Exp $  */
+/*     $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */
 
 /*
  * Copyright (c) 1995 Kenneth Stailey.  All rights reserved.
@@ -320,7 +320,7 @@ ssstrategy(bp)
        int s;
 
        SC_DEBUG(ss->sc_link, SDEV_DB1,
-           ("ssstrategy %d bytes @ blk %d\n", bp->b_bcount, bp->b_blkno));
+           ("ssstrategy %ld bytes @ blk %d\n", bp->b_bcount, bp->b_blkno));
 
        if (bp->b_bcount > ss->sio.scan_window_size)
                bp->b_bcount = ss->sio.scan_window_size;

diff --git a/sys/scsi/ss_mustek.c b/sys/scsi/ss_mustek.c
index 369651b..8e75453 100644 (file)
--- a/sys/scsi/ss_mustek.c
+++ b/sys/scsi/ss_mustek.c
@@ -1,5 +1,5 @@
-/*     $OpenBSD: ss_mustek.c,v 1.4 1996/05/07 09:34:32 niklas Exp $    */
-/*     $NetBSD: ss_mustek.c,v 1.3 1996/03/30 21:47:04 christos Exp $   */
+/*     $OpenBSD: ss_mustek.c,v 1.5 1996/05/10 12:31:40 deraadt Exp $   */
+/*     $NetBSD: ss_mustek.c,v 1.4 1996/05/05 19:52:57 christos Exp $   */
 
 /*
  * Copyright (c) 1995 Joachim Koenig-Baltes.  All rights reserved.
@@ -261,11 +261,11 @@ mustek_minphys(ss, bp)
        struct scsi_link *sc_link = ss->sc_link;
 #endif
 
-       SC_DEBUG(sc_link, SDEV_DB1, ("mustek_minphys: before: %d\n",
+       SC_DEBUG(sc_link, SDEV_DB1, ("mustek_minphys: before: %ld\n",
            bp->b_bcount));
        bp->b_bcount -= bp->b_bcount %
            ((ss->sio.scan_pixels_per_line * ss->sio.scan_bits_per_pixel) / 8);
-       SC_DEBUG(sc_link, SDEV_DB1, ("mustek_minphys: after:  %d\n",
+       SC_DEBUG(sc_link, SDEV_DB1, ("mustek_minphys: after:  %ld\n",
            bp->b_bcount));
 }
 
@@ -476,7 +476,7 @@ mustek_read(ss, bp)
        /* instead of the bytes, the mustek wants the number of lines */
        lines_to_read = bp->b_bcount /
            ((ss->sio.scan_pixels_per_line * ss->sio.scan_bits_per_pixel) / 8);
-       SC_DEBUG(sc_link, SDEV_DB1, ("mustek_read: read %d lines\n",
+       SC_DEBUG(sc_link, SDEV_DB1, ("mustek_read: read %ld lines\n",
            lines_to_read));
        _lto3b(lines_to_read, cmd.length);
 
@@ -548,7 +548,7 @@ mustek_get_status(ss, timeout, update)
                    ("mustek_get_size: bpl=%ld, lines=%ld\n",
                    (ss->sio.scan_pixels_per_line * ss->sio.scan_bits_per_pixel) / 8,
                    ss->sio.scan_lines));
-               SC_DEBUG(sc_link, SDEV_DB1, ("window size = %d\n",
+               SC_DEBUG(sc_link, SDEV_DB1, ("window size = %ld\n",
                    ss->sio.scan_window_size));
        }
 

diff --git a/sys/scsi/ss_scanjet.c b/sys/scsi/ss_scanjet.c
index 164f942..a629cd7 100644 (file)
--- a/sys/scsi/ss_scanjet.c
+++ b/sys/scsi/ss_scanjet.c
@@ -1,5 +1,5 @@
-/*     $OpenBSD: ss_scanjet.c,v 1.4 1996/05/07 09:34:34 niklas Exp $   */
-/*     $NetBSD: ss_scanjet.c,v 1.3 1996/03/30 21:47:07 christos Exp $  */
+/*     $OpenBSD: ss_scanjet.c,v 1.5 1996/05/10 12:31:41 deraadt Exp $  */
+/*     $NetBSD: ss_scanjet.c,v 1.4 1996/05/05 19:52:58 christos Exp $  */
 
 /*
  * Copyright (c) 1995 Kenneth Stailey.  All rights reserved.
@@ -204,9 +204,6 @@ scanjet_trigger_scanner(ss)
        struct ss_softc *ss;
 {
        char escape_codes[20];
-#ifdef SCSIDEBUG
-       struct scsi_link *sc_link = ss->sc_link;
-#endif
        int error;
 
        scanjet_compute_sizes(ss);

diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 39dd0ac..5d2b8e9 100644 (file)
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,5 +1,5 @@
-/*     $OpenBSD: st.c,v 1.10 1996/04/21 22:31:20 deraadt Exp $ */
-/*     $NetBSD: st.c,v 1.65 1996/03/30 21:45:04 christos Exp $ */
+/*     $OpenBSD: st.c,v 1.11 1996/05/10 12:31:41 deraadt Exp $ */
+/*     $NetBSD: st.c,v 1.66 1996/05/05 19:53:01 christos Exp $ */
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -829,7 +829,7 @@ ststrategy(bp)
        int s;
 
        SC_DEBUG(st->sc_link, SDEV_DB1,
-           ("ststrategy %d bytes @ blk %d\n", bp->b_bcount, bp->b_blkno));
+           ("ststrategy %ld bytes @ blk %d\n", bp->b_bcount, bp->b_blkno));
        /*
         * If it's a null transfer, return immediatly
         */