diff options
| author | bde <bde@FreeBSD.org> | 1998-07-11 06:35:39 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-11 06:35:39 +0000 |
| commit | 065e3edb4989d6adb56bfc42cab8726f680cef5b (patch) | |
| tree | c5eb214b570ae3cccae7a9958db22dbfe9d5954f /sys/isa | |
| parent | a4b7c7a6b332ba36b7bbd82b88b16274e82447f0 (diff) | |
| download | FreeBSD-src-065e3edb4989d6adb56bfc42cab8726f680cef5b.zip FreeBSD-src-065e3edb4989d6adb56bfc42cab8726f680cef5b.tar.gz | |
Don't pretend to support ix86's with 7-bit ints by using longs just to
ensure 8-bit variables. Doing so mainly bogotified some printf formats.
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 8 | ||||
| -rw-r--r-- | sys/isa/fdc.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 472fe57..91973cc 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -44,7 +44,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.114 1998/06/07 19:40:39 dfr Exp $ + * $Id: fd.c,v 1.115 1998/07/04 22:30:16 julian Exp $ * */ @@ -509,7 +509,7 @@ fd_read_status(fdc_p fdc, int fdsu) { /* * XXX types are poorly chosen. Only bytes can by read - * from the hardware, but fdc_status wants u_longs and + * from the hardware, but fdc->status[] wants u_ints and * fd_in() gives ints. */ int status; @@ -1865,7 +1865,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) default: printf("fdc%d: Unexpected FD int->", fdcu); if (fd_read_status(fdc, fd->fdsu) == 0) - printf("FDC status :%lx %lx %lx %lx %lx %lx %lx ", + printf("FDC status :%x %x %x %x %x %x %x ", fdc->status[0], fdc->status[1], fdc->status[2], @@ -1943,7 +1943,7 @@ retrier(fdcu) if (fdc->flags & FDC_STAT_VALID) { printf( - " (ST0 %b ST1 %b ST2 %b cyl %ld hd %ld sec %ld)\n", + " (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n", fdc->status[0], NE7_ST0BITS, fdc->status[1], NE7_ST1BITS, fdc->status[2], NE7_ST2BITS, diff --git a/sys/isa/fdc.h b/sys/isa/fdc.h index 34d7011..8524123 100644 --- a/sys/isa/fdc.h +++ b/sys/isa/fdc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fdc.h,v 1.8 1997/02/22 09:36:10 peter Exp $ + * $Id: fdc.h,v 1.9 1997/09/17 20:16:16 tegge Exp $ * */ @@ -60,7 +60,7 @@ struct fdc_data int state; int retry; int fdout; /* mirror of the w/o digital output reg */ - u_long status[7]; /* copy of the registers */ + u_int status[7]; /* copy of the registers */ enum fdc_type fdct; /* chip version of FDC */ int fdc_errs; /* number of logged errors */ struct buf_queue_head head; /* Head of buf chain */ |
