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

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

details:   https://anonhg.NetBSD.org/src/rev/4c37c3d7a421
branches:  trunk
changeset: 786867:4c37c3d7a421
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/sbmips/include/disklabel.h |  2 +-
 sys/arch/sbmips/sbmips/disksubr.c   |  8 ++++----
 sys/arch/sh3/sh3/disksubr.c         |  8 ++++----
 sys/arch/x86/include/bootinfo.h     |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r 9d8a18eec0bd -r 4c37c3d7a421 sys/arch/sbmips/include/disklabel.h
--- a/sys/arch/sbmips/include/disklabel.h       Thu May 16 19:06:44 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.9 2013/05/16 19:06:44 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.10 2013/05/16 19:06:45 christos Exp $ */
 
 /*
  * Copyright 2000, 2001
diff -r 9d8a18eec0bd -r 4c37c3d7a421 sys/arch/sbmips/sbmips/disksubr.c
--- a/sys/arch/sbmips/sbmips/disksubr.c Thu May 16 19:06:44 2013 +0000
+++ b/sys/arch/sbmips/sbmips/disksubr.c Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.20 2009/03/16 23:11:15 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.21 2013/05/16 19:06:45 christos Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.20 2009/03/16 23:11:15 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.21 2013/05/16 19:06:45 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -135,7 +135,7 @@
        cyl = LABELSECTOR / lp->d_secpercyl;
        if (!osdep)
                goto nombrpart;
-       dp = osdep->dosparts;
+       dp = osdep->mbrparts;
 
        /* read master boot record */
        bp->b_blkno = MBR_BBSECTOR;
@@ -334,7 +334,7 @@
        cyl = LABELSECTOR / lp->d_secpercyl;
        if (!osdep)
                goto nombrpart;
-       dp = osdep->dosparts;
+       dp = osdep->mbrparts;
 
        /* read master boot record */
        bp->b_blkno = MBR_BBSECTOR;
diff -r 9d8a18eec0bd -r 4c37c3d7a421 sys/arch/sh3/sh3/disksubr.c
--- a/sys/arch/sh3/sh3/disksubr.c       Thu May 16 19:06:44 2013 +0000
+++ b/sys/arch/sh3/sh3/disksubr.c       Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.28 2011/02/19 10:46:29 kiyohara Exp $   */
+/*     $NetBSD: disksubr.c,v 1.29 2013/05/16 19:06:45 christos Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2011/02/19 10:46:29 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29 2013/05/16 19:06:45 christos Exp $");
 
 #include "opt_mbr.h"
 
@@ -345,7 +345,7 @@
        cyl = LABELSECTOR / lp->d_secpercyl;
        if (!osdep)
                goto nombrpart;
-       dp = osdep->dosparts;
+       dp = osdep->mbrparts;
 
        /* read master boot record */
        bp->b_blkno = MBR_BBSECTOR;
@@ -604,7 +604,7 @@
        cyl = LABELSECTOR / lp->d_secpercyl;
        if (!osdep)
                goto nombrpart;
-       dp = osdep->dosparts;
+       dp = osdep->mbrparts;
 
        /* read master boot record */
        bp->b_blkno = MBR_BBSECTOR;
diff -r 9d8a18eec0bd -r 4c37c3d7a421 sys/arch/x86/include/bootinfo.h
--- a/sys/arch/x86/include/bootinfo.h   Thu May 16 19:06:44 2013 +0000
+++ b/sys/arch/x86/include/bootinfo.h   Thu May 16 19:06:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootinfo.h,v 1.19 2011/11/28 07:56:54 tls Exp $        */
+/*     $NetBSD: bootinfo.h,v 1.22 2013/05/16 19:06:45 christos Exp $   */
 
 /*
  * Copyright (c) 1997
@@ -157,7 +157,7 @@
        unsigned int    cksum;                  /* MBR checksum */
        int             res0, res1, res2, res3; /* future expansion; 0 now */
 #endif
-       struct mbr_partition dosparts[MBR_PART_COUNT]; /* MBR itself */
+       struct mbr_partition mbrparts[MBR_PART_COUNT]; /* MBR itself */
 } __packed;
 
 struct btinfo_biosgeom {