diff options
| -rw-r--r-- | sys/dev/isa/wd.c | 16 | ||||
| -rw-r--r-- | sys/dev/isa/wdc.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/wdlink.h | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c index df36b3f7983..931c7b003fb 100644 --- a/sys/dev/isa/wd.c +++ b/sys/dev/isa/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.25 1997/04/18 06:12:23 niklas Exp $ */ +/* $OpenBSD: wd.c,v 1.26 1997/07/06 18:10:17 niklas Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* @@ -104,7 +104,7 @@ bdev_decl(wd); void wdfinish __P((struct wd_softc *, struct buf *)); int wdsetctlr __P((struct wd_link *)); -#if !defined(amiga) && !defined(alpha) +#if !defined(amiga) static void bad144intern __P((struct wd_softc *)); #endif int wdlock __P((struct wd_link *)); @@ -282,7 +282,7 @@ wdstart(vp) struct wd_link *d_link = wd->d_link; struct wdc_link *ctlr_link = d_link->ctlr_link; struct wdc_xfer *xfer; - u_long p_offset; + u_int32_t p_offset; while (d_link->openings > 0) { @@ -572,7 +572,7 @@ wdgetdisklabel(dev, wd) if (d_link->sc_state > GEOMETRY) d_link->sc_state = GEOMETRY; -#if !defined(amiga) && !defined(alpha) +#if !defined(amiga) if ((lp->d_flags & D_BADSECT) != 0) bad144intern(wd); #endif @@ -623,7 +623,7 @@ wdioctl(dev, xfer, addr, flag, p) return EIO; switch (xfer) { -#if !defined(amiga) && !defined(alpha) +#if !defined(amiga) case DIOCSBAD: if ((flag & FWRITE) == 0) return EBADF; @@ -823,10 +823,10 @@ wddump(dev, blkno, va, size) while (nblks > 0) { daddr_t xlt_blkno = blkno; - long cylin, head, sector; + int cylin, head, sector; if ((lp->d_flags & D_BADSECT) != 0) { - long blkdiff; + int blkdiff; int i; for (i = 0; (blkdiff = d_link->sc_badsect[i]) != -1; i++) { @@ -908,7 +908,7 @@ wddump(dev, blkno, va, size) } #endif /* __BDEVSW_DUMP_NEW_TYPE */ -#if !defined(amiga) && !defined(alpha) +#if !defined(amiga) /* * Internalize the bad sector table. */ diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c index 70a141582ff..b9aac2d3900 100644 --- a/sys/dev/isa/wdc.c +++ b/sys/dev/isa/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.21 1997/07/04 19:22:19 downsj Exp $ */ +/* $OpenBSD: wdc.c,v 1.22 1997/07/06 18:10:18 niklas Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* @@ -454,7 +454,7 @@ wdc_ata_start(wdc, xfer) if (xfer->c_skip == 0 || (wdc->sc_flags & WDCF_SINGLE) != 0 || d_link->sc_mode == WDM_DMA) { daddr_t blkno = xfer->c_blkno; - long cylin, head, sector; + int cylin, head, sector; int command; if ((wdc->sc_flags & WDCF_SINGLE) != 0) @@ -476,7 +476,7 @@ wdc_ata_start(wdc, xfer) && (bp->b_flags & B_FORMAT) == 0 #endif ) { - long blkdiff; + int blkdiff; int i; for (i = 0; diff --git a/sys/dev/isa/wdlink.h b/sys/dev/isa/wdlink.h index 154902ca047..b25b67b2c99 100644 --- a/sys/dev/isa/wdlink.h +++ b/sys/dev/isa/wdlink.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdlink.h,v 1.7 1997/07/04 17:02:04 downsj Exp $ */ +/* $OpenBSD: wdlink.h,v 1.8 1997/07/06 18:10:19 niklas Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -114,7 +114,7 @@ struct wd_link { struct wdc_xfer { struct wdc_link *c_link; /* controller structure info */ struct wd_link *d_link; /* drive/bus structure info */ - volatile long c_flags; /* handle also B_READ and B_WRITE */ + volatile int c_flags; /* handle also B_READ and B_WRITE */ #define C_INUSE 0x01 #define C_ATAPI 0x02 #define C_ERROR 0x04 @@ -128,7 +128,7 @@ struct wdc_xfer { int c_skip; /* bytes already transferred */ int c_nblks; /* number of blocks currently transferring */ int c_nbytes; /* number of bytes currently transferring */ - u_long c_p_offset; /* offset of the partition */ + u_int32_t c_p_offset; /* offset of the partition */ TAILQ_ENTRY(wdc_xfer) c_xferchain; LIST_ENTRY(wdc_xfer) free_list; }; |