Current update

4 files changed, 33 insertions, 30 deletions

diff --git a/sys/arch/wgrisc/include/ansi.h b/sys/arch/wgrisc/include/ansi.h
index cc607a5d559..3803a631267 100644
--- a/sys/arch/wgrisc/include/ansi.h
+++ b/sys/arch/wgrisc/include/ansi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ansi.h,v 1.1 1997/02/06 16:02:44 pefo Exp $	*/
+/*	$OpenBSD: ansi.h,v 1.2 1997/05/11 16:25:59 pefo Exp $	*/
 /*	$NetBSD: ansi.h,v 1.5 1994/10/26 21:09:33 cgd Exp $	*/
 
 /*-
@@ -54,6 +54,7 @@
 #define	_BSD_SSIZE_T_	int			/* byte count or error */
 #define	_BSD_TIME_T_	long			/* time() */
 #define	_BSD_VA_LIST_	char *			/* va_list */
+#define	_BSD_CLOCKID_T_	int
 
 /*
  * Runes (wchar_t) is declared to be an ``int'' instead of the more natural
diff --git a/sys/arch/wgrisc/include/asm.h b/sys/arch/wgrisc/include/asm.h
index 06df98758c2..e5c8f892109 100644
--- a/sys/arch/wgrisc/include/asm.h
+++ b/sys/arch/wgrisc/include/asm.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: asm.h,v 1.1 1997/02/06 16:02:44 pefo Exp $	*/
+/*      $OpenBSD: asm.h,v 1.2 1997/05/11 16:26:00 pefo Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,7 +49,9 @@
 
 #include <machine/regdef.h>
 
+#ifndef ABICALLS
 #define	ABICALLS	.abicalls
+#endif
 
 #if defined(ABICALLS) && !defined(_KERNEL)
 	ABICALLS
diff --git a/sys/arch/wgrisc/include/disklabel.h b/sys/arch/wgrisc/include/disklabel.h
index 41df7318418..8c71a8c20d5 100644
--- a/sys/arch/wgrisc/include/disklabel.h
+++ b/sys/arch/wgrisc/include/disklabel.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: disklabel.h,v 1.1 1997/02/06 16:02:42 pefo Exp $	*/
-/*	$NetBSD: disklabel.h,v 1.2 1995/01/18 06:37:55 mellon Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.2 1997/05/11 16:26:01 pefo Exp $	*/
+/*	$NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $	*/
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -34,41 +34,41 @@
 #ifndef _MACHINE_DISKLABEL_H_
 #define _MACHINE_DISKLABEL_H_
 
-#define	LABELSECTOR	1			/* sector containing label */
-#define	LABELOFFSET	0			/* offset of label in sector */
-#define	MAXPARTITIONS	16			/* number of partitions */
-#define	PARTITIONSHIFT	4			/* log2 */
-#define	PARTITIONMASK	0xf			
-#define	RAW_PART	2			/* raw partition: xx?c */
+#define	LABELSECTOR	1		/* sector containing label */
+#define	LABELOFFSET	0		/* offset of label in sector */
+#define	MAXPARTITIONS	16		/* number of partitions */
+#define	RAW_PART	2		/* raw partition: ie. rsd0c */
 
-/* DOS partition table -- used when the system is booted from a dos
- * partition. This is the case on NT systems.
- */
+/* DOS partition table -- located in boot block */
 #define	DOSBBSECTOR	0		/* DOS boot block relative sector # */
 #define	DOSPARTOFF	446
 #define	NDOSPART	4
 
 struct dos_partition {
-	unsigned char	dp_flag;	/* bootstrap flags */
-	unsigned char	dp_shd;		/* starting head */
-	unsigned char	dp_ssect;	/* starting sector */
-	unsigned char	dp_scyl;	/* starting cylinder */
-	unsigned char	dp_typ;		/* partition type (see below) */
-	unsigned char	dp_ehd;		/* end head */
-	unsigned char	dp_esect;	/* end sector */
-	unsigned char	dp_ecyl;	/* end cylinder */
-	unsigned long	dp_start;	/* absolute starting sector number */
-	unsigned long	dp_size;	/* partition size in sectors */
-} dos_partitions[NDOSPART];
+	u_int8_t	dp_flag;	/* bootstrap flags */
+	u_int8_t	dp_shd;		/* starting head */
+	u_int8_t	dp_ssect;	/* starting sector */
+	u_int8_t	dp_scyl;	/* starting cylinder */
+	u_int8_t	dp_typ;		/* partition type (see below) */
+	u_int8_t	dp_ehd;		/* end head */
+	u_int8_t	dp_esect;	/* end sector */
+	u_int8_t	dp_ecyl;	/* end cylinder */
+	u_int32_t	dp_start;	/* absolute starting sector number */
+	u_int32_t	dp_size;	/* partition size in sectors */
+};
 
 /* Known DOS partition types. */
+#define	DOSPTYP_UNUSED	0x00		/* Unused partition */
+#define DOSPTYP_FAT12	0x01		/* 12-bit FAT */
+#define DOSPTYP_FAT16S	0x04		/* 16-bit FAT, less than 32M */
+#define DOSPTYP_EXTEND	0x05		/* Extended; contains sub-partitions */
+#define DOSPTYP_FAT16B	0x06		/* 16-bit FAT, more than 32M */
+#define DOSPTYP_FAT16C	0x0e		/* 16-bit FAT, CHS-mapped */
+#define DOSPTYP_ONTRACK	0x54
+#define	DOSPTYP_LINUX	0x83		/* That other thing */
 #define DOSPTYP_386BSD	0xa5		/* 386BSD partition type */
 #define DOSPTYP_NETBSD	DOSPTYP_386BSD	/* NetBSD partition type (XXX) */
 #define DOSPTYP_OPENBSD	0xa6		/* OpenBSD partition type */
-#define DOSPTYP_FAT12   0x1
-#define DOSPTYP_FAT16S  0x4
-#define DOSPTYP_FAT16B  0x6
-#define DOSPTYP_FAT16C  0xe
 
 #include <sys/dkbad.h>
 struct cpu_disklabel {
diff --git a/sys/arch/wgrisc/include/param.h b/sys/arch/wgrisc/include/param.h
index a53fcbc6a9c..f788a31ad68 100644
--- a/sys/arch/wgrisc/include/param.h
+++ b/sys/arch/wgrisc/include/param.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: param.h,v 1.3 1997/02/28 22:57:41 niklas Exp $ */
+/*      $OpenBSD: param.h,v 1.4 1997/05/11 16:26:02 pefo Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
  * Machine dependent constants for Willowglen Mips RISC machines:
  */
 #define	MACHINE		"wgrisc"
-#define	MACHINE		wgrisc
+#define	_MACHINE	wgrisc
 #define MACHINE_ARCH	"mips"
 #define _MACHINE_ARCH	mips
 #define MID_MACHINE	MID_PMAX	/* XXX Bogus, but needed for now... */