 @@ -1,14 +1,14 @@
-/*	$NetBSD: intiovar.h,v 1.13 2008/12/18 05:56:42 isaki Exp $	*/
+/*	$NetBSD: intiovar.h,v 1.14 2013/01/22 11:58:39 isaki Exp $	*/
 /*
+ *
  * Copyright (c) 1998 NetBSD Foundation, Inc.
  * 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
 @@ -116,26 +116,28 @@ int intio_intr(struct frame *);
 #define intio_set_sysport_powoff(a) \
 	intio_sysport[sysport_powoff] = (a)
 #define intio_get_sysport_contrast() \
 	(intio_sysport[sysport_contrast])
 #define intio_get_sysport_tvctrl() \
 	(intio_sysport[sysport_tvctrl])
 #define INTIO_SYSPORT_TVSTAT	0x08
 #define intio_get_sysport_keyctrl() \
 	(intio_sysport[sysport_keyctrl])
 #define INTIO_SYSPORT_KBEXIST	0x08
 #define intio_get_sysport_waitctrl() \
 	(intio_sysport[sysport_waitctrl])
 #define intio_get_sysport_sramwp() \
 	(intio_sysport[sysport_sramwp])
 #define intio_get_sysport_mpustat() \
 	(intio_sysport[sysport_mpustat])
 /* I/O controller (sicilian/pluto) */
 #define INTIO_SICILIAN		(0x00e9c000)
 #define intio_sicilian		((volatile uint8_t *)IIOV(INTIO_SICILIAN))
 #define sicilian_intr		1
 #define sicilian_ivec		3
 #define intio_get_sicilian_intr() \
 	(intio_sicilian[sicilian_intr])
 #define intio_set_sicilian_intr(a) \
 	intio_sicilian[sicilian_intr] = (a)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.185 2012/07/30 17:19:59 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.186 2013/01/22 11:58:39 isaki Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * 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.
+ *
  * from: Utah $Hdr: machdep.c 1.74 92/12/20$
+ *
  *	@(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.185 2012/07/30 17:19:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.186 2013/01/22 11:58:39 isaki Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_fpu_emulate.h"
 #include "opt_m060sp.h"
 #include "opt_modular.h"
 #include "opt_panicbutton.h"
 #include "opt_extmem.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -115,26 +115,27 @@ char	machine[] = MACHINE;	/* from
 /* Our exported CPU info; we can have only one. */
 struct cpu_info cpu_info_store;
 struct vm_map *phys_map = NULL;
 extern paddr_t avail_start, avail_end;
 extern u_int lowram;
 extern int end, *esym;
 int	maxmem;			/* max memory per process */
 /* prototypes for local functions */
 void	identifycpu(void);
 static int check_emulator(char *, int);
 void	initcpu(void);
 int	cpu_dumpsize(void);
 int	cpu_dump(int (*)(dev_t, daddr_t, void *, size_t), daddr_t *);
 void	cpu_init_kcore_hdr(void);
 #ifdef EXTENDED_MEMORY
 static int mem_exists(void *, u_long);
 static void setmemrange(void);
 #endif
 /* functions called from locore.s */
 void	x68k_init(void);
 void	dumpsys(void);
 void	straytrap(int, u_short);
 @@ -294,26 +295,27 @@ static const char *fpu_descr[] = {
 #endif
 	", m68881 FPU",		/* 1 */
 	", m68882 FPU",		/* 2 */
 	"/FPU",			/* 3 */
 	"/FPU",			/* 4 */
 	};
 void
 identifycpu(void)
+{
 	/* there's alot of XXX in here... */
 	const char *cpu_type, *mach, *mmu, *fpu;
 	char clock[16];
 	char emubuf[20];
 	/*
 	 * check machine type constant
 	 */
 	switch (intio_get_sysport_mpustat()) {
 	case 0xdc:
 		/*
 		 * CPU Type == 68030, Clock == 25MHz
 		 */
 		mach = "030";
 		break;
 	case 0xfe:
 		/*
 @@ -325,26 +327,29 @@ identifycpu(void)
 		/*
 		 * CPU Type == 68000, Clock == 10MHz
 		 */
 		mach = "000/ACE/PRO/EXPERT/SUPER";
 		break;
 	default:
 		/*
 		 * unknown type
 		 */
 		mach = "000?(unknown model)";
 		break;
+	}
 	emubuf[0] = '\0';
 	check_emulator(emubuf, sizeof(emubuf));
 	cpuspeed = 2048 / delay_divisor;
 	sprintf(clock, "%dMHz", cpuspeed);
 	switch (cputype) {
 	case CPU_68060:
 		cpu_type = "m68060";
 		mmu = "/MMU";
 		cpuspeed = 128 / delay_divisor;
 		sprintf(clock, "%d/%dMHz", cpuspeed*2, cpuspeed);
 		break;
 	case CPU_68040:
 		cpu_type = "m68040";
 		mmu = "/MMU";
 		cpuspeed = 759 / delay_divisor;
 @@ -357,32 +362,80 @@ identifycpu(void)
 	case CPU_68020:
 		cpu_type = "m68020";
 		mmu = ", m68851 MMU";
 		break;
 	default:
 		cpu_type = "unknown";
 		mmu = ", unknown MMU";
 		break;
+	}
 	if (fputype >= 0 && fputype < sizeof(fpu_descr)/sizeof(fpu_descr[0]))
 		fpu = fpu_descr[fputype];
 	else
 		fpu = ", unknown FPU";
-	sprintf(cpu_model, "X68%s (%s CPU%s%s, %s clock)",
+	sprintf(cpu_model, "X68%s (%s CPU%s%s, %s clock)%s%s",
-	    mach, cpu_type, mmu, fpu, clock);
+	    mach, cpu_type, mmu, fpu, clock,
 		emubuf[0] ? " on " : "", emubuf);
 	printf("%s\n", cpu_model);
+}
 /*
  * If it is an emulator, store the name in buf and return 1.
  * Otherwise return 0.
  */
 static int
 check_emulator(char *buf, int bufsize)
+{
 	int xm6major;
 	int xm6minor;
 	int xm6imark;
 	int xm6imajor;
 	int xm6iminor;
 	/* XM6 and its family */
 	intio_set_sysport_sramwp('X');
 	if (intio_get_sysport_sramwp() == '6') {
 		xm6major = intio_get_sysport_sramwp();
 		xm6minor = intio_get_sysport_sramwp();
 		xm6imark = intio_get_sysport_sramwp();
 		switch (xm6imark) {
 		case 0xff:	/* Original XM6 or unknown compatibles */
 			snprintf(buf, bufsize, "XM6 v%d.%02d",
 				xm6major, xm6minor);
 			break;
 		case 'i':	/* XM6i */
 			xm6imajor = intio_get_sysport_sramwp();
 			xm6iminor = intio_get_sysport_sramwp();
 			snprintf(buf, bufsize, "XM6i v%d.%02d",
 				xm6imajor, xm6iminor);
 			break;
 		case 'g':	/* XM6 TypeG */
 			snprintf(buf, bufsize, "XM6 TypeG v%d.%02d",
 				xm6major, xm6minor);
 			break;
 		default:	/* Other XM6 compatibles? */
 			/* XXX what should I do? */
 			return 0;
+		}
 		return 1;
+	}
 	return 0;
+}
 /*
  * machine dependent system variables.
  */
 SYSCTL_SETUP(sysctl_machdep_setup, "sysctl machdep subtree setup")
+{
 	sysctl_createv(clog, 0, NULL, NULL,
 	    CTLFLAG_PERMANENT,
 	    CTLTYPE_NODE, "machdep", NULL,
 	    NULL, 0, NULL, 0,
 	    CTL_MACHDEP, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 	    CTLFLAG_PERMANENT,