summaryrefslogtreecommitdiffstats
path: root/sys/scsi/sd.c
diff options
context:
space:
mode:
authorwollman <wollman@FreeBSD.org>1993-12-19 00:55:01 +0000
committerwollman <wollman@FreeBSD.org>1993-12-19 00:55:01 +0000
commit71b67e5a560e27117fd4ff9fe76b1e67f1423f1e (patch)
tree62dff2aa17f4c31d27a9595b764f9cbc9810eb80 /sys/scsi/sd.c
parentc7341bb860bd0d1789ca0b8bfce96c383fd7dbbc (diff)
downloadFreeBSD-src-71b67e5a560e27117fd4ff9fe76b1e67f1423f1e.zip
FreeBSD-src-71b67e5a560e27117fd4ff9fe76b1e67f1423f1e.tar.gz
Make everything compile with -Wtraditional. Make it easier to distribute
a binary link-kit. Make all non-optional options (pagers, procfs) standard, and update LINT to reflect new symtab requirements. NB: -Wtraditional will henceforth be forgotten. This editing pass was primarily intended to detect any constructions where the old code might have been relying on traditional C semantics or syntax. These were all fixed, and the result of fixing some of them means that -Wall is now a realistic possibility within a few weeks.
Diffstat (limited to 'sys/scsi/sd.c')
-rw-r--r--sys/scsi/sd.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 660d194..b543631 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -14,7 +14,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
*
- * $Id: sd.c,v 1.12 1993/11/18 05:03:02 rgrimes Exp $
+ * $Id: sd.c,v 1.13 1993/11/25 01:37:34 wollman Exp $
*/
#define SPLSD splbio
@@ -48,9 +48,8 @@ int Debugger();
#else /* NetBSD */
#include <ddb.h>
#if NDDB > 0
-int Debugger();
#else /* NDDB > 0 */
-#define Debugger()
+#define Debugger(s)
#endif /* NDDB > 0 */
#endif
@@ -271,7 +270,7 @@ sdopen(dev)
if (sd->params.secsiz != SECSIZE) { /* XXX One day... */
printf("sd%d: Can't deal with %d bytes logical blocks\n",
unit, sd->params.secsiz);
- Debugger();
+ Debugger("sd");
errcode = ENXIO;
goto bad;
}
@@ -516,7 +515,7 @@ sdstart(unit)
bzero(&cmd, sizeof(cmd));
cmd.op_code = (bp->b_flags & B_READ)
? READ_BIG : WRITE_BIG;
- cmd.addr_3 = (blkno & 0xff000000) >> 24;
+ cmd.addr_3 = (blkno & 0xff000000UL) >> 24;
cmd.addr_2 = (blkno & 0xff0000) >> 16;
cmd.addr_1 = (blkno & 0xff00) >> 8;
cmd.addr_0 = blkno & 0xff;
OpenPOWER on IntegriCloud