summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/cats/cats/cats_machdep.c28
1 files changed, 21 insertions, 7 deletions
diff --git a/sys/arch/cats/cats/cats_machdep.c b/sys/arch/cats/cats/cats_machdep.c
index 621a2579b46..9911e0d0350 100644
--- a/sys/arch/cats/cats/cats_machdep.c
+++ b/sys/arch/cats/cats/cats_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cats_machdep.c,v 1.1 2004/02/01 05:12:54 drahn Exp $ */
+/* $OpenBSD: cats_machdep.c,v 1.2 2004/02/11 22:07:51 miod Exp $ */
/* $NetBSD: cats_machdep.c,v 1.50 2003/10/04 14:28:28 chris Exp $ */
/*
@@ -173,13 +173,13 @@ extern struct user *proc0paddr;
/* Prototypes */
-void consinit __P((void));
+void consinit(void);
-int fcomcnattach __P((u_int iobase, int rate,tcflag_t cflag));
-int fcomcndetach __P((void));
+int fcomcnattach(u_int iobase, int rate,tcflag_t cflag);
+int fcomcndetach(void);
-static void process_kernel_args __P((char *));
-extern void configure __P((void));
+static void process_kernel_args(char *);
+extern void configure(void);
/* A load of console goo. */
#include "vga.h"
@@ -731,7 +731,9 @@ debugledaddr = (void*)(DC21285_PCI_IO_VBASE+DEBUG_LED_OFFSET);
* Since the ARM stacks use STMFD etc. we must set r13 to the top end
* of the stack memory.
*/
+#ifdef VERBOSE_INIT_ARM
printf("init subsystems: stacks ");
+#endif
set_stackptr(PSR_IRQ32_MODE,
irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE);
@@ -748,7 +750,9 @@ debugledaddr = (void*)(DC21285_PCI_IO_VBASE+DEBUG_LED_OFFSET);
* Initialisation of the vectors will just panic on a data abort.
* This just fills in a slighly better one.
*/
+#ifdef VERBOSE_INIT_ARM
printf("vectors ");
+#endif
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
@@ -762,11 +766,15 @@ debugledaddr = (void*)(DC21285_PCI_IO_VBASE+DEBUG_LED_OFFSET);
*/
/* Initialise the undefined instruction handlers */
+#ifdef VERBOSE_INIT_ARM
printf("undefined ");
+#endif
undefined_init();
/* Load memory into UVM. */
+#ifdef VERBOSE_INIT_ARM
printf("page ");
+#endif
uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
/* XXX Always one RAM block -- nuke the loop. */
@@ -843,14 +851,20 @@ debugledaddr = (void*)(DC21285_PCI_IO_VBASE+DEBUG_LED_OFFSET);
}
/* Boot strap pmap telling it where the kernel page table is */
+#ifdef VERBOSE_INIT_ARM
printf("pmap ");
+#endif
pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, KERNEL_VM_BASE,
KERNEL_VM_BASE + KERNEL_VM_SIZE);
/* Setup the IRQ system */
+#ifdef VERBOSE_INIT_ARM
printf("irq ");
+#endif
footbridge_intr_init();
+#ifdef VERBOSE_INIT_ARM
printf("done.\n");
+#endif
#ifdef IPKDB
/* Initialise ipkdb */
@@ -922,7 +936,7 @@ process_kernel_args(args)
extern struct bus_space footbridge_pci_io_bs_tag;
extern struct bus_space footbridge_pci_mem_bs_tag;
-void footbridge_pci_bs_tag_init __P((void));
+void footbridge_pci_bs_tag_init(void);
void
consinit(void)