[src/netbsd-1-5]: src/sys/arch/macppc Pull in some changes for Apple partitio...

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

details:   https://anonhg.NetBSD.org/src/rev/e1a7b204fc08
branches:  netbsd-1-5
changeset: 489295:e1a7b204fc08
user:      wrstuden <wrstuden%NetBSD.org@localhost>
date:      Mon Aug 28 16:16:24 2000 +0000

description:
Pull in some changes for Apple partitioning. Approved by thorpej.

 > Log Message:
 > Add some new partition types, and flags. Have the Apple Partition Map
 > code ignore the new partition types, and look for the new "USR" partition
 > flag.
 >
 > >From SUNAGAWA Keiki <kei_sun%ba2.so-net.ne.jp@localhost> with slight changes by me.
 >
 > Closes PR port-macppc/10046

diffstat:

 sys/arch/macppc/include/disklabel.h |  8 +++++++-
 sys/arch/macppc/macppc/disksubr.c   |  8 +++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r 773eabcb64d1 -r e1a7b204fc08 sys/arch/macppc/include/disklabel.h
--- a/sys/arch/macppc/include/disklabel.h       Mon Aug 28 05:52:34 2000 +0000
+++ b/sys/arch/macppc/include/disklabel.h       Mon Aug 28 16:16:24 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.4 1999/09/27 17:02:43 wrstuden Exp $   */
+/*     $NetBSD: disklabel.h,v 1.4.12.1 2000/08/28 16:16:24 wrstuden Exp $      */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -173,10 +173,14 @@
 #define PART_TYPE_DRIVER       "APPLE_DRIVER"
 #define PART_TYPE_DRIVER43     "APPLE_DRIVER43"
 #define PART_TYPE_DRIVERATA    "APPLE_DRIVER_ATA"
+#define PART_TYPE_DRIVERIOKIT  "APPLE_DRIVER_IOKIT"
 #define PART_TYPE_FWB_COMPONENT        "FWB DRIVER COMPONENTS"
+#define PART_TYPE_FREE         "APPLE_FREE"
 #define PART_TYPE_MAC          "APPLE_HFS"
 #define PART_TYPE_NETBSD       "NETBSD"
+#define PART_TYPE_NBSD_PPCBOOT "NETBSD/MACPPC"
 #define PART_TYPE_PARTMAP      "APPLE_PARTITION_MAP"
+#define PART_TYPE_PATCHES      "APPLE_PATCHES"
 #define PART_TYPE_SCRATCH      "APPLE_SCRATCH"
 #define PART_TYPE_UNIX         "APPLE_UNIX_SVR2"
 
@@ -196,11 +200,13 @@
        u_int32_t       bzbUMountTime;
 };
 
+/* Apple occasionally changes these */
 #define BZB_MAGIC      0xABADBABE
 #define BZB_TYPEFS     1
 #define BZB_TYPESWAP   3
 #define BZB_ROOTFS     0x8000
 #define BZB_USRFS      0x4000
+#define BZB_USRFS_NEW  0x0004
 
 #ifdef _KERNEL
 struct disklabel;
diff -r 773eabcb64d1 -r e1a7b204fc08 sys/arch/macppc/macppc/disksubr.c
--- a/sys/arch/macppc/macppc/disksubr.c Mon Aug 28 05:52:34 2000 +0000
+++ b/sys/arch/macppc/macppc/disksubr.c Mon Aug 28 16:16:24 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.8 2000/05/19 18:54:25 thorpej Exp $     */
+/*     $NetBSD: disksubr.c,v 1.8.4.1 2000/08/28 16:16:25 wrstuden Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -187,8 +187,10 @@
        if (strcmp(PART_TYPE_DRIVER, typestr) == 0 ||
            strcmp(PART_TYPE_DRIVER43, typestr) == 0 ||
            strcmp(PART_TYPE_DRIVERATA, typestr) == 0 ||
+           strcmp(PART_TYPE_DRIVERIOKIT, typestr) == 0 ||
            strcmp(PART_TYPE_FWB_COMPONENT, typestr) == 0 ||
-           strcmp(PART_TYPE_PARTMAP, typestr) == 0)
+           strcmp(PART_TYPE_PARTMAP, typestr) == 0 ||
+           strcmp(PART_TYPE_PATCHES, typestr) == 0)
                type = 0;
        else if (strcmp(PART_TYPE_UNIX, typestr) == 0) {
                /* unix part, swap, root, usr */
@@ -197,7 +199,7 @@
                        type = 0;
                else if (bzb->bzbFlags & BZB_ROOTFS)
                        type = ROOT_PART;
-               else if (bzb->bzbFlags & BZB_USRFS)
+               else if (bzb->bzbFlags & (BZB_USRFS | BZB_USRFS_NEW))
                        type = UFS_PART;
                else if (bzb->bzbType == BZB_TYPESWAP)
                        type = SWAP_PART;