devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Make the simulator builds know about software poweroff, for more consistent behaviour to the targets. Changed some #if conditions to better reflect the hardware. Fixes iriver sim.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6833 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-06-22 23:24:45 +00:00
parent 7ec8aa2a2c
commit 337f3a1b99
9 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/tree.c
View file

@ -820,7 +820,7 @@ static bool dirbrowse(void)
break; break;
#ifdef TREE_OFF #ifdef TREE_OFF
#ifndef HAVE_SW_POWEROFF #if (CONFIG_KEYPAD == RECORDER_PAD) && !defined(HAVE_SW_POWEROFF)
case TREE_OFF: case TREE_OFF:
if (*tc.dirfilter < NUM_FILTER_MODES) if (*tc.dirfilter < NUM_FILTER_MODES)
{ {
@ -839,7 +839,7 @@ static bool dirbrowse(void)
} }
break; break;
#endif #endif
#if defined(HAVE_CHARGING) && !defined(IRIVER_H100) #if defined(HAVE_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
case TREE_OFF | BUTTON_REPEAT: case TREE_OFF | BUTTON_REPEAT:
if (charger_inserted()) { if (charger_inserted()) {
charging_splash(); charging_splash();

6
firmware/export/config-fmrecorder.h
View file

@ -14,6 +14,9 @@
/* define this if you have a real-time clock */ /* define this if you have a real-time clock */
#define HAVE_RTC 1 #define HAVE_RTC 1
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#ifndef SIMULATOR #ifndef SIMULATOR
/* Define this if you have a MAS3587F */ /* Define this if you have a MAS3587F */
@ -73,9 +76,6 @@
/* Define this for LCD backlight available */ /* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#define CONFIG_LCD LCD_SSD1815 #define CONFIG_LCD LCD_SSD1815
#define BOOTFILE_EXT ".ajz" #define BOOTFILE_EXT ".ajz"

6
firmware/export/config-gmini120.h
View file

@ -16,6 +16,9 @@
#define CONFIG_KEYPAD GMINI100_PAD #define CONFIG_KEYPAD GMINI100_PAD
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#ifndef SIMULATOR #ifndef SIMULATOR
/* Define this if you have a TCC730 (CalmRISC16) */ /* Define this if you have a TCC730 (CalmRISC16) */
@ -40,9 +43,6 @@
#define CPU_FREQ 30000000 #define CPU_FREQ 30000000
/* approximate value (and false in general since freq is variable) */ /* approximate value (and false in general since freq is variable) */
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
/* Always enable debug till we stabilize */ /* Always enable debug till we stabilize */
#define EMULATOR #define EMULATOR

6
firmware/export/config-gminisp.h
View file

@ -10,6 +10,9 @@
#define CONFIG_KEYPAD GMINI100_PAD #define CONFIG_KEYPAD GMINI100_PAD
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#ifndef SIMULATOR #ifndef SIMULATOR
/* Define this if you have a TCC730 (CalmRISC16) */ /* Define this if you have a TCC730 (CalmRISC16) */
@ -34,9 +37,6 @@
#define CPU_FREQ 30000000 #define CPU_FREQ 30000000
/* approximate value (and false in general since freq is variable) */ /* approximate value (and false in general since freq is variable) */
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
/* Always enable debug till we stabilize */ /* Always enable debug till we stabilize */
#define EMULATOR #define EMULATOR

6
firmware/export/config-h100.h
View file

@ -24,6 +24,9 @@
#define CONFIG_LCD LCD_S1D15E06 #define CONFIG_LCD LCD_S1D15E06
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#ifndef SIMULATOR #ifndef SIMULATOR
/* Define this if you have a Motorola SCF5249 */ /* Define this if you have a Motorola SCF5249 */
@ -64,9 +67,6 @@
#define USB_IRIVERSTYLE #define USB_IRIVERSTYLE
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
/* Define this if you have adjustable CPU frequency */ /* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ #define HAVE_ADJUSTABLE_CPU_FREQ

6
firmware/export/config-h300.h
View file

@ -22,6 +22,9 @@
/* Define this if you have an remote lcd */ /* Define this if you have an remote lcd */
#define HAVE_REMOTE_LCD #define HAVE_REMOTE_LCD
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#ifndef SIMULATOR #ifndef SIMULATOR
/* Define this if you have a Motorola SCF5249 */ /* Define this if you have a Motorola SCF5249 */
@ -64,9 +67,6 @@
#define USB_IRIVERSTYLE #define USB_IRIVERSTYLE
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
/* Define this if you have adjustable CPU frequency */ /* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ #define HAVE_ADJUSTABLE_CPU_FREQ

6
firmware/export/config-ondiofm.h
View file

@ -11,6 +11,9 @@
/* define this if you have an Ondio style 6-key keyboard */ /* define this if you have an Ondio style 6-key keyboard */
#define CONFIG_KEYPAD ONDIO_PAD #define CONFIG_KEYPAD ONDIO_PAD
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#ifndef SIMULATOR #ifndef SIMULATOR
/* Define this if you have a SH7034 */ /* Define this if you have a SH7034 */
@ -76,9 +79,6 @@
/* Define this if the MAS SIBI line can be controlled via PB8 */ /* Define this if the MAS SIBI line can be controlled via PB8 */
#define HAVE_MAS_SIBI_CONTROL #define HAVE_MAS_SIBI_CONTROL
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
/* define this if more than one device/partition can be used */ /* define this if more than one device/partition can be used */
#define HAVE_MULTIVOLUME #define HAVE_MULTIVOLUME

6
firmware/export/config-ondiosp.h
View file

@ -8,6 +8,9 @@
/* define this if you have an Ondio style 6-key keyboard */ /* define this if you have an Ondio style 6-key keyboard */
#define CONFIG_KEYPAD ONDIO_PAD #define CONFIG_KEYPAD ONDIO_PAD
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#ifndef SIMULATOR #ifndef SIMULATOR
/* Define this if you have a SH7034 */ /* Define this if you have a SH7034 */
@ -64,9 +67,6 @@
/* Define this if the MAS SIBI line can be controlled via PB8 */ /* Define this if the MAS SIBI line can be controlled via PB8 */
#define HAVE_MAS_SIBI_CONTROL #define HAVE_MAS_SIBI_CONTROL
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
/* define this if more than one device/partition can be used */ /* define this if more than one device/partition can be used */
#define HAVE_MULTIVOLUME #define HAVE_MULTIVOLUME

6
firmware/export/config-recorderv2.h
View file

@ -14,6 +14,9 @@
/* define this if you have a real-time clock */ /* define this if you have a real-time clock */
#define HAVE_RTC 1 #define HAVE_RTC 1
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#ifndef SIMULATOR #ifndef SIMULATOR
/* Define this if you have a SH7034 */ /* Define this if you have a SH7034 */
@ -73,9 +76,6 @@
/* Define this for LCD backlight available */ /* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
#define CONFIG_LCD LCD_SSD1815 #define CONFIG_LCD LCD_SSD1815
#define BOOTFILE_EXT ".ajz" #define BOOTFILE_EXT ".ajz"