From df1fc979e9dafa311ec8c2b86389e9f06b05da68 Mon Sep 17 00:00:00 2001
From: Per Fogelstrom <pefo@cvs.openbsd.org>
Date: Wed, 15 Oct 1997 14:07:54 +0000
Subject: Add shm/sem includes, fix up disklabel stuff

---
 sys/arch/powerpc/powerpc/machdep.c     | 11 ++++++++++-
 sys/arch/powerpc/stand/Makefile        |  5 +++--
 sys/arch/powerpc/stand/ofwboot/ofdev.c | 13 +++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c
index 8af537521b3..2ccc1968b39 100644
--- a/sys/arch/powerpc/powerpc/machdep.c
+++ b/sys/arch/powerpc/powerpc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.9 1997/10/13 13:42:58 pefo Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.10 1997/10/15 14:07:52 pefo Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -52,6 +52,15 @@
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 
+#ifdef SYSVSHM
+#include <sys/shm.h>
+#endif
+#ifdef SYSVSEM
+#include <sys/sem.h>
+#endif
+#ifdef SYSVMSG
+#include <sys/msg.h>
+#endif
 #include <net/netisr.h>
 
 #include <machine/bat.h>
diff --git a/sys/arch/powerpc/stand/Makefile b/sys/arch/powerpc/stand/Makefile
index a7b3355a903..fb1d3abc93a 100644
--- a/sys/arch/powerpc/stand/Makefile
+++ b/sys/arch/powerpc/stand/Makefile
@@ -1,7 +1,8 @@
-#	$OpenBSD: Makefile,v 1.6 1997/05/21 22:50:04 rahnds Exp $
+#	$OpenBSD: Makefile,v 1.7 1997/10/15 14:07:53 pefo Exp $
 #	$NetBSD: Makefile,v 1.1 1996/09/30 16:34:59 ws Exp $
 
-SUBDIR=	boot boot.mac ofwboot
+#SUBDIR=	boot boot.mac ofwboot mbr
+SUBDIR=	ofwboot mbr
 
 SAREL=
 KERNREL=
diff --git a/sys/arch/powerpc/stand/ofwboot/ofdev.c b/sys/arch/powerpc/stand/ofwboot/ofdev.c
index 5f6bebab1df..17ad77692db 100644
--- a/sys/arch/powerpc/stand/ofwboot/ofdev.c
+++ b/sys/arch/powerpc/stand/ofwboot/ofdev.c
@@ -186,7 +186,7 @@ search_label(devp, off, buf, lp, off0)
 	u_long off0;
 {
 	size_t read;
-	struct mbr_partition *p;
+	struct dos_partition *p;
 	int i;
 	u_long poff;
 	static int recursion;
@@ -200,10 +200,11 @@ search_label(devp, off, buf, lp, off0)
 
 	if (recursion++ <= 1)
 		off0 += off;
-	for (p = (struct mbr_partition *)(buf + MBRPARTOFF), i = 4;
+	for (p = (struct dos_partition *)(buf + DOSPARTOFF), i = 4;
 	     --i >= 0; p++) {
-		if (p->mbr_type == MBR_NETBSD) {
-			poff = get_long(&p->mbr_start) + off0;
+		if (p->dp_typ == DOSPTYP_OPENBSD ||
+		    p->dp_typ == DOSPTYP_NETBSD) {
+			poff = get_long(&p->dp_start) + off0;
 			if (strategy(devp, F_READ, poff + LABELSECTOR,
 				     DEV_BSIZE, buf, &read) == 0
 			    && read == DEV_BSIZE) {
@@ -217,8 +218,8 @@ search_label(devp, off, buf, lp, off0)
 				recursion--;
 				return ERDLAB;
 			}
-		} else if (p->mbr_type == MBR_EXTENDED) {
-			poff = get_long(&p->mbr_start);
+		} else if (p->dp_typ == DOSPTYP_EXTEND) {
+			poff = get_long(&p->dp_start);
 			if (!search_label(devp, poff, buf, lp, off0)) {
 				recursion--;
 				return 0;
-- 
cgit v1.2.3