diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2010-08-01 08:56:15 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-08-01 08:56:15 +0000 |
commit | 451aa862448a119af2faf52ac5410f491d3138d1 (patch) | |
tree | c905eabe2c2f6ad4bd3b17c83a0ec7b839952827 | |
parent | f971deed6d3227c5fe8e3e6160d8fcc940acd85f (diff) | |
download | rockbox-451aa862448a119af2faf52ac5410f491d3138d1.tar.gz rockbox-451aa862448a119af2faf52ac5410f491d3138d1.zip |
Various minor cleanups for mini2440
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27645 a1c6a512-1295-4272-9138-f99709370657
7 files changed, 12 insertions, 4 deletions
diff --git a/firmware/drivers/audio/uda1341.c b/firmware/drivers/audio/uda1341.c index a566b611c6..6b38353afe 100644 --- a/firmware/drivers/audio/uda1341.c +++ b/firmware/drivers/audio/uda1341.c | |||
@@ -221,10 +221,12 @@ void audiohw_set_treble(int value) | |||
221 | } | 221 | } |
222 | */ | 222 | */ |
223 | 223 | ||
224 | #ifdef AUDIOHW_HAVE_PRESCALER | ||
224 | void audiohw_set_prescaler(int val) | 225 | void audiohw_set_prescaler(int val) |
225 | { | 226 | { |
226 | (void)val; | 227 | (void)val; |
227 | } | 228 | } |
229 | #endif /* AUDIOHW_HAVE_PRESCALER */ | ||
228 | 230 | ||
229 | /** | 231 | /** |
230 | * Sets left and right master volume (1(max) to 62(muted)) | 232 | * Sets left and right master volume (1(max) to 62(muted)) |
diff --git a/firmware/target/arm/s3c2440/dma-s3c2440.c b/firmware/target/arm/s3c2440/dma-s3c2440.c index c8df4fcc75..d514f3650e 100644 --- a/firmware/target/arm/s3c2440/dma-s3c2440.c +++ b/firmware/target/arm/s3c2440/dma-s3c2440.c | |||
@@ -35,7 +35,7 @@ static int dma_used = 0; | |||
35 | /* Status flags */ | 35 | /* Status flags */ |
36 | #define STATUS_CHANNEL_ACTIVE (1<<0) | 36 | #define STATUS_CHANNEL_ACTIVE (1<<0) |
37 | 37 | ||
38 | struct dma_channel_state | 38 | static struct dma_channel_state |
39 | { | 39 | { |
40 | volatile unsigned status; | 40 | volatile unsigned status; |
41 | void (*callback)(void); | 41 | void (*callback)(void); |
@@ -162,7 +162,7 @@ void dma_enable_channel(int channel, struct dma_request *request) | |||
162 | } | 162 | } |
163 | 163 | ||
164 | /* ISRs */ | 164 | /* ISRs */ |
165 | inline void generic_isr (unsigned channel) | 165 | static inline void generic_isr (unsigned channel) |
166 | { | 166 | { |
167 | if (dma_state [channel].status | STATUS_CHANNEL_ACTIVE) | 167 | if (dma_state [channel].status | STATUS_CHANNEL_ACTIVE) |
168 | { | 168 | { |
diff --git a/firmware/target/arm/s3c2440/mini2440/backlight-mini2440.c b/firmware/target/arm/s3c2440/mini2440/backlight-mini2440.c index 88c0b5ce2c..a9e003b80a 100644 --- a/firmware/target/arm/s3c2440/mini2440/backlight-mini2440.c +++ b/firmware/target/arm/s3c2440/mini2440/backlight-mini2440.c | |||
@@ -54,7 +54,7 @@ void _backlight_set_brightness(int brightness) | |||
54 | backlight_control = BACKLIGHT_CONTROL_SET; | 54 | backlight_control = BACKLIGHT_CONTROL_SET; |
55 | } | 55 | } |
56 | 56 | ||
57 | void _backlight_set_state (unsigned int level) | 57 | static void _backlight_set_state (unsigned int level) |
58 | { | 58 | { |
59 | if (level == 0) | 59 | if (level == 0) |
60 | GPGDAT &= ~GPIO_LCD_PWR; | 60 | GPGDAT &= ~GPIO_LCD_PWR; |
diff --git a/firmware/target/arm/s3c2440/mini2440/button-mini2440.c b/firmware/target/arm/s3c2440/mini2440/button-mini2440.c index 0435f47559..981e2a1280 100644 --- a/firmware/target/arm/s3c2440/mini2440/button-mini2440.c +++ b/firmware/target/arm/s3c2440/mini2440/button-mini2440.c | |||
@@ -82,8 +82,11 @@ void touchpad_set_sensitivity(int level) | |||
82 | /* No touchpad */ | 82 | /* No touchpad */ |
83 | } | 83 | } |
84 | 84 | ||
85 | #ifdef HAVE_HEADPHONE_DETECTION | ||
85 | bool headphones_inserted(void) | 86 | bool headphones_inserted(void) |
86 | { | 87 | { |
87 | /* No detect */ | 88 | /* No detect */ |
88 | return false; | 89 | return false; |
89 | } | 90 | } |
91 | #endif /* HAVE_HEADPHONE_DETECTION */ | ||
92 | |||
diff --git a/firmware/target/arm/s3c2440/mini2440/led-mini2440.c b/firmware/target/arm/s3c2440/mini2440/led-mini2440.c index f541d75273..606d443184 100644 --- a/firmware/target/arm/s3c2440/mini2440/led-mini2440.c +++ b/firmware/target/arm/s3c2440/mini2440/led-mini2440.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "config.h" | 21 | #include "config.h" |
22 | #include "cpu.h" | 22 | #include "cpu.h" |
23 | #include "kernel.h" | 23 | #include "kernel.h" |
24 | #include "led-mini2440.h" | ||
24 | 25 | ||
25 | /* LED functions for debug */ | 26 | /* LED functions for debug */ |
26 | 27 | ||
diff --git a/firmware/target/arm/s3c2440/mini2440/powermgmt-mini2440.c b/firmware/target/arm/s3c2440/mini2440/powermgmt-mini2440.c index 5584993040..5281b10698 100644 --- a/firmware/target/arm/s3c2440/mini2440/powermgmt-mini2440.c +++ b/firmware/target/arm/s3c2440/mini2440/powermgmt-mini2440.c | |||
@@ -58,6 +58,7 @@ unsigned int battery_adc_voltage(void) | |||
58 | return 4000 * 1024 / 1000; | 58 | return 4000 * 1024 / 1000; |
59 | } | 59 | } |
60 | 60 | ||
61 | #ifdef HAVE_BATTERY_SWITCH | ||
61 | unsigned int input_millivolts(void) | 62 | unsigned int input_millivolts(void) |
62 | { | 63 | { |
63 | unsigned int batt_millivolts = battery_voltage(); | 64 | unsigned int batt_millivolts = battery_voltage(); |
@@ -65,5 +66,5 @@ unsigned int input_millivolts(void) | |||
65 | /* No battery, return nominal value */ | 66 | /* No battery, return nominal value */ |
66 | return batt_millivolts; | 67 | return batt_millivolts; |
67 | } | 68 | } |
68 | 69 | #endif /* HAVE_BATTERY_SWITCH */ | |
69 | 70 | ||
diff --git a/firmware/target/arm/s3c2440/uart-s3c2440.c b/firmware/target/arm/s3c2440/uart-s3c2440.c index 8fe6511253..e9c9345103 100644 --- a/firmware/target/arm/s3c2440/uart-s3c2440.c +++ b/firmware/target/arm/s3c2440/uart-s3c2440.c | |||
@@ -33,6 +33,7 @@ | |||
33 | 33 | ||
34 | #include "system-target.h" | 34 | #include "system-target.h" |
35 | #include "uart-s3c2440.h" | 35 | #include "uart-s3c2440.h" |
36 | #include "serial.h" | ||
36 | 37 | ||
37 | #define MAX_PRINTF_BUF 1024 | 38 | #define MAX_PRINTF_BUF 1024 |
38 | 39 | ||