From c08eec9f47b977af19e2fef8538d51f98c0e05ad Mon Sep 17 00:00:00 2001
From: toshii <toshii@NetBSD.org>
Date: Wed, 14 Mar 2001 14:47:40 +0000
Subject: [PATCH] Use hpc/hpc/disksubr.c.

---
 sys/arch/hpcarm/conf/files.hpcarm         |  4 +-
 sys/arch/hpcarm/include/disklabel.h       | 58 ++++++++++++++++++++++-
 sys/arch/hpcarm/include/disklabel_acorn.h |  3 --
 3 files changed, 58 insertions(+), 7 deletions(-)
 delete mode 100644 sys/arch/hpcarm/include/disklabel_acorn.h

diff --git a/sys/arch/hpcarm/conf/files.hpcarm b/sys/arch/hpcarm/conf/files.hpcarm
index f299875c7b53..bcdea0653d32 100644
--- a/sys/arch/hpcarm/conf/files.hpcarm
+++ b/sys/arch/hpcarm/conf/files.hpcarm
@@ -1,4 +1,4 @@
-#	$NetBSD: files.hpcarm,v 1.11 2001/03/10 19:05:40 toshii Exp $
+#	$NetBSD: files.hpcarm,v 1.12 2001/03/14 14:47:40 toshii Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -51,7 +51,7 @@ file	arch/hpcarm/hpcarm/vm_machdep.c
 # H/PC Platform common files.
 #
 include	"arch/hpc/conf/files.hpc"
-#file	arch/hpc/hpc/disksubr.c			disk
+file	arch/hpc/hpc/disksubr.c			disk
 include	"dev/hpc/files.bicons"
 include	"dev/hpc/files.hpcfb"
 include	"dev/hpc/files.hpckbd"
diff --git a/sys/arch/hpcarm/include/disklabel.h b/sys/arch/hpcarm/include/disklabel.h
index 96125a7b589f..513ac6f262a9 100644
--- a/sys/arch/hpcarm/include/disklabel.h
+++ b/sys/arch/hpcarm/include/disklabel.h
@@ -1,3 +1,57 @@
-/*	$NetBSD: disklabel.h,v 1.1 2001/02/23 03:48:15 ichiro Exp $	*/
+/*	$NetBSD: disklabel.h,v 1.2 2001/03/14 14:47:41 toshii Exp $	*/
 
-#include <arm/disklabel.h>
+/*
+ * Copyright (c) 1994 Christopher G. Demetriou
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Christopher G. Demetriou.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE_DISKLABEL_H_
+#define _MACHINE_DISKLABEL_H_
+
+#define	LABELSECTOR	1		/* sector containing label */
+#define	LABELOFFSET	0		/* offset of label in sector */
+#define	MAXPARTITIONS	8		/* number of partitions */
+#define	RAW_PART	3		/* raw partition: XX?d (XXX) */
+
+/* Pull in MBR partition definitions. */
+#include <sys/disklabel_mbr.h>
+
+#ifndef __ASSEMBLER__
+#include <sys/dkbad.h>
+struct cpu_disklabel {
+	struct mbr_partition dosparts[NMBRPART];
+	struct dkbad bad;
+};
+#endif
+
+#ifdef _KERNEL
+struct disklabel;
+int	bounds_check_with_label __P((struct buf *, struct disklabel *, int));
+#endif
+
+#endif /* _MACHINE_DISKLABEL_H_ */
diff --git a/sys/arch/hpcarm/include/disklabel_acorn.h b/sys/arch/hpcarm/include/disklabel_acorn.h
deleted file mode 100644
index b1bf4904ad23..000000000000
--- a/sys/arch/hpcarm/include/disklabel_acorn.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: disklabel_acorn.h,v 1.1 2001/02/23 03:48:15 ichiro Exp $	*/
-
-#include <arm/disklabel_acorn.h>