patch-2.4.22 linux-2.4.22/arch/mips/mips-boards/sead/sead_time.c
Next file: linux-2.4.22/arch/mips/mm/Makefile
Previous file: linux-2.4.22/arch/mips/mips-boards/sead/sead_setup.c
Back to the patch index
Back to the overall index
- Lines: 62
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/mips-boards/sead/sead_time.c
- Orig date:
2002-11-28 15:53:10.000000000 -0800
diff -urN linux-2.4.21/arch/mips/mips-boards/sead/sead_time.c linux-2.4.22/arch/mips/mips-boards/sead/sead_time.c
@@ -59,7 +59,7 @@
static inline void ack_r4ktimer(unsigned long newval)
{
- write_32bit_cp0_register(CP0_COMPARE, newval);
+ write_c0_compare(newval);
}
/*
@@ -87,7 +87,7 @@
r4k_cur += r4k_offset;
ack_r4ktimer(r4k_cur);
- } while (((unsigned long)read_32bit_cp0_register(CP0_COUNT)
+ } while (((unsigned long)read_c0_count()
- r4k_cur) < 0x7fffffff);
irq_exit(cpu, irq);
@@ -111,18 +111,19 @@
void __init mips_time_init(void)
{
- unsigned int est_freq, flags;
+ unsigned long flags;
+ unsigned int est_freq;
- __save_and_cli(flags);
+ local_irq_save(flags);
/* Start r4k counter. */
- write_32bit_cp0_register(CP0_COUNT, 0);
+ write_c0_count(0);
printk("calculating r4koff... ");
r4k_offset = cal_r4koff();
printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset);
- if ((read_32bit_cp0_register(CP0_PRID) & 0xffff00) ==
+ if ((read_c0_prid() & 0xffff00) ==
(PRID_COMP_MIPS | PRID_IMP_20KC))
est_freq = r4k_offset*HZ;
else
@@ -133,7 +134,7 @@
printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
(est_freq%1000000)*100/1000000);
- __restore_flags(flags);
+ local_irq_restore(flags);
}
void __init mips_timer_setup(struct irqaction *irq)
@@ -143,7 +144,7 @@
setup_irq(MIPS_CPU_TIMER_IRQ, irq);
/* to generate the first timer interrupt */
- r4k_cur = (read_32bit_cp0_register(CP0_COUNT) + r4k_offset);
- write_32bit_cp0_register(CP0_COMPARE, r4k_cur);
- set_cp0_status(ALLINTS);
+ r4k_cur = (read_c0_count() + r4k_offset);
+ write_c0_compare(r4k_cur);
+ set_c0_status(ALLINTS);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)