summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2013-05-16 19:06:44 +0000
committerchristos <christos@NetBSD.org>2013-05-16 19:06:44 +0000
commit1faef0219c72972baffe008b5dd91323eefc63f0 (patch)
tree94c34e1edc797582af3bab3c8c5294d0e5d89881
parent734e72045f87adea028fec05aea8a95b1eda84cd (diff)
Complete the dosparts -> mbrparts conversion. Only x86k new uses dosparts
because it also uses struct dos_partition.
-rw-r--r--sys/arch/emips/include/disklabel.h2
-rw-r--r--sys/arch/evbppc/include/disklabel.h4
-rw-r--r--sys/arch/hpcmips/include/disklabel.h4
-rw-r--r--sys/arch/i386/stand/lib/bootinfo_biosgeom.c6
-rw-r--r--sys/arch/ibmnws/include/disklabel.h4
-rw-r--r--sys/arch/landisk/include/disklabel.h4
-rw-r--r--sys/arch/mvmeppc/include/disklabel.h4
-rw-r--r--sys/arch/prep/include/disklabel.h4
-rw-r--r--sys/arch/rs6000/include/disklabel.h4
-rw-r--r--sys/arch/sandpoint/include/disklabel.h4
-rw-r--r--sys/arch/sbmips/include/disklabel.h4
11 files changed, 22 insertions, 22 deletions
diff --git a/sys/arch/emips/include/disklabel.h b/sys/arch/emips/include/disklabel.h
index 2071d360c3f..59e23c66cb9 100644
--- a/sys/arch/emips/include/disklabel.h
+++ b/sys/arch/emips/include/disklabel.h
@@ -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 --git a/sys/arch/evbppc/include/disklabel.h b/sys/arch/evbppc/include/disklabel.h
index 3895c2e1799..ebfbd757030 100644
--- a/sys/arch/evbppc/include/disklabel.h
+++ b/sys/arch/evbppc/include/disklabel.h
@@ -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 --git a/sys/arch/hpcmips/include/disklabel.h b/sys/arch/hpcmips/include/disklabel.h
index c06ee1ab88c..be9cce12ad0 100644
--- a/sys/arch/hpcmips/include/disklabel.h
+++ b/sys/arch/hpcmips/include/disklabel.h
@@ -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 --git a/sys/arch/i386/stand/lib/bootinfo_biosgeom.c b/sys/arch/i386/stand/lib/bootinfo_biosgeom.c
index 43e8784d7df..ccbfa6f2bca 100644
--- a/sys/arch/i386/stand/lib/bootinfo_biosgeom.c
+++ b/sys/arch/i386/stand/lib/bootinfo_biosgeom.c
@@ -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++;
}
diff --git a/sys/arch/ibmnws/include/disklabel.h b/sys/arch/ibmnws/include/disklabel.h
index 3f179cdeef7..ec617733d65 100644
--- a/sys/arch/ibmnws/include/disklabel.h
+++ b/sys/arch/ibmnws/include/disklabel.h
@@ -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 --git a/sys/arch/landisk/include/disklabel.h b/sys/arch/landisk/include/disklabel.h
index e3b1e19ca5b..b0b99bbf4a6 100644
--- a/sys/arch/landisk/include/disklabel.h
+++ b/sys/arch/landisk/include/disklabel.h
@@ -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 --git a/sys/arch/mvmeppc/include/disklabel.h b/sys/arch/mvmeppc/include/disklabel.h
index b25efb3e9b9..8ac727041f5 100644
--- a/sys/arch/mvmeppc/include/disklabel.h
+++ b/sys/arch/mvmeppc/include/disklabel.h
@@ -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 --git a/sys/arch/prep/include/disklabel.h b/sys/arch/prep/include/disklabel.h
index 51af079994a..476b077bb61 100644
--- a/sys/arch/prep/include/disklabel.h
+++ b/sys/arch/prep/include/disklabel.h
@@ -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 --git a/sys/arch/rs6000/include/disklabel.h b/sys/arch/rs6000/include/disklabel.h
index bbfcdda67c0..e0ce5e512ad 100644
--- a/sys/arch/rs6000/include/disklabel.h
+++ b/sys/arch/rs6000/include/disklabel.h
@@ -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 --git a/sys/arch/sandpoint/include/disklabel.h b/sys/arch/sandpoint/include/disklabel.h
index 1c30e2f416e..39d9067da71 100644
--- a/sys/arch/sandpoint/include/disklabel.h
+++ b/sys/arch/sandpoint/include/disklabel.h
@@ -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 --git a/sys/arch/sbmips/include/disklabel.h b/sys/arch/sbmips/include/disklabel.h
index 96b738d5657..6e03c5ade34 100644
--- a/sys/arch/sbmips/include/disklabel.h
+++ b/sys/arch/sbmips/include/disklabel.h
@@ -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;
};