[src/trunk]: src/sys/arch/evbppc/include Add support for an MBR disklabel if ...

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

details:   https://anonhg.NetBSD.org/src/rev/e96f2dbe82d4
branches:  trunk
changeset: 555500:e96f2dbe82d4
user:      scw <scw%NetBSD.org@localhost>
date:      Wed Nov 19 13:58:11 2003 +0000

description:
Add support for an MBR disklabel if EVBPPC_HAS_MBR is defined.

diffstat:

 sys/arch/evbppc/include/disklabel.h |  17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 5d8c76bdc50a -r e96f2dbe82d4 sys/arch/evbppc/include/disklabel.h
--- a/sys/arch/evbppc/include/disklabel.h       Wed Nov 19 05:20:50 2003 +0000
+++ b/sys/arch/evbppc/include/disklabel.h       Wed Nov 19 13:58:11 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.2 2003/05/10 16:12:03 thorpej Exp $    */
+/*     $NetBSD: disklabel.h,v 1.3 2003/11/19 13:58:11 scw Exp $        */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -33,14 +33,25 @@
 #ifndef        _MACHINE_DISKLABEL_H_
 #define        _MACHINE_DISKLABEL_H_
 
+#define        MAXPARTITIONS   16              /* number of partitions */
+#define        RAW_PART        2               /* raw partition: XX?c */
+
+#ifdef EVBPPC_HAS_MBR
+#define        LABELSECTOR     1               /* sector containing label */
+#define        LABELOFFSET     0               /* offset of label in sector */
+/* Pull in MBR partition definitions. */
+#include <sys/bootblock.h>
+#else
 #define        LABELSECTOR     0               /* sector containing label */
 #define        LABELOFFSET     64              /* offset of label in sector */
-#define        MAXPARTITIONS   16              /* number of partitions */
-#define        RAW_PART        2               /* raw partition: XX?c */
+#endif /* EVBPPC_HAS_MBR */
 
 #include <sys/dkbad.h>
 
 struct cpu_disklabel {
+#ifdef EVBPPC_HAS_MBR
+       struct mbr_partition dosparts[MBR_PART_COUNT];
+#endif
        struct dkbad bad;               /* bad-sector information */
 };