summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2010-07-31 10:59:22 +0000
committerBertrik Sikken <bertrik@sikken.nl>2010-07-31 10:59:22 +0000
commitc9a3419b9e40d08cd93a536c1282348498a35b99 (patch)
tree93c1f765abd4d784f4121fd405f011bde4309978 /firmware
parent028d91aa0c0928b32e58f692d058b3da1d894bce (diff)
downloadrockbox-c9a3419b9e40d08cd93a536c1282348498a35b99.tar.gz
rockbox-c9a3419b9e40d08cd93a536c1282348498a35b99.tar.bz2
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.c4
-rw-r--r--firmware/target/arm/ipod/power-ipod.c3
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;
#define STORAGE_MINIMUM_IDLE_TIME (HZ/10)
#define STORAGE_DELAY_UNIT (HZ/20)
-unsigned int storage_last_thread[NUM_DRIVES];
-unsigned int storage_last_activity[NUM_DRIVES];
+static unsigned int storage_last_thread[NUM_DRIVES];
+static unsigned int storage_last_activity[NUM_DRIVES];
static bool storage_should_wait(int drive, int prio)
{
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 @@
#include "usb.h"
#include "lcd.h"
#include "string.h"
+#ifdef HAVE_USB_CHARGING_ENABLE
+#include "usb_core.h" /* for usb_charging_maxcurrent_change */
+#endif
void power_init(void)
{