diff options
author | peter <peter@FreeBSD.org> | 1999-04-24 18:59:19 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-04-24 18:59:19 +0000 |
commit | 6994e5b80181dda0367cc24342a59efbbfd24a10 (patch) | |
tree | fb0aa7dbe0a0bfc6150eaeb6ca9b74bbd2cb7c3e /usr.sbin/config/config.h | |
parent | 3843abdc03deacf817f6459a1690b2911648a571 (diff) | |
download | FreeBSD-src-6994e5b80181dda0367cc24342a59efbbfd24a10.zip FreeBSD-src-6994e5b80181dda0367cc24342a59efbbfd24a10.tar.gz |
More cleanups, tweaks and features.
- make this work: options FOO123=456 *without quotes*
- grumble (but accept) vector xxxintr, and tty/net/bio/cam flags.
- complain if a device is specified twice (eg: 2 x psm0)
- don't require quotes around: port IO_COM2
- recognize negative numbers. (ie: options CAM_DEBUG_UNIT=-1)
- GC some more unused stuff (we don't have composite disks from config(8)).
- various other nits (snprintf paranoia etc)
Diffstat (limited to 'usr.sbin/config/config.h')
-rw-r--r-- | usr.sbin/config/config.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index 8d462e4..d7f009b 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -90,9 +90,8 @@ struct file_list { #define SYSTEMSPEC 5 #define SWAPSPEC 6 #define COMPDEVICE 7 -#define COMPSPEC 8 -#define NODEPEND 9 -#define LOCAL 10 +#define NODEPEND 8 +#define LOCAL 9 #define DEVDONE 0x80000000 #define TYPEMASK 0x7fffffff @@ -104,18 +103,10 @@ struct file_list { #define NO_OBJ 4 #define BEFORE_DEPEND 8 -struct idlst { - char *id; - struct idlst *id_next; -}; - struct device { int d_type; /* CONTROLLER, DEVICE, bus adaptor */ struct device *d_conn; /* what it is connected to */ char *d_name; /* name of device (e.g. rk11) */ - struct idlst *d_vec; /* interrupt vectors */ - int d_pri; /* interrupt priority */ - int d_addr; /* address of csr */ int d_unit; /* unit number */ int d_drive; /* drive number */ int d_target; /* target number */ @@ -129,7 +120,6 @@ struct device { int d_disabled; /* nonzero to skip probe/attach */ char *d_port; /* io port base manifest constant */ int d_portn; /* io port base (if number not manifest) */ - char *d_mask; /* interrupt mask */ int d_maddr; /* io memory base */ int d_msize; /* io memory size */ int d_drq; /* DMA request */ |