jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 23:19:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

The whole NEW_CONF_C_SYNTAX was bogus; David's right, it can't be

Browse Source 
optional at all.  Make it non-optional.
Submitted by:	davidg
This commit is contained in:
Jordan K. Hubbard 1995-02-09 11:59:40 +00:00
parent 640ed9d2a8
commit 4a48e9b15a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=6272
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/i386/i386/conf.c
View File

@ -41,7 +41,7 @@
* SUCH DAMAGE.
*
* from: @(#)conf.c 5.8 (Berkeley) 5/12/91
* $Id: conf.c,v 1.58 1995/02/06 23:20:03 jkh Exp $
* $Id: conf.c,v 1.59 1995/02/09 11:13:09 jkh Exp $
*/
#include <sys/param.h>
@ -772,14 +772,8 @@ d_mmap_t spigot_mmap;
/*
* This stuff from Heikki is kind of bizarre, and I'm not sure how I feel
* about it yet (I think I like it about as much as I can like anything in
* here), but I'm intrigued enough for now to enable it by default. -jkh
*
* If you want to use the Cyclades driver, you MUST have this on for now
* (or convert Heikki's syntax to the old one).
* here). -jkh
*/
#define NEW_CONF_C_SYNTAX yes
#if defined(NEW_CONF_C_SYNTAX)
#ifndef __CONCAT
#define __CONCAT(x,y) x ## y
#endif
@ -812,11 +806,11 @@ d_mmap_t spigot_mmap;
(d_mmap_t((*))) enodev, 0 }
#endif
/* Cyclades serial driver */
#include "cy.h"
cdev_decl(cy);
#endif /* NEW_CONF_C_SYNTAX */
/* open, close, read, write, ioctl, stop, reset, ttys, select, mmap, strat */
struct cdevsw cdevsw[] =
@ -974,9 +968,7 @@ struct cdevsw cdevsw[] =
{ gscopen, gscclose, gscread, nowrite, /*47*/
gscioctl, nostop, nullreset, NULL, /* gsc */
seltrue, nommap, NULL },
#if defined(NEW_CONF_C_SYNTAX)
cdev_tty_init(NCY,cy), /* cyclades */
#endif
{ sscopen, sscclose, sscread, sscwrite, /*49*/
sscioctl, nostop, nullreset, NULL, /* scsi super */
sscselect, sscmmap, sscstrategy },