diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/ata.h | 2 | ||||
-rw-r--r-- | firmware/export/config-fmrecorder.h | 4 | ||||
-rw-r--r-- | firmware/export/config-gmini120.h | 3 | ||||
-rw-r--r-- | firmware/export/config-gminisp.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 3 | ||||
-rw-r--r-- | firmware/export/config-player.h | 4 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 4 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 4 | ||||
-rw-r--r-- | firmware/export/config.h | 5 | ||||
-rw-r--r-- | firmware/export/led.h | 3 |
11 files changed, 26 insertions, 12 deletions
diff --git a/firmware/export/ata.h b/firmware/export/ata.h index 2043de915a..e9dc54c6fe 100644 --- a/firmware/export/ata.h +++ b/firmware/export/ata.h | |||
@@ -61,7 +61,9 @@ extern int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count, | |||
61 | extern void ata_delayed_write(unsigned long sector, const void* buf); | 61 | extern void ata_delayed_write(unsigned long sector, const void* buf); |
62 | extern void ata_flush(void); | 62 | extern void ata_flush(void); |
63 | extern void ata_spin(void); | 63 | extern void ata_spin(void); |
64 | #if CONFIG_LED == LED_REAL | ||
64 | extern void ata_set_led_enabled(bool enabled); | 65 | extern void ata_set_led_enabled(bool enabled); |
66 | #endif | ||
65 | extern unsigned short* ata_get_identify(void); | 67 | extern unsigned short* ata_get_identify(void); |
66 | 68 | ||
67 | extern long last_disk_activity; | 69 | extern long last_disk_activity; |
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index ec410cb02a..b7f8621f67 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -67,8 +67,8 @@ | |||
67 | /* The start address index for ROM builds */ | 67 | /* The start address index for ROM builds */ |
68 | #define ROM_START 0x14010 | 68 | #define ROM_START 0x14010 |
69 | 69 | ||
70 | /* Define this for programmable LED available */ | 70 | /* Software controlled LED */ |
71 | #define HAVE_LED | 71 | #define CONFIG_LED LED_REAL |
72 | 72 | ||
73 | /* Define this for LCD backlight available */ | 73 | /* Define this for LCD backlight available */ |
74 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ | 74 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ |
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h index 473f1cfa7f..f1c20ee240 100644 --- a/firmware/export/config-gmini120.h +++ b/firmware/export/config-gmini120.h | |||
@@ -54,7 +54,8 @@ | |||
54 | 54 | ||
55 | #define GMINI_ARCH | 55 | #define GMINI_ARCH |
56 | 56 | ||
57 | #define HAVE_LED | 57 | /* Software controlled LED */ |
58 | #define CONFIG_LED LED_REAL | ||
58 | 59 | ||
59 | /* Define this if you have adjustable CPU frequency */ | 60 | /* Define this if you have adjustable CPU frequency */ |
60 | #define HAVE_ADJUSTABLE_CPU_FREQ | 61 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h index 431cf2f3ef..5cf8a76204 100644 --- a/firmware/export/config-gminisp.h +++ b/firmware/export/config-gminisp.h | |||
@@ -48,7 +48,8 @@ | |||
48 | 48 | ||
49 | #define GMINI_ARCH | 49 | #define GMINI_ARCH |
50 | 50 | ||
51 | #define HAVE_LED | 51 | /* Software controlled LED */ |
52 | #define CONFIG_LED LED_REAL | ||
52 | 53 | ||
53 | /* Define this if you have adjustable CPU frequency */ | 54 | /* Define this if you have adjustable CPU frequency */ |
54 | #define HAVE_ADJUSTABLE_CPU_FREQ | 55 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index cce88e591b..2380f220c0 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -85,6 +85,9 @@ | |||
85 | /* define this if media can be exchanged on the fly */ | 85 | /* define this if media can be exchanged on the fly */ |
86 | #define HAVE_HOTSWAP | 86 | #define HAVE_HOTSWAP |
87 | 87 | ||
88 | /* Virtual LED (icon) */ | ||
89 | #define CONFIG_LED LED_VIRTUAL | ||
90 | |||
88 | #define CONFIG_LCD LCD_SSD1815 | 91 | #define CONFIG_LCD LCD_SSD1815 |
89 | 92 | ||
90 | #define BOOTFILE_EXT ".ajz" | 93 | #define BOOTFILE_EXT ".ajz" |
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 58cb4085ae..66062fa0f3 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -73,6 +73,9 @@ | |||
73 | /* define this if media can be exchanged on the fly */ | 73 | /* define this if media can be exchanged on the fly */ |
74 | #define HAVE_HOTSWAP | 74 | #define HAVE_HOTSWAP |
75 | 75 | ||
76 | /* Virtual LED (icon) */ | ||
77 | #define CONFIG_LED LED_VIRTUAL | ||
78 | |||
76 | #define CONFIG_LCD LCD_SSD1815 | 79 | #define CONFIG_LCD LCD_SSD1815 |
77 | 80 | ||
78 | #define BOOTFILE_EXT ".ajz" | 81 | #define BOOTFILE_EXT ".ajz" |
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 8b85bfdfae..eee9e97530 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h | |||
@@ -60,8 +60,8 @@ | |||
60 | /* The start address index for ROM builds */ | 60 | /* The start address index for ROM builds */ |
61 | #define ROM_START 0xD010 | 61 | #define ROM_START 0xD010 |
62 | 62 | ||
63 | /* Define this for programmable LED available */ | 63 | /* Software controlled LED */ |
64 | #define HAVE_LED | 64 | #define CONFIG_LED LED_REAL |
65 | 65 | ||
66 | /* Define this for LCD backlight available */ | 66 | /* Define this for LCD backlight available */ |
67 | #define CONFIG_BACKLIGHT BL_PA14_LO /* port PA14, low active */ | 67 | #define CONFIG_BACKLIGHT BL_PA14_LO /* port PA14, low active */ |
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index a3a354feea..61c76d480d 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -61,8 +61,8 @@ | |||
61 | /* The start address index for ROM builds */ | 61 | /* The start address index for ROM builds */ |
62 | #define ROM_START 0x11010 | 62 | #define ROM_START 0x11010 |
63 | 63 | ||
64 | /* Define this for programmable LED available */ | 64 | /* Software controlled LED */ |
65 | #define HAVE_LED | 65 | #define CONFIG_LED LED_REAL |
66 | 66 | ||
67 | /* Define this for LCD backlight available */ | 67 | /* Define this for LCD backlight available */ |
68 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ | 68 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ |
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index b9a011802c..e042a78ead 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -67,8 +67,8 @@ | |||
67 | /* The start address index for ROM builds */ | 67 | /* The start address index for ROM builds */ |
68 | #define ROM_START 0x12010 | 68 | #define ROM_START 0x12010 |
69 | 69 | ||
70 | /* Define this for programmable LED available */ | 70 | /* Software controlled LED */ |
71 | #define HAVE_LED | 71 | #define CONFIG_LED LED_REAL |
72 | 72 | ||
73 | /* Define this for LCD backlight available */ | 73 | /* Define this for LCD backlight available */ |
74 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ | 74 | #define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 56001e32ad..6faaa49ffa 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -74,6 +74,11 @@ | |||
74 | #define I2C_GMINI 2 /* Gmini style */ | 74 | #define I2C_GMINI 2 /* Gmini style */ |
75 | #define I2C_H100 3 /* iRiver h100 style */ | 75 | #define I2C_H100 3 /* iRiver h100 style */ |
76 | 76 | ||
77 | /* CONFIG_LED */ | ||
78 | #define LED_REAL 1 /* SW controlled LED (Archos recorders, player, Gmini) */ | ||
79 | #define LED_VIRTUAL 2 /* Virtual LED (icon) (Archos Ondio) */ | ||
80 | /* else HW controlled LED (iRiver H1x0) */ | ||
81 | |||
77 | /* now go and pick yours */ | 82 | /* now go and pick yours */ |
78 | #if defined(ARCHOS_PLAYER) | 83 | #if defined(ARCHOS_PLAYER) |
79 | #include "config-player.h" | 84 | #include "config-player.h" |
diff --git a/firmware/export/led.h b/firmware/export/led.h index 052da2633b..f1b3b95447 100644 --- a/firmware/export/led.h +++ b/firmware/export/led.h | |||
@@ -23,8 +23,7 @@ | |||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | 24 | ||
25 | extern void led( bool on ); | 25 | extern void led( bool on ); |
26 | extern void invert_led( bool on ); | 26 | #if CONFIG_LED == LED_VIRTUAL |
27 | #ifndef HAVE_LED | ||
28 | extern bool led_read(int delayticks); /* read for status bar */ | 27 | extern bool led_read(int delayticks); /* read for status bar */ |
29 | #endif | 28 | #endif |
30 | 29 | ||