diff options
-rw-r--r-- | sys/mips/adm5120/adm5120_machdep.c | 25 | ||||
-rw-r--r-- | sys/mips/alchemy/alchemy_machdep.c | 25 | ||||
-rw-r--r-- | sys/mips/atheros/ar71xx_machdep.c | 24 | ||||
-rw-r--r-- | sys/mips/idt/idt_machdep.c | 25 | ||||
-rw-r--r-- | sys/mips/include/hwfunc.h | 10 | ||||
-rw-r--r-- | sys/mips/include/md_var.h | 3 | ||||
-rw-r--r-- | sys/mips/include/trap.h | 6 | ||||
-rw-r--r-- | sys/mips/malta/malta_machdep.c | 25 | ||||
-rw-r--r-- | sys/mips/nlm/xlp_machdep.c | 21 | ||||
-rw-r--r-- | sys/mips/rmi/xlr_machdep.c | 18 | ||||
-rw-r--r-- | sys/mips/rt305x/rt305x_machdep.c | 25 | ||||
-rw-r--r-- | sys/mips/sentry5/s5_machdep.c | 25 | ||||
-rw-r--r-- | sys/mips/sibyte/sb_machdep.c | 25 |
13 files changed, 3 insertions, 254 deletions
diff --git a/sys/mips/adm5120/adm5120_machdep.c b/sys/mips/adm5120/adm5120_machdep.c index bc7b7b0..29079c8 100644 --- a/sys/mips/adm5120/adm5120_machdep.c +++ b/sys/mips/adm5120/adm5120_machdep.c @@ -116,19 +116,6 @@ mips_init(void) } void -platform_halt(void) -{ - -} - - -void -platform_identify(void) -{ - -} - -void platform_reset(void) { @@ -137,18 +124,6 @@ platform_reset(void) } void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - -void platform_start(__register_t a0 __unused, __register_t a1 __unused, __register_t a2 __unused, __register_t a3 __unused) { diff --git a/sys/mips/alchemy/alchemy_machdep.c b/sys/mips/alchemy/alchemy_machdep.c index 047fa42..0593f83 100644 --- a/sys/mips/alchemy/alchemy_machdep.c +++ b/sys/mips/alchemy/alchemy_machdep.c @@ -117,19 +117,6 @@ mips_init(void) } void -platform_halt(void) -{ - -} - - -void -platform_identify(void) -{ - -} - -void platform_reset(void) { @@ -138,18 +125,6 @@ platform_reset(void) } void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - -void platform_start(__register_t a0 __unused, __register_t a1 __unused, __register_t a2 __unused, __register_t a3 __unused) { diff --git a/sys/mips/atheros/ar71xx_machdep.c b/sys/mips/atheros/ar71xx_machdep.c index e9f7c2d..8ff9653 100644 --- a/sys/mips/atheros/ar71xx_machdep.c +++ b/sys/mips/atheros/ar71xx_machdep.c @@ -106,18 +106,6 @@ platform_cpu_init() } void -platform_halt(void) -{ - -} - -void -platform_identify(void) -{ - -} - -void platform_reset(void) { ar71xx_device_stop(RST_RESET_FULL_CHIP); @@ -126,18 +114,6 @@ platform_reset(void) ; } -void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - /* * Obtain the MAC address via the Redboot environment. */ diff --git a/sys/mips/idt/idt_machdep.c b/sys/mips/idt/idt_machdep.c index 6c76c26..ac18748 100644 --- a/sys/mips/idt/idt_machdep.c +++ b/sys/mips/idt/idt_machdep.c @@ -82,19 +82,6 @@ platform_cpu_init() } void -platform_halt(void) -{ - -} - - -void -platform_identify(void) -{ - -} - -void platform_reset(void) { volatile unsigned int * p = (void *)0xb8008000; @@ -111,18 +98,6 @@ platform_reset(void) } void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - -void platform_start(__register_t a0, __register_t a1, __register_t a2 __unused, __register_t a3 __unused) { diff --git a/sys/mips/include/hwfunc.h b/sys/mips/include/hwfunc.h index a9e3285..5c797fc 100644 --- a/sys/mips/include/hwfunc.h +++ b/sys/mips/include/hwfunc.h @@ -30,14 +30,11 @@ #include <sys/_cpuset.h> -struct trapframe; struct timecounter; + /* - * Hooks downward into hardware functionality. + * Hooks downward into platform functionality. */ - -void platform_halt(void); -void platform_intr(struct trapframe *); void platform_reset(void); void platform_start(__register_t, __register_t, __register_t, __register_t); @@ -48,7 +45,6 @@ unsigned platform_get_timecount(struct timecounter *); /* For hardware specific CPU initialization */ void platform_cpu_init(void); -void platform_secondary_init(void); #ifdef SMP @@ -100,6 +96,6 @@ extern void platform_cpu_mask(cpuset_t *mask); */ struct cpu_group *platform_smp_topo(void); - #endif /* SMP */ + #endif /* !_MACHINE_HWFUNC_H_ */ diff --git a/sys/mips/include/md_var.h b/sys/mips/include/md_var.h index 00ff95a..6b3d0fc 100644 --- a/sys/mips/include/md_var.h +++ b/sys/mips/include/md_var.h @@ -76,9 +76,6 @@ void mips_pcpu0_init(void); void mips_proc0_init(void); void mips_postboot_fixup(void); -/* Platform call-downs. */ -void platform_identify(void); - extern int busdma_swi_pending; void busdma_swi(void); diff --git a/sys/mips/include/trap.h b/sys/mips/include/trap.h index d8042382..32bf1a8 100644 --- a/sys/mips/include/trap.h +++ b/sys/mips/include/trap.h @@ -118,10 +118,4 @@ void MipsUserIntr(void); register_t trap(struct trapframe *); -#ifndef LOCORE /* XXX */ -int check_address(void *); -void platform_trap_enter(void); -void platform_trap_exit(void); -#endif - #endif /* !_MACHINE_TRAP_H_ */ diff --git a/sys/mips/malta/malta_machdep.c b/sys/mips/malta/malta_machdep.c index 0ff34cb..8efb987 100644 --- a/sys/mips/malta/malta_machdep.c +++ b/sys/mips/malta/malta_machdep.c @@ -199,19 +199,6 @@ mips_init(void) #endif } -void -platform_halt(void) -{ - -} - - -void -platform_identify(void) -{ - -} - /* * Perform a board-level soft-reset. * Note that this is not emulated by gxemul. @@ -225,18 +212,6 @@ platform_reset(void) *c = MALTA_GORESET; } -void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - static uint64_t malta_cpu_freq(void) { diff --git a/sys/mips/nlm/xlp_machdep.c b/sys/mips/nlm/xlp_machdep.c index 5bdb6d9..39854fb 100644 --- a/sys/mips/nlm/xlp_machdep.c +++ b/sys/mips/nlm/xlp_machdep.c @@ -561,22 +561,6 @@ platform_cpu_init() } void -platform_identify(void) -{ - - printf("XLP Eval Board\n"); -} - -/* - * XXX Maybe return the state of the watchdog in enter, and pass it to - * exit? Like spl(). - */ -void -platform_trap_enter(void) -{ -} - -void platform_reset(void) { uint64_t sysbase = nlm_get_sys_regbase(0); @@ -586,11 +570,6 @@ platform_reset(void) __asm __volatile("wait"); } -void -platform_trap_exit(void) -{ -} - #ifdef SMP /* * XLP threads are started simultaneously when we enable threads, this will diff --git a/sys/mips/rmi/xlr_machdep.c b/sys/mips/rmi/xlr_machdep.c index 836c605..d6fdf43 100644 --- a/sys/mips/rmi/xlr_machdep.c +++ b/sys/mips/rmi/xlr_machdep.c @@ -517,19 +517,6 @@ platform_cpu_init() } void -platform_identify(void) -{ - - printf("Board [%d:%d], processor 0x%08x\n", (int)xlr_boot1_info.board_major_version, - (int)xlr_boot1_info.board_minor_version, mips_rd_prid()); -} - -void -platform_trap_enter(void) -{ -} - -void platform_reset(void) { xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_GPIO_OFFSET); @@ -538,11 +525,6 @@ platform_reset(void) xlr_write_reg(mmio, 8, 1); } -void -platform_trap_exit(void) -{ -} - #ifdef SMP int xlr_ap_release[MAXCPU]; diff --git a/sys/mips/rt305x/rt305x_machdep.c b/sys/mips/rt305x/rt305x_machdep.c index a388b4f..33c131c 100644 --- a/sys/mips/rt305x/rt305x_machdep.c +++ b/sys/mips/rt305x/rt305x_machdep.c @@ -118,19 +118,6 @@ mips_init(void) } void -platform_halt(void) -{ - -} - - -void -platform_identify(void) -{ - -} - -void platform_reset(void) { @@ -139,18 +126,6 @@ platform_reset(void) } void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - -void platform_start(__register_t a0 __unused, __register_t a1 __unused, __register_t a2 __unused, __register_t a3 __unused) { diff --git a/sys/mips/sentry5/s5_machdep.c b/sys/mips/sentry5/s5_machdep.c index 134f05b..cde081b 100644 --- a/sys/mips/sentry5/s5_machdep.c +++ b/sys/mips/sentry5/s5_machdep.c @@ -144,19 +144,6 @@ mips_init(void) } void -platform_halt(void) -{ - -} - - -void -platform_identify(void) -{ - -} - -void platform_reset(void) { @@ -168,18 +155,6 @@ platform_reset(void) } void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - -void platform_start(__register_t a0, __register_t a1, __register_t a2, __register_t a3) { diff --git a/sys/mips/sibyte/sb_machdep.c b/sys/mips/sibyte/sb_machdep.c index 304d036..452eea6 100644 --- a/sys/mips/sibyte/sb_machdep.c +++ b/sys/mips/sibyte/sb_machdep.c @@ -272,19 +272,6 @@ mips_init(void) } void -platform_halt(void) -{ - -} - - -void -platform_identify(void) -{ - -} - -void platform_reset(void) { @@ -295,18 +282,6 @@ platform_reset(void) sb_system_reset(); } -void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - static void kseg0_map_coherent(void) { |