Module Name: src
Committed By: kiyohara
Date: Sun Aug 7 15:22:19 UTC 2011
Modified Files:
src/sys/arch/bebox/bebox: machdep.c
src/sys/arch/bebox/include: isa_machdep.h
Log Message:
Cleanup headers and variables.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/bebox/bebox/machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/bebox/include/isa_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/bebox/bebox/machdep.c
diff -u src/sys/arch/bebox/bebox/machdep.c:1.103 src/sys/arch/bebox/bebox/machdep.c:1.104
--- src/sys/arch/bebox/bebox/machdep.c:1.103 Sun Aug 7 15:16:35 2011
+++ src/sys/arch/bebox/bebox/machdep.c Sun Aug 7 15:22:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.103 2011/08/07 15:16:35 kiyohara Exp $ */
+/* $NetBSD: machdep.c,v 1.104 2011/08/07 15:22:19 kiyohara Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.103 2011/08/07 15:16:35 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.104 2011/08/07 15:22:19 kiyohara Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -41,42 +41,27 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/device.h>
-#include <sys/exec.h>
-#include <sys/extent.h>
-#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/ksyms.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
#include <sys/mount.h>
-#include <sys/msgbuf.h>
-#include <sys/proc.h>
#include <sys/reboot.h>
-#include <sys/syscallargs.h>
-#include <sys/syslog.h>
#include <sys/systm.h>
+#include <sys/vnode.h>
#include <uvm/uvm_extern.h>
-#include <machine/bootinfo.h>
+#include <machine/bebox.h>
#include <machine/autoconf.h>
+#include <machine/bootinfo.h>
#include <machine/powerpc.h>
-#include <powerpc/pmap.h>
-#include <powerpc/psl.h>
-#include <powerpc/trap.h>
-
-#include <powerpc/oea/bat.h>
#include <powerpc/pic/picvar.h>
+#include <powerpc/psl.h>
#include <dev/cons.h>
-#include "ksyms.h"
-
#include "vga.h"
#if (NVGA > 0)
#include <dev/ic/mc6845reg.h>
@@ -104,12 +89,10 @@
* Global variables used here and there
*/
char bootinfo[BOOTINFO_MAXSIZE];
-#define OFMEMREGIONS 32
-struct mem_region physmemr[OFMEMREGIONS], availmemr[OFMEMREGIONS];
+#define MEMREGIONS 2
+struct mem_region physmemr[MEMREGIONS], availmemr[MEMREGIONS];
char bootpath[256];
-paddr_t avail_end; /* XXX temporary */
struct pic_ops *isa_pic;
-int isa_pcmciamask = 0x8b28; /* XXXX */
extern int primary_pic;
void initppc(u_long, u_long, u_int, void *);
static void disable_device(const char *);
@@ -140,7 +123,6 @@
availmemr[0].start = (endkernel + PGOFSET) & ~PGOFSET;
availmemr[0].size = meminfo->memsize - availmemr[0].start;
}
- avail_end = physmemr[0].start + physmemr[0].size; /* XXX temporary */
/*
* Get CPU clock
Index: src/sys/arch/bebox/include/isa_machdep.h
diff -u src/sys/arch/bebox/include/isa_machdep.h:1.20 src/sys/arch/bebox/include/isa_machdep.h:1.21
--- src/sys/arch/bebox/include/isa_machdep.h:1.20 Wed Aug 19 15:00:46 2009
+++ src/sys/arch/bebox/include/isa_machdep.h Sun Aug 7 15:22:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.20 2009/08/19 15:00:46 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.21 2011/08/07 15:22:19 kiyohara Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -44,7 +44,6 @@
extern struct powerpc_bus_dma_tag isa_bus_dma_tag;
extern struct pic_ops *isa_pic;
-extern int isa_pcmciamask;
/* function mappings */
#define isa_attach_hook(p, s, iaa) \
@@ -58,7 +57,7 @@
#define isa_intr_disestablish(ic, arg) \
genppc_isa_intr_disestablish(ic, arg)
#define isa_intr_alloc(ic, mask, type, irqp) \
- genppc_isa_intr_alloc(ic, isa_pic, mask & isa_pcmciamask, type, irqp)
+ genppc_isa_intr_alloc(ic, isa_pic, mask, type, irqp)
/*
* Miscellanous functions.
