diff options
author | jkh <jkh@FreeBSD.org> | 1995-07-31 22:06:55 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1995-07-31 22:06:55 +0000 |
commit | 14ef24d99e1fcd7017a814b5def77ca5a727d336 (patch) | |
tree | a183013486b4852911451db004ef94c83296806e /sys | |
parent | 7c7b3a85cdc90dd1c9ccf5862ca1c582eb341753 (diff) | |
download | FreeBSD-src-14ef24d99e1fcd7017a814b5def77ca5a727d336.zip FreeBSD-src-14ef24d99e1fcd7017a814b5def77ca5a727d336.tar.gz |
Reserve space for Jim Lowe's impending Matrox Meteor card driver.
Submitted by: james
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/files | 1 | ||||
-rw-r--r-- | sys/i386/i386/conf.c | 23 |
2 files changed, 23 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files index 79e90f9..d82e9a3 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -288,6 +288,7 @@ pci/if_pdq.c optional fea device-driver pci/pdq.c optional fea device-driver pci/if_pdq.c optional fpa device-driver pci/pdq.c optional fpa device-driver +pci/meteor.c optional meteor device-driver scsi/cd.c optional cd scsi/ch.c optional ch scsi/scsi_base.c optional scbus diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index 54b9717..5d4a47d 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.88 1995/07/16 14:34:57 davidg Exp $ + * $Id: conf.c,v 1.89 1995/07/22 13:56:06 bde Exp $ */ #include <sys/param.h> @@ -356,6 +356,24 @@ d_psize_t vnsize; #define vnsize zerosize #endif +/* Matrox Meteor capture card */ +#include "meteor.h" +#if NMETEOR > 0 +d_open_t meteor_open; +d_close_t meteor_close; +d_read_t meteor_read; +d_write_t meteor_write; +d_ioctl_t meteor_ioctl; +d_mmap_t meteor_mmap; +#else +#define meteor_open nxopen +#define meteor_close nxclose +#define meteor_read nxread +#define meteor_write nxwrite +#define meteor_ioctl nxioctl +#define meteor_mmap nxmmap +#endif + #define swopen noopen #define swclose noclose #define swioctl noioc @@ -1229,6 +1247,9 @@ struct cdevsw cdevsw[] = { labpcopen, labpcclose, rawread, rawwrite, /*66*/ labpcioctl, nostop, nullreset, nodevtotty,/* labpc */ seltrue, nommap, labpcstrategy }, + { meteor_open, meteor_close, meteor_read, meteor_write, /*67*/ + meteor_ioctl, nostop, nullreset, nodevtotty,/* Meteor */ + seltrue, meteor_mmap, NULL }, }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); |