summaryrefslogtreecommitdiffstats
path: root/usr.sbin/config/config.h
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2004-08-30 23:03:58 +0000
committerpeter <peter@FreeBSD.org>2004-08-30 23:03:58 +0000
commit1d9abdbe783a3f2587fde29b89cda1c8da982097 (patch)
tree48d9944fb7d50a767ae5d57a3e3f8f4c3facf67e /usr.sbin/config/config.h
parent78508cab2611f6e60cfba0bb7d5314c1fd36f4b3 (diff)
downloadFreeBSD-src-1d9abdbe783a3f2587fde29b89cda1c8da982097.zip
FreeBSD-src-1d9abdbe783a3f2587fde29b89cda1c8da982097.tar.gz
Kill count device support from config. I've changed the last few
remaining consumers to have the count passed as an option. This is i4b, pc98/wdc, and coda. Bump configvers.h from 500013 to 600000. Remove heuristics that tried to parse "device ed5" as 5 units of the ed device. This broke things like the snd_emu10k1 device, which required quotes to make it parse right. The no-longer-needed quotes have been removed from NOTES, GENERIC etc. eg, I've removed the quotes from: device snd_maestro device "snd_maestro3" device snd_mss I believe everything will still compile and work after this.
Diffstat (limited to 'usr.sbin/config/config.h')
-rw-r--r--usr.sbin/config/config.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 691aa3a..f3d292d 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -41,7 +41,7 @@
struct file_list {
STAILQ_ENTRY(file_list) f_next;
char *f_fn; /* the name */
- int f_type; /* type or count */
+ int f_type; /* type */
u_char f_flags; /* see below */
char *f_compilewith; /* special make rule if present */
char *f_depends; /* additional dependancies */
@@ -72,14 +72,12 @@ struct files_name {
#define NO_IMPLCT_RULE 1
#define NO_OBJ 2
#define BEFORE_DEPEND 4
-#define NEED_COUNT 8
-#define ISDUP 16
-#define NOWERROR 32
+#define ISDUP 8
+#define NOWERROR 16
struct device {
int d_done; /* processed */
char *d_name; /* name of device (e.g. rk11) */
- int d_count; /* device count */
#define UNKNOWN -2 /* -2 means not set yet */
STAILQ_ENTRY(device) d_next; /* Next one in list */
};
OpenPOWER on IntegriCloud