backout premature

7 files changed, 57 insertions, 56 deletions

diff --git a/sys/arch/macppc/include/apmvar.h b/sys/arch/macppc/include/apmvar.h
index bc9b67fb307..241bb36fb63 100644
--- a/sys/arch/macppc/include/apmvar.h
+++ b/sys/arch/macppc/include/apmvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmvar.h,v 1.3 2002/09/15 02:02:43 deraadt Exp $	*/
+/*	$OpenBSD: apmvar.h,v 1.4 2002/09/15 09:01:58 deraadt Exp $	*/
 
 /*
  *  Copyright (c) 2001 Alexander Guy
@@ -54,7 +54,7 @@
 #define		APM_BATT_LIFE_UNKNOWN	0xff
 
 #define		APM_NOEVENT		0x0000
-#define		APM_STANDBY_REQ		0x0001
+#define		APM_STANDBY_REQ		0x0001 
 #define		APM_SUSPEND_REQ		0x0002
 #define		APM_NORMAL_RESUME	0x0003
 #define		APM_CRIT_RESUME		0x0004 /* suspend/resume happened
@@ -80,9 +80,9 @@
  *
  * This software may be used, modified, copied, and distributed, in
  * both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author 
+ * responsible for the proper functioning of this software, nor does 
+ * the author assume any responsibility for damages incurred with its 
  * use.
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
diff --git a/sys/arch/macppc/include/bus.h b/sys/arch/macppc/include/bus.h
index 8b81c45e8da..b863ccaa57e 100644
--- a/sys/arch/macppc/include/bus.h
+++ b/sys/arch/macppc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.7 2002/09/15 02:02:43 deraadt Exp $	*/
+/*	$OpenBSD: bus.h,v 1.8 2002/09/15 09:01:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997 Per Fogelstrom.  All rights reserved.
@@ -82,7 +82,7 @@ static __inline CAT3(u_int,m,_t)					      \
 CAT(bus_space_read_,n)(bus_space_tag_t bst, bus_space_handle_t bsh,	      \
      bus_addr_t ba)							      \
 {									      \
-    if (bst->bus_reverse)						      \
+    if(bst->bus_reverse)						      \
 	return CAT3(in,m,rb)((volatile CAT3(u_int,m,_t) *)(bsh + (ba)));      \
     else								      \
 	return CAT(in,m)((volatile CAT3(u_int,m,_t) *)(bsh + (ba)));	      \
@@ -99,7 +99,7 @@ static __inline void							      \
 CAT(bus_space_write_,n)(bus_space_tag_t bst, bus_space_handle_t bsh,	      \
      bus_addr_t ba, CAT3(u_int,m,_t) x)					      \
 {									      \
-    if (bst->bus_reverse)						      \
+    if(bst->bus_reverse)						      \
 	CAT3(out,m,rb)((volatile CAT3(u_int,m,_t) *)(bsh + (ba)), x);	      \
     else								      \
 	CAT(out,m)((volatile CAT3(u_int,m,_t) *)(bsh + (ba)), x);	      \
@@ -112,7 +112,7 @@ bus_space_write(4,32)
 #define	bus_space_write_8	!!! bus_space_write_8 unimplemented !!!
 
 #define bus_space_read_multi(n, m)					      \
-static __inline void							      \
+static __inline void						       	      \
 CAT(bus_space_read_multi_,n)(bus_space_tag_t bst, bus_space_handle_t bsh,     \
     bus_size_t ba, CAT3(u_int,m,_t) *buf, bus_size_t cnt)		      \
 {									      \
@@ -130,7 +130,7 @@ bus_space_read_multi(4,32)
 #define	bus_space_write_multi_8	!!! bus_space_write_multi_8 not implemented !!!
 
 #define bus_space_write_multi(n, m)					      \
-static __inline void							      \
+static __inline void								      \
 CAT(bus_space_write_multi_,n)(bus_space_tag_t bst, bus_space_handle_t bsh,    \
     bus_size_t ba, const CAT3(u_int,m,_t) *buf, bus_size_t cnt)		      \
 {									      \
@@ -476,8 +476,8 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2,
 #define BUS_SPACE_BARRIER_READ  0x01		/* force read barrier */ 
 #define BUS_SPACE_BARRIER_WRITE 0x02		/* force write barrier */
 /* Compatibility defines */
-#define BUS_BARRIER_READ	BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE	BUS_SPACE_BARRIER_WRITE
+#define BUS_BARRIER_READ        BUS_SPACE_BARRIER_READ
+#define BUS_BARRIER_WRITE       BUS_SPACE_BARRIER_WRITE
 
 
 #define	BUS_DMA_WAITOK		0x000	/* safe to sleep (pseudo-flag) */
@@ -489,7 +489,7 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2,
 #define	BUS_DMA_BUS2		0x020
 #define	BUS_DMA_BUS3		0x040
 #define	BUS_DMA_BUS4		0x080
-#define BUS_DMA_READ		0x100	/* mapping is device -> memory only */
+#define BUS_DMA_READ            0x100	/* mapping is device -> memory only */
 #define	BUS_DMA_WRITE		0x200	/* mapping is memory -> device only */
 #define	BUS_DMA_STREAMING	0x400	/* hint: sequential, unidirectional */
 
diff --git a/sys/arch/macppc/include/conf.h b/sys/arch/macppc/include/conf.h
index 82616fac15a..43a411db94c 100644
--- a/sys/arch/macppc/include/conf.h
+++ b/sys/arch/macppc/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.7 2002/09/15 02:02:43 deraadt Exp $	*/
+/*	$OpenBSD: conf.h,v 1.8 2002/09/15 09:01:58 deraadt Exp $	*/
 /*	$NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $	*/
 
 /*
@@ -38,8 +38,8 @@ cdev_decl(mm);
 
 /* open, close, write, ioctl, kqueue */
 #define cdev_apm_init(c,n) { \
-	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
-	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
+        dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
+        (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
 	(dev_type_mmap((*))) enodev, D_KQFILTER, dev_init(c,n,kqfilter) }
 
diff --git a/sys/arch/macppc/include/cpu.h b/sys/arch/macppc/include/cpu.h
index 436bad8bdfb..99c79deeb5a 100644
--- a/sys/arch/macppc/include/cpu.h
+++ b/sys/arch/macppc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.6 2002/09/15 02:02:43 deraadt Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.7 2002/09/15 09:01:58 deraadt Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 
 #include <powerpc/cpu.h>
 
-/*
+/* 
  * CTL_MACHDEP definitions.
  */
 #define CPU_ALLOWAPERTURE	1	/* allow mmap of /dev/xf86 */
diff --git a/sys/arch/macppc/include/disklabel.h b/sys/arch/macppc/include/disklabel.h
index b9522832a87..6412730c2ec 100644
--- a/sys/arch/macppc/include/disklabel.h
+++ b/sys/arch/macppc/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.3 2002/09/15 02:02:43 deraadt Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.4 2002/09/15 09:01:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -106,8 +106,8 @@ get_le(p)
 /* HFS/DPME */
 
 /* partition map structure from Inside Macintosh: Devices, SCSI Manager
- * pp. 13-14.  The partition map always begins on physical block 1.
- *
+ * pp. 13-14.  The partition map always begins on physical block 1.  
+ * 
  * With the exception of block 0, all blocks on the disk must belong to
  * exactly one partition.  The partition map itself belongs to a partition
  * of type `APPLE_PARTITION_MAP', and is not limited in size by anything
@@ -115,43 +115,44 @@ get_le(p)
  * the first partition listed.
  */
 struct part_map_entry {
-#define PART_ENTRY_MAGIC	0x504d
-	u_int16_t	pmSig;		/* partition signature */
-	u_int16_t	pmSigPad;	/* (reserved) */
-	u_int32_t	pmMapBlkCnt;	/* number of blocks in partition map */
-	u_int32_t	pmPyPartStart;	/* first physical block of partition */
-	u_int32_t	pmPartBlkCnt;	/* number of blocks in partition */
-	char		pmPartName[32];	/* partition name */
-	char		pmPartType[32];	/* partition type */
-	u_int32_t	pmLgDataStart;	/* first logical block of data area */
-	u_int32_t	pmDataCnt;	/* number of blocks in data area */
-	u_int32_t	pmPartStatus;	/* partition status information */
-	u_int32_t	pmLgBootStart;	/* first logical block of boot code */
-	u_int32_t	pmBootSize;	/* size of boot code, in bytes */
-	u_int32_t	pmBootLoad;	/* boot code load address */
-	u_int32_t	pmBootLoad2;	/* (reserved) */
-	u_int32_t	pmBootEntry;	/* boot code entry point */
-	u_int32_t	pmBootEntry2;	/* (reserved) */
-	u_int32_t	pmBootCksum;	/* boot code checksum */
-	char		pmProcessor[16]; /* processor type (e.g. "68020") */
-	u_int8_t	pmBootArgs[128]; /* A/UX boot arguments */
+#define PART_ENTRY_MAGIC        0x504d
+	u_int16_t       pmSig;          /* partition signature */   
+	u_int16_t       pmSigPad;       /* (reserved) */
+	u_int32_t       pmMapBlkCnt;    /* number of blocks in partition map */
+	u_int32_t       pmPyPartStart;  /* first physical block of partition */
+	u_int32_t       pmPartBlkCnt;   /* number of blocks in partition */
+	char            pmPartName[32]; /* partition name */
+	char            pmPartType[32]; /* partition type */
+	u_int32_t       pmLgDataStart;  /* first logical block of data area */
+	u_int32_t       pmDataCnt;      /* number of blocks in data area */
+	u_int32_t       pmPartStatus;   /* partition status information */
+	u_int32_t       pmLgBootStart;  /* first logical block of boot code */
+	u_int32_t       pmBootSize;     /* size of boot code, in bytes */
+	u_int32_t       pmBootLoad;     /* boot code load address */
+	u_int32_t       pmBootLoad2;    /* (reserved) */
+	u_int32_t       pmBootEntry;    /* boot code entry point */
+	u_int32_t       pmBootEntry2;   /* (reserved) */
+	u_int32_t       pmBootCksum;    /* boot code checksum */
+	char            pmProcessor[16]; /* processor type (e.g. "68020") */
+	u_int8_t        pmBootArgs[128]; /* A/UX boot arguments */
 	/* we do not index the disk image as an array,
 	 * leave out the on disk padding
 	 */
 #if 0
-	u_int8_t	pad[248];	/* pad to end of block */
+	u_int8_t        pad[248];       /* pad to end of block */
 #endif
 };
 
-#define PART_TYPE_DRIVER	"APPLE_DRIVER"
-#define PART_TYPE_DRIVER43	"APPLE_DRIVER43"
-#define PART_TYPE_DRIVERATA	"APPLE_DRIVER_ATA"
-#define PART_TYPE_DRIVERIOKIT	"APPLE_DRIVER_IOKIT"
-#define PART_TYPE_FWDRIVER	"APPLE_FWDRIVER"
-#define PART_TYPE_FWB_COMPONENT	"FWB DRIVER COMPONENTS"
-#define PART_TYPE_FREE		"APPLE_FREE"
-#define PART_TYPE_MAC		"APPLE_HFS"
-#define PART_TYPE_OPENBSD	"OPENBSD"
+#define PART_TYPE_DRIVER        "APPLE_DRIVER"
+#define PART_TYPE_DRIVER43      "APPLE_DRIVER43"
+#define PART_TYPE_DRIVERATA     "APPLE_DRIVER_ATA"
+#define PART_TYPE_DRIVERIOKIT   "APPLE_DRIVER_IOKIT"
+#define PART_TYPE_FWDRIVER      "APPLE_FWDRIVER"
+#define PART_TYPE_FWB_COMPONENT "FWB DRIVER COMPONENTS"
+#define PART_TYPE_FREE          "APPLE_FREE"
+#define PART_TYPE_MAC           "APPLE_HFS"
+#define PART_TYPE_OPENBSD       "OPENBSD"
+
 
 struct cpu_disklabel {
 	struct dos_partition dosparts[NDOSPART];
diff --git a/sys/arch/macppc/include/powerpc.h b/sys/arch/macppc/include/powerpc.h
index 5af35ede048..4a34f0cd251 100644
--- a/sys/arch/macppc/include/powerpc.h
+++ b/sys/arch/macppc/include/powerpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: powerpc.h,v 1.5 2002/09/15 02:02:43 deraadt Exp $	*/
+/*	$OpenBSD: powerpc.h,v 1.6 2002/09/15 09:01:58 deraadt Exp $	*/
 /*	$NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $	*/
 
 /*
@@ -70,7 +70,7 @@ struct firmware {
 	exit_f		*exit;
 	boot_f		*boot;
 	vmon_f		*vmon;
-
+	
 #ifdef FW_HAS_PUTC
 	boot_f		*putc;
 #endif
diff --git a/sys/arch/macppc/include/vmparam.h b/sys/arch/macppc/include/vmparam.h
index 1c1f1737ed4..502ef9e5b27 100644
--- a/sys/arch/macppc/include/vmparam.h
+++ b/sys/arch/macppc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.10 2002/09/15 02:02:43 deraadt Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.11 2002/09/15 09:01:58 deraadt Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $	*/
 
 /*-
@@ -62,7 +62,7 @@
  * Size of shared memory map
  */
 #ifndef	SHMMAXPGS
-#define	SHMMAXPGS	4096
+#define	SHMMAXPGS       4096
 #endif
 
 /*
@@ -79,7 +79,7 @@
  * It is related to human patience and other factors which don't really
  * change over time.
  */
-#define	MAXSLP		20
+#define	MAXSLP 		20
 
 /*
  * Would like to have MAX addresses = 0, but this doesn't (currently) work