diff options
Diffstat (limited to 'sys/arch/mips64/include')
| -rw-r--r-- | sys/arch/mips64/include/arcbios.h | 16 | ||||
| -rw-r--r-- | sys/arch/mips64/include/cpu.h | 25 | ||||
| -rw-r--r-- | sys/arch/mips64/include/dlfcn.h | 61 | ||||
| -rw-r--r-- | sys/arch/mips64/include/ecoff_machdep.h | 98 | ||||
| -rw-r--r-- | sys/arch/mips64/include/exception.h | 7 | ||||
| -rw-r--r-- | sys/arch/mips64/include/frame.h | 7 | ||||
| -rw-r--r-- | sys/arch/mips64/include/memconf.h | 15 | ||||
| -rw-r--r-- | sys/arch/mips64/include/pio.h | 7 | ||||
| -rw-r--r-- | sys/arch/mips64/include/regnum.h | 7 | ||||
| -rw-r--r-- | sys/arch/mips64/include/types.h | 4 |
10 files changed, 21 insertions, 226 deletions
diff --git a/sys/arch/mips64/include/arcbios.h b/sys/arch/mips64/include/arcbios.h index d5084a2b987..bb6bb2411b4 100644 --- a/sys/arch/mips64/include/arcbios.h +++ b/sys/arch/mips64/include/arcbios.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arcbios.h,v 1.1 2004/08/08 21:51:36 pefo Exp $ */ +/* $OpenBSD: arcbios.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ /*- * Copyright (c) 1996 M. Warner Losh. All rights reserved. * @@ -356,11 +356,11 @@ void bios_display_info(int *, int *, int *, int *); int Bios_Load(void); int Bios_Invoke(void); int Bios_Execute(void); -int Bios_Halt(void); -int Bios_PowerDown(void); -int Bios_Restart(void); -int Bios_Reboot(void); -int Bios_EnterInteractiveMode(void); +void Bios_Halt(void); +void Bios_PowerDown(void); +void Bios_Restart(void); +void Bios_Reboot(void); +void Bios_EnterInteractiveMode(void); int Bios_GetPeer(void); arc_config_t *Bios_GetChild(arc_config_t *); int Bios_GetParent(void); @@ -381,11 +381,11 @@ int Bios_GetReadStatus(void); int Bios_Write(int, char *, int, int *); int Bios_Seek(void); int Bios_Mount(void); -int Bios_GetEnvironmentVariable(void); +char *Bios_GetEnvironmentVariable(const char *); int Bios_SetEnvironmentVariable(void); int Bios_GetFileInformation(void); int Bios_SetFileInformation(void); -int Bios_FlushAllCaches(void); +void Bios_FlushAllCaches(void); int Bios_TestUnicodeCharacter(void); arc_dsp_stat_t *Bios_GetDisplayStatus(int); diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index c3172d4639a..117c8aa194f 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: cpu.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -357,25 +357,6 @@ int want_resched; /* resched() was called */ -/* - * CPU identification, from PRID register. - */ -union cpuprid { - int cpuprid; - struct { -#if BYTE_ORDER == BIG_ENDIAN - u_int pad1:16; /* reserved */ - u_int cp_imp:8; /* implementation identifier */ - u_int cp_majrev:4; /* major revision identifier */ - u_int cp_minrev:4; /* minor revision identifier */ -#else - u_int cp_minrev:4; /* minor revision identifier */ - u_int cp_majrev:4; /* major revision identifier */ - u_int cp_imp:8; /* implementation identifier */ - u_int pad1:16; /* reserved */ -#endif - } cpu; -}; #endif /* !_LOCORE */ #endif /* _KERNEL */ @@ -439,8 +420,6 @@ union cpuprid { #define MIPS_VR5400 0x54 /* NEC Vr5400 FPU ISA IV+ */ #if defined(_KERNEL) && !defined(_LOCORE) -union cpuprid cpu_id; -union cpuprid fpu_id; u_int CpuPrimaryInstCacheSize; u_int CpuPrimaryInstCacheLSize; @@ -463,6 +442,8 @@ struct user; void tlb_set_wired(int); void tlb_set_pid(int); +u_int cp0_get_prid(void); +u_int cp1_get_prid(void); u_int cp0_get_count(void); void cp0_set_compare(u_int); diff --git a/sys/arch/mips64/include/dlfcn.h b/sys/arch/mips64/include/dlfcn.h deleted file mode 100644 index f242fcdc055..00000000000 --- a/sys/arch/mips64/include/dlfcn.h +++ /dev/null @@ -1,61 +0,0 @@ -/* $OpenBSD: dlfcn.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ - -/* - * Copyright (c) 1998 Per Fogelstrom, Opsycon AB - * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed under OpenBSD by - * Per Fogelstrom, Opsycon AB, Sweden. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 _MIPS_DLFCN_H_ -#define _MIPS_DLFCN_H_ - -#include <sys/cdefs.h> - -__BEGIN_DECLS -extern void *dlopen __P((const char *, int)); -extern int dlclose __P((void *)); -extern void *dlsym __P((void *, const char *)); -extern int dlctl __P((void *, int, void *)); -extern const char *dlerror __P((void)); -__END_DECLS - -/* - * dlopen() modes. - */ -#define DL_LAZY 1 /* Resolve when called */ -#define DL_NOW 2 /* Resolve immediatly */ - -/* - * dlctl() commands. - */ - -#define DL_DUMP_MAP 99 - - -#endif /* !_MIPS_DLFCN_H_ */ diff --git a/sys/arch/mips64/include/ecoff_machdep.h b/sys/arch/mips64/include/ecoff_machdep.h deleted file mode 100644 index 1de7eeadc6d..00000000000 --- a/sys/arch/mips64/include/ecoff_machdep.h +++ /dev/null @@ -1,98 +0,0 @@ -/* $OpenBSD: ecoff_machdep.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ -/* $NetBSD: ecoff.h,v 1.4 1995/06/16 02:07:33 mellon Exp $ */ - -/* - * Copyright (c) 1994 Adam Glass - * All rights reserved. - * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Adam Glass. - * 4. The name of the Author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY Adam Glass ``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 Adam Glass 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 _MIPS_ECOFF_H_ -#define _MIPS_ECOFF_H_ - -#define ECOFF_LDPGSZ 4096 - -#define ECOFF_PAD - -#define ECOFF_MACHDEP \ - u_long ea_gprmask; \ - u_long ea_cprmask[4]; \ - u_long ea_gp_value - -#define ECOFF_MAGIC_MIPSEL 0x0162 -#define ECOFF_BADMAG(ex) ((ex)->f.f_magic != ECOFF_MAGIC_MIPSEL) - -#define ECOFF_SEGMENT_ALIGNMENT(ep) ((ep)->a.vstamp < 23 ? 8 : 16) - -struct ecoff_symhdr { - int16_t sh_magic; - int16_t sh_vstamp; - int32_t sh_linemax; - int32_t sh_densenummax; - int32_t sh_procmax; - int32_t sh_lsymmax; - int32_t sh_optsymmax; - int32_t sh_auxxymmax; - int32_t sh_lstrmax; - int32_t sh_estrmax; - int32_t sh_fdmax; - int32_t sh_rfdmax; - int32_t sh_esymmax; - long sh_linesize; - long sh_lineoff; - long sh_densenumoff; - long sh_procoff; - long sh_lsymoff; - long sh_optsymoff; - long sh_auxsymoff; - long sh_lstroff; - long sh_estroff; - long sh_fdoff; - long sh_rfdoff; - long sh_esymoff; -}; -/* Some day they will make up their minds.... */ -#define esymMax sh_esymmax -#define cbExtOffset sh_esymoff -#define cbSsExtOffset sh_estroff - -struct ecoff_extsym { - long es_value; - int es_strindex; - unsigned es_type:6; - unsigned es_class:5; - unsigned :1; - unsigned es_symauxindex:20; - unsigned es_jmptbl:1; - unsigned es_cmain:1; - unsigned es_weakext:1; - unsigned :29; - int es_indexfld; -}; - -#endif /* !_MIPS_ECOFF_H_ */ diff --git a/sys/arch/mips64/include/exception.h b/sys/arch/mips64/include/exception.h index fdfd2c05ab7..3fd4792f7b5 100644 --- a/sys/arch/mips64/include/exception.h +++ b/sys/arch/mips64/include/exception.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exception.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: exception.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Opsycon AB, Sweden. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/sys/arch/mips64/include/frame.h b/sys/arch/mips64/include/frame.h index 4176328349a..21bb05b7940 100644 --- a/sys/arch/mips64/include/frame.h +++ b/sys/arch/mips64/include/frame.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frame.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */ +/* $OpenBSD: frame.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ /* * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se) @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Opsycon AB, Sweden. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/sys/arch/mips64/include/memconf.h b/sys/arch/mips64/include/memconf.h index 16a4201516b..1ad9c8b48a5 100644 --- a/sys/arch/mips64/include/memconf.h +++ b/sys/arch/mips64/include/memconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: memconf.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: memconf.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -12,11 +12,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Per Fogelstrom. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -37,14 +32,14 @@ #ifndef _MIPS_MEMCONF_H_ #define _MIPS_MEMCONF_H_ -struct mem_descriptor { - paddr_t mem_start; - psize_t mem_size; +struct phys_mem_desc { + u_int32_t mem_first_page; + u_int32_t mem_last_page; }; #ifdef _KERNEL #define MAXMEMSEGS 16 -extern struct mem_descriptor mem_layout[]; +extern struct phys_mem_desc mem_layout[]; #endif #endif /* !_MIPS_MEMCONF_H_ */ diff --git a/sys/arch/mips64/include/pio.h b/sys/arch/mips64/include/pio.h index 9ac0f842b4e..e8253b69c63 100644 --- a/sys/arch/mips64/include/pio.h +++ b/sys/arch/mips64/include/pio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pio.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: pio.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Opsycon AB, Sweden. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/sys/arch/mips64/include/regnum.h b/sys/arch/mips64/include/regnum.h index 296016dc01b..0de6f8e9f7f 100644 --- a/sys/arch/mips64/include/regnum.h +++ b/sys/arch/mips64/include/regnum.h @@ -1,4 +1,4 @@ -/* $OpenBSD: regnum.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: regnum.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Opsycon AB, Sweden. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/sys/arch/mips64/include/types.h b/sys/arch/mips64/include/types.h index 947e3a75374..9107f33dc96 100644 --- a/sys/arch/mips64/include/types.h +++ b/sys/arch/mips64/include/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */ +/* $OpenBSD: types.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -85,8 +85,6 @@ typedef int32_t register_t; typedef int32_t f_register_t; #endif -#define __SWAP_BROKEN - #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) typedef struct label_t { register_t val[14]; |