diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-07-14 17:47:29 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-07-14 17:47:29 +0000 |
| commit | 144072022130ec59d138f16118beaacc81570939 (patch) | |
| tree | d702922cb806e63998d5da4dfeefacb22c69c9b3 | |
| parent | 7dde74bdd695964419f148702edb402ef00b2a48 (diff) | |
board ids will be auto-gen
move iodc.h and iomod.h into cpu.h so MI part won't see 'em
| -rw-r--r-- | sys/arch/hppa/include/cpu.h | 57 | ||||
| -rw-r--r-- | sys/arch/hppa/include/intr.h | 5 |
2 files changed, 4 insertions, 58 deletions
diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h index d2b3ff088db..16ef2b7ec2e 100644 --- a/sys/arch/hppa/include/cpu.h +++ b/sys/arch/hppa/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.2 1998/07/07 21:32:38 mickey Exp $ */ +/* $OpenBSD: cpu.h,v 1.3 1998/07/14 17:47:27 mickey Exp $ */ /* * Copyright (c) 1988-1994, The University of Utah and @@ -26,6 +26,8 @@ #ifndef _HPPA_CPU_H_ #define _HPPA_CPU_H_ +#include <machine/iodc.h> +#include <machine/iomod.h> #include <machine/frame.h> /* @@ -38,59 +40,6 @@ */ #undef COPY_SIGCODE /* copy sigcode above user stack in exec */ -/* - * Supported systems - */ -#define HP_810 0x100 -#define HP_815 0x103 -#define HP_822 0x101 -#define HP_825 0x008 -#define HP_827 0x102 -#define HP_835 0x00a -#define HP_840 0x004 -#define HP_842 0x104 -#define HP_845 0x00b -#define HP_850 0x080 -#define HP_852 0x105 -#define HP_855 0x081 -#define HP_860 0x082 -#define HP_870 0x083 - -#define HP_720 0x200 /* [S] Cobra */ -#define HP_750 0x201 /* [S] Coral */ -#define HP_730 0x202 /* [S] King Cobra */ - -#define HP_710 0x300 /* [S] Bushmaster */ -#define HP_705 0x302 /* [S] Bushmaster */ - -#define HP_715_33 0x311 /* [S] Scorpio */ -#define HP_715_50 0x310 /* [S] Scorpio */ -#define HP_715T_50 0x312 /* [S] Scorpio (upgrade from 4XXt) */ -#define HP_715S_50 0x314 /* [S] Scorpio (upgrade from 4XXs) */ -#define HP_715_75 0x316 /* [S] Scorpio */ -#define HP_725 0xFFF /* [S] Scorpio -- is this the real ID? */ -#define HP_735 0x203 /* [S] Hardball */ -#define HP_735_125 0x206 /* [S] Hardball */ -#define HP_755 0xFFD /* [S] Coral II -- is this the real ID? */ - -#define HP_712_60 0x600 /* [S] Gekko */ -#define HP_712_80 0x601 /* [S] Gekko */ -#define HP_712_100 0x602 /* [S] Gekko */ -#define HP_743i_1 0x603 -#define HP_743i_2 0x604 -#define HP_712_4 0x605 /* [S] Gekko */ -#define HP_7GL_1 0x606 -#define HP_7GL_2 0x607 -#define HP_7GL_3 0x608 -#define HP_743v_1 0x617 -#define HP_743v_2 0x618 -#define HP_743i_3 0x619 - -#define CPU_M770_100 0x585 /* J-class J200 */ -#define CPU_M770_120 0x586 /* J-class J210 */ -#define CPU_M777_100 0x592 /* C-class C200 */ -#define CPU_M777_120 0x58E /* C-class C210 */ - #define HPPA_IOSPACE 0xf0000000 #define HPPA_IOBCAST 0xfffc0000 #define HPPA_PDC_LOW 0xef000000 diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h index 949f41d1f98..e6ef8eb485a 100644 --- a/sys/arch/hppa/include/intr.h +++ b/sys/arch/hppa/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.2 1998/07/07 21:32:41 mickey Exp $ */ +/* $OpenBSD: intr.h,v 1.3 1998/07/14 17:47:28 mickey Exp $ */ /* * Copyright (c) 1990,1991,1992,1994 The University of Utah and @@ -27,9 +27,6 @@ #ifndef _HPPA_INTR_H_ #define _HPPA_INTR_H_ -#include <machine/iodc.h> -#include <machine/iomod.h> - /* * While the original 8 SPL's were "plenty", the PA-RISC chip provides us * with 32 possible interrupt levels. We take advantage of this by using |