d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark the 'conflicts' keyword as obsolete, and don't generate (unused)

Browse Source 
resource table entries for it.
This commit is contained in:
peter 2000-01-29 18:14:59 +00:00
parent 7b7a871993
commit 7eaa773c7a
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.sbin/config/config.h
View File

@ -86,7 +86,6 @@ struct device {
#define QUES -1 /* -1 means '?' */
#define UNKNOWN -2 /* -2 means not set yet */
int d_flags; /* flags for device init */
int d_conflicts; /* I'm allowed to conflict */
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) */

5
usr.sbin/config/config.y
View File

@ -400,7 +400,9 @@ Info:
DISABLE
= { cur.d_disabled = 1; } |
CONFLICTS
= { cur.d_conflicts = 1; };
= {
warnx("line %d: Obsolete keyword 'conflicts' found", yyline);
};
%%
@ -489,7 +491,6 @@ init_dev(dp)
dp->d_name = "OHNO!!!";
dp->d_type = DEVICE;
dp->d_conn = 0;
dp->d_conflicts = 0;
dp->d_disabled = 0;
dp->d_flags = 0;
dp->d_bus = dp->d_lun = dp->d_target = dp->d_drive = dp->d_unit = \

4
usr.sbin/config/mkioconf.c
View File

@ -95,10 +95,6 @@ write_device_resources(FILE *fp, struct device *dp)
fprintf(fp, "\t{ \"flags\",\tRES_INT,\t{ 0x%x }},\n", dp->d_flags);
count++;
}
if (dp->d_conflicts) {
fprintf(fp, "\t{ \"conflicts\",\tRES_INT,\t{ %d }},\n", dp->d_conflicts);
count++;
}
if (dp->d_disabled) {
fprintf(fp, "\t{ \"disabled\",\tRES_INT,\t{ %d }},\n", dp->d_disabled);
count++;