move cdev_decl out and kill some ugly print and some spaces

3 files changed, 47 insertions, 47 deletions

diff --git a/sys/arch/hppa/dev/mem.c b/sys/arch/hppa/dev/mem.c
index 008b4fcc63d..3e372bfa879 100644
--- a/sys/arch/hppa/dev/mem.c
+++ b/sys/arch/hppa/dev/mem.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: mem.c,v 1.10 2002/03/15 21:44:18 mickey Exp $	*/
+/*	$OpenBSD: mem.c,v 1.11 2002/03/16 00:34:56 mickey Exp $	*/
 
 /*
- * Copyright (c) 1998,1999 Michael Shalayeff
+ * Copyright (c) 1998-2002 Michael Shalayeff
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,31 +47,31 @@
  * CSL requests users of this software to return to csl-dist@cs.utah.edu any
  * improvements that they make and grant CSL redistribution rights.
  *
- * 	Utah $Hdr: mem.c 1.9 94/12/16$
+ *	Utah $Hdr: mem.c 1.9 94/12/16$
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon 
+ *
+ * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 
@@ -90,6 +90,7 @@
 
 #include <uvm/uvm.h>
 
+#include <machine/conf.h>
 #include <machine/bus.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
@@ -117,18 +118,13 @@ struct cfdriver mem_cd = {
 	NULL, "mem", DV_DULL
 };
 
-#define mmread  mmrw
-#define mmwrite mmrw
-cdev_decl(mm);
-
+/* A lock for the vmmap, 16-byte aligned as PA-RISC semaphores must be. */
+static volatile int32_t vmmap_lock __attribute__ ((aligned (32))) = 1;
 extern char *vmmap;
 caddr_t zeropage;
 
-/* A lock for the vmmap, 16-byte aligned as PA-RISC semaphores must be. */
-static int32_t vmmap_lock __attribute__ ((aligned (16))) = 1;
-
 int
-memmatch(parent, cfdata, aux)   
+memmatch(parent, cfdata, aux)
 	struct device *parent;
 	void *cfdata;
 	void *aux;
@@ -138,6 +134,7 @@ memmatch(parent, cfdata, aux)
 	if (ca->ca_type.iodc_type != HPPA_TYPE_MEMORY ||
 	    ca->ca_type.iodc_sv_model != HPPA_MEMORY_PDEP)
 		return 0;
+
 	return 1;
 }
 
@@ -156,26 +153,28 @@ memattach(parent, self, aux)
 
 	/* XXX check if we are dealing w/ Viper */
 	if (ca->ca_hpa == (hppa_hpa_t)VIPER_HPA) {
-		int s;
 
 		sc->sc_vp = (struct vi_trs *)
 			&((struct iomod *)ca->ca_hpa)->priv_trs;
 
-		printf (" viper rev %x, ctrl %b",
-			sc->sc_vp->vi_status.hw_rev,
-			VI_CTRL, VIPER_BITS);
-		s = splhigh();
+		printf(" viper rev %x,", sc->sc_vp->vi_status.hw_rev);
 #if 0
-		VI_CTRL |= VI_CTRL_ANYDEN;
-		((struct vi_ctrl *)&VI_CTRL)->core_den = 0;
-		((struct vi_ctrl *)&VI_CTRL)->sgc0_den = 0;
-		((struct vi_ctrl *)&VI_CTRL)->sgc1_den = 0;
-		((struct vi_ctrl *)&VI_CTRL)->core_prf = 1;
-		sc->sc_vp->vi_control = VI_CTRL;
-#endif
-		splx(s);
-#ifdef DEBUG
-		printf (" >> %b", VI_CTRL, VIPER_BITS);
+		{
+			int s;
+
+			printf(" ctrl %b", VI_CTRL, VIPER_BITS);
+
+			s = splhigh();
+			VI_CTRL |= VI_CTRL_ANYDEN;
+			((struct vi_ctrl *)&VI_CTRL)->core_den = 0;
+			((struct vi_ctrl *)&VI_CTRL)->sgc0_den = 0;
+			((struct vi_ctrl *)&VI_CTRL)->sgc1_den = 0;
+			((struct vi_ctrl *)&VI_CTRL)->core_prf = 1;
+			sc->sc_vp->vi_control = VI_CTRL;
+			splx(s);
+
+			printf (" >> %b, ", VI_CTRL, VIPER_BITS);
+		}
 #endif
 	} else
 		sc->sc_vp = NULL;
@@ -226,7 +225,7 @@ mmopen(dev, flag, ioflag, p)
 /*ARGSUSED*/
 int
 mmclose(dev, flag, mode, p)
-	dev_t dev;  
+	dev_t dev;
 	int flag, mode;
 	struct proc *p;
 {
@@ -241,12 +240,12 @@ mmrw(dev, uio, flags)
 {
 	extern u_int totalphysmem;
 	extern vaddr_t virtual_avail;
-	struct iovec 	*iov;
+	struct iovec	*iov;
 	int32_t lockheld = 0;
 	vaddr_t	v, o;
 	vm_prot_t prot;
 	int rw, error = 0;
-	u_int 	c;
+	u_int	c;
 
 	while (uio->uio_resid > 0 && error == 0) {
 		iov = uio->uio_iov;
@@ -270,8 +269,8 @@ mmrw(dev, uio, flags)
 			}
 
 			/*
-			 * If the address is inside our large 
-			 * directly-mapped kernel BTLB entry, 
+			 * If the address is inside our large
+			 * directly-mapped kernel BTLB entry,
 			 * use kmem instead.
 			 */
 			if (v < virtual_avail)
@@ -286,7 +285,7 @@ mmrw(dev, uio, flags)
 				    : "=r" (lockheld) : "r" (&vmmap_lock));
 				if (lockheld)
 					break;
-				error = tsleep((caddr_t)&vmmap_lock, 
+				error = tsleep((caddr_t)&vmmap_lock,
 				    PZERO | PCATCH,
 				    "mmrw", 0);
 				if (error)
@@ -331,8 +330,8 @@ use_kmem:
 			if (uio->uio_rw == UIO_WRITE) {
 				uio->uio_resid = 0;
 				return (0);
-			} 
-			/* 
+			}
+			/*
 			 * On the first call, allocate and zero a page
 			 * of memory for use with /dev/zero.
 			 */
@@ -364,7 +363,7 @@ paddr_t
 mmmmap(dev, off, prot)
 	dev_t dev;
 	off_t off;
-	int prot;  
+	int prot;
 {
 	if (minor(dev) != 0)
 		return (-1);
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index abe06cb4bb5..39fb915a6f3 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.16 2002/03/15 22:50:05 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.17 2002/03/16 00:34:56 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -92,9 +92,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 	dev_init(c,n,write), dev_init(c,n,ioctl),(dev_type_stop((*))) enodev, \
 	0, seltrue, (dev_type_mmap((*))) enodev }
 
-#define mmread  mmrw
-#define mmwrite mmrw
-cdev_decl(mm);
 #include "pty.h"
 #include "wsdisplay.h"
 #include "wskbd.h"
diff --git a/sys/arch/hppa/include/conf.h b/sys/arch/hppa/include/conf.h
index c4ea83d576f..e9b1885b20d 100644
--- a/sys/arch/hppa/include/conf.h
+++ b/sys/arch/hppa/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.3 2002/03/14 01:26:32 millert Exp $	*/
+/*	$OpenBSD: conf.h,v 1.4 2002/03/16 00:34:56 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -41,6 +41,10 @@ cdev_decl(pdc);
 int pdcparam(struct tty *, struct termios *);
 void pdcstart(struct tty *);
 
+#define mmread  mmrw
+#define mmwrite mmrw
+cdev_decl(mm);
+
 cdev_decl(fd);
 bdev_decl(fd);