diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2007-09-23 23:08:39 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2007-09-23 23:08:39 +0000 |
commit | 9ac9cc6024271f806af23a84903d809eb145dc60 (patch) | |
tree | 66ff450d331c4dfae8758281a7faa47ffd2f752f /firmware/target/arm/olympus/mrobe-500/button-mr500.c | |
parent | d969a420b6c7f9aee321d218b7a9feb1c7158703 (diff) | |
download | rockbox-9ac9cc6024271f806af23a84903d809eb145dc60.tar.gz rockbox-9ac9cc6024271f806af23a84903d809eb145dc60.zip |
Working DM320 interrupts, changed the way registers are accessed in spi and uart drivers. Uart might be broken with interrupts - buttons on remote don't seem to respond when interrupts are enabled.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14836 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/olympus/mrobe-500/button-mr500.c')
-rw-r--r-- | firmware/target/arm/olympus/mrobe-500/button-mr500.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/olympus/mrobe-500/button-mr500.c b/firmware/target/arm/olympus/mrobe-500/button-mr500.c index 87ab80a5e5..7410875fd1 100644 --- a/firmware/target/arm/olympus/mrobe-500/button-mr500.c +++ b/firmware/target/arm/olympus/mrobe-500/button-mr500.c | |||
@@ -37,7 +37,7 @@ | |||
37 | void button_init_device(void) | 37 | void button_init_device(void) |
38 | { | 38 | { |
39 | /* GIO is the power button, set as input */ | 39 | /* GIO is the power button, set as input */ |
40 | outw(inw(IO_GIO_DIR0)|0x01, IO_GIO_DIR0); | 40 | IO_GIO_DIR0|=0x01; |
41 | } | 41 | } |
42 | 42 | ||
43 | inline bool button_hold(void) | 43 | inline bool button_hold(void) |
@@ -52,7 +52,7 @@ int button_read_device(void) | |||
52 | int i = 0; | 52 | int i = 0; |
53 | int btn = BUTTON_NONE, timeout = BUTTON_TIMEOUT; | 53 | int btn = BUTTON_NONE, timeout = BUTTON_TIMEOUT; |
54 | 54 | ||
55 | if ((inw(IO_GIO_BITSET0)&0x01) == 0) | 55 | if ((IO_GIO_BITSET0&0x01) == 0) |
56 | btn |= BUTTON_POWER; | 56 | btn |= BUTTON_POWER; |
57 | 57 | ||
58 | uartHeartbeat(); | 58 | uartHeartbeat(); |