@zigc/lib 0.17.0-dev.607 → 0.17.0-dev.633

package/libc/include/generic-netbsd/machine/byte_swap.h

@@ -1,11 +1,11 @@
-/*	$NetBSD: byte_swap.h,v 1.16 2017/01/17 11:08:50 rin Exp $	*/
+/* $NetBSD: byte_swap.h,v 1.5.30.1 2025/12/18 19:57:52 martin Exp $ */
 
 /*-
- * Copyright (c) 1997, 1999, 2002 The NetBSD Foundation, Inc.
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum, Neil A. Carson, and Jason R. Thorpe.
+ * by Matt Thomas of 3am Software Foundry.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,57 +29,57 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ARM_BYTE_SWAP_H_
-#define	_ARM_BYTE_SWAP_H_
+#ifndef _RISCV_BYTE_SWAP_H_
+#define	_RISCV_BYTE_SWAP_H_
 
 #ifdef _LOCORE
 
-#if defined(_ARM_ARCH_6) || defined(_ARM_ARCH_7)
-
-#define	BSWAP16(_src, _dst, _tmp)		\
-	rev16	_dst, _src
-#define	BSWAP32(_src, _dst, _tmp)		\
-	rev	_dst, _src
+#define	BSWAP16(_src, _dst, _tmp)	\
+	andi	_dst, _src, 0xff	;\
+	slli	_dst, _dst, 8		;\
+	srli	_tmp, _src, 8		;\
+	and	_tmp, _tmp, 0xff	;\
+	ori	_dst, _dst, _tmp
+
+#define BSWAP32(_src, _dst, _tmp)	\
+	li	v1, 0xff00		;\
+	slli	_dst, _src, 24		;\
+	srli	_tmp, _src, 24		;\
+	ori	_dst, _dst, _tmp	;\
+	and	_tmp, _src, v1		;\
+	slli	_tmp, _src, 8		;\
+	ori	_dst, _dst, _tmp	;\
+	srli	_tmp, _src, 8		;\
+	and	_tmp, _tmp, v1		;\
+	ori	_dst, _dst, _tmp
 
 #else
 
-#define	BSWAP16(_src, _dst, _tmp)		\
-	mov	_tmp, _src, ror #8		;\
-	orr	_tmp, _tmp, _tmp, lsr #16	;\
-	bic	_dst, _tmp, _tmp, lsl #16
-
-#define	BSWAP32(_src, _dst, _tmp)		\
-	eor	_tmp, _src, _src, ror #16	;\
-	bic	_tmp, _tmp, #0x00FF0000		;\
-	mov	_dst, _src, ror #8		;\
-	eor	_dst, _dst, _tmp, lsr #8
-
-#endif
+#include <sys/stdint.h>
+__BEGIN_DECLS
 
+#define	__BYTE_SWAP_U64_VARIABLE __byte_swap_u64_variable
+static __inline uint64_t
+__byte_swap_u64_variable(uint64_t v)
+{
+	const uint64_t m1 = 0x0000ffff0000ffffull;
+	const uint64_t m0 = 0x00ff00ff00ff00ffull;
 
-#else
+	v = (v >> 32) | (v << 32);
+	v = ((v >> 16) & m1) | ((v & m1) << 16);
+	v = ((v >> 8) & m0) | ((v & m0) << 8);
 
-#ifdef __GNUC__
-#include <sys/types.h>
-__BEGIN_DECLS
+	return v;
+}
 
 #define	__BYTE_SWAP_U32_VARIABLE __byte_swap_u32_variable
 static __inline uint32_t
 __byte_swap_u32_variable(uint32_t v)
 {
-	uint32_t t1;
-
-#ifdef _ARM_ARCH_6
-	if (!__builtin_constant_p(v)) {
-		__asm("rev\t%0, %1" : "=r" (v) : "0" (v));
-		return v;
-	}
-#endif
+	const uint32_t m = 0xff00ff;
 
-	t1 = v ^ ((v << 16) | (v >> 16));
-	t1 &= 0xff00ffffU;
-	v = (v >> 8) | (v << 24);
-	v ^= (t1 >> 8);
+	v = (v >> 16) | (v << 16);
+	v = ((v >> 8) & m) | ((v & m) << 8);
 
 	return v;
 }
@@ -88,34 +88,12 @@ __byte_swap_u32_variable(uint32_t v)
 static __inline uint16_t
 __byte_swap_u16_variable(uint16_t v)
 {
-
-#ifdef _ARM_ARCH_6
-	if (!__builtin_constant_p(v)) {
-		uint32_t v32 = v;
-		__asm("rev16\t%0, %1" : "=r" (v32) : "0" (v32));
-		return (uint16_t)v32;
-	}
-#elif !defined(__thumb__) && 0	/* gcc produces decent code for this */
-	if (!__builtin_constant_p(v)) {
-		uint32_t v0 = v;
-		__asm volatile(
-			"mov	%0, %1, ror #8\n"
-			"orr	%0, %0, %0, lsr #16\n"
-			"bic	%0, %0, %0, lsl #16"
-		: "=&r" (v0)
-		: "0" (v0));
-		return (uint16_t)v0;
-	}
-#endif
-	v &= 0xffff;
-	v = (uint16_t)((v >> 8) | (v << 8));
-
-	return v;
+	/*LINTED*/
+	return (uint16_t)((v >> 8) | (v << 8));
 }
 
 __END_DECLS
-#endif
 
 #endif	/* _LOCORE */
 
-#endif /* _ARM_BYTE_SWAP_H_ */
+#endif /* _RISCV_BYTE_SWAP_H_ */

package/libc/include/generic-netbsd/machine/cdefs.h

@@ -1,3 +1,8 @@
-/*	$NetBSD: cdefs.h,v 1.1 2002/12/09 12:15:59 scw Exp $	*/
+/* $NetBSD: cdefs.h,v 1.2 2023/05/07 12:41:48 skrll Exp $ */
 
-#include <powerpc/cdefs.h>
+#ifndef _RISCV_CDEFS_H_
+#define _RISCV_CDEFS_H_
+
+#define	__ALIGNBYTES	((size_t)(__BIGGEST_ALIGNMENT__ - 1U))
+
+#endif /* _RISCV_CDEFS_H_ */

package/libc/include/generic-netbsd/machine/cpu.h

@@ -1,10 +1,11 @@
-/*	$NetBSD: cpu.h,v 1.8 2021/08/03 09:25:43 rin Exp $	*/
+/* $NetBSD: cpu.h,v 1.16 2024/08/04 08:16:25 skrll Exp $ */
 
-/*
- * Copyright 2002 Wasabi Systems, Inc.
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
- * Written by Eduardo Horvath for Wasabi Systems, Inc.
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -14,18 +15,11 @@
  * 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 for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 WASABI SYSTEMS, INC
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * 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
@@ -35,31 +29,214 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_EVBPPC_CPU_H_
-#define	_EVBPPC_CPU_H_
+#ifndef _RISCV_CPU_H_
+#define _RISCV_CPU_H_
+
+#if defined(_KERNEL) || defined(_KMEMUSER)
+
+struct clockframe {
+	vaddr_t cf_epc;
+	register_t cf_status;
+	int cf_intr_depth;
+};
+
+#define CLKF_USERMODE(cf)	(((cf)->cf_status & SR_SPP) == 0)
+#define CLKF_PC(cf)		((cf)->cf_epc)
+#define CLKF_INTR(cf)		((cf)->cf_intr_depth > 1)
+
+#include <sys/cpu_data.h>
+#include <sys/device_if.h>
+#include <sys/evcnt.h>
+#include <sys/intr.h>
+
+struct cpu_info {
+	struct cpu_data ci_data;
+	device_t ci_dev;
+	cpuid_t ci_cpuid;
+	struct lwp *ci_curlwp;
+	struct lwp *ci_onproc;		/* current user LWP / kthread */
+	struct lwp *ci_softlwps[SOFTINT_COUNT];
+	struct trapframe *ci_ddb_regs;
+
+	uint64_t ci_lastintr;
+	uint64_t ci_lastintr_scheduled;
+	struct evcnt ci_ev_timer;
+	struct evcnt ci_ev_timer_missed;
+
+	u_long ci_cpu_freq;		/* CPU frequency */
+	int ci_mtx_oldspl;
+	int ci_mtx_count;
+	int ci_cpl;
+	volatile u_int ci_intr_depth;
+
+	int ci_want_resched __aligned(COHERENCY_UNIT);
+	u_int ci_softints;
+
+	tlb_asid_t ci_pmap_asid_cur;
+
+	union pmap_segtab *ci_pmap_user_segtab;
+#ifdef _LP64
+	union pmap_segtab *ci_pmap_user_seg0tab;
+#endif
+
+	struct evcnt ci_ev_fpu_saves;
+	struct evcnt ci_ev_fpu_loads;
+	struct evcnt ci_ev_fpu_reenables;
+
+	struct pmap_tlb_info *ci_tlb_info;
 
-#if defined(_KERNEL) && !defined(_MODULE)
-#ifdef _KERNEL_OPT
-#include "opt_ppcarch.h"
-#include "opt_multiprocessor.h"
+#ifdef MULTIPROCESSOR
+	volatile u_long ci_flags;
+#define	CPUF_PRIMARY	__BIT(0)		/* CPU is primary CPU */
+#define	CPUF_PRESENT	__BIT(1)		/* CPU is present */
+#define	CPUF_RUNNING	__BIT(2)		/* CPU is running */
+#define	CPUF_PAUSED	__BIT(3)		/* CPU is paused */
+
+	void *ci_intcsoftc;
+	volatile u_long ci_request_ipis;
+						/* bitmask of IPIs requested */
+	u_long ci_active_ipis;			/* bitmask of IPIs being serviced */
+
+	struct evcnt ci_evcnt_all_ipis;		/* aggregated IPI counter */
+	struct evcnt ci_evcnt_per_ipi[NIPIS];	/* individual IPI counters */
+	struct evcnt ci_evcnt_synci_onproc_rqst;
+	struct evcnt ci_evcnt_synci_deferred_rqst;
+	struct evcnt ci_evcnt_synci_ipi_rqst;
+
+	kcpuset_t *ci_shootdowncpus;
+	kcpuset_t *ci_multicastcpus;
+	kcpuset_t *ci_watchcpus;
+	kcpuset_t *ci_ddbcpus;
 #endif
 
-#ifdef PPC_IBM4XX
-extern int fake_mapiodev;
+#if defined(GPROF) && defined(MULTIPROCESSOR)
+	struct gmonparam *ci_gmon;	/* MI per-cpu GPROF */
 #endif
+};
+
+#endif /* _KERNEL || _KMEMUSER */
+
+#ifdef _KERNEL
+
+extern struct cpu_info cpu_info_store[];
+extern cpuid_t cpu_bphartid;
+extern u_int cpu_hartindex[];
 
 #ifdef MULTIPROCESSOR
-#define CPU_MAXNUM 2
-#else
-#define CPU_MAXNUM 1
+
+void cpu_hatch(struct cpu_info *, unsigned long);
+
+void cpu_init_secondary_processor(u_int);
+void cpu_boot_secondary_processors(void);
+void cpu_mpstart(void);
+bool cpu_hatched_p(u_int);
+
+void cpu_clr_mbox(u_int);
+void cpu_set_hatched(u_int);
+
+
+void	cpu_halt(void);
+void	cpu_halt_others(void);
+bool	cpu_is_paused(cpuid_t);
+void	cpu_pause(void);
+void	cpu_pause_others(void);
+void	cpu_resume(cpuid_t);
+void	cpu_resume_others(void);
+void	cpu_debug_dump(void);
+
+extern kcpuset_t *cpus_running;
+extern kcpuset_t *cpus_hatched;
+extern kcpuset_t *cpus_paused;
+extern kcpuset_t *cpus_resumed;
+extern kcpuset_t *cpus_halted;
+
+/*
+ * definitions of cpu-dependent requirements
+ * referenced in generic code
+ */
+
+/*
+ * Send an inter-processor interrupt to each other CPU (excludes curcpu())
+ */
+void cpu_broadcast_ipi(int);
+
+/*
+ * Send an inter-processor interrupt to CPUs in kcpuset (excludes curcpu())
+ */
+void cpu_multicast_ipi(const kcpuset_t *, int);
+
+/*
+ * Send an inter-processor interrupt to another CPU.
+ */
+int cpu_send_ipi(struct cpu_info *, int);
+
 #endif
 
-#endif	/* _KERNEL && !_MODULE */
+struct lwp;
+static inline struct cpu_info *lwp_getcpu(struct lwp *);
 
-#include <powerpc/cpu.h>
+register struct lwp *riscv_curlwp __asm("tp");
+#define	curlwp		riscv_curlwp
+#define	curcpu()	lwp_getcpu(curlwp)
+#define	curpcb		((struct pcb *)lwp_getpcb(curlwp))
 
-#if defined(_KERNEL)
-extern char module_machine_booke[];
+static inline cpuid_t
+cpu_number(void)
+{
+#ifdef MULTIPROCESSOR
+	return curcpu()->ci_cpuid;
+#else
+	return 0;
 #endif
+}
+
+void	cpu_proc_fork(struct proc *, struct proc *);
+void	cpu_signotify(struct lwp *);
+void	cpu_need_proftick(struct lwp *l);
+void	cpu_boot_secondary_processors(void);
+
+#define CPU_INFO_ITERATOR	cpuid_t
+#ifdef MULTIPROCESSOR
+#define	CPU_IS_PRIMARY(ci)	((ci)->ci_flags & CPUF_PRIMARY)
+#define	CPU_INFO_FOREACH(cii, ci)		\
+    cii = 0, ci = &cpu_info_store[0];		\
+    ci != NULL;					\
+    cii++, ncpu ? (ci = cpu_infos[cii])		\
+		: (ci = NULL)
+#else
+#define CPU_IS_PRIMARY(ci)	true
+#define CPU_INFO_FOREACH(cii, ci) \
+	(cii) = 0, (ci) = curcpu(); (cii) == 0; (cii)++
+#endif
+
+#define CPU_INFO_CURPMAP(ci)	(curlwp->l_proc->p_vmspace->vm_map.pmap)
+
+static inline void
+cpu_dosoftints(void)
+{
+	extern void dosoftints(void);
+	struct cpu_info * const ci = curcpu();
+	if (ci->ci_intr_depth == 0
+	    && (ci->ci_data.cpu_softints >> ci->ci_cpl) > 0)
+		dosoftints();
+}
+
+static inline bool
+cpu_intr_p(void)
+{
+	return curcpu()->ci_intr_depth > 0;
+}
+
+#define LWP_PC(l)	cpu_lwp_pc(l)
+
+vaddr_t	cpu_lwp_pc(struct lwp *);
+
+static inline void
+cpu_idle(void)
+{
+	asm volatile("wfi" ::: "memory");
+}
+
+#endif /* _KERNEL */
 
-#endif	/* _EVBPPC_CPU_H_ */
+#endif /* _RISCV_CPU_H_ */

package/libc/include/generic-netbsd/machine/cputypes.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: cputypes.h,v 1.16.4.1 2024/10/03 16:11:36 martin Exp $	*/
+/*	$NetBSD: cputypes.h,v 1.20 2025/01/31 11:47:34 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -50,6 +50,7 @@
 #define CPU_ID_BROADCOM		0x42000000 /* 'B' */
 #define CPU_ID_CAVIUM		0x43000000 /* 'C' */
 #define CPU_ID_DEC		0x44000000 /* 'D' */
+#define CPU_ID_FUJITSU		0x46000000 /* 'F' */
 #define CPU_ID_INFINEON		0x49000000 /* 'I' */
 #define CPU_ID_MOTOROLA		0x4d000000 /* 'M' */
 #define CPU_ID_NVIDIA		0x4e000000 /* 'N' */
@@ -177,6 +178,11 @@
 #define CPU_ID_NEOVERSEN1R3	0x413fd0c0
 #define CPU_ID_NEOVERSEE1R1	0x411fd4a0
 #define CPU_ID_CORTEXA77R0	0x410fd0d0
+#define CPU_ID_NEOVERSEV1R1	0x411fd400
+#define CPU_ID_CORTEXA710R2	0x412fd470
+#define CPU_ID_NEOVERSEN2R0	0x410fd490
+#define CPU_ID_CORTEXA520R0	0x410fd800
+#define CPU_ID_CORTEXA720R0	0x410fd810
 
 #define CPU_ID_CORTEX_P(n)	((n & 0xff0fe000) == 0x410fc000)
 #define CPU_ID_CORTEX_A5_P(n)	((n & 0xff0ff0f0) == 0x410fc050)
@@ -209,9 +215,14 @@
 #define CPU_ID_THUNDERX83XXRX	0x43000a30
 #define CPU_ID_THUNDERX2RX	0x43000af0
 
+#define CPU_ID_A64FX		0x460f0010
+
 #define CPU_ID_AMPERE1		0xc00fac30
 #define CPU_ID_AMPERE1A		0xc00fac40
 
+#define CPU_ID_ORYON		0x510f0010
+#define CPU_ID_ORYON_P(n)	((n & 0xff0ffff0) == CPU_ID_ORYON)
+
 /*
  * Chip-specific errata. These defines are intended to be
  * booleans used within if statements. When an appropriate

package/libc/include/generic-netbsd/machine/disklabel.h

@@ -1,9 +1,12 @@
-/*	$NetBSD: disklabel.h,v 1.8 2013/05/16 19:06:44 christos Exp $	*/
+/* $NetBSD: disklabel.h,v 1.2 2022/05/24 19:37:39 andvar Exp $ */
 
-/*
- * Copyright (c) 1994 Christopher G. Demetriou
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -12,58 +15,54 @@
  * 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.
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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_
+#ifndef _RISCV_DISKLABEL_H_
+#define _RISCV_DISKLABEL_H_
 
-#define	MAXPARTITIONS	16		/* number of partitions */
-#define	RAW_PART	2		/* raw partition: XX?c */
-
-#ifdef EVBPPC_HAS_MBR
-#define LABELUSESMBR	1		/* use MBR partitionning */
-#define	LABELSECTOR	1		/* sector containing label */
-#define	LABELOFFSET	0		/* offset of label in sector */
-/* Pull in MBR partition definitions. */
-#if HAVE_NBTOOL_CONFIG_H
-#include <nbinclude/sys/bootblock.h>
-#else
-#include <sys/bootblock.h>
-#endif /* HAVE_NBTOOL_CONFIG_H */
-#else
-#define LABELUSESMBR	0		/* no MBR partitionning */
-#define	LABELSECTOR	0		/* sector containing label */
-#define	LABELOFFSET	64		/* offset of label in sector */
-#endif /* EVBPPC_HAS_MBR */
+#define LABELUSESMBR		1	/* use MBR partitionning */
+#define LABELSECTOR		1	/* sector containing label */
+#define LABELOFFSET		0	/* offset of label in sector */
+#define MAXPARTITIONS		16	/* number of partitions */
+#define RAW_PART		2	/* raw partition: XX?c */
 
 #if HAVE_NBTOOL_CONFIG_H
 #include <nbinclude/sys/dkbad.h>
+#include <nbinclude/sys/bootblock.h>
 #else
 #include <sys/dkbad.h>
+#include <sys/bootblock.h>
 #endif /* HAVE_NBTOOL_CONFIG_H */
 
 struct cpu_disklabel {
-#ifdef EVBPPC_HAS_MBR
 	struct mbr_partition mbrparts[MBR_PART_COUNT];
-#endif
 #define __HAVE_DISKLABEL_DKBAD
-	struct dkbad bad;		/* bad-sector information */
+	struct dkbad bad;
 };
 
-#endif /* _MACHINE_DISKLABEL_H_ */
+#ifdef _KERNEL
+struct buf;
+struct disklabel;
+
+/* for readdisklabel.  rv != 0 -> matches, msg == NULL -> success */
+int	mbr_label_read(dev_t, void (*)(struct buf *), struct disklabel *,
+	    struct cpu_disklabel *, const char **, int *, int *);
+
+/* for writedisklabel.  rv == 0 -> doesn't match, rv > 0 -> success */
+int	mbr_label_locate(dev_t, void (*)(struct buf *),
+	    struct disklabel *, struct cpu_disklabel *, int *, int *);
+#endif /* _KERNEL */
+
+#endif /* _RISCV_DISKLABEL_H_ */