diff options
| author | Barry Wardell <rockbox@barrywardell.net> | 2006-09-20 23:21:59 +0000 |
|---|---|---|
| committer | Barry Wardell <rockbox@barrywardell.net> | 2006-09-20 23:21:59 +0000 |
| commit | e63e62b2a1d849b9a965e989b3ce18576c0ac521 (patch) | |
| tree | 4a992431717e4ba4218f1da6feb0e9be01165215 /firmware/export | |
| parent | 9acc450e716b0c2accfa3922aba91cb707d4ae14 (diff) | |
| download | rockbox-e63e62b2a1d849b9a965e989b3ce18576c0ac521.tar.gz rockbox-e63e62b2a1d849b9a965e989b3ce18576c0ac521.zip | |
Detect charger connected on H10. No need to sleep(HZ) when powering off.
More sensible USB support for H10: plugging in puts it into USB charging mode and leaves Rockbox usable, holding 'O' while pluggin in the USB cable will reboot the H10 (continuing to hold 'O' starts it up in UMS mode), holding any other button brings up the USB screen as previously.
Implement system_reboot() for all PP5020 devices.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11015 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/config-h10.h | 9 | ||||
| -rw-r--r-- | firmware/export/config-h10_5gb.h | 9 | ||||
| -rw-r--r-- | firmware/export/pp5020.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index c024fd464c..df42068fb8 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h | |||
| @@ -85,12 +85,11 @@ | |||
| 85 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 85 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
| 86 | #define BATTERY_SCALE_FACTOR 5865 | 86 | #define BATTERY_SCALE_FACTOR 5865 |
| 87 | 87 | ||
| 88 | /* Hardware controlled charging? FIXME */ | 88 | /* Hardware controlled charging */ |
| 89 | //#define CONFIG_CHARGING CHARGING_SIMPLE | 89 | #define CONFIG_CHARGING CHARGING_SIMPLE |
| 90 | 90 | ||
| 91 | /* define this if the hardware can be powered off while charging */ | 91 | /* define this if the hardware can be powered off while charging */ |
| 92 | /* TODO: should this be set for the H10? */ | 92 | #define HAVE_POWEROFF_WHILE_CHARGING |
| 93 | //#define HAVE_POWEROFF_WHILE_CHARGING | ||
| 94 | 93 | ||
| 95 | /* The start address index for ROM builds */ | 94 | /* The start address index for ROM builds */ |
| 96 | #define ROM_START 0x00000000 | 95 | #define ROM_START 0x00000000 |
| @@ -128,7 +127,7 @@ | |||
| 128 | /* #define USB_IPODSTYLE */ | 127 | /* #define USB_IPODSTYLE */ |
| 129 | 128 | ||
| 130 | /* define this if the unit can be powered or charged via USB */ | 129 | /* define this if the unit can be powered or charged via USB */ |
| 131 | /*#define HAVE_USB_POWER*/ | 130 | #define HAVE_USB_POWER |
| 132 | 131 | ||
| 133 | /* Virtual LED (icon) */ | 132 | /* Virtual LED (icon) */ |
| 134 | #define CONFIG_LED LED_VIRTUAL | 133 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index 9ad7eede2e..35d54679eb 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h | |||
| @@ -81,12 +81,11 @@ | |||
| 81 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 81 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
| 82 | #define BATTERY_SCALE_FACTOR 5865 | 82 | #define BATTERY_SCALE_FACTOR 5865 |
| 83 | 83 | ||
| 84 | /* Hardware controlled charging? FIXME */ | 84 | /* Hardware controlled charging */ |
| 85 | //#define CONFIG_CHARGING CHARGING_SIMPLE | 85 | #define CONFIG_CHARGING CHARGING_SIMPLE |
| 86 | 86 | ||
| 87 | /* define this if the hardware can be powered off while charging */ | 87 | /* define this if the hardware can be powered off while charging */ |
| 88 | /* TODO: should this be set for the H10? */ | 88 | #define HAVE_POWEROFF_WHILE_CHARGING |
| 89 | //#define HAVE_POWEROFF_WHILE_CHARGING | ||
| 90 | 89 | ||
| 91 | /* The start address index for ROM builds */ | 90 | /* The start address index for ROM builds */ |
| 92 | #define ROM_START 0x00000000 | 91 | #define ROM_START 0x00000000 |
| @@ -110,7 +109,7 @@ | |||
| 110 | /* #define USB_IPODSTYLE */ | 109 | /* #define USB_IPODSTYLE */ |
| 111 | 110 | ||
| 112 | /* define this if the unit can be powered or charged via USB */ | 111 | /* define this if the unit can be powered or charged via USB */ |
| 113 | /*#define HAVE_USB_POWER*/ | 112 | #define HAVE_USB_POWER |
| 114 | 113 | ||
| 115 | /* Virtual LED (icon) */ | 114 | /* Virtual LED (icon) */ |
| 116 | #define CONFIG_LED LED_VIRTUAL | 115 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h index ccb49a0d90..37d8882519 100644 --- a/firmware/export/pp5020.h +++ b/firmware/export/pp5020.h | |||
| @@ -125,6 +125,8 @@ | |||
| 125 | #define DEV_RS (*(volatile unsigned long *)(0x60006004)) | 125 | #define DEV_RS (*(volatile unsigned long *)(0x60006004)) |
| 126 | #define DEV_EN (*(volatile unsigned long *)(0x6000600c)) | 126 | #define DEV_EN (*(volatile unsigned long *)(0x6000600c)) |
| 127 | 127 | ||
| 128 | #define DEV_SYSTEM 0x4 | ||
| 129 | |||
| 128 | #define TIMER1_CFG (*(volatile unsigned long *)(0x60005000)) | 130 | #define TIMER1_CFG (*(volatile unsigned long *)(0x60005000)) |
| 129 | #define TIMER1_VAL (*(volatile unsigned long *)(0x60005004)) | 131 | #define TIMER1_VAL (*(volatile unsigned long *)(0x60005004)) |
| 130 | #define TIMER2_CFG (*(volatile unsigned long *)(0x60005008)) | 132 | #define TIMER2_CFG (*(volatile unsigned long *)(0x60005008)) |