diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1995-03-16 18:17:34 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1995-03-16 18:17:34 +0000 |
| commit | b5e8ce9f12b66453759f254bdf8bfc53fe2b6948 (patch) | |
| tree | e4952f18ac85eccbbd3d9b0f010098732d07fe6d /sys/dev | |
| parent | 11098d3bad179feb30248af23c90e5df877d36f8 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ed/if_ed.c | 4 | ||||
| -rw-r--r-- | sys/dev/fdc/fdc.c | 17 | ||||
| -rw-r--r-- | sys/dev/sio/sio.c | 7 | ||||
| -rw-r--r-- | sys/dev/speaker/spkr.c | 4 |
4 files changed, 23 insertions, 9 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 718c67083773..e4e71e2c883a 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -13,7 +13,7 @@ * the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000, * and a variety of similar clones. * - * $Id: if_ed.c,v 1.66 1995/02/25 15:56:00 davidg Exp $ + * $Id: if_ed.c,v 1.67 1995/02/26 20:03:53 davidg Exp $ */ #include "ed.h" @@ -50,6 +50,8 @@ #include <net/bpfdesc.h> #endif +#include <machine/clock.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 94b032919508..6ab787b90fd9 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.52 1995/02/26 01:37:51 bde Exp $ + * $Id: fd.c,v 1.53 1995/03/12 22:40:56 joerg Exp $ * */ @@ -289,6 +289,7 @@ static timeout_t fd_turnoff; static timeout_t fd_motor_on; static void fd_turnon(fdu_t); static void fdc_reset(fdc_p); +static int fd_in(fdcu_t, int *); static void fdstart(fdcu_t); static timeout_t fd_timeout; static timeout_t fd_pseudointr; @@ -477,9 +478,19 @@ int fd_read_status(fdc_p fdc, int fdsu) { int i, ret; + for (i = 0; i < 7; i++) { - if ((ret = fd_in(fdc->fdcu, fdc->status + i))) + /* + * XXX types are poorly chosen. Only bytes can by read + * from the hardware, but fdc_status wants u_longs and + * fd_in() gives ints. + */ + int status; + + ret = fd_in(fdc->fdcu, &status); + fdc->status[i] = status; + if (ret != 0) break; } @@ -854,7 +865,7 @@ in_fdc(fdcu_t fdcu) /* * fd_in: Like in_fdc, but allows you to see if it worked. */ -int +static int fd_in(fdcu_t fdcu, int *ptr) { int baseport = fdc_data[fdcu].baseport; diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 1d8bf01fee82..565bb190a43f 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.69 1995/02/28 00:20:54 pst Exp $ + * $Id: sio.c,v 1.70 1995/02/28 23:21:33 ache Exp $ */ #include "sio.h" @@ -313,10 +313,9 @@ struct tty *sio_tty[NSIO]; #else struct tty sio_tty[NSIO]; #endif -extern struct tty *constty; /* XXX */ #ifdef KGDB -#include "machine/remote-sl.h" +#include <machine/remote-sl.h> extern int kgdb_dev; extern int kgdb_rate; @@ -1955,7 +1954,7 @@ comwakeup(chan) /* * Following are all routines needed for SIO to act as console */ -#include "i386/i386/cons.h" +#include <i386/i386/cons.h> struct siocnstate { u_char dlbl; diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 70e50a995656..f9c72d6ca690 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.10 1994/10/14 16:37:58 ache Exp $ + * $Id: spkr.c,v 1.11 1995/02/03 10:19:38 ache Exp $ */ #include "speaker.h" @@ -16,9 +16,11 @@ #include <sys/kernel.h> #include <sys/errno.h> #include <sys/buf.h> +#include <sys/proc.h> #include <sys/uio.h> #include <i386/isa/isa.h> #include <i386/isa/timerreg.h> +#include <machine/clock.h> #include <machine/speaker.h> /**************** MACHINE DEPENDENT PART STARTS HERE ************************* |