diff options
Diffstat (limited to 'sys/arch/mvme68k')
31 files changed, 129 insertions, 45 deletions
diff --git a/sys/arch/mvme68k/include/ansi.h b/sys/arch/mvme68k/include/ansi.h index 5243cfacc36..2b13980c863 100644 --- a/sys/arch/mvme68k/include/ansi.h +++ b/sys/arch/mvme68k/include/ansi.h @@ -1,4 +1,4 @@ -/* $Id: ansi.h,v 1.2 1995/11/07 08:49:44 deraadt Exp $ */ +/* $OpenBSD: ansi.h,v 1.3 1996/04/28 10:56:01 deraadt Exp $ */ /* Just use the common m68k definition */ #include <m68k/ansi.h> diff --git a/sys/arch/mvme68k/include/asm.h b/sys/arch/mvme68k/include/asm.h index 32692e40f5c..d8869e0c2d3 100644 --- a/sys/arch/mvme68k/include/asm.h +++ b/sys/arch/mvme68k/include/asm.h @@ -1,3 +1,3 @@ -/* $Id: asm.h,v 1.2 1995/11/07 08:49:45 deraadt Exp $ */ +/* $OpenBSD: asm.h,v 1.3 1996/04/28 10:56:02 deraadt Exp $ */ #include <m68k/asm.h> diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h index f1ad108dd57..8c6f604b65f 100644 --- a/sys/arch/mvme68k/include/autoconf.h +++ b/sys/arch/mvme68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $Id: autoconf.h,v 1.2 1995/11/07 08:49:46 deraadt Exp $ */ +/* $OpenBSD: autoconf.h,v 1.3 1996/04/28 10:56:03 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt diff --git a/sys/arch/mvme68k/include/cdefs.h b/sys/arch/mvme68k/include/cdefs.h index ffd0e8f2a8d..8ab985b5069 100644 --- a/sys/arch/mvme68k/include/cdefs.h +++ b/sys/arch/mvme68k/include/cdefs.h @@ -1,4 +1,4 @@ -/* $Id: cdefs.h,v 1.2 1995/11/07 08:49:47 deraadt Exp $ */ +/* $OpenBSD: cdefs.h,v 1.3 1996/04/28 10:56:05 deraadt Exp $ */ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h index 1e99b6eda69..318b3cae811 100644 --- a/sys/arch/mvme68k/include/cpu.h +++ b/sys/arch/mvme68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $Id: cpu.h,v 1.3 1995/12/21 14:40:36 deraadt Exp $ */ +/* $OpenBSD: cpu.h,v 1.4 1996/04/28 10:56:07 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt diff --git a/sys/arch/mvme68k/include/db_machdep.h b/sys/arch/mvme68k/include/db_machdep.h index 4b4f3ad69dd..0ce93d2c09f 100644 --- a/sys/arch/mvme68k/include/db_machdep.h +++ b/sys/arch/mvme68k/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $Id: db_machdep.h,v 1.2 1995/11/07 08:49:48 deraadt Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.3 1996/04/28 10:56:08 deraadt Exp $ */ #define DB_MACHINE_COMMANDS diff --git a/sys/arch/mvme68k/include/disklabel.h b/sys/arch/mvme68k/include/disklabel.h index 9a0722ee829..78741c4c925 100644 --- a/sys/arch/mvme68k/include/disklabel.h +++ b/sys/arch/mvme68k/include/disklabel.h @@ -1,9 +1,9 @@ -/* $NetBSD: disklabel.h,v 1.1.1.1 1995/07/25 23:12:14 chuck Exp $ */ +/* $OpenBSD: disklabel.h,v 1.2 1996/04/28 10:56:12 deraadt Exp $ */ /* - * Copyright (c) 1994 Christopher G. Demetriou + * Copyright (c) 1995 Dale Rahn. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -14,9 +14,9 @@ * 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 Christopher G. Demetriou. + * This product includes software developed by Dale Rahn. * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission + * 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 @@ -28,19 +28,103 @@ * 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_DISKLABEL_H_ #define _MACHINE_DISKLABEL_H_ -#define LABELSECTOR 0 /* sector containing label */ -#define LABELOFFSET 64 /* offset of label in sector */ -#define MAXPARTITIONS 8 /* number of partitions */ -#define RAW_PART 2 /* raw partition: xx?c */ +/* number of boot pieces , ie xxboot bootxx */ +#define NUMBOOT 2 + +#define PARTITIONSHIFT 4 + +#define LABELSECTOR 0 /* sector containing label */ +#define LABELOFFSET 0 /* offset of label in sector */ +#define MAXPARTITIONS (1 << PARTITIONSHIFT) /* number of partitions */ +#define RAW_PART 2 /* raw partition: xx?c */ + +/* + * used to encode disk minor numbers + * this should probably be moved to sys/disklabel.h + */ +#define DISKUNIT(dev) (minor(dev) / MAXPARTITIONS) +#define DISKPART(dev) (minor(dev) % MAXPARTITIONS) +#define MAKEDISKDEV(maj, unit, part) \ + (makedev((maj), ((unit) * MAXPARTITIONS) + (part))) -/* Just a dummy */ struct cpu_disklabel { - int cd_dummy; /* must have one element. */ -}; + /* VID */ + u_char vid_id[4]; + u_char vid_0[16]; + u_int vid_oss; + u_short vid_osl; + u_char vid_1[4]; + u_short vid_osa_u; + u_short vid_osa_l; + u_char vid_2[2]; + u_short partitions; + u_char vid_vd[16]; + u_long bbsize; + u_long magic1; /* 4 */ + u_short type; /* 2 */ + u_short subtype; /* 2 */ + u_char packname[16]; /* 16 */ + u_long flags; /* 4 */ + u_long drivedata[5]; /* 4 */ + u_long spare[5]; /* 4 */ + u_short checksum; /* 2 */ + + u_long secpercyl; /* 4 */ + u_long secperunit; /* 4 */ + u_long headswitch; /* 4 */ + + u_char vid_3[4]; + u_int vid_cas; + u_char vid_cal; + u_char vid_4_0[3]; + u_char vid_4[64]; + u_char vid_4_1[28]; + u_long sbsize; + u_char vid_mot[8]; -#endif /* _MACHINE_DISKLABEL_H_ */ + /* CFG */ + u_char cfg_0[4]; + u_short cfg_atm; + u_short cfg_prm; + u_short cfg_atw; + u_short cfg_rec; + + u_short sparespertrack; + u_short sparespercyl; + u_long acylinders; + u_short rpm; + u_short cylskew; + + u_char cfg_spt; + u_char cfg_hds; + u_short cfg_trk; + u_char cfg_ilv; + u_char cfg_sof; + u_short cfg_psm; + u_short cfg_shd; + u_char cfg_2[2]; + u_short cfg_pcom; + u_char cfg_3; + u_char cfg_ssr; + u_short cfg_rwcc; + u_short cfg_ecc; + u_short cfg_eatm; + u_short cfg_eprm; + u_short cfg_eatw; + u_char cfg_gpb1; + u_char cfg_gpb2; + u_char cfg_gpb3; + u_char cfg_gpb4; + u_char cfg_ssc; + u_char cfg_runit; + u_short cfg_rsvc1; + u_short cfg_rsvc2; + u_long magic2; + u_char cfg_4[192]; +}; +#endif _MACHINE_DISKLABEL_H_ diff --git a/sys/arch/mvme68k/include/endian.h b/sys/arch/mvme68k/include/endian.h index 42e215473aa..03eb53ac558 100644 --- a/sys/arch/mvme68k/include/endian.h +++ b/sys/arch/mvme68k/include/endian.h @@ -1,4 +1,4 @@ -/* $Id: endian.h,v 1.2 1995/11/07 08:49:49 deraadt Exp $ */ +/* $OpenBSD: endian.h,v 1.3 1996/04/28 10:56:15 deraadt Exp $ */ /* Just use the common m68k definition */ #include <m68k/endian.h> diff --git a/sys/arch/mvme68k/include/exec.h b/sys/arch/mvme68k/include/exec.h index 26db9171851..af7c1880873 100644 --- a/sys/arch/mvme68k/include/exec.h +++ b/sys/arch/mvme68k/include/exec.h @@ -1,4 +1,4 @@ -/* $Id: exec.h,v 1.2 1995/11/07 08:49:50 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.3 1996/04/28 10:56:16 deraadt Exp $ */ /* * Copyright (c) 1993 Christopher G. Demetriou diff --git a/sys/arch/mvme68k/include/float.h b/sys/arch/mvme68k/include/float.h index e09bdec1d73..b171bd9dea8 100644 --- a/sys/arch/mvme68k/include/float.h +++ b/sys/arch/mvme68k/include/float.h @@ -1,4 +1,4 @@ -/* $Id: float.h,v 1.2 1995/11/07 08:49:50 deraadt Exp $ */ +/* $OpenBSD: float.h,v 1.3 1996/04/28 10:56:18 deraadt Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ diff --git a/sys/arch/mvme68k/include/frame.h b/sys/arch/mvme68k/include/frame.h index dc6892d7f1e..4400bb910fd 100644 --- a/sys/arch/mvme68k/include/frame.h +++ b/sys/arch/mvme68k/include/frame.h @@ -1,3 +1,3 @@ -/* $Id: frame.h,v 1.2 1995/11/07 08:49:51 deraadt Exp $ */ +/* $OpenBSD: frame.h,v 1.3 1996/04/28 10:56:19 deraadt Exp $ */ #include <m68k/frame.h> diff --git a/sys/arch/mvme68k/include/ieeefp.h b/sys/arch/mvme68k/include/ieeefp.h index ddc75724183..01b90b0a332 100644 --- a/sys/arch/mvme68k/include/ieeefp.h +++ b/sys/arch/mvme68k/include/ieeefp.h @@ -1,4 +1,4 @@ -/* $Id: ieeefp.h,v 1.2 1995/11/07 08:49:52 deraadt Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.3 1996/04/28 10:56:20 deraadt Exp $ */ /* Just use the common m68k definition */ #include <m68k/ieeefp.h> diff --git a/sys/arch/mvme68k/include/limits.h b/sys/arch/mvme68k/include/limits.h index 38f30a8723e..f5d7c035138 100644 --- a/sys/arch/mvme68k/include/limits.h +++ b/sys/arch/mvme68k/include/limits.h @@ -1,4 +1,4 @@ -/* $Id: limits.h,v 1.2 1995/11/07 08:49:53 deraadt Exp $ */ +/* $OpenBSD: limits.h,v 1.3 1996/04/28 10:56:21 deraadt Exp $ */ /* Just use the common m68k definition */ #include <m68k/limits.h> diff --git a/sys/arch/mvme68k/include/mioctl.h b/sys/arch/mvme68k/include/mioctl.h index 0cfe2cdaffb..512373930b4 100644 --- a/sys/arch/mvme68k/include/mioctl.h +++ b/sys/arch/mvme68k/include/mioctl.h @@ -1,4 +1,4 @@ -/* $Id: mioctl.h,v 1.2 1995/11/07 08:49:54 deraadt Exp $ */ +/* $OpenBSD: mioctl.h,v 1.3 1996/04/28 10:56:22 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt diff --git a/sys/arch/mvme68k/include/nvram.h b/sys/arch/mvme68k/include/nvram.h index b5fb692e1c7..03ac2f50d4e 100644 --- a/sys/arch/mvme68k/include/nvram.h +++ b/sys/arch/mvme68k/include/nvram.h @@ -1,4 +1,4 @@ -/* $Id: nvram.h,v 1.2 1995/11/07 08:49:54 deraadt Exp $ */ +/* $OpenBSD: nvram.h,v 1.3 1996/04/28 10:56:23 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt diff --git a/sys/arch/mvme68k/include/pcb.h b/sys/arch/mvme68k/include/pcb.h index 4edade720df..211ecc78c42 100644 --- a/sys/arch/mvme68k/include/pcb.h +++ b/sys/arch/mvme68k/include/pcb.h @@ -1,4 +1,4 @@ -/* $Id: pcb.h,v 1.2 1995/11/07 08:49:56 deraadt Exp $ */ +/* $OpenBSD: pcb.h,v 1.3 1996/04/28 10:56:24 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. diff --git a/sys/arch/mvme68k/include/pmap.h b/sys/arch/mvme68k/include/pmap.h index 8103a94c8f2..ac1a785e455 100644 --- a/sys/arch/mvme68k/include/pmap.h +++ b/sys/arch/mvme68k/include/pmap.h @@ -1,4 +1,4 @@ -/* $Id: pmap.h,v 1.2 1995/11/07 08:49:57 deraadt Exp $ */ +/* $OpenBSD: pmap.h,v 1.3 1996/04/28 10:56:25 deraadt Exp $ */ /* * Copyright (c) 1987 Carnegie-Mellon University diff --git a/sys/arch/mvme68k/include/proc.h b/sys/arch/mvme68k/include/proc.h index 6896652c9bc..1711d32893b 100644 --- a/sys/arch/mvme68k/include/proc.h +++ b/sys/arch/mvme68k/include/proc.h @@ -1,4 +1,4 @@ -/* $Id: proc.h,v 1.3 1995/11/28 20:43:07 deraadt Exp $ */ +/* $OpenBSD: proc.h,v 1.4 1996/04/28 10:56:25 deraadt Exp $ */ /* * Copyright (c) 1991, 1993 diff --git a/sys/arch/mvme68k/include/profile.h b/sys/arch/mvme68k/include/profile.h index 95cf0fbc485..ab458cc3623 100644 --- a/sys/arch/mvme68k/include/profile.h +++ b/sys/arch/mvme68k/include/profile.h @@ -1,3 +1,3 @@ -/* $Id: profile.h,v 1.2 1995/11/07 08:49:58 deraadt Exp $ */ +/* $OpenBSD: profile.h,v 1.3 1996/04/28 10:56:26 deraadt Exp $ */ #include <m68k/profile.h> diff --git a/sys/arch/mvme68k/include/prom.h b/sys/arch/mvme68k/include/prom.h index 2325b5806cb..767af7806e1 100644 --- a/sys/arch/mvme68k/include/prom.h +++ b/sys/arch/mvme68k/include/prom.h @@ -1,4 +1,4 @@ -/* $Id: prom.h,v 1.2 1995/11/07 08:49:59 deraadt Exp $ */ +/* $OpenBSD: prom.h,v 1.3 1996/04/28 10:56:27 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -64,7 +64,7 @@ #define ENVIRONTYPE_NETBOOT 4 #define ENVIRONTYPE_MEMSIZE 5 -#ifndef LOCORE +#ifndef _LOCORE struct prom_netctrl { u_char dev; u_char ctrl; diff --git a/sys/arch/mvme68k/include/psl.h b/sys/arch/mvme68k/include/psl.h index 5243a91651c..9f1025d4977 100644 --- a/sys/arch/mvme68k/include/psl.h +++ b/sys/arch/mvme68k/include/psl.h @@ -1,3 +1,3 @@ -/* $Id: psl.h,v 1.2 1995/11/07 08:50:00 deraadt Exp $ */ +/* $OpenBSD: psl.h,v 1.3 1996/04/28 10:56:28 deraadt Exp $ */ #include <m68k/psl.h> diff --git a/sys/arch/mvme68k/include/pte.h b/sys/arch/mvme68k/include/pte.h index 173c7c4647d..6aa1b56f792 100644 --- a/sys/arch/mvme68k/include/pte.h +++ b/sys/arch/mvme68k/include/pte.h @@ -1,4 +1,4 @@ -/* $Id: pte.h,v 1.2 1995/11/07 08:50:01 deraadt Exp $ */ +/* $OpenBSD: pte.h,v 1.3 1996/04/28 10:56:29 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. diff --git a/sys/arch/mvme68k/include/ptrace.h b/sys/arch/mvme68k/include/ptrace.h index 906da20f4ca..65ccefe48a7 100644 --- a/sys/arch/mvme68k/include/ptrace.h +++ b/sys/arch/mvme68k/include/ptrace.h @@ -1,4 +1,4 @@ -/* $Id: ptrace.h,v 1.2 1995/11/07 08:50:01 deraadt Exp $ */ +/* $OpenBSD: ptrace.h,v 1.3 1996/04/28 10:56:30 deraadt Exp $ */ /* Just use the common m68k definition */ #include <m68k/ptrace.h> diff --git a/sys/arch/mvme68k/include/reg.h b/sys/arch/mvme68k/include/reg.h index 3599a943dd9..adfeaea12df 100644 --- a/sys/arch/mvme68k/include/reg.h +++ b/sys/arch/mvme68k/include/reg.h @@ -1,4 +1,4 @@ -/* $Id: reg.h,v 1.2 1995/11/07 08:50:02 deraadt Exp $ */ +/* $OpenBSD: reg.h,v 1.3 1996/04/28 10:56:31 deraadt Exp $ */ #ifndef _MACHINE_REG_H_ #define _MACHINE_REG_H_ diff --git a/sys/arch/mvme68k/include/setjmp.h b/sys/arch/mvme68k/include/setjmp.h index 0843a9c3c53..4a14bb85055 100644 --- a/sys/arch/mvme68k/include/setjmp.h +++ b/sys/arch/mvme68k/include/setjmp.h @@ -1,3 +1,3 @@ -/* $Id: setjmp.h,v 1.2 1995/11/07 08:50:03 deraadt Exp $ */ +/* $OpenBSD: setjmp.h,v 1.3 1996/04/28 10:56:32 deraadt Exp $ */ #include <m68k/setjmp.h> diff --git a/sys/arch/mvme68k/include/signal.h b/sys/arch/mvme68k/include/signal.h index feac291319b..07f41f12900 100644 --- a/sys/arch/mvme68k/include/signal.h +++ b/sys/arch/mvme68k/include/signal.h @@ -1,4 +1,4 @@ -/* $Id: signal.h,v 1.2 1995/11/07 08:50:04 deraadt Exp $ */ +/* $OpenBSD: signal.h,v 1.3 1996/04/28 10:56:33 deraadt Exp $ */ /* Just use the common m68k definition */ #include <m68k/signal.h> diff --git a/sys/arch/mvme68k/include/stdarg.h b/sys/arch/mvme68k/include/stdarg.h index 65d252073c7..75510e1f514 100644 --- a/sys/arch/mvme68k/include/stdarg.h +++ b/sys/arch/mvme68k/include/stdarg.h @@ -1,4 +1,4 @@ -/* $Id: stdarg.h,v 1.2 1995/11/07 08:50:05 deraadt Exp $ */ +/* $OpenBSD: stdarg.h,v 1.3 1996/04/28 10:56:33 deraadt Exp $ */ /* Just use the common m68k definition */ #include <m68k/stdarg.h> diff --git a/sys/arch/mvme68k/include/trap.h b/sys/arch/mvme68k/include/trap.h index 515baf90403..22029ffd243 100644 --- a/sys/arch/mvme68k/include/trap.h +++ b/sys/arch/mvme68k/include/trap.h @@ -1,3 +1,3 @@ -/* $Id: trap.h,v 1.2 1995/11/07 08:50:06 deraadt Exp $ */ +/* $OpenBSD: trap.h,v 1.3 1996/04/28 10:56:34 deraadt Exp $ */ #include <m68k/trap.h> diff --git a/sys/arch/mvme68k/include/types.h b/sys/arch/mvme68k/include/types.h index 69ae636bac1..578b5148e95 100644 --- a/sys/arch/mvme68k/include/types.h +++ b/sys/arch/mvme68k/include/types.h @@ -1,4 +1,4 @@ -/* $Id: types.h,v 1.2 1995/11/07 08:50:06 deraadt Exp $ */ +/* $OpenBSD: types.h,v 1.3 1996/04/28 10:56:35 deraadt Exp $ */ #ifndef _MACHINE_TYPES_H_ #define _MACHINE_TYPES_H_ diff --git a/sys/arch/mvme68k/include/varargs.h b/sys/arch/mvme68k/include/varargs.h index 653572172a3..1cbbe78bc9c 100644 --- a/sys/arch/mvme68k/include/varargs.h +++ b/sys/arch/mvme68k/include/varargs.h @@ -1,4 +1,4 @@ -/* $Id: varargs.h,v 1.2 1995/11/07 08:50:07 deraadt Exp $ */ +/* $OpenBSD: varargs.h,v 1.3 1996/04/28 10:56:36 deraadt Exp $ */ /* Just use the common m68k definition */ #include <m68k/varargs.h> diff --git a/sys/arch/mvme68k/include/vmparam.h b/sys/arch/mvme68k/include/vmparam.h index 4b75b1ec4ce..82ca7b4d107 100644 --- a/sys/arch/mvme68k/include/vmparam.h +++ b/sys/arch/mvme68k/include/vmparam.h @@ -1,4 +1,4 @@ -/* $Id: vmparam.h,v 1.2 1995/11/07 08:50:08 deraadt Exp $ */ +/* $OpenBSD: vmparam.h,v 1.3 1996/04/28 10:56:37 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. |