--- cci/sys/tahoe/conf.c 2019/07/28 12:24:19 1.1 +++ cci/sys/tahoe/conf.c 2019/07/28 12:30:03 1.1.1.2 @@ -145,7 +145,39 @@ int bstopen(),bstclose(),bstread(),bstio #define bstioctl nodev #endif -int iiioctl(), iiclose(), iiopen(); +#include "dr.h" +#if NDR > 0 +int dropen(),drclose(),drread(),drwrite(),drioctl(),drreset(); +int dr11open(),dr11close(),dr11read(),dr11write(),dr11ioctl(); +#define dr11read nodev +#define dr11write nodev +#else +#define dropen nodev +#define drclose nodev +#define drread nodev +#define drwrite nodev +#define drioctl nodev +#define drreset nodev +#endif + +#include "enp.h" +#if NENP > 0 +int enpioctl(), enpreconfig(); +int enpr_open(), enpr_close(), enpr_read(), enpr_write(), enpr_ioctl(); +#else +#define enptr 0 +#define enpioctl nodev +#define enpreconfig nodev +#define enpr_open nodev +#define enpr_close nodev +#define enpr_read nodev +#define enpr_write nodev +#define enpr_ioctl nodev +#endif + + +int iiioctl_20(), iiclose_20(), iiopen_20(); +int iiioctl_30(), iiclose_30(), iiopen_30(); int ttselect(), seltrue(); /* NOTE: this structure is not to be changed at a whim, there are */ @@ -195,9 +227,25 @@ struct cdevsw cdevsw[] = bstopen, bstclose, bstread, nodev, /*13*/ bstioctl, nodev, nulldev, 0, nodev, nodev, - iiopen, iiclose, nulldev, nulldev, /*14*/ - iiioctl, nulldev, nulldev, 0, + iiopen_20, iiclose_20, nulldev, nulldev, /*14*/ + iiioctl_20, nulldev, nulldev, 0, seltrue, nodev, + iiopen_30, iiclose_30, nulldev, nulldev, /*15*/ + iiioctl_30, nulldev, nulldev, 0, + seltrue, nodev, + enpr_open, enpr_close, enpr_read, enpr_write, /*16*/ + enpr_ioctl, nodev, nulldev, 0, + nodev, nodev, + /* Reserved for Ram Disk */ + nodev, nodev, nodev, nodev, /*17*/ + nodev, nulldev, nulldev, 0, + nodev, nodev, + dropen, drclose, drread, drwrite, /*18*/ + drioctl, nodev, drreset, 0, + nodev, nodev, + dr11open, dr11close, dr11read, dr11write, /*19*/ + dr11ioctl, nodev, nodev, 0, + nodev, nodev, }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);