Do not use <mips64/archtype.h> for loongson model numbers, but rather put the

list in loongson's <machine/autoconf.h> directly. <mips64/archtype.h> is
intended to be only used on ARCBios-like platforms.

11 files changed, 18 insertions, 40 deletions

diff --git a/sys/arch/loongson/dev/gdiumiic.c b/sys/arch/loongson/dev/gdiumiic.c
index f550f05c9f4..68f1a11a790 100644
--- a/sys/arch/loongson/dev/gdiumiic.c
+++ b/sys/arch/loongson/dev/gdiumiic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdiumiic.c,v 1.4 2010/02/24 22:16:18 miod Exp $	*/
+/*	$OpenBSD: gdiumiic.c,v 1.5 2012/10/03 21:44:51 miod Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -31,7 +31,6 @@
 #include <sys/rwlock.h>
 
 #include <machine/autoconf.h>
-#include <mips64/archtype.h>
 
 #include <dev/gpio/gpiovar.h>
 
diff --git a/sys/arch/loongson/dev/kb3310.c b/sys/arch/loongson/dev/kb3310.c
index 692a10790e2..900a1e7ec14 100644
--- a/sys/arch/loongson/dev/kb3310.c
+++ b/sys/arch/loongson/dev/kb3310.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kb3310.c,v 1.17 2011/07/21 20:36:12 miod Exp $	*/
+/*	$OpenBSD: kb3310.c,v 1.18 2012/10/03 21:44:51 miod Exp $	*/
 /*
  * Copyright (c) 2010 Otto Moerbeek <otto@drijf.net>
  *
@@ -22,7 +22,6 @@
 #include <sys/sensors.h>
 #include <sys/timeout.h>
 
-#include <mips64/archtype.h>
 #include <machine/apmvar.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/loongson/dev/smfb.c b/sys/arch/loongson/dev/smfb.c
index 2a29b337a89..56494a038a7 100644
--- a/sys/arch/loongson/dev/smfb.c
+++ b/sys/arch/loongson/dev/smfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smfb.c,v 1.13 2011/07/21 20:36:12 miod Exp $	*/
+/*	$OpenBSD: smfb.c,v 1.14 2012/10/03 21:44:51 miod Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -27,8 +27,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <mips64/include/archtype.h>
-
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/loongson/include/autoconf.h b/sys/arch/loongson/include/autoconf.h
index ef6f1327dee..4b32941f59b 100644
--- a/sys/arch/loongson/include/autoconf.h
+++ b/sys/arch/loongson/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.8 2010/08/31 10:24:46 pirofti Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.9 2012/10/03 21:44:51 miod Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -51,6 +51,13 @@ struct legacy_io_range {
  */
 struct platform {
 	int				 system_type;
+#define	LOONGSON_2E		0x0000	/* Generic Loongson 2E system */
+#define	LOONGSON_YEELOONG	0x0001	/* Lemote Yeeloong */
+#define	LOONGSON_GDIUM		0x0002	/* EMTEC Gdium Liberty */
+#define	LOONGSON_FULOONG	0x0003	/* Lemote Fuloong */
+#define	LOONGSON_LYNLOONG	0x0004	/* Lemote Lynloong */
+#define	LOONGSON_EBT700		0x0005	/* eBenton EBT700 */
+
 	char				*vendor;
 	char				*product;
 
diff --git a/sys/arch/loongson/loongson/bus_dma.c b/sys/arch/loongson/loongson/bus_dma.c
index 19e7712930c..ab3c742a873 100644
--- a/sys/arch/loongson/loongson/bus_dma.c
+++ b/sys/arch/loongson/loongson/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.10 2012/04/21 12:20:30 miod Exp $ */
+/*	$OpenBSD: bus_dma.c,v 1.11 2012/10/03 21:44:51 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -63,7 +63,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <mips64/archtype.h>
 #include <mips64/cache.h>
 #include <machine/cpu.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/loongson/loongson/gdium_machdep.c b/sys/arch/loongson/loongson/gdium_machdep.c
index 05274690f3c..7f823468f66 100644
--- a/sys/arch/loongson/loongson/gdium_machdep.c
+++ b/sys/arch/loongson/loongson/gdium_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdium_machdep.c,v 1.6 2010/05/08 21:59:56 miod Exp $	*/
+/*	$OpenBSD: gdium_machdep.c,v 1.7 2012/10/03 21:44:51 miod Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -24,7 +24,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <mips64/archtype.h>
 #include <machine/autoconf.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/loongson/loongson/generic2e_machdep.c b/sys/arch/loongson/loongson/generic2e_machdep.c
index f868d0a1fb8..6133e615702 100644
--- a/sys/arch/loongson/loongson/generic2e_machdep.c
+++ b/sys/arch/loongson/loongson/generic2e_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: generic2e_machdep.c,v 1.4 2012/10/03 11:18:23 miod Exp $	*/
+/*	$OpenBSD: generic2e_machdep.c,v 1.5 2012/10/03 21:44:51 miod Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -52,7 +52,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <mips64/archtype.h>
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
 #include <mips64/mips_cpu.h>
diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index 5a03811f924..4f72f20b3be 100644
--- a/sys/arch/loongson/loongson/machdep.c
+++ b/sys/arch/loongson/loongson/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.37 2012/10/03 11:18:23 miod Exp $ */
+/*	$OpenBSD: machdep.c,v 1.38 2012/10/03 21:44:51 miod Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -82,8 +82,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#include <mips64/archtype.h>
-
 /* The following is used externally (sysctl_hw) */
 char	machine[] = MACHINE;		/* Machine "architecture" */
 char	cpu_model[30];
diff --git a/sys/arch/loongson/loongson/wscons_machdep.c b/sys/arch/loongson/loongson/wscons_machdep.c
index 5d4244d9728..9d9711d19a3 100644
--- a/sys/arch/loongson/loongson/wscons_machdep.c
+++ b/sys/arch/loongson/loongson/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.9 2010/11/23 04:07:55 shadchin Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.10 2012/10/03 21:44:51 miod Exp $ */
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -48,8 +48,6 @@
 #include <sys/device.h>
 #include <sys/extent.h>
 
-#include <mips64/archtype.h>
-
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 
diff --git a/sys/arch/loongson/loongson/yeeloong_machdep.c b/sys/arch/loongson/loongson/yeeloong_machdep.c
index 922e560cb7b..dba75f0c4c3 100644
--- a/sys/arch/loongson/loongson/yeeloong_machdep.c
+++ b/sys/arch/loongson/loongson/yeeloong_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yeeloong_machdep.c,v 1.19 2012/10/03 11:18:23 miod Exp $	*/
+/*	$OpenBSD: yeeloong_machdep.c,v 1.20 2012/10/03 21:44:51 miod Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -26,7 +26,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <mips64/archtype.h>
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
 #include <mips64/mips_cpu.h>
diff --git a/sys/arch/mips64/include/archtype.h b/sys/arch/mips64/include/archtype.h
index 55b56ffebcd..cbd22b71e54 100644
--- a/sys/arch/mips64/include/archtype.h
+++ b/sys/arch/mips64/include/archtype.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archtype.h,v 1.15 2012/03/24 20:09:07 miod Exp $	*/
+/*	$OpenBSD: archtype.h,v 1.16 2012/10/03 21:44:51 miod Exp $	*/
 /*
  * Copyright (c) 1997-2004 Opsycon AB, Sweden (www.opsycon.se)
  *
@@ -30,7 +30,6 @@
 /*
  * Define architectural identities for the different Mips machines.
  */
-#define	ARC_CLASS		0x0000	/* ARC class */
 #define	ACER_PICA_61		0x0001	/* Acer Labs Pica 61 */
 #define	MAGNUM			0x0002	/* Mips MAGNUM R4000 */
 #define	DESKSTATION_RPC44	0x0003	/* Deskstation rPC44 */
@@ -39,7 +38,6 @@
 #define NEC_R94			0x0006	/* NEC Magnum class */
 #define	SNI_RM200		0x0007	/* Siemens Nixdorf RM200 */
 
-#define	SGI_CLASS		0x0010	/* Silicon Graphics class */
 #define	SGI_IP17		0x0011	/* Crimson */
 #define	SGI_IP19		0x0012	/* Onyx (!S model Challenge) */
 #define	SGI_IP20		0x0013	/* Indigo */
@@ -53,21 +51,17 @@
 #define	SGI_O2			0x001b	/* IP32 O2  */
 #define	SGI_IP35		0x001c	/* IP35 Origin3x0/3x00/Fuel/Tezro */
 
-#define	ALGOR_CLASS		0x0020	/* Algorithmics class */
 #define	ALGOR_P4032		0x0021	/* ALGORITHMICS P-4032 */
 #define	ALGOR_P5064		0x0022	/* ALGORITHMICS P-5064 */
 
-#define	GALILEO_CLASS		0x0030	/* Galileo PCI based class */
 #define	GALILEO_G9		0x0031	/* Galileo GT-64011 Eval board */
 #define GALILEO_EV64240		0x0032	/* Galileo EV64240 Eval board */
 #define GALILEO_EV64340		0x0033	/* Galileo EV64340 Eval board */
 
-#define	MOMENTUM_CLASS		0x0040	/* Momentum Inc class */
 #define	MOMENTUM_CP7000		0x0041	/* Momentum Ocelot */
 #define	MOMENTUM_CP7000G	0x0042	/* Momentum Ocelot-G */
 #define	MOMENTUM_JAGUAR		0x0043	/* Momentum Jaguar ATX */
 
-#define	WG_CLASS		0x0050	/* Willowglen class */
 #define	WG4308			0x0052	/* Willowglen 4308 LMD */
 #define	WG4309			0x0053	/* Willowglen 4309 LMD */
 #define	WG4409			0x0054	/* Willowglen 4409 LMD */
@@ -78,17 +72,6 @@
 #define	WG8200			0x0059	/* Willowglen CPU-8200 */
 #define	WG8232			0x005a	/* Willowglen CPU-8232 */
 
-#define	LOONGSON_CLASS		0x0060	/* Loongson + PMON2000 class */
-#define	LOONGSON_2E		0x0060	/* Generic Loongson 2E system */
-#define	LOONGSON_YEELOONG	0x0061	/* Lemote Yeeloong */
-#define	LOONGSON_GDIUM		0x0062	/* EMTEC Gdium Liberty */
-#define	LOONGSON_FULOONG	0x0063	/* Lemote Fuloong */
-#define	LOONGSON_LYNLOONG	0x0064	/* Lemote Lynloong */
-#define	LOONGSON_EBT700		0x0065	/* eBenton EBT700 */
-
-#define	MISC_CLASS		0x00f0	/* Misc machines... */
 #define	LAGUNA			0x00f1	/* Heurikon Laguna VME board */
 
-#define	ARCHCLASS(n)	((n) & 0xf0)
-
 #endif /* !_MIPS64_ARCHTYPE_H_ */