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 a5186fb31e
commit 2ec4fd84ba
11 changed files with 22 additions and 22 deletions

View File

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

View File

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

View File

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

View File

@ -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 @@ bi_getbiosgeom(void)
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++;
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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