Commit 75973fa1ee9afe3bf35c4a9ae6898ac126ebfb09
1 parent
929a62a0
MIPS: remove empty cpu_mips_irqctrl_init()
cpu_mips_irqctrl_init() function in hw/mips_timer.c is empty. Attached patch removes it, and its callers. (Hervé Poussineau) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5214 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
6 changed files
with
0 additions
and
9 deletions
hw/mips.h
| @@ -25,7 +25,6 @@ extern void cpu_mips_irq_init_cpu(CPUState *env); | @@ -25,7 +25,6 @@ extern void cpu_mips_irq_init_cpu(CPUState *env); | ||
| 25 | 25 | ||
| 26 | /* mips_timer.c */ | 26 | /* mips_timer.c */ |
| 27 | extern void cpu_mips_clock_init(CPUState *); | 27 | extern void cpu_mips_clock_init(CPUState *); |
| 28 | -extern void cpu_mips_irqctrl_init (void); | ||
| 29 | 28 | ||
| 30 | /* rc4030.c */ | 29 | /* rc4030.c */ |
| 31 | qemu_irq *rc4030_init(qemu_irq timer, qemu_irq jazz_bus); | 30 | qemu_irq *rc4030_init(qemu_irq timer, qemu_irq jazz_bus); |
hw/mips_malta.c
| @@ -878,7 +878,6 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size, | @@ -878,7 +878,6 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size, | ||
| 878 | /* Init internal devices */ | 878 | /* Init internal devices */ |
| 879 | cpu_mips_irq_init_cpu(env); | 879 | cpu_mips_irq_init_cpu(env); |
| 880 | cpu_mips_clock_init(env); | 880 | cpu_mips_clock_init(env); |
| 881 | - cpu_mips_irqctrl_init(); | ||
| 882 | 881 | ||
| 883 | /* Interrupt controller */ | 882 | /* Interrupt controller */ |
| 884 | /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */ | 883 | /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */ |
hw/mips_mipssim.c
| @@ -165,7 +165,6 @@ mips_mipssim_init (ram_addr_t ram_size, int vga_ram_size, | @@ -165,7 +165,6 @@ mips_mipssim_init (ram_addr_t ram_size, int vga_ram_size, | ||
| 165 | /* Init CPU internal devices. */ | 165 | /* Init CPU internal devices. */ |
| 166 | cpu_mips_irq_init_cpu(env); | 166 | cpu_mips_irq_init_cpu(env); |
| 167 | cpu_mips_clock_init(env); | 167 | cpu_mips_clock_init(env); |
| 168 | - cpu_mips_irqctrl_init(); | ||
| 169 | 168 | ||
| 170 | /* Register 64 KB of ISA IO space at 0x1fd00000. */ | 169 | /* Register 64 KB of ISA IO space at 0x1fd00000. */ |
| 171 | isa_mmio_init(0x1fd00000, 0x00010000); | 170 | isa_mmio_init(0x1fd00000, 0x00010000); |
hw/mips_r4k.c
| @@ -225,7 +225,6 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size, | @@ -225,7 +225,6 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size, | ||
| 225 | /* Init CPU internal devices */ | 225 | /* Init CPU internal devices */ |
| 226 | cpu_mips_irq_init_cpu(env); | 226 | cpu_mips_irq_init_cpu(env); |
| 227 | cpu_mips_clock_init(env); | 227 | cpu_mips_clock_init(env); |
| 228 | - cpu_mips_irqctrl_init(); | ||
| 229 | 228 | ||
| 230 | /* The PIC is attached to the MIPS CPU INT0 pin */ | 229 | /* The PIC is attached to the MIPS CPU INT0 pin */ |
| 231 | i8259 = i8259_init(env->irq[2]); | 230 | i8259 = i8259_init(env->irq[2]); |
hw/mips_timer.c
| @@ -4,10 +4,6 @@ | @@ -4,10 +4,6 @@ | ||
| 4 | 4 | ||
| 5 | #define TIMER_FREQ 100 * 1000 * 1000 | 5 | #define TIMER_FREQ 100 * 1000 * 1000 |
| 6 | 6 | ||
| 7 | -void cpu_mips_irqctrl_init (void) | ||
| 8 | -{ | ||
| 9 | -} | ||
| 10 | - | ||
| 11 | /* XXX: do not use a global */ | 7 | /* XXX: do not use a global */ |
| 12 | uint32_t cpu_mips_get_random (CPUState *env) | 8 | uint32_t cpu_mips_get_random (CPUState *env) |
| 13 | { | 9 | { |
target-mips/exec.h
| @@ -33,7 +33,6 @@ void cpu_loop_exit(void); | @@ -33,7 +33,6 @@ void cpu_loop_exit(void); | ||
| 33 | void do_raise_exception_err (uint32_t exception, int error_code); | 33 | void do_raise_exception_err (uint32_t exception, int error_code); |
| 34 | void do_raise_exception (uint32_t exception); | 34 | void do_raise_exception (uint32_t exception); |
| 35 | 35 | ||
| 36 | -void cpu_mips_irqctrl_init (void); | ||
| 37 | uint32_t cpu_mips_get_random (CPUState *env); | 36 | uint32_t cpu_mips_get_random (CPUState *env); |
| 38 | uint32_t cpu_mips_get_count (CPUState *env); | 37 | uint32_t cpu_mips_get_count (CPUState *env); |
| 39 | void cpu_mips_store_count (CPUState *env, uint32_t value); | 38 | void cpu_mips_store_count (CPUState *env, uint32_t value); |