diff options
Diffstat (limited to 'sys/arch/aviion/include')
| -rw-r--r-- | sys/arch/aviion/include/board.h | 66 | ||||
| -rw-r--r-- | sys/arch/aviion/include/cpu.h | 10 | ||||
| -rw-r--r-- | sys/arch/aviion/include/param.h | 14 | ||||
| -rw-r--r-- | sys/arch/aviion/include/trap.h | 3 |
4 files changed, 82 insertions, 11 deletions
diff --git a/sys/arch/aviion/include/board.h b/sys/arch/aviion/include/board.h new file mode 100644 index 00000000000..15bd2fac301 --- /dev/null +++ b/sys/arch/aviion/include/board.h @@ -0,0 +1,66 @@ +/* $OpenBSD: board.h,v 1.1 2006/05/20 12:04:54 miod Exp $ */ +/* + * Copyright (c) 2006, Miodrag Vallat + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _MACHINE_BOARD_H_ +#define _MACHINE_BOARD_H_ + +#if !defined(_LOCORE) + +struct board { + const char *descr; + void (*bootstrap)(void); + vaddr_t (*memsize)(void); + void (*startup)(void); + + void (*intr)(u_int, struct trapframe *); + void (*init_clocks)(void); + u_int (*getipl)(void); + u_int (*setipl)(u_int); + u_int (*raiseipl)(u_int); +}; + +#define md_interrupt_func(t, f) platform->intr(t, f) + +#define DECLARE_BOARD(b) \ +extern struct board board_av##b; \ +void av##b##_bootstrap(void); \ +vaddr_t av##b##_memsize(void); \ +void av##b##_startup(void); \ +void av##b##_intr(u_int, struct trapframe *); \ +void av##b##_init_clocks(void); \ +u_int av##b##_getipl(void); \ +u_int av##b##_setipl(u_int); \ +u_int av##b##_raiseipl(u_int); + +DECLARE_BOARD(400); +DECLARE_BOARD(530); +DECLARE_BOARD(5000); +DECLARE_BOARD(6280); + +extern struct board *platform; /* just to have people confuse both names */ + +#endif /* _LOCORE */ +#endif /* _MACHINE_BOARD_H_ */ diff --git a/sys/arch/aviion/include/cpu.h b/sys/arch/aviion/include/cpu.h index 3510ef0954b..f24ae82aab0 100644 --- a/sys/arch/aviion/include/cpu.h +++ b/sys/arch/aviion/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.1 2006/05/09 18:19:21 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.2 2006/05/20 12:04:54 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -45,14 +45,6 @@ #ifdef _KERNEL -/* board dependent pointers */ -extern void (*md_interrupt_func_ptr)(u_int, struct trapframe *); -#define md_interrupt_func (*md_interrupt_func_ptr) -extern u_int (*md_getipl)(void); -extern u_int (*md_setipl)(u_int); -extern u_int (*md_raiseipl)(u_int); -extern void (*md_init_clocks)(void); - struct intrhand { SLIST_ENTRY(intrhand) ih_link; int (*ih_fn)(void *); diff --git a/sys/arch/aviion/include/param.h b/sys/arch/aviion/include/param.h index 2bbb019d23a..a926e8f6d87 100644 --- a/sys/arch/aviion/include/param.h +++ b/sys/arch/aviion/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.1 2006/05/09 18:19:04 miod Exp $ */ +/* $OpenBSD: param.h,v 1.2 2006/05/20 12:04:54 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. @@ -49,4 +49,16 @@ #define KERNBASE 0x00000000 /* start of kernel virtual */ #define KERNTEXTOFF 0x00001000 /* start of kernel text */ +#if !defined(_LOCORE) +extern int avtyp; +#endif + +/* + * Values for the avtyp variable. + */ +#define AV_400 1 /* 100/200/300/400/3000/4000/4300 */ +#define AV_530 2 /* 4600/530 */ +#define AV_5000 3 /* 5000/6000 */ +#define AV_6280 4 /* 6280/8000-8 */ + #endif /* !_MACHINE_PARAM_H_ */ diff --git a/sys/arch/aviion/include/trap.h b/sys/arch/aviion/include/trap.h index d7ea00a0640..cb81662344c 100644 --- a/sys/arch/aviion/include/trap.h +++ b/sys/arch/aviion/include/trap.h @@ -1,3 +1,4 @@ -/* $OpenBSD: trap.h,v 1.1 2006/04/18 10:56:57 miod Exp $ */ +/* $OpenBSD: trap.h,v 1.2 2006/05/20 12:04:54 miod Exp $ */ /* public domain */ +#include <machine/board.h> /* md_interrupt_func */ #include <m88k/trap.h> |