diff options
| author | ian <ian@FreeBSD.org> | 2015-02-12 03:50:33 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-02-12 03:50:33 +0000 |
| commit | dff1ee7f45c73c94ead5792fd2f879e70e6232c8 (patch) | |
| tree | 7c6cdeb383764776a348de294da4e685c265f42c /sys/arm/s3c2xx0 | |
| parent | 0a5ffc45680c62f19448a2d2f49d063715444a28 (diff) | |
| download | FreeBSD-src-dff1ee7f45c73c94ead5792fd2f879e70e6232c8.zip FreeBSD-src-dff1ee7f45c73c94ead5792fd2f879e70e6232c8.tar.gz | |
MFC r271394, r271398:
Add more register values to armreg.h and remove CPU_CONTROL_32BP_ENABLE
from asm.h as they were already defined in armreg.h.
Unify interrupts bit definition and usage. While here remove PSR_C_bit.
Diffstat (limited to 'sys/arm/s3c2xx0')
| -rw-r--r-- | sys/arm/s3c2xx0/s3c24x0.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arm/s3c2xx0/s3c24x0.c b/sys/arm/s3c2xx0/s3c24x0.c index 14e6f82..01e1135 100644 --- a/sys/arm/s3c2xx0/s3c24x0.c +++ b/sys/arm/s3c2xx0/s3c24x0.c @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> +#include <machine/armreg.h> #include <machine/cpu.h> #include <machine/bus.h> @@ -638,7 +639,7 @@ s3c24x0_clock_freq(struct s3c2xx0_softc *sc) void cpu_reset(void) { - (void) disable_interrupts(I32_bit|F32_bit); + (void) disable_interrupts(PSR_I|PSR_F); bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_wdt_ioh, WDT_WTCON, WTCON_ENABLE | WTCON_CLKSEL_16 | WTCON_ENRST); |
