Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete the dosparts -> mbrparts conversion. Only x86k new uses dosparts 

because it also uses struct dos_partition.
This commit is contained in:
christos 2013-05-16 19:06:44 +00:00
parent 2ec4fd84ba
commit 5021bb4477
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arch/sbmips/include/disklabel.h
View File

@ -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

8
sys/arch/sbmips/sbmips/disksubr.c
View File

@ -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 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, stru
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 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, str
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
dp = osdep->dosparts;
dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;

8
sys/arch/sh3/sh3/disksubr.c
View File

@ -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 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
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 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
dp = osdep->dosparts;
dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;

4
sys/arch/x86/include/bootinfo.h
View File

@ -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 @@ struct bi_biosgeom_entry {
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 {