diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2010-07-31 10:59:22 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-07-31 10:59:22 +0000 |
commit | c9a3419b9e40d08cd93a536c1282348498a35b99 (patch) | |
tree | 93c1f765abd4d784f4121fd405f011bde4309978 /firmware | |
parent | 028d91aa0c0928b32e58f692d058b3da1d894bce (diff) | |
download | rockbox-c9a3419b9e40d08cd93a536c1282348498a35b99.tar.gz rockbox-c9a3419b9e40d08cd93a536c1282348498a35b99.zip |
Add #include to power-ipod.c, make some variables static in storage.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27634 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/storage.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/ipod/power-ipod.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/firmware/storage.c b/firmware/storage.c index 372042564c..867c68cf6b 100644 --- a/firmware/storage.c +++ b/firmware/storage.c | |||
@@ -40,8 +40,8 @@ static unsigned int num_drives; | |||
40 | #define STORAGE_MINIMUM_IDLE_TIME (HZ/10) | 40 | #define STORAGE_MINIMUM_IDLE_TIME (HZ/10) |
41 | #define STORAGE_DELAY_UNIT (HZ/20) | 41 | #define STORAGE_DELAY_UNIT (HZ/20) |
42 | 42 | ||
43 | unsigned int storage_last_thread[NUM_DRIVES]; | 43 | static unsigned int storage_last_thread[NUM_DRIVES]; |
44 | unsigned int storage_last_activity[NUM_DRIVES]; | 44 | static unsigned int storage_last_activity[NUM_DRIVES]; |
45 | 45 | ||
46 | static bool storage_should_wait(int drive, int prio) | 46 | static bool storage_should_wait(int drive, int prio) |
47 | { | 47 | { |
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c index a82a18f699..ef594173f0 100644 --- a/firmware/target/arm/ipod/power-ipod.c +++ b/firmware/target/arm/ipod/power-ipod.c | |||
@@ -29,6 +29,9 @@ | |||
29 | #include "usb.h" | 29 | #include "usb.h" |
30 | #include "lcd.h" | 30 | #include "lcd.h" |
31 | #include "string.h" | 31 | #include "string.h" |
32 | #ifdef HAVE_USB_CHARGING_ENABLE | ||
33 | #include "usb_core.h" /* for usb_charging_maxcurrent_change */ | ||
34 | #endif | ||
32 | 35 | ||
33 | void power_init(void) | 36 | void power_init(void) |
34 | { | 37 | { |