CVS commit: src/sys/dev/dkwedge

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sat Jan 24 02:58:57 UTC 2015

Modified Files:
        src/sys/dev/dkwedge: dkwedge_apple.c

Log Message:
Look at the bzb flags to mark partition as swap. Requested by John D. Baker.
XXX: Pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/dkwedge/dkwedge_apple.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/dkwedge/dkwedge_apple.c
diff -u src/sys/dev/dkwedge/dkwedge_apple.c:1.1 src/sys/dev/dkwedge/dkwedge_apple.c:1.2
--- src/sys/dev/dkwedge/dkwedge_apple.c:1.1	Sat Apr  7 01:36:10 2012
+++ src/sys/dev/dkwedge/dkwedge_apple.c	Fri Jan 23 21:58:56 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkwedge_apple.c,v 1.1 2012/04/07 05:36:10 christos Exp $	*/
+/*	$NetBSD: dkwedge_apple.c,v 1.2 2015/01/24 02:58:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_apple.c,v 1.1 2012/04/07 05:36:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_apple.c,v 1.2 2015/01/24 02:58:56 christos Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
@@ -106,6 +106,18 @@ swap_apple_part_map_entry(struct apple_p
 	SWAP32(pmBootCksum);
 }
 
+static void
+swap_apple_blockzeroblock(struct apple_blockzeroblock *ap)
+{
+        SWAP32(bzbMagic);
+        SWAP16(bzbBadBlockInode);
+        SWAP16(bzbFlags);
+        SWAP16(bzbReserved);
+        SWAP32(bzbCreationTime);
+        SWAP32(bzbMountTime);
+        SWAP32(bzbUMountTime);
+}
+
 #undef SWAP16
 #undef SWAP32
 
@@ -137,6 +149,8 @@ dkwedge_discover_apple(struct disk *pdk,
 	uint32_t blocksize, offset, rsize;
 	struct apple_drvr_map *am;
 	struct apple_part_map_entry *ae;
+	struct apple_blockzeroblock ab;
+	const char *ptype;
 
 	buf = DKW_MALLOC(ASIZE);
 	if ((error = dkwedge_read(pdk, vp, 0, buf, ASIZE)) != 0) {
@@ -193,9 +207,17 @@ dkwedge_discover_apple(struct disk *pdk,
 		if (i == __arraycount(map))
 			continue;
 
+		ptype = map[i].type;
+		memcpy(&ab, ae->pmBootArgs, sizeof(ab));
+		swap_apple_blockzeroblock(&ab);
+		if (ab.bzbMagic == APPLE_BZB_MAGIC) {
+			if (ab.bzbType == APPLE_BZB_TYPESWAP)
+				ptype = DKW_PTYPE_SWAP;
+		}
+
 		struct dkwedge_info dkw;
 
-		strcpy(dkw.dkw_ptype, map[i].type);
+		strcpy(dkw.dkw_ptype, ptype);
 		strcpy(dkw.dkw_parent, pdk->dk_name);
 		dkw.dkw_offset = ae->pmPyPartStart;
 		dkw.dkw_size = ae->pmPartBlkCnt;