[src/trunk]: src/sys/arch/ofppc/stand/ofwboot Catch up with sys/disklabel_mbr.h.

[wrstuden <wrstuden%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7d4081c01cb9
branches:  trunk
changeset: 477149:7d4081c01cb9
user:      wrstuden <wrstuden%NetBSD.org@localhost>
date:      Tue Oct 12 19:40:51 1999 +0000

description:
Catch up with sys/disklabel_mbr.h.

diffstat:

 sys/arch/ofppc/stand/ofwboot/ofdev.c |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r e5e952c5359b -r 7d4081c01cb9 sys/arch/ofppc/stand/ofwboot/ofdev.c
--- a/sys/arch/ofppc/stand/ofwboot/ofdev.c      Tue Oct 12 19:40:27 1999 +0000
+++ b/sys/arch/ofppc/stand/ofwboot/ofdev.c      Tue Oct 12 19:40:51 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofdev.c,v 1.3 1998/03/02 16:18:17 drochner Exp $       */
+/*     $NetBSD: ofdev.c,v 1.4 1999/10/12 19:40:51 wrstuden Exp $       */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -36,6 +36,7 @@
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
+#include <sys/disklabel_mbr.h>
 
 #include <netinet/in.h>
 
@@ -202,16 +203,16 @@
 
        if (recursion++ <= 1)
                off0 += off;
-       for (p = (struct mbr_partition *)(buf + MBRPARTOFF), i = 4;
+       for (p = (struct mbr_partition *)(buf + MBR_PARTOFF), i = 4;
             --i >= 0; p++) {
-               if (p->mbr_type == MBR_NETBSD
+               if (p->mbrp_typ == MBR_PTYPE_NETBSD
 #ifdef COMPAT_386BSD_MBRPART
-                   || (p->mbr_type == MBR_386BSD &&
+                   || (p->mbrp_typ == MBR_PTYPE_386BSD &&
                        (printf("WARNING: old BSD partition ID!\n"), 1)
                        /* XXX XXX - libsa printf() is void */ )
 #endif
                    ) {
-                       poff = get_long(&p->mbr_start) + off0;
+                       poff = get_long(&p->mbrp_start) + off0;
                        if (strategy(devp, F_READ, poff + LABELSECTOR,
                                     DEV_BSIZE, buf, &read) == 0
                            && read == DEV_BSIZE) {
@@ -225,8 +226,8 @@
                                recursion--;
                                return ERDLAB;
                        }
-               } else if (p->mbr_type == MBR_EXTENDED) {
-                       poff = get_long(&p->mbr_start);
+               } else if (p->mbrp_typ == MBR_PTYPE_EXT) {
+                       poff = get_long(&p->mbrp_start);
                        if (!search_label(devp, poff, buf, lp, off0)) {
                                recursion--;
                                return 0;