Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Some prototype cleanup.
details: https://anonhg.NetBSD.org/src/rev/fdec0bb10a90
branches: trunk
changeset: 520936:fdec0bb10a90
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sun Jan 20 03:41:47 2002 +0000
description:
Some prototype cleanup.
diffstat:
sys/arch/arm/arm32/arm32_machdep.c | 9 +--------
sys/arch/arm/arm32/pmap.c | 6 ++----
sys/arch/arm/include/arm32/machdep.h | 13 ++++++++++---
sys/arch/arm/include/cpu.h | 5 ++++-
sys/arch/evbarm/iq80310/iq80310_7seg.c | 3 ++-
sys/arch/evbarm/iq80310/iq80310_intr.c | 4 +++-
sys/arch/evbarm/iq80310/iq80310_machdep.c | 28 +++++++---------------------
7 files changed, 29 insertions(+), 39 deletions(-)
diffs (222 lines):
diff -r 31bd984b65f3 -r fdec0bb10a90 sys/arch/arm/arm32/arm32_machdep.c
--- a/sys/arch/arm/arm32/arm32_machdep.c Sun Jan 20 03:39:51 2002 +0000
+++ b/sys/arch/arm/arm32/arm32_machdep.c Sun Jan 20 03:41:47 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.10 2002/01/12 13:37:55 chris Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.11 2002/01/20 03:41:47 thorpej Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -104,13 +104,6 @@
/* Prototypes */
-void map_section __P((vaddr_t pt, vaddr_t va, paddr_t pa,
- int cacheable));
-void map_pagetable __P((vaddr_t pt, vaddr_t va, paddr_t pa));
-void map_entry __P((vaddr_t pt, vaddr_t va, paddr_t pa));
-void map_entry_nc __P((vaddr_t pt, vaddr_t va, paddr_t pa));
-void map_entry_ro __P((vaddr_t pt, vaddr_t va, paddr_t pa));
-
u_long strtoul __P((const char *s, char **ptr, int base));
void data_abort_handler __P((trapframe_t *frame));
void prefetch_abort_handler __P((trapframe_t *frame));
diff -r 31bd984b65f3 -r fdec0bb10a90 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Sun Jan 20 03:39:51 2002 +0000
+++ b/sys/arch/arm/arm32/pmap.c Sun Jan 20 03:41:47 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.34 2002/01/17 03:06:21 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.35 2002/01/20 03:41:48 thorpej Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@@ -142,7 +142,7 @@
#include <machine/param.h>
#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.34 2002/01/17 03:06:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.35 2002/01/20 03:41:48 thorpej Exp $");
#ifdef PMAP_DEBUG
#define PDEBUG(_lev_,_stat_) \
if (pmap_debug_level >= (_lev_)) \
@@ -303,8 +303,6 @@
/* Local function prototypes (not used outside this file) */
pt_entry_t *pmap_pte __P((struct pmap *pmap, vaddr_t va));
-void map_pagetable __P((vaddr_t pagetable, vaddr_t va,
- paddr_t pa, unsigned int flags));
void pmap_copy_on_write __P((paddr_t pa));
void pmap_pinit __P((struct pmap *));
void pmap_freepagedir __P((struct pmap *));
diff -r 31bd984b65f3 -r fdec0bb10a90 sys/arch/arm/include/arm32/machdep.h
--- a/sys/arch/arm/include/arm32/machdep.h Sun Jan 20 03:39:51 2002 +0000
+++ b/sys/arch/arm/include/arm32/machdep.h Sun Jan 20 03:41:47 2002 +0000
@@ -1,17 +1,24 @@
-/* $NetBSD: machdep.h,v 1.2 2002/01/07 22:58:08 chris Exp $ */
+/* $NetBSD: machdep.h,v 1.3 2002/01/20 03:41:48 thorpej Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
/* misc prototypes used by the many arm machdeps */
void halt __P((void));
-vsize_t map_chunk __P((vaddr_t, vaddr_t, vaddr_t, paddr_t, vsize_t, u_int,
- u_int));
void parse_mi_bootargs __P((char *));
void data_abort_handler __P((trapframe_t *));
void prefetch_abort_handler __P((trapframe_t *));
+void undefinedinstruction_bounce __P((trapframe_t *));
void dumpsys __P((void));
+void map_section(vaddr_t, vaddr_t, paddr_t, int);
+void map_pagetable(vaddr_t, vaddr_t, paddr_t);
+void map_entry(vaddr_t, vaddr_t, paddr_t);
+void map_entry_nc(vaddr_t, vaddr_t, paddr_t);
+void map_entry_ro(vaddr_t, vaddr_t, paddr_t);
+vsize_t map_chunk(vaddr_t, vaddr_t, vaddr_t, paddr_t, vsize_t,
+ u_int, u_int);
+
/*
* note that we use void * as all the platforms have different ideas on what
* the structure is
diff -r 31bd984b65f3 -r fdec0bb10a90 sys/arch/arm/include/cpu.h
--- a/sys/arch/arm/include/cpu.h Sun Jan 20 03:39:51 2002 +0000
+++ b/sys/arch/arm/include/cpu.h Sun Jan 20 03:41:47 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.18 2001/12/21 22:56:17 bjh21 Exp $ */
+/* $NetBSD: cpu.h,v 1.19 2002/01/20 03:41:48 thorpej Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -244,6 +244,9 @@
/* fault.c */
int badaddr_read __P((void *, size_t, void *));
+/* syscall.c */
+void swi_handler __P((trapframe_t *));
+
#endif /* !_LOCORE */
#endif /* _KERNEL */
diff -r 31bd984b65f3 -r fdec0bb10a90 sys/arch/evbarm/iq80310/iq80310_7seg.c
--- a/sys/arch/evbarm/iq80310/iq80310_7seg.c Sun Jan 20 03:39:51 2002 +0000
+++ b/sys/arch/evbarm/iq80310/iq80310_7seg.c Sun Jan 20 03:41:47 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_7seg.c,v 1.4 2001/12/01 21:23:17 thorpej Exp $ */
+/* $NetBSD: iq80310_7seg.c,v 1.5 2002/01/20 03:41:48 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -45,6 +45,7 @@
#include <machine/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
+#include <evbarm/iq80310/iq80310var.h>
#include <evbarm/iq80310/obiovar.h>
#define ASCIIMAP_START '0'
diff -r 31bd984b65f3 -r fdec0bb10a90 sys/arch/evbarm/iq80310/iq80310_intr.c
--- a/sys/arch/evbarm/iq80310/iq80310_intr.c Sun Jan 20 03:39:51 2002 +0000
+++ b/sys/arch/evbarm/iq80310/iq80310_intr.c Sun Jan 20 03:41:47 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_intr.c,v 1.6 2001/12/01 06:15:36 thorpej Exp $ */
+/* $NetBSD: iq80310_intr.c,v 1.7 2002/01/20 03:41:48 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -144,6 +144,8 @@
return (intstat & iq80310_intrmask);
}
+__inline void irq_setmasks_nointr(void); /* called from asm */
+
__inline void
irq_setmasks_nointr(void)
{
diff -r 31bd984b65f3 -r fdec0bb10a90 sys/arch/evbarm/iq80310/iq80310_machdep.c
--- a/sys/arch/evbarm/iq80310/iq80310_machdep.c Sun Jan 20 03:39:51 2002 +0000
+++ b/sys/arch/evbarm/iq80310/iq80310_machdep.c Sun Jan 20 03:41:47 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.15 2002/01/18 19:47:05 thorpej Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.16 2002/01/20 03:41:48 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -97,6 +97,8 @@
#include <machine/frame.h>
#include <arm/undefined.h>
+#include <arm/arm32/machdep.h>
+
#include <arm/xscale/i80312reg.h>
#include <arm/xscale/i80312var.h>
@@ -126,7 +128,6 @@
#endif
BootConfig bootconfig; /* Boot config storage */
-static char bootargs[MAX_BOOT_STRING + 1];
char *boot_args = NULL;
char *boot_file = NULL;
@@ -176,23 +177,6 @@
void consinit(void);
-void map_section(vm_offset_t pt, vm_offset_t va, vm_offset_t pa,
- int cacheable);
-void map_pagetable(vm_offset_t pt, vm_offset_t va, vm_offset_t pa);
-void map_entry(vm_offset_t pt, vm_offset_t va, vm_offset_t pa);
-void map_entry_nc(vm_offset_t pt, vm_offset_t va, vm_offset_t pa);
-void map_entry_ro(vm_offset_t pt, vm_offset_t va, vm_offset_t pa);
-vm_size_t map_chunk(vm_offset_t pd, vm_offset_t pt, vm_offset_t va,
- vm_offset_t pa, vm_size_t size, u_int acc, u_int flg);
-
-void process_kernel_args(char *);
-void data_abort_handler(trapframe_t *frame);
-void prefetch_abort_handler(trapframe_t *frame);
-void undefinedinstruction_bounce(trapframe_t *frame);
-
-extern void parse_mi_bootargs(char *args);
-extern void dumpsys(void);
-
#include "com.h"
#if NCOM > 0
#include <dev/ic/comreg.h>
@@ -244,7 +228,6 @@
}
/* Disable console buffering */
-/* cnpollc(1);*/
/*
* If RB_NOSYNC was not specified sync the discs.
@@ -323,7 +306,7 @@
* Relocating the kernel to the bottom of physical memory
*/
u_int
-initarm(void)
+initarm(void *arg)
{
extern vaddr_t xscale_cache_clean_addr, xscale_minidata_clean_addr;
extern vsize_t xscale_minidata_clean_size;
@@ -859,9 +842,11 @@
return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
}
+#if 0
void
process_kernel_args(char *args)
{
+ static char bootargs[MAX_BOOT_STRING + 1];
boothowto = 0;
@@ -888,6 +873,7 @@
parse_mi_bootargs(boot_args);
}
+#endif
void
consinit(void)
Home |
Main Index |
Thread Index |
Old Index