 @@ -1,14 +1,14 @@
-/*	$NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $	*/
+/*	$NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -57,40 +57,51 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH 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>
-__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <sys/bus.h>
 #include <machine/pmap.h>
 /*
  * Global variables used here and there.
  */
 struct vm_map *phys_map = NULL;
 /*
  * XXX This should probably be in autoconf.
  */
 char machine[] = MACHINE;
 char machine_arch[] = MACHINE_ARCH;
 /*
  * ibm4xx kernels need to set module_machine to this for modules to work.
  */
 char module_machine_ibm4xx[] = "powerpc-ibm4xx";
 int fake_mapiodev = 1;
 /*
  * mapiodev:
+ *
  * 	Allocate vm space and mapin the I/O address. Use reserved TLB
  * 	mapping if one is found.
  */
 void *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.47 2021/03/30 01:33:50 rin Exp $	*/
+/*	$NetBSD: machdep.c,v 1.48 2021/03/30 02:41:14 rin Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * 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>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2021/03/30 01:33:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2021/03/30 02:41:14 rin Exp $");
 #include "opt_explora.h"
 #include "opt_modular.h"
 #include "ksyms.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/msgbuf.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 @@ -64,33 +64,28 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/spr.h>
 #include <powerpc/ibm4xx/cpu.h>
 #include <powerpc/ibm4xx/dcr403cgx.h>
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 #include <machine/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 #define TLB_PG_SIZE	(16*1024*1024)
 char machine[] = MACHINE;		/* from <machine/param.h> */
 char machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 static const unsigned int cpuspeed = 66000000;
 struct vm_map *phys_map = NULL;
 void		initppc(vaddr_t, vaddr_t);
 void
 initppc(vaddr_t startkernel, vaddr_t endkernel)
+{
 	u_int i, j, t, br[4];
 	u_int maddr, msize, size;
 	br[0] = mfdcr(DCR_BR4);
 	br[1] = mfdcr(DCR_BR5);
 	br[2] = mfdcr(DCR_BR6);
 	br[3] = mfdcr(DCR_BR7);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.28 2021/03/30 01:33:50 rin Exp $ */
+/*	$NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Based on Walnut and Explora.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2021/03/30 01:33:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_virtex.h"
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/boot_flag.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/malloc.h>
 @@ -78,37 +78,26 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <evbppc/virtex/virtex.h>
 #include "ksyms.h"
 #if defined(DDB)
 #include <powerpc/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 #if defined(KGDB)
 #include <sys/kgdb.h>
 #endif
 /*
  * Global variables used here and there
  */
 struct vm_map *phys_map = NULL;
 /*
  * This should probably be in autoconf!				XXX
  */
 char machine[] = MACHINE;		/* from <machine/param.h> */
 char machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 void initppc(vaddr_t, vaddr_t);
 /* BSS segment start & end. */
 extern char 		edata[], end[];
 /* One region holds all memory, the other is terminator expected by 405 pmap. */
 #define MEMREGIONS 	2
 struct mem_region 	physmemr[MEMREGIONS];
 struct mem_region 	availmemr[MEMREGIONS];
 /* Maximum TLB page size. */
 #define TLB_PG_SIZE 	(16*1024*1024)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.65 2021/03/30 02:04:44 rin Exp $	*/
+/*	$NetBSD: machdep.c,v 1.66 2021/03/30 02:41:15 rin Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH 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>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2021/03/30 02:04:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2021/03/30 02:41:15 rin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/boot_flag.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 @@ -118,37 +118,26 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #include "ksyms.h"
 #if defined(DDB)
 #include <powerpc/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 #define TLB_PG_SIZE 	(16*1024*1024)
 /*
  * Global variables used here and there
  */
 struct vm_map *phys_map = NULL;
 /*
  * This should probably be in autoconf!				XXX
  */
 char machine[] = MACHINE;		/* from <machine/param.h> */
 char machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 void initppc(vaddr_t, vaddr_t, char *, void *);
 void
 initppc(vaddr_t startkernel, vaddr_t endkernel, char *args, void *info_block)
+{
 	u_int memsize;
 	/* Disable all external interrupts */
 	mtdcr(DCR_UIC0_BASE + DCR_UIC_ER, 0);
 	/* Setup board from OpenBIOS */
 	openbios_board_init(info_block);
 	memsize = openbios_board_memsize_get();

 @@ -1,17 +1,16 @@
-#	$NetBSD: files.obs405,v 1.22 2021/03/29 13:38:31 rin Exp $
+#	$NetBSD: files.obs405,v 1.23 2021/03/30 02:41:14 rin Exp $
+#
 # obs405-specific configuration info
 file	arch/powerpc/ibm4xx/ibm4xx_autoconf.c
 file	arch/powerpc/ibm4xx/ibm40x_machdep.c
 file	arch/powerpc/ibm4xx/ibm4xx_machdep.c
 file	arch/evbppc/obs405/obs405_machdep.c
 # Memory Disk for install kernel
 file	dev/md_root.c				memory_disk_hooks
 # Machine-independent SCSI drivers
 include	"dev/scsipi/files.scsipi"
 # Machine-independent ATA drivers
 include	"dev/ata/files.ata"