diff options
| author | jkh <jkh@FreeBSD.org> | 1995-05-11 02:21:34 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-05-11 02:21:34 +0000 |
| commit | 7499b6c1c74057921b76cf9fb0fe8ba4285d2700 (patch) | |
| tree | 5160a07833c3df52e648656e0b0b49b7d30e64d4 /usr.sbin/config/config.y | |
| parent | f622ff4fe55ed84e844559b7ab7ef749ee83a214 (diff) | |
| download | FreeBSD-src-7499b6c1c74057921b76cf9fb0fe8ba4285d2700.zip FreeBSD-src-7499b6c1c74057921b76cf9fb0fe8ba4285d2700.tar.gz | |
Add a new `conflicts' flag for telling when a device is in conflict with
others. The flag can be put in descriptive locations, e.g.:
device sb0 at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr
or
device psm0 at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
But is nonetheless boolean only. You can't turn conflict checking off for
only a given type of conflict. I didn't deem it worth the trouble at this
stage, and it's far better than the ALLOW_CONFLICT_* that preceeded it.
Diffstat (limited to 'usr.sbin/config/config.y')
| -rw-r--r-- | usr.sbin/config/config.y | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index 3e1dc9f..76e9a50 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -12,6 +12,7 @@ %token BIO %token COMMA %token CONFIG +%token CONFLICTS %token CONTROLLER %token CPU %token CSR @@ -633,7 +634,9 @@ Info: NET = { cur.d_mask = "net"; } | FLAGS NUMBER - = { cur.d_flags = $2; }; + = { cur.d_flags = $2; } | + CONFLICTS + = { cur.d_conflicts = 1; }; Int_spec: VECTOR Id_list @@ -909,6 +912,7 @@ init_dev(dp) dp->d_name = "OHNO!!!"; dp->d_type = DEVICE; dp->d_conn = 0; + dp->d_conflicts = 0; dp->d_vec = 0; dp->d_addr = dp->d_flags = dp->d_dk = 0; dp->d_pri = -1; |
