[src/trunk]: src/sys/arch Complete the dosparts -> mbrparts conversion. Only ...

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

details:   https://anonhg.NetBSD.org/src/rev/9d8a18eec0bd
branches:  trunk
changeset: 786866:9d8a18eec0bd
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 16 19:06:44 2013 +0000

description:
Complete the dosparts -> mbrparts conversion. Only x86k new uses dosparts
because it also uses struct dos_partition.

diffstat:

 sys/arch/emips/include/disklabel.h          |  2 +-
 sys/arch/evbppc/include/disklabel.h         |  4 ++--
 sys/arch/hpcmips/include/disklabel.h        |  4 ++--
 sys/arch/i386/stand/lib/bootinfo_biosgeom.c |  6 +++---
 sys/arch/ibmnws/include/disklabel.h         |  4 ++--
 sys/arch/landisk/include/disklabel.h        |  4 ++--
 sys/arch/mvmeppc/include/disklabel.h        |  4 ++--
 sys/arch/prep/include/disklabel.h           |  4 ++--
 sys/arch/rs6000/include/disklabel.h         |  4 ++--
 sys/arch/sandpoint/include/disklabel.h      |  4 ++--
 sys/arch/sbmips/include/disklabel.h         |  4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diffs (191 lines):

diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/emips/include/disklabel.h
--- a/sys/arch/emips/include/disklabel.h        Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/emips/include/disklabel.h        Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.4 2013/05/16 19:06:44 christos Exp $   */
+/*     $NetBSD: disklabel.h,v 1.3 2013/05/16 19:06:44 christos Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/evbppc/include/disklabel.h
--- a/sys/arch/evbppc/include/disklabel.h       Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/evbppc/include/disklabel.h       Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.7 2011/08/30 12:39:54 bouyer Exp $     */
+/*     $NetBSD: disklabel.h,v 1.8 2013/05/16 19:06:44 christos Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -60,7 +60,7 @@
 
 struct cpu_disklabel {
 #ifdef EVBPPC_HAS_MBR
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #endif
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;               /* bad-sector information */
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/hpcmips/include/disklabel.h
--- a/sys/arch/hpcmips/include/disklabel.h      Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/hpcmips/include/disklabel.h      Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.10 2011/08/30 12:39:55 bouyer Exp $    */
+/*     $NetBSD: disklabel.h,v 1.11 2013/05/16 19:06:44 christos Exp $  */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -67,7 +67,7 @@
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/i386/stand/lib/bootinfo_biosgeom.c
--- a/sys/arch/i386/stand/lib/bootinfo_biosgeom.c       Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/i386/stand/lib/bootinfo_biosgeom.c       Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootinfo_biosgeom.c,v 1.21 2010/12/25 01:19:33 jakllsch Exp $  */
+/*     $NetBSD: bootinfo_biosgeom.c,v 1.22 2013/05/16 19:06:44 christos Exp $  */
 
 /*
  * Copyright (c) 1997
@@ -169,8 +169,8 @@
                for (j = 0, cksum = 0; j < BIOSDISK_DEFAULT_SECSIZE; j++)
                        cksum += buf[j];
                bibg->disk[nvalid].cksum = cksum;
-               memcpy(bibg->disk[nvalid].dosparts, &buf[MBR_PART_OFFSET],
-                      sizeof(bibg->disk[nvalid].dosparts));
+               memcpy(bibg->disk[nvalid].mbrparts, &buf[MBR_PART_OFFSET],
+                      sizeof(bibg->disk[nvalid].mbrparts));
                nvalid++;
        }
 
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/ibmnws/include/disklabel.h
--- a/sys/arch/ibmnws/include/disklabel.h       Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/ibmnws/include/disklabel.h       Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.5 2011/08/30 12:39:55 bouyer Exp $     */
+/*     $NetBSD: disklabel.h,v 1.6 2013/05/16 19:06:45 christos Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -49,7 +49,7 @@
 #endif /* HAVE_NBTOOL_CONFIG_H */
 
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/landisk/include/disklabel.h
--- a/sys/arch/landisk/include/disklabel.h      Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/landisk/include/disklabel.h      Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.3 2011/08/30 12:39:56 bouyer Exp $     */
+/*     $NetBSD: disklabel.h,v 1.4 2013/05/16 19:06:45 christos Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -54,7 +54,7 @@
 #endif /* HAVE_NBTOOL_CONFIG_H */
 
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/mvmeppc/include/disklabel.h
--- a/sys/arch/mvmeppc/include/disklabel.h      Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/mvmeppc/include/disklabel.h      Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.8 2011/08/30 12:39:57 bouyer Exp $     */
+/*     $NetBSD: disklabel.h,v 1.9 2013/05/16 19:06:45 christos Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -49,7 +49,7 @@
 #endif /* HAVE_NBTOOL_CONFIG_H */
 
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/prep/include/disklabel.h
--- a/sys/arch/prep/include/disklabel.h Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/prep/include/disklabel.h Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.9 2011/08/30 12:39:57 bouyer Exp $     */
+/*     $NetBSD: disklabel.h,v 1.10 2013/05/16 19:06:45 christos Exp $  */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -47,7 +47,7 @@
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/rs6000/include/disklabel.h
--- a/sys/arch/rs6000/include/disklabel.h       Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/rs6000/include/disklabel.h       Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.3 2011/08/30 12:39:58 bouyer Exp $     */
+/*     $NetBSD: disklabel.h,v 1.4 2013/05/16 19:06:45 christos Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -47,7 +47,7 @@
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/sandpoint/include/disklabel.h
--- a/sys/arch/sandpoint/include/disklabel.h    Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/sandpoint/include/disklabel.h    Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.8 2011/08/30 12:39:58 bouyer Exp $     */
+/*     $NetBSD: disklabel.h,v 1.9 2013/05/16 19:06:45 christos Exp $   */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -47,7 +47,7 @@
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };
diff -r 8d59f895dbe5 -r 9d8a18eec0bd sys/arch/sbmips/include/disklabel.h
--- a/sys/arch/sbmips/include/disklabel.h       Thu May 16 19:06:43 2013 +0000
+++ b/sys/arch/sbmips/include/disklabel.h       Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2011/08/30 12:39:58 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.9 2013/05/16 19:06:44 christos Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -88,7 +88,7 @@
 #include <sys/dkbad.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 struct cpu_disklabel {
-       struct mbr_partition dosparts[MBR_PART_COUNT];
+       struct mbr_partition mbrparts[MBR_PART_COUNT];
 #define __HAVE_DISKLABEL_DKBAD
        struct dkbad bad;
 };