[src/trunk]: src/sys/arch/macppc/macppc Recognize NETBSD & NETBSD/MACPPC pari...

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

details:   https://anonhg.NetBSD.org/src/rev/7657e9fc466e
branches:  trunk
changeset: 504357:7657e9fc466e
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Feb 28 03:02:29 2001 +0000

description:
Recognize NETBSD & NETBSD/MACPPC parition types, default HFS to parition d.
Exclude FWDRIVER.

diffstat:

 sys/arch/macppc/macppc/disksubr.c |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (49 lines):

diff -r 1e3dec36037e -r 7657e9fc466e sys/arch/macppc/macppc/disksubr.c
--- a/sys/arch/macppc/macppc/disksubr.c Wed Feb 28 02:59:19 2001 +0000
+++ b/sys/arch/macppc/macppc/disksubr.c Wed Feb 28 03:02:29 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.12 2001/02/24 22:39:18 matt Exp $       */
+/*     $NetBSD: disksubr.c,v 1.13 2001/02/28 03:02:29 matt Exp $       */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -184,14 +184,19 @@
                if ((*s >= 'a') && (*s <= 'z'))
                        *s = (*s - 'a' + 'A');
 
-       if (strcmp(PART_TYPE_DRIVER, typestr) == 0 ||
+       if (strncmp(PART_TYPE_DRIVER, typestr, strlen(PART_TYPE_DRIVER)) == 0 ||
            strcmp(PART_TYPE_DRIVER43, typestr) == 0 ||
            strcmp(PART_TYPE_DRIVERATA, typestr) == 0 ||
            strcmp(PART_TYPE_DRIVERIOKIT, typestr) == 0 ||
+           strcmp(PART_TYPE_FWDRIVER, typestr) == 0 ||
            strcmp(PART_TYPE_FWB_COMPONENT, typestr) == 0 ||
            strcmp(PART_TYPE_PARTMAP, typestr) == 0 ||
            strcmp(PART_TYPE_PATCHES, typestr) == 0)
                type = 0;
+       else if (strcmp(PART_TYPE_NBSD_PPCBOOT, typestr) == 0)
+               type = ROOT_PART;
+       else if (strcmp(PART_TYPE_NETBSD, typestr) == 0)
+               type = UFS_PART;
        else if (strcmp(PART_TYPE_UNIX, typestr) == 0) {
                /* unix part, swap, root, usr */
                bzb = (struct blockzeroblock *)(&part->pmBootArgs);
@@ -258,6 +263,10 @@
                        setpartition(part + i, &lp->d_partitions[1], FS_SWAP);
                        if (*maxslot < 1)
                                *maxslot = 1;
+               } else if (type == HFS_PART) {
+                       setpartition(part + i, &lp->d_partitions[3], FS_HFS);
+                       if (*maxslot < 3)
+                               *maxslot = 3;
                } else
                        printf("disksubr.c: can't do type %d\n", type);
 
@@ -328,6 +337,7 @@
        if (getNamedType(part, NUM_PARTS, lp, UFS_PART, 0, &maxslot))
                getNamedType(part, NUM_PARTS, lp, UFS_PART, -1, &maxslot);
        getNamedType(part, NUM_PARTS, lp, SWAP_PART, -1, &maxslot);
+       getNamedType(part, NUM_PARTS, lp, HFS_PART, -1, &maxslot);
 
        /* Now get as many of the rest of the partitions as we can */
        for (i = 0; i < NUM_PARTS; i++) {