Module Name:    src
Committed By:   skrll
Date:           Thu May 10 10:27:11 UTC 2012

Modified Files:
        src/sys/arch/acorn32/acorn32: rpc_machdep.c
        src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c if_cs.c rsbus_io.c
        src/sys/arch/acorn32/include: podulebus_machdep.h
        src/sys/arch/acorn32/podulebus: if_ie.c if_ne_pbus.c netslot.c
            podulebus_io.c
        src/sys/arch/acorn32/stand/boot32: boot32.c
        src/sys/arch/acorn32/stand/lib: riscoscalls.h

Log Message:
_int*_t -> uint*_t

Same code before and after.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/acorn32/eb7500atx/if_cs.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/acorn32/eb7500atx/rsbus_io.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/acorn32/include/podulebus_machdep.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn32/podulebus/if_ne_pbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn32/podulebus/netslot.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/acorn32/podulebus/podulebus_io.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/acorn32/stand/boot32/boot32.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn32/stand/lib/riscoscalls.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.82 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.83
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.82	Tue Jul 19 15:59:52 2011
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c	Thu May 10 10:27:09 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_machdep.c,v 1.82 2011/07/19 15:59:52 dyoung Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.83 2012/05/10 10:27:09 skrll Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.82 2011/07/19 15:59:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.83 2012/05/10 10:27:09 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -134,7 +134,7 @@ char *boot_args = NULL;		/* holds the pr
 extern char *booted_kernel;	/* used for ioctl to retrieve booted kernel */
 
 extern int       *vidc_base;
-extern u_int32_t  iomd_base;
+extern uint32_t  iomd_base;
 extern struct bus_space iomd_bs_tag;
 
 paddr_t physical_start;

Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.21 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.22
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.21	Tue Jul 19 15:59:52 2011
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c	Thu May 10 10:27:09 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: eb7500atx_machdep.c,v 1.21 2011/07/19 15:59:52 dyoung Exp $	*/
+/*	$NetBSD: eb7500atx_machdep.c,v 1.22 2012/05/10 10:27:09 skrll Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.21 2011/07/19 15:59:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.22 2012/05/10 10:27:09 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -137,7 +137,7 @@ char *boot_args = NULL;		/* holds the pr
 extern char *booted_kernel;	/* used for ioctl to retrieve booted kernel */
 
 extern int       *vidc_base;
-extern u_int32_t  iomd_base;
+extern uint32_t  iomd_base;
 extern struct bus_space iomd_bs_tag;
 
 paddr_t physical_start;

Index: src/sys/arch/acorn32/eb7500atx/if_cs.c
diff -u src/sys/arch/acorn32/eb7500atx/if_cs.c:1.8 src/sys/arch/acorn32/eb7500atx/if_cs.c:1.9
--- src/sys/arch/acorn32/eb7500atx/if_cs.c:1.8	Thu Feb  2 19:42:57 2012
+++ src/sys/arch/acorn32/eb7500atx/if_cs.c	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cs.c,v 1.8 2012/02/02 19:42:57 tls Exp $	*/
+/*	$NetBSD: if_cs.c,v 1.9 2012/05/10 10:27:10 skrll Exp $	*/
 
 /*
  * Copyright (c) 2004 Christopher Gilbert
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.8 2012/02/02 19:42:57 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.9 2012/05/10 10:27:10 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -117,7 +117,7 @@ static struct bus_space cs_rsbus_bs_tag;
 int	cs_rsbus_probe(device_t, cfdata_t, void *);
 void	cs_rsbus_attach(device_t, device_t, void *);
 
-static u_int8_t cs_rbus_read_1(struct cs_softc *, bus_size_t);
+static uint8_t cs_rbus_read_1(struct cs_softc *, bus_size_t);
 
 CFATTACH_DECL_NEW(cs_rsbus, sizeof(struct cs_softc),
 	cs_rsbus_probe, cs_rsbus_attach, NULL, NULL);
@@ -211,7 +211,7 @@ cs_rsbus_attach(device_t parent, device_
  * Provide a function to correctly do reading from oddly numbered registers
  * as you can't simply shift the register number
  */
-static u_int8_t
+static uint8_t
 cs_rbus_read_1(struct cs_softc *sc, bus_size_t a)
 {
 	bus_size_t offset;

Index: src/sys/arch/acorn32/eb7500atx/rsbus_io.c
diff -u src/sys/arch/acorn32/eb7500atx/rsbus_io.c:1.3 src/sys/arch/acorn32/eb7500atx/rsbus_io.c:1.4
--- src/sys/arch/acorn32/eb7500atx/rsbus_io.c:1.3	Tue Jul 19 15:59:52 2011
+++ src/sys/arch/acorn32/eb7500atx/rsbus_io.c	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsbus_io.c,v 1.3 2011/07/19 15:59:52 dyoung Exp $	*/
+/*	$NetBSD: rsbus_io.c,v 1.4 2012/05/10 10:27:10 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsbus_io.c,v 1.3 2011/07/19 15:59:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus_io.c,v 1.4 2012/05/10 10:27:10 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -132,7 +132,7 @@ struct bus_space rsbus_bs_tag = {
 /* Rough-and-ready implementations from arm26 */
 void
 rsbus_bs_rr_1(void *cookie, bus_space_handle_t bsh,
-			bus_size_t offset, u_int8_t *datap, bus_size_t count)
+			bus_size_t offset, uint8_t *datap, bus_size_t count)
 {
 	int i;
 
@@ -142,7 +142,7 @@ rsbus_bs_rr_1(void *cookie, bus_space_ha
 
 void
 rsbus_bs_rr_2(void *cookie, bus_space_handle_t bsh,
-			bus_size_t offset, u_int16_t *datap, bus_size_t count)
+			bus_size_t offset, uint16_t *datap, bus_size_t count)
 {
 	int i;
 
@@ -152,7 +152,7 @@ rsbus_bs_rr_2(void *cookie, bus_space_ha
 
 void
 rsbus_bs_wr_1(void *cookie, bus_space_handle_t bsh,
-			 bus_size_t offset, u_int8_t const *datap,
+			 bus_size_t offset, uint8_t const *datap,
 			 bus_size_t count)
 {
 	int i;
@@ -163,7 +163,7 @@ rsbus_bs_wr_1(void *cookie, bus_space_ha
 
 void
 rsbus_bs_wr_2(void *cookie, bus_space_handle_t bsh,
-			 bus_size_t offset, u_int16_t const *datap,
+			 bus_size_t offset, uint16_t const *datap,
 			 bus_size_t count)
 {
 	int i;
@@ -174,7 +174,7 @@ rsbus_bs_wr_2(void *cookie, bus_space_ha
 
 void
 rsbus_bs_sr_1(void *cookie, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int8_t value, bus_size_t count)
+		       bus_size_t offset, uint8_t value, bus_size_t count)
 {
 	int i;
 
@@ -184,7 +184,7 @@ rsbus_bs_sr_1(void *cookie, bus_space_ha
 
 void
 rsbus_bs_sr_2(void *cookie, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int16_t value, bus_size_t count)
+		       bus_size_t offset, uint16_t value, bus_size_t count)
 {
 	int i;
 

Index: src/sys/arch/acorn32/include/podulebus_machdep.h
diff -u src/sys/arch/acorn32/include/podulebus_machdep.h:1.4 src/sys/arch/acorn32/include/podulebus_machdep.h:1.5
--- src/sys/arch/acorn32/include/podulebus_machdep.h:1.4	Tue Jul 19 15:59:53 2011
+++ src/sys/arch/acorn32/include/podulebus_machdep.h	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus_machdep.h,v 1.4 2011/07/19 15:59:53 dyoung Exp $ */
+/* $NetBSD: podulebus_machdep.h,v 1.5 2012/05/10 10:27:10 skrll Exp $ */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -153,7 +153,7 @@ extern podule_t podules[MAX_PODULES + MA
 int matchpodule(struct podule_attach_args *pa,
     int manufacturer, int product, int required_slot);
 
-void netslot_ea(u_int8_t *buffer);
+void netslot_ea(uint8_t *buffer);
 
 extern void *podulebus_irq_establish(podulebus_intr_handle_t, int,
     int (*)(void *), void *, struct evcnt *);

Index: src/sys/arch/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.30 src/sys/arch/acorn32/podulebus/if_ie.c:1.31
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.30	Fri Jun  3 07:35:37 2011
+++ src/sys/arch/acorn32/podulebus/if_ie.c	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.30 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: if_ie.c,v 1.31 2012/05/10 10:27:10 skrll Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.30 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.31 2012/05/10 10:27:10 skrll Exp $");
 
 #define IGNORE_ETHER1_IDROM_CHECKSUM
 
@@ -312,7 +312,7 @@ void ieattach ( device_t parent, device_
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	int i;
 	char idrom[32];
-	u_int8_t hwaddr[ETHER_ADDR_LEN];
+	uint8_t hwaddr[ETHER_ADDR_LEN];
 
 	/* Check a few things about the attach args */
 

Index: src/sys/arch/acorn32/podulebus/if_ne_pbus.c
diff -u src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.16 src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.17
--- src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.16	Tue Jul 19 15:59:54 2011
+++ src/sys/arch/acorn32/podulebus/if_ne_pbus.c	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_pbus.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $	*/
+/*	$NetBSD: if_ne_pbus.c,v 1.17 2012/05/10 10:27:10 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pbus.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pbus.c,v 1.17 2012/05/10 10:27:10 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -105,11 +105,11 @@ CFATTACH_DECL_NEW(ne_pbus, sizeof(struct
 /*
  * Prototypes for interface specific routines
  */
-static u_int8_t *em_ea		(struct ne_pbus_softc *sc, u_int8_t *buffer);
+static uint8_t *em_ea		(struct ne_pbus_softc *sc, uint8_t *buffer);
 static void em_postattach	(struct ne_pbus_softc *sc);
 static void eh600_postattach	(struct ne_pbus_softc *sc);
 static void eh600_preattach	(struct ne_pbus_softc *sc);
-static u_int8_t *eh600_ea	(struct ne_pbus_softc *sc, u_int8_t *buffer);
+static uint8_t *eh600_ea	(struct ne_pbus_softc *sc, uint8_t *buffer);
 
 void	eh600_init_media        (struct dp8390_softc *);
 
@@ -139,8 +139,8 @@ struct ne_clone {
 #define NE_SPACE_EASI           2
 	unsigned char	reserved0;	/* not used (padding) */
 	const char	*name;		/* name */
-	u_int8_t *	(*getea)	/* do this to get the MAC */
-			    (struct ne_pbus_softc *sc, u_int8_t *buffer);
+	uint8_t *	(*getea)	/* do this to get the MAC */
+			    (struct ne_pbus_softc *sc, uint8_t *buffer);
 	void		(*preattach)	/* do this before attach */
 			    (struct ne_pbus_softc *sc);
 	void		(*postattach)	/* do this after attach */
@@ -236,8 +236,8 @@ ne_pbus_attach(device_t parent, device_t
 
  	int *media, nmedia, defmedia;
 	struct ne_clone *ne = NULL;
-	u_int8_t buffer[6];
-	u_int8_t *myea;
+	uint8_t buffer[6];
+	uint8_t *myea;
 	int loop;
 
 	dsc->sc_dev = self;
@@ -627,7 +627,7 @@ eh600_ea(struct ne_pbus_softc *sc, uint8
 			pod_addr |= (POD_READ(address + 28) << 24);
 
 			if (pod_addr < 0x800) {
-				u_int8_t tmp;
+				uint8_t tmp;
 				int addr_index = 0;
 				int found_ether = 0;
 

Index: src/sys/arch/acorn32/podulebus/netslot.c
diff -u src/sys/arch/acorn32/podulebus/netslot.c:1.9 src/sys/arch/acorn32/podulebus/netslot.c:1.10
--- src/sys/arch/acorn32/podulebus/netslot.c:1.9	Fri Jun  3 07:35:37 2011
+++ src/sys/arch/acorn32/podulebus/netslot.c	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: netslot.c,v 1.9 2011/06/03 07:35:37 matt Exp $	*/
+/*	$NetBSD: netslot.c,v 1.10 2012/05/10 10:27:10 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -35,7 +35,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.9 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.10 2012/05/10 10:27:10 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -143,7 +143,7 @@ netslotscan(device_t dev)
 }
 
 void
-netslot_ea(u_int8_t *buffer)
+netslot_ea(uint8_t *buffer)
 {
 	/* Build station address from machine ID */
 	buffer[0] = 0x00;

Index: src/sys/arch/acorn32/podulebus/podulebus_io.c
diff -u src/sys/arch/acorn32/podulebus/podulebus_io.c:1.7 src/sys/arch/acorn32/podulebus/podulebus_io.c:1.8
--- src/sys/arch/acorn32/podulebus/podulebus_io.c:1.7	Tue Jul 19 15:59:54 2011
+++ src/sys/arch/acorn32/podulebus/podulebus_io.c	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: podulebus_io.c,v 1.7 2011/07/19 15:59:54 dyoung Exp $	*/
+/*	$NetBSD: podulebus_io.c,v 1.8 2012/05/10 10:27:10 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus_io.c,v 1.7 2011/07/19 15:59:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus_io.c,v 1.8 2012/05/10 10:27:10 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -184,7 +184,7 @@ podulebus_bs_barrier(void *t, bus_space_
 
 void
 podulebus_bs_rr_1(void *cookie, bus_space_handle_t bsh,
-			bus_size_t offset, u_int8_t *datap, bus_size_t count)
+			bus_size_t offset, uint8_t *datap, bus_size_t count)
 {
 	int i;
 
@@ -194,7 +194,7 @@ podulebus_bs_rr_1(void *cookie, bus_spac
 
 void
 podulebus_bs_rr_2(void *cookie, bus_space_handle_t bsh,
-			bus_size_t offset, u_int16_t *datap, bus_size_t count)
+			bus_size_t offset, uint16_t *datap, bus_size_t count)
 {
 	int i;
 
@@ -204,7 +204,7 @@ podulebus_bs_rr_2(void *cookie, bus_spac
 
 void
 podulebus_bs_wr_1(void *cookie, bus_space_handle_t bsh,
-			 bus_size_t offset, u_int8_t const *datap,
+			 bus_size_t offset, uint8_t const *datap,
 			 bus_size_t count)
 {
 	int i;
@@ -215,7 +215,7 @@ podulebus_bs_wr_1(void *cookie, bus_spac
 
 void
 podulebus_bs_wr_2(void *cookie, bus_space_handle_t bsh,
-			 bus_size_t offset, u_int16_t const *datap,
+			 bus_size_t offset, uint16_t const *datap,
 			 bus_size_t count)
 {
 	int i;
@@ -226,7 +226,7 @@ podulebus_bs_wr_2(void *cookie, bus_spac
 
 void
 podulebus_bs_sr_1(void *cookie, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int8_t value, bus_size_t count)
+		       bus_size_t offset, uint8_t value, bus_size_t count)
 {
 	int i;
 
@@ -236,7 +236,7 @@ podulebus_bs_sr_1(void *cookie, bus_spac
 
 void
 podulebus_bs_sr_2(void *cookie, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int16_t value, bus_size_t count)
+		       bus_size_t offset, uint16_t value, bus_size_t count)
 {
 	int i;
 

Index: src/sys/arch/acorn32/stand/boot32/boot32.c
diff -u src/sys/arch/acorn32/stand/boot32/boot32.c:1.38 src/sys/arch/acorn32/stand/boot32/boot32.c:1.39
--- src/sys/arch/acorn32/stand/boot32/boot32.c:1.38	Sat Jan 22 19:19:15 2011
+++ src/sys/arch/acorn32/stand/boot32/boot32.c	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot32.c,v 1.38 2011/01/22 19:19:15 joerg Exp $	*/
+/*	$NetBSD: boot32.c,v 1.39 2012/05/10 10:27:10 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2002 Reinoud Zandijk
@@ -657,7 +657,7 @@ vsync_rate(void)
 	time0 = os_read_monotonic_time();
 	while (os_read_monotonic_time() - time0 < 100)
 		continue;
-	return (u_int8_t)(count0 - osbyte_read(osbyte_VAR_VSYNC_TIMER));
+	return (uint8_t)(count0 - osbyte_read(osbyte_VAR_VSYNC_TIMER));
 }
 
 void

Index: src/sys/arch/acorn32/stand/lib/riscoscalls.h
diff -u src/sys/arch/acorn32/stand/lib/riscoscalls.h:1.11 src/sys/arch/acorn32/stand/lib/riscoscalls.h:1.12
--- src/sys/arch/acorn32/stand/lib/riscoscalls.h:1.11	Sun Aug  2 11:20:37 2009
+++ src/sys/arch/acorn32/stand/lib/riscoscalls.h	Thu May 10 10:27:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: riscoscalls.h,v 1.11 2009/08/02 11:20:37 gavan Exp $	*/
+/*	$NetBSD: riscoscalls.h,v 1.12 2012/05/10 10:27:10 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -99,7 +99,7 @@
 
 #ifndef __ASSEMBLER__
 typedef struct os_error {
-	u_int32_t errnum;
+	uint32_t errnum;
 	char errmess[252];
 } os_error;
 
@@ -387,26 +387,26 @@ extern os_error xcache_control(u_int, u_
 #ifndef __ASSEMBLER__
 
 struct filecore_disc {
-	u_int8_t	log2secsize;
-	u_int8_t	secspertrack;
-	u_int8_t	heads;
-	u_int8_t	density;
-	u_int8_t	idlen;
-	u_int8_t	log2bpmp;
-	u_int8_t	skew;
-	u_int8_t	bootoption;
-	u_int8_t	lowsector;
-	u_int8_t	nzones;
-	u_int16_t	zone_spare;
-	u_int32_t	root;
-	u_int32_t	disc_size;
-	u_int16_t	disc_id;
+	uint8_t		log2secsize;
+	uint8_t		secspertrack;
+	uint8_t		heads;
+	uint8_t		density;
+	uint8_t		idlen;
+	uint8_t		log2bpmp;
+	uint8_t		skew;
+	uint8_t		bootoption;
+	uint8_t		lowsector;
+	uint8_t		nzones;
+	uint16_t	zone_spare;
+	uint32_t	root;
+	uint32_t	disc_size;
+	uint16_t	disc_id;
 	char		disc_name[10];
-	u_int32_t	disc_type;
-	u_int32_t	disc_size_hi;
-	u_int8_t	share_size;
-	u_int8_t	big_flag;
-	u_int8_t	reserved[22];
+	uint32_t	disc_type;
+	uint32_t	disc_size_hi;
+	uint8_t		share_size;
+	uint8_t		big_flag;
+	uint8_t		reserved[22];
 };
 
 struct filecore_daddr64 {

Reply via email to