 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.80 2011/06/12 03:35:43 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.81 2011/07/28 09:56:34 tsutsui Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.80 2011/06/12 03:35:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.81 2011/07/28 09:56:34 tsutsui Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_compat_sunos.h"
 #include "opt_modular.h"
 #include "opt_panicbutton.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 @@ -141,27 +141,27 @@ extern void syscnattach(int);
  * 2048 / cpuspeed (where cpuspeed is in MHz).
+ *
  * On the 68040/68060(?), the value of delay_divisor is roughly
  * 759 / cpuspeed (where cpuspeed is in MHz).
  * XXX -- is the above formula correct?
  */
 int	cpuspeed = 25;		/* only used for printing later */
 int	delay_divisor = 300;	/* for delay() loop count */
 /*
  * Early initialization, before main() is called.
  */
 void
-luna68k_init()
+luna68k_init(void)
+{
 	volatile unsigned char *pio0 = (void *)0x49000000;
 	int sw1, i;
 	char *cp;
 	extern char bootarg[64];
 	extern paddr_t avail_start, avail_end;
 	/*
 	 * Tell the VM system about available physical memory.  The
 	 * luna68k only has one segment.
 	 */
 	uvm_page_physload(atop(avail_start), atop(avail_end),
 @@ -172,27 +172,27 @@ luna68k_init()
 	 * avail_end was pre-decremented in pmap_bootstrap to compensate.
 	 */
 	for (i = 0; i < btoc(MSGBUFSIZE); i++)
 		pmap_enter(pmap_kernel(), (vaddr_t)msgbufaddr + i * PAGE_SIZE,
 		    avail_end + i * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE,
 		    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
 	pmap_update(pmap_kernel());
 	initmsgbuf(msgbufaddr, m68k_round_page(MSGBUFSIZE));
 	pio0[3] = 0xb6;
 	pio0[2] = 1 << 6;		/* enable parity check */
 	pio0[3] = 0xb6;
-	sw1 = pio0[0];			/* dipssw1 value */
+	sw1 = pio0[0];			/* dip sw1 value */
 	sw1 ^= 0xff;
 	sysconsole = !(sw1 & 0x2);	/* console selection */
 	boothowto = 0;
 	i = 0;
 	/*
 	 * 'bootarg' has;
 	 *   "<args of x command> ENADDR=<addr> HOST=<host> SERVER=<name>"
 	 * where <addr> is MAC address of which network loader used (not
 	 * necessarily same as one at 0x4101.FFE0), <host> and <name>
 	 * are the values of HOST and SERVER environment variables,
+	 *
 	 * NetBSD/luna68k cares only the first argment; any of "sda".
 @@ -204,26 +204,27 @@ luna68k_init()
+	}
 #if 0 /* overload 1:sw1, which now means 'go ROM monitor' after poweron */
 	if (boothowto == 0)
 		boothowto = (sw1 & 0x1) ? RB_SINGLE : 0;
 #endif
+}
 /*
  * Console initialization: called early on from main,
  */
 void
 consinit(void)
+{
 	if (sysconsole == 0)
 		syscnattach(0);
 	else {
 		omfb_cnattach();
 		ws_cnattach();
+	}
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern char end[];
 		extern int *esym;
 		ksyms_addsyms_elf(*(int *)&end, ((int *)&end) + 1, esym);
 @@ -258,56 +259,60 @@ cpu_startup(void)
 	 */
 	printf("%s%s", copyright, version);
 	identifycpu();
 	format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
 	printf("total memory = %s\n", pbuf);
 	minaddr = 0;
 	/*
 	 * Allocate a submap for physio
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				   VM_PHYS_SIZE, 0, false, NULL);
+	    VM_PHYS_SIZE, 0, false, NULL);
 	format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
 	printf("avail memory = %s\n", pbuf);
 	/*
 	 * Say "Hi" to the world
 	 */
 	greeting();
+}
 void
 identifycpu(void)
+{
 	extern int cputype;
 	const char *cpu;
 	memset(cpu_model, 0, sizeof(cpu_model));
 	switch (cputype) {
 	case CPU_68030:
 		cpu = "MC68030 CPU+MMU, MC68882 FPU";
 		machtype = LUNA_I;
-		cpuspeed = 20; delay_divisor = 102;	/* 20MHz 68030 */
+		/* 20MHz 68030 */
 		cpuspeed = 20;
 		delay_divisor = 102;
 		hz = 60;
 		break;
 #if defined(M68040)
 	case CPU_68040:
 		cpu = "MC68040 CPU+MMU+FPU, 4k on-chip physical I/D caches";
 		machtype = LUNA_II;
-		cpuspeed = 25; delay_divisor = 300;	/* 25MHz 68040 */
+		/* 25MHz 68040 */
 		cpuspeed = 25;
 		delay_divisor = 300;
 		break;
 #endif
 	default:
 		panic("unknown CPU type");
+	}
 	strcpy(cpu_model, cpu);
 	printf("%s\n", cpu_model);
+}
 /*
  * machine dependent system variables.
  */
 SYSCTL_SETUP(sysctl_machdep_setup, "sysctl machdep subtree setup")
 @@ -319,28 +324,27 @@ SYSCTL_SETUP(sysctl_machdep_setup, "sysc
 		       NULL, 0, NULL, 0,
 		       CTL_MACHDEP, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRUCT, "console_device", NULL,
 		       sysctl_consdev, 0, NULL, sizeof(dev_t),
 		       CTL_MACHDEP, CPU_CONSDEV, CTL_EOL);
+}
 int	waittime = -1;
 void
-cpu_reboot(volatile int howto, char *bootstr)
+cpu_reboot(int howto, char *bootstr)
 	/* howto:  XXX to shutup GCC XXX */
+{
 	struct pcb *pcb = lwp_getpcb(curlwp);
 	extern void doboot(void);
 	/* take a snap shot before clobbering any registers */
 	if (pcb != NULL)
 		savectx(pcb);
 	/* If system is hold, just halt. */
 	if (cold) {
 		howto |= RB_HALT;
 		goto haltsys;
+	}
 @@ -361,44 +365,46 @@ cpu_reboot(volatile int howto, char *boo
 	/* If rebooting and a dump is requested, do it. */
 	if (howto & RB_DUMP)
 		dumpsys();
 haltsys:
 	/* Run any shutdown hooks. */
 	doshutdownhooks();
 	pmf_system_shutdown(boothowto);
 	/* Finally, halt/reboot the system. */
 	if ((howto & RB_POWERDOWN) == RB_POWERDOWN) {
-		u_int8_t *pio = (void *)0x4d000000;
+		uint8_t *pio = (void *)0x4d000000;
 		printf("power is going down.\n");
 		DELAY(100000);
 		pio[3] = 0x94;
 		pio[2] = 0 << 4;
-		for (;;) /* NOP */;
+		for (;;)
 			/* NOP */;
+	}
 	if (howto & RB_HALT) {
 		printf("System halted.	Hit any key to reboot.\n\n");
 		(void)cngetc();
+	}
 	printf("rebooting...\n");
 	DELAY(100000);
 	doboot();
 	/*NOTREACHED*/
-	while (1) ;
+	for (;;)
+		;
+}
 /*
  * Initialize the kernel crash dump header.
  */
 void
 cpu_init_kcore_hdr(void)
+{
 	cpu_kcore_hdr_t *h = &cpu_kcore_hdr;
 	struct m68k_kcore_hdr *m = &h->un._m68k;
 	extern char end[];
 	memset(&cpu_kcore_hdr, 0, sizeof(cpu_kcore_hdr));
 @@ -421,42 +427,42 @@ cpu_init_kcore_hdr(void)
 	m->sg40_shift1	= SG4_SHIFT1;
 	m->sg40_mask2	= SG4_MASK2;
 	m->sg40_shift2	= SG4_SHIFT2;
 	m->sg40_mask3	= SG4_MASK3;
 	m->sg40_shift3	= SG4_SHIFT3;
 	m->sg40_addr1	= SG4_ADDR1;
 	m->sg40_addr2	= SG4_ADDR2;
 	m->pg_v		= PG_V;
 	m->pg_frame	= PG_FRAME;
 	/*
 	 * Initialize pointer to kernel segment table.
 	 */
-	m->sysseg_pa = (u_int32_t)(pmap_kernel()->pm_stpa);
+	m->sysseg_pa = (uint32_t)(pmap_kernel()->pm_stpa);
 	/*
 	 * Initialize relocation value such that:
+	 *
 	 *	pa = (va - KERNBASE) + reloc
+	 *
 	 * Since we're linked and loaded at the same place,
 	 * and the kernel is mapped va == pa, this is 0.
 	 */
 	m->reloc = 0;
 	/*
 	 * Define the end of the relocatable range.
 	 */
-	m->relocend = (u_int32_t)end;
+	m->relocend = (uint32_t)end;
 	/*
 	 * The luna68k has one contiguous memory segment.
 	 */
 	m->ram_segs[0].start = 0 /* lowram */;
 	m->ram_segs[0].size  = ctob(physmem);
+}
 /*
  * Compute the size of the machine-dependent crash dump header.
  * Returns size in disk blocks.
  */
 @@ -464,53 +470,51 @@ cpu_init_kcore_hdr(void)
 #define MDHDRSIZE roundup(CHDRSIZE, dbtob(1))
 int
 cpu_dumpsize(void)
+{
 	return btodb(MDHDRSIZE);
+}
 /*
  * Called by dumpsys() to dump the machine-dependent header.
  */
 int
-cpu_dump(dump, blknop)
+cpu_dump(int (*dump)(dev_t, daddr_t, void *, size_t), daddr_t *blknop)
 	int (*dump)(dev_t, daddr_t, void *, size_t);
 	daddr_t *blknop;
+{
 	int buf[MDHDRSIZE / sizeof(int)];
 	cpu_kcore_hdr_t *chdr;
 	kcore_seg_t *kseg;
 	int error;
 	kseg = (kcore_seg_t *)buf;
 	chdr = (cpu_kcore_hdr_t *)&buf[ALIGN(sizeof(kcore_seg_t)) /
 	    sizeof(int)];
 	/* Create the segment header. */
 	CORE_SETMAGIC(*kseg, KCORE_MAGIC, MID_MACHINE, CORE_CPU);
 	kseg->c_size = MDHDRSIZE - ALIGN(sizeof(kcore_seg_t));
 	memcpy(chdr, &cpu_kcore_hdr, sizeof(cpu_kcore_hdr_t));
 	error = (*dump)(dumpdev, *blknop, (void *)buf, sizeof(buf));
 	*blknop += btodb(sizeof(buf));
-	return (error);
+	return error;
+}
 /*
  * These variables are needed by /sbin/savecore
  */
-u_int32_t dumpmag = 0x8fca0101;	/* magic number */
+uint32_t dumpmag = 0x8fca0101;	/* magic number */
 int	dumpsize = 0;		/* pages */
 long	dumplo = 0;		/* blocks */
 /*
  * This is called by main to set dumplo and dumpsize.
  * Dumps always skip the first PAGE_SIZE of disk space
  * in case there might be a disk label stored there.
  * If there is extra space, put dump at the end to
  * reduce the chance that swapping trashes it.
  */
 void
 cpu_dumpconf(void)
+{
 @@ -634,123 +638,126 @@ dumpsys(void)
 			return;
 		default:
 			printf("error %d\n", error);
 			return;
+		}
+	}
 	printf("succeeded\n");
+}
 void
 straytrap(int pc, u_short evec)
+{
 	printf("unexpected trap (vector offset %x) from %x\n",
-	       evec & 0xFFF, pc);
+	    evec & 0xFFF, pc);
+}
 int	*nofault;
 int
 badaddr(register void *addr, int nbytes)
+{
 	register int i;
 	label_t faultbuf;
 #ifdef lint
 	i = *addr; if (i) return (0);
 #endif
-	nofault = (int *) &faultbuf;
+	nofault = (int *)&faultbuf;
 	if (setjmp((label_t *)nofault)) {
-		nofault = (int *) 0;
+		nofault = (int *)0;
-		return(1);
+		return 1;
+	}
 	switch (nbytes) {
 	case 1:
-		i = *(volatile char *)addr;
+		i = *(volatile int8_t *)addr;
 		break;
 	case 2:
-		i = *(volatile short *)addr;
+		i = *(volatile int16_t *)addr;
 		break;
 	case 4:
-		i = *(volatile int *)addr;
+		i = *(volatile int32_t *)addr;
 		break;
 	default:
 		panic("badaddr: bad request");
+	}
-	nofault = (int *) 0;
+	nofault = (int *)0;
-	return (0);
+	return 0;
+}
 void luna68k_abort(const char *);
 static int innmihand;	/* simple mutex */
 /*
  * Level 7 interrupts are caused by e.g. the ABORT switch.
+ *
  * If we have DDB, then break into DDB on ABORT.  In a production
  * environment, bumping the ABORT switch would be bad, so we enable
  * panic'ing on ABORT with the kernel option "PANICBUTTON".
  */
 void
 nmihand(struct frame frame)
+{
 	/* Prevent unwanted recursion */
 	if (innmihand)
 		return;
 	innmihand = 1;
 	luna68k_abort("ABORT SWITCH");
+}
 /*
  * Common code for handling ABORT signals from buttons, switches,
  * serial lines, etc.
  */
 void
 luna68k_abort(const char *cp)
+{
 #ifdef DDB
 	printf("%s\n", cp);
 	cpu_Debugger();
 #else
 #ifdef PANICBUTTON
 	panic(cp);
 #else
 	printf("%s ignored\n", cp);
 #endif /* PANICBUTTON */
 #endif /* DDB */
+}
 /*
  * cpu_exec_aout_makecmds():
  *	CPU-dependent a.out format hook for execve().
+ *
  * Determine of the given exec package refers to something which we
  * understand and, if so, set up the vmcmds for it.
  */
 int
 cpu_exec_aout_makecmds(struct lwp *l, struct exec_package *epp)
+{
 	int error = ENOEXEC;
 #ifdef COMPAT_SUNOS
-	extern sunos_exec_aout_makecmds
+	extern sunos_exec_aout_makecmds(struct proc *, struct exec_package *);
 (struct proc *, struct exec_package *);
 	if ((error = sunos_exec_aout_makecmds(l->l_proc, epp)) == 0)
 		return 0;
 #endif
 	return error;
+}
 #ifdef MODULAR
 /*
  * Push any modules loaded by the bootloader etc.
  */
 void
 module_init_md(void)
+{