Clean this up a bit; defopt has rendered the #undef hacks unnecessary.

Also, put the cpu_decl()s in cpuconf.h, so that platform support files
can pull in the prototypes from there, and pull in options for those
systems for which there is code in the source tree.
This commit is contained in:
thorpej 1997-09-02 14:19:29 +00:00
parent b7c1c1e321
commit 8b6e894364
2 changed files with 15 additions and 24 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuconf.c,v 1.5 1997/09/02 14:00:11 thorpej Exp $ */
/* $NetBSD: cpuconf.c,v 1.6 1997/09/02 14:19:29 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -41,33 +41,14 @@
#include <sys/device.h>
#include <machine/cpuconf.h>
#undef DEC_2100_A50 /* config 'option' with flag brokenness */
#include "dec_2100_a50.h"
cpu_decl(dec_2100_a50);
#undef DEC_KN8AE /* config 'option' with flag brokenness */
#include "dec_kn8ae.h"
cpu_decl(dec_kn8ae);
#undef DEC_3000_300 /* config 'option' with flag brokenness */
#include "dec_3000_300.h"
cpu_decl(dec_3000_300);
#undef DEC_3000_500 /* config 'option' with flag brokenness */
#include "dec_3000_500.h"
cpu_decl(dec_3000_500);
#undef DEC_AXPPCI_33 /* config 'option' with flag brokenness */
#include "dec_axppci_33.h"
cpu_decl(dec_axppci_33);
#undef DEC_EB164 /* config 'option' with flag brokenness */
#include "dec_eb164.h"
cpu_decl(dec_eb164);
#undef DEC_KN20AA /* config 'option' with flag brokenness */
#include "dec_eb64plus.h"
#include "dec_kn20aa.h"
cpu_decl(dec_kn20aa);
#include "dec_kn8ae.h"
const struct cpusw cpusw[] = {
cpu_unknown(), /* 0: ??? */
@ -98,7 +79,8 @@ const struct cpusw cpusw[] = {
cpu_notdef("DEC 1000 (\"Mikasa\")"), /* 17: ST_DEC_1000 */
cpu_unknown(), /* 18: ??? */
cpu_notdef("EB66"), /* 19: ST_EB66 */
cpu_notdef("EB64+"), /* 20: ST_EB64P */
cpu_init("EB64+",DEC_EB64PLUS,dec_eb64plus),
/* 20: ST_EB64P */
cpu_unknown(), /* 21: ??? */
cpu_notdef("DEC 4100 (\"Rawhide\")"), /* 22: ST_DEC_4100 */
cpu_notdef("??? (\"Lego\")"), /* 23: ST_DEC_EV45_PBP */

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuconf.h,v 1.3 1997/09/02 14:00:17 thorpej Exp $ */
/* $NetBSD: cpuconf.h,v 1.4 1997/09/02 14:19:35 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -71,3 +71,12 @@ struct cpusw {
extern const struct cpusw cpusw[];
extern const int ncpusw;
#endif
cpu_decl(dec_2100_a50);
cpu_decl(dec_3000_300);
cpu_decl(dec_3000_500);
cpu_decl(dec_axppci_33);
cpu_decl(dec_eb164);
cpu_decl(dec_eb64plus);
cpu_decl(dec_kn20aa);
cpu_decl(dec_kn8ae);