diff options
| author | peter <peter@FreeBSD.org> | 1995-08-05 21:33:04 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1995-08-05 21:33:04 +0000 |
| commit | 94298d4284aac19534557638c951271810e29786 (patch) | |
| tree | ac335d2107bf55135e9a87706bfaf0609545a89d /sys | |
| parent | 6e28dc018a63579c8e5716e54b5098cbad1f0edc (diff) | |
| download | FreeBSD-src-94298d4284aac19534557638c951271810e29786.zip FreeBSD-src-94298d4284aac19534557638c951271810e29786.tar.gz | |
Grab next major (68) for the Specialix SI/XIO driver which is due to
come in RSN. As Jordan said "First in, first served.."
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files.i386 | 4 | ||||
| -rw-r--r-- | sys/i386/conf/files.i386 | 4 | ||||
| -rw-r--r-- | sys/i386/i386/conf.c | 27 |
3 files changed, 32 insertions, 3 deletions
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index ea8af63..cd71c62 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.101 1995/07/22 23:53:30 bde Exp $ +# $Id: files.i386,v 1.102 1995/07/28 22:25:52 jkh Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ @@ -113,6 +113,8 @@ i386/isa/rc.c optional rc device-driver i386/isa/readMBR.c standard i386/isa/scd.c optional scd device-driver i386/isa/seagate.c optional sea device-driver +i386/isa/si.c optional si device-driver +i386/isa/si_code.c optional si device-driver i386/isa/sio.c optional sio device-driver i386/isa/sound/dev_table.c optional snd device-driver i386/isa/sound/soundcard.c optional snd device-driver diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index ea8af63..cd71c62 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.101 1995/07/22 23:53:30 bde Exp $ +# $Id: files.i386,v 1.102 1995/07/28 22:25:52 jkh Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ @@ -113,6 +113,8 @@ i386/isa/rc.c optional rc device-driver i386/isa/readMBR.c standard i386/isa/scd.c optional scd device-driver i386/isa/seagate.c optional sea device-driver +i386/isa/si.c optional si device-driver +i386/isa/si_code.c optional si device-driver i386/isa/sio.c optional sio device-driver i386/isa/sound/dev_table.c optional snd device-driver i386/isa/sound/soundcard.c optional snd device-driver diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index 5d4a47d..1c5fa69 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.89 1995/07/22 13:56:06 bde Exp $ + * $Id: conf.c,v 1.90 1995/07/31 22:06:55 jkh Exp $ */ #include <sys/param.h> @@ -918,6 +918,28 @@ d_ttycv_t cydevtotty; #define cydevtotty nxdevtotty #endif +/* Specialix serial driver */ +#include "si.h" +#if NSI > 0 +d_open_t siopen; +d_close_t siclose; +d_read_t siread; +d_write_t siwrite; +d_ioctl_t siioctl; +d_stop_t sistop; +d_ttycv_t sidevtotty; +#define sireset nxreset +#else +#define siopen nxopen +#define siclose nxclose +#define siread nxread +#define siwrite nxwrite +#define siioctl nxioctl +#define sistop nxstop +#define sireset nxreset +#define sidevtotty nxdevtotty +#endif + #include "ity.h" #if NITY > 0 d_open_t ityopen; @@ -1250,6 +1272,9 @@ struct cdevsw cdevsw[] = { meteor_open, meteor_close, meteor_read, meteor_write, /*67*/ meteor_ioctl, nostop, nullreset, nodevtotty,/* Meteor */ seltrue, meteor_mmap, NULL }, + { siopen, siclose, siread, siwrite, /*68*/ + siioctl, sistop, sireset, sidevtotty,/* slxos */ + ttselect, nxmmap, NULL }, }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); |
