diff options
-rw-r--r-- | apps/tree.c | 4 | ||||
-rw-r--r-- | firmware/export/config-fmrecorder.h | 6 | ||||
-rw-r--r-- | firmware/export/config-gmini120.h | 6 | ||||
-rw-r--r-- | firmware/export/config-gminisp.h | 6 | ||||
-rw-r--r-- | firmware/export/config-h100.h | 6 | ||||
-rw-r--r-- | firmware/export/config-h300.h | 6 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 6 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 6 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 6 |
9 files changed, 26 insertions, 26 deletions
diff --git a/apps/tree.c b/apps/tree.c index b096b8927f..1332fc07ba 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -820,7 +820,7 @@ static bool dirbrowse(void) | |||
820 | break; | 820 | break; |
821 | 821 | ||
822 | #ifdef TREE_OFF | 822 | #ifdef TREE_OFF |
823 | #ifndef HAVE_SW_POWEROFF | 823 | #if (CONFIG_KEYPAD == RECORDER_PAD) && !defined(HAVE_SW_POWEROFF) |
824 | case TREE_OFF: | 824 | case TREE_OFF: |
825 | if (*tc.dirfilter < NUM_FILTER_MODES) | 825 | if (*tc.dirfilter < NUM_FILTER_MODES) |
826 | { | 826 | { |
@@ -839,7 +839,7 @@ static bool dirbrowse(void) | |||
839 | } | 839 | } |
840 | break; | 840 | break; |
841 | #endif | 841 | #endif |
842 | #if defined(HAVE_CHARGING) && !defined(IRIVER_H100) | 842 | #if defined(HAVE_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) |
843 | case TREE_OFF | BUTTON_REPEAT: | 843 | case TREE_OFF | BUTTON_REPEAT: |
844 | if (charger_inserted()) { | 844 | if (charger_inserted()) { |
845 | charging_splash(); | 845 | charging_splash(); |
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index b7f8621f67..914ef60f79 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -14,6 +14,9 @@ | |||
14 | /* define this if you have a real-time clock */ | 14 | /* define this if you have a real-time clock */ |
15 | #define HAVE_RTC 1 | 15 | #define HAVE_RTC 1 |
16 | 16 | ||
17 | /* Define this if you have a software controlled poweroff */ | ||
18 | #define HAVE_SW_POWEROFF | ||
19 | |||
17 | #ifndef SIMULATOR | 20 | #ifndef SIMULATOR |
18 | 21 | ||
19 | /* Define this if you have a MAS3587F */ | 22 | /* Define this if you have a MAS3587F */ |
@@ -73,9 +76,6 @@ | |||
73 | /* Define this for LCD backlight available */ | 76 | /* Define this for LCD backlight available */ |
74 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ | 77 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ |
75 | 78 | ||
76 | /* Define this if you have a software controlled poweroff */ | ||
77 | #define HAVE_SW_POWEROFF | ||
78 | |||
79 | #define CONFIG_LCD LCD_SSD1815 | 79 | #define CONFIG_LCD LCD_SSD1815 |
80 | 80 | ||
81 | #define BOOTFILE_EXT ".ajz" | 81 | #define BOOTFILE_EXT ".ajz" |
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h index f1c20ee240..93b8727b63 100644 --- a/firmware/export/config-gmini120.h +++ b/firmware/export/config-gmini120.h | |||
@@ -16,6 +16,9 @@ | |||
16 | 16 | ||
17 | #define CONFIG_KEYPAD GMINI100_PAD | 17 | #define CONFIG_KEYPAD GMINI100_PAD |
18 | 18 | ||
19 | /* Define this if you have a software controlled poweroff */ | ||
20 | #define HAVE_SW_POWEROFF | ||
21 | |||
19 | #ifndef SIMULATOR | 22 | #ifndef SIMULATOR |
20 | 23 | ||
21 | /* Define this if you have a TCC730 (CalmRISC16) */ | 24 | /* Define this if you have a TCC730 (CalmRISC16) */ |
@@ -40,9 +43,6 @@ | |||
40 | #define CPU_FREQ 30000000 | 43 | #define CPU_FREQ 30000000 |
41 | /* approximate value (and false in general since freq is variable) */ | 44 | /* approximate value (and false in general since freq is variable) */ |
42 | 45 | ||
43 | /* Define this if you have a software controlled poweroff */ | ||
44 | #define HAVE_SW_POWEROFF | ||
45 | |||
46 | /* Always enable debug till we stabilize */ | 46 | /* Always enable debug till we stabilize */ |
47 | #define EMULATOR | 47 | #define EMULATOR |
48 | 48 | ||
diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h index 5cf8a76204..6a1105f30a 100644 --- a/firmware/export/config-gminisp.h +++ b/firmware/export/config-gminisp.h | |||
@@ -10,6 +10,9 @@ | |||
10 | 10 | ||
11 | #define CONFIG_KEYPAD GMINI100_PAD | 11 | #define CONFIG_KEYPAD GMINI100_PAD |
12 | 12 | ||
13 | /* Define this if you have a software controlled poweroff */ | ||
14 | #define HAVE_SW_POWEROFF | ||
15 | |||
13 | #ifndef SIMULATOR | 16 | #ifndef SIMULATOR |
14 | 17 | ||
15 | /* Define this if you have a TCC730 (CalmRISC16) */ | 18 | /* Define this if you have a TCC730 (CalmRISC16) */ |
@@ -34,9 +37,6 @@ | |||
34 | #define CPU_FREQ 30000000 | 37 | #define CPU_FREQ 30000000 |
35 | /* approximate value (and false in general since freq is variable) */ | 38 | /* approximate value (and false in general since freq is variable) */ |
36 | 39 | ||
37 | /* Define this if you have a software controlled poweroff */ | ||
38 | #define HAVE_SW_POWEROFF | ||
39 | |||
40 | /* Always enable debug till we stabilize */ | 40 | /* Always enable debug till we stabilize */ |
41 | #define EMULATOR | 41 | #define EMULATOR |
42 | 42 | ||
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 82247cf497..552eea1166 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -24,6 +24,9 @@ | |||
24 | 24 | ||
25 | #define CONFIG_LCD LCD_S1D15E06 | 25 | #define CONFIG_LCD LCD_S1D15E06 |
26 | 26 | ||
27 | /* Define this if you have a software controlled poweroff */ | ||
28 | #define HAVE_SW_POWEROFF | ||
29 | |||
27 | #ifndef SIMULATOR | 30 | #ifndef SIMULATOR |
28 | 31 | ||
29 | /* Define this if you have a Motorola SCF5249 */ | 32 | /* Define this if you have a Motorola SCF5249 */ |
@@ -64,9 +67,6 @@ | |||
64 | 67 | ||
65 | #define USB_IRIVERSTYLE | 68 | #define USB_IRIVERSTYLE |
66 | 69 | ||
67 | /* Define this if you have a software controlled poweroff */ | ||
68 | #define HAVE_SW_POWEROFF | ||
69 | |||
70 | /* Define this if you have adjustable CPU frequency */ | 70 | /* Define this if you have adjustable CPU frequency */ |
71 | #define HAVE_ADJUSTABLE_CPU_FREQ | 71 | #define HAVE_ADJUSTABLE_CPU_FREQ |
72 | 72 | ||
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 92f2cc03eb..015f31ad8a 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h | |||
@@ -22,6 +22,9 @@ | |||
22 | /* Define this if you have an remote lcd */ | 22 | /* Define this if you have an remote lcd */ |
23 | #define HAVE_REMOTE_LCD | 23 | #define HAVE_REMOTE_LCD |
24 | 24 | ||
25 | /* Define this if you have a software controlled poweroff */ | ||
26 | #define HAVE_SW_POWEROFF | ||
27 | |||
25 | #ifndef SIMULATOR | 28 | #ifndef SIMULATOR |
26 | 29 | ||
27 | /* Define this if you have a Motorola SCF5249 */ | 30 | /* Define this if you have a Motorola SCF5249 */ |
@@ -64,9 +67,6 @@ | |||
64 | 67 | ||
65 | #define USB_IRIVERSTYLE | 68 | #define USB_IRIVERSTYLE |
66 | 69 | ||
67 | /* Define this if you have a software controlled poweroff */ | ||
68 | #define HAVE_SW_POWEROFF | ||
69 | |||
70 | /* Define this if you have adjustable CPU frequency */ | 70 | /* Define this if you have adjustable CPU frequency */ |
71 | #define HAVE_ADJUSTABLE_CPU_FREQ | 71 | #define HAVE_ADJUSTABLE_CPU_FREQ |
72 | 72 | ||
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 2380f220c0..b052832bbc 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -11,6 +11,9 @@ | |||
11 | /* define this if you have an Ondio style 6-key keyboard */ | 11 | /* define this if you have an Ondio style 6-key keyboard */ |
12 | #define CONFIG_KEYPAD ONDIO_PAD | 12 | #define CONFIG_KEYPAD ONDIO_PAD |
13 | 13 | ||
14 | /* Define this if you have a software controlled poweroff */ | ||
15 | #define HAVE_SW_POWEROFF | ||
16 | |||
14 | #ifndef SIMULATOR | 17 | #ifndef SIMULATOR |
15 | 18 | ||
16 | /* Define this if you have a SH7034 */ | 19 | /* Define this if you have a SH7034 */ |
@@ -76,9 +79,6 @@ | |||
76 | /* Define this if the MAS SIBI line can be controlled via PB8 */ | 79 | /* Define this if the MAS SIBI line can be controlled via PB8 */ |
77 | #define HAVE_MAS_SIBI_CONTROL | 80 | #define HAVE_MAS_SIBI_CONTROL |
78 | 81 | ||
79 | /* Define this if you have a software controlled poweroff */ | ||
80 | #define HAVE_SW_POWEROFF | ||
81 | |||
82 | /* define this if more than one device/partition can be used */ | 82 | /* define this if more than one device/partition can be used */ |
83 | #define HAVE_MULTIVOLUME | 83 | #define HAVE_MULTIVOLUME |
84 | 84 | ||
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 66062fa0f3..6c800b3a53 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -8,6 +8,9 @@ | |||
8 | /* define this if you have an Ondio style 6-key keyboard */ | 8 | /* define this if you have an Ondio style 6-key keyboard */ |
9 | #define CONFIG_KEYPAD ONDIO_PAD | 9 | #define CONFIG_KEYPAD ONDIO_PAD |
10 | 10 | ||
11 | /* Define this if you have a software controlled poweroff */ | ||
12 | #define HAVE_SW_POWEROFF | ||
13 | |||
11 | #ifndef SIMULATOR | 14 | #ifndef SIMULATOR |
12 | 15 | ||
13 | /* Define this if you have a SH7034 */ | 16 | /* Define this if you have a SH7034 */ |
@@ -64,9 +67,6 @@ | |||
64 | /* Define this if the MAS SIBI line can be controlled via PB8 */ | 67 | /* Define this if the MAS SIBI line can be controlled via PB8 */ |
65 | #define HAVE_MAS_SIBI_CONTROL | 68 | #define HAVE_MAS_SIBI_CONTROL |
66 | 69 | ||
67 | /* Define this if you have a software controlled poweroff */ | ||
68 | #define HAVE_SW_POWEROFF | ||
69 | |||
70 | /* define this if more than one device/partition can be used */ | 70 | /* define this if more than one device/partition can be used */ |
71 | #define HAVE_MULTIVOLUME | 71 | #define HAVE_MULTIVOLUME |
72 | 72 | ||
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index e042a78ead..450222dd38 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -14,6 +14,9 @@ | |||
14 | /* define this if you have a real-time clock */ | 14 | /* define this if you have a real-time clock */ |
15 | #define HAVE_RTC 1 | 15 | #define HAVE_RTC 1 |
16 | 16 | ||
17 | /* Define this if you have a software controlled poweroff */ | ||
18 | #define HAVE_SW_POWEROFF | ||
19 | |||
17 | #ifndef SIMULATOR | 20 | #ifndef SIMULATOR |
18 | 21 | ||
19 | /* Define this if you have a SH7034 */ | 22 | /* Define this if you have a SH7034 */ |
@@ -73,9 +76,6 @@ | |||
73 | /* Define this for LCD backlight available */ | 76 | /* Define this for LCD backlight available */ |
74 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ | 77 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ |
75 | 78 | ||
76 | /* Define this if you have a software controlled poweroff */ | ||
77 | #define HAVE_SW_POWEROFF | ||
78 | |||
79 | #define CONFIG_LCD LCD_SSD1815 | 79 | #define CONFIG_LCD LCD_SSD1815 |
80 | 80 | ||
81 | #define BOOTFILE_EXT ".ajz" | 81 | #define BOOTFILE_EXT ".ajz" |