diff options
| author | Per Fogelstrom <pefo@cvs.openbsd.org> | 2004-09-20 10:31:17 +0000 |
|---|---|---|
| committer | Per Fogelstrom <pefo@cvs.openbsd.org> | 2004-09-20 10:31:17 +0000 |
| commit | e23dc300a351fc939a2fc15cf95007bf6bac77fe (patch) | |
| tree | de7d537ecf99f691e339cef008ca6ecc7cc5a949 /sys/arch/sgi/include | |
| parent | 92bf9ed453ee4ec9bed85639bb539260d2f319c4 (diff) | |
Add support for R10K cpu class
Diffstat (limited to 'sys/arch/sgi/include')
| -rw-r--r-- | sys/arch/sgi/include/autoconf.h | 13 | ||||
| -rw-r--r-- | sys/arch/sgi/include/intr.h | 8 |
2 files changed, 17 insertions, 4 deletions
diff --git a/sys/arch/sgi/include/autoconf.h b/sys/arch/sgi/include/autoconf.h index de6943333c7..cfeca154e64 100644 --- a/sys/arch/sgi/include/autoconf.h +++ b/sys/arch/sgi/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.7 2004/08/10 21:11:42 pefo Exp $ */ +/* $OpenBSD: autoconf.h,v 1.8 2004/09/20 10:31:16 pefo Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -56,12 +56,21 @@ struct sys_rec { u_int32_t cfg_reg; u_int32_t stat_reg; } cpu[MAX_CPUS]; + /* Published Cache OPS */ + void (*_SyncCache)(void); + void (*_InvalidateICache)(vaddr_t, int); + void (*_InvalidateICachePage)(vaddr_t); + void (*_SyncDCachePage)(vaddr_t); + void (*_HitSyncDCache)(vaddr_t, int); + void (*_IOSyncDCache)(vaddr_t, int, int); + void (*_HitInvalidateDCache)(vaddr_t, int); + /* BUS mappings */ struct mips_bus_space local; struct mips_bus_space isa_io; struct mips_bus_space isa_mem; struct mips_bus_space pci_io[2]; struct mips_bus_space pci_mem[2]; - + /* Console/Serial configuration */ int cons_baudclk; struct mips_bus_space console_io; /* for stupid map designs */ struct mips_bus_space *cons_iot; diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h index 94a93eee758..319eea78308 100644 --- a/sys/arch/sgi/include/intr.h +++ b/sys/arch/sgi/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.3 2004/08/10 19:16:18 deraadt Exp $ */ +/* $OpenBSD: intr.h,v 1.4 2004/09/20 10:31:16 pefo Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -148,7 +148,6 @@ intrmask_t imask[NIPLS]; /* Inlines */ static __inline void register_pending_int_handler(void (*)(void)); -static __inline int splraise(int newcpl); static __inline void splx(int newcpl); static __inline int spllower(int newcpl); @@ -163,6 +162,8 @@ register_pending_int_handler(void(*pending)(void)) /* */ +#ifdef INLINE_SPLRAISE +static __inline int splraise(int newcpl); static __inline int splraise(int newcpl) { @@ -174,6 +175,9 @@ splraise(int newcpl) __asm__ (" sync\n .set reorder\n"); return (oldcpl); } +#else +int splraise(int newcpl); +#endif static __inline void splx(int newcpl) |