diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/audio.h | 2 | ||||
-rw-r--r-- | firmware/export/config-e200.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ifp7xx.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ipodnano.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 3 | ||||
-rw-r--r-- | firmware/mpeg.c | 4 |
7 files changed, 20 insertions, 1 deletions
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index e6fed90069..933076537e 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h | |||
@@ -96,7 +96,9 @@ struct mp3entry* audio_next_track(void); | |||
96 | bool audio_has_changed_track(void); | 96 | bool audio_has_changed_track(void); |
97 | void audio_get_debugdata(struct audio_debug *dbgdata); | 97 | void audio_get_debugdata(struct audio_debug *dbgdata); |
98 | void audio_set_crossfade(int type); | 98 | void audio_set_crossfade(int type); |
99 | #ifndef HAVE_FLASH_STORAGE | ||
99 | void audio_set_buffer_margin(int seconds); | 100 | void audio_set_buffer_margin(int seconds); |
101 | #endif | ||
100 | unsigned int audio_error(void); | 102 | unsigned int audio_error(void); |
101 | void audio_error_clear(void); | 103 | void audio_error_clear(void); |
102 | int audio_get_file_pos(void); | 104 | int audio_get_file_pos(void); |
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index bbf4ce0c81..b59974ad96 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h | |||
@@ -84,6 +84,9 @@ | |||
84 | 84 | ||
85 | #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ | 85 | #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ |
86 | 86 | ||
87 | /* define this if you have a flash memory storage */ | ||
88 | #define HAVE_FLASH_STORAGE | ||
89 | |||
87 | /** Non-simulator section **/ | 90 | /** Non-simulator section **/ |
88 | #ifndef SIMULATOR | 91 | #ifndef SIMULATOR |
89 | 92 | ||
diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h index 435b6ef984..89b2228078 100644 --- a/firmware/export/config-ifp7xx.h +++ b/firmware/export/config-ifp7xx.h | |||
@@ -57,6 +57,9 @@ | |||
57 | #define MAX_CONTRAST_SETTING 63 | 57 | #define MAX_CONTRAST_SETTING 63 |
58 | #define DEFAULT_CONTRAST_SETTING 40 | 58 | #define DEFAULT_CONTRAST_SETTING 40 |
59 | 59 | ||
60 | /* define this if you have a flash memory storage */ | ||
61 | #define HAVE_FLASH_STORAGE | ||
62 | |||
60 | #ifndef SIMULATOR | 63 | #ifndef SIMULATOR |
61 | 64 | ||
62 | /* Define this if you have a Philips PNX0101 */ | 65 | /* Define this if you have a Philips PNX0101 */ |
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index edf7f2dea2..546d9b85fc 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h | |||
@@ -70,6 +70,9 @@ | |||
70 | /* We can fade the backlight by using PWM */ | 70 | /* We can fade the backlight by using PWM */ |
71 | #define HAVE_BACKLIGHT_PWM_FADING | 71 | #define HAVE_BACKLIGHT_PWM_FADING |
72 | 72 | ||
73 | /* define this if you have a flash memory storage */ | ||
74 | #define HAVE_FLASH_STORAGE | ||
75 | |||
73 | #ifndef SIMULATOR | 76 | #ifndef SIMULATOR |
74 | 77 | ||
75 | /* Define this if you have a PortalPlayer PP5022 */ | 78 | /* Define this if you have a PortalPlayer PP5022 */ |
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index ea806a4973..93c0fccc8c 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -48,6 +48,9 @@ | |||
48 | 48 | ||
49 | #define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ | 49 | #define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ |
50 | 50 | ||
51 | /* define this if you have a flash memory storage */ | ||
52 | #define HAVE_FLASH_STORAGE | ||
53 | |||
51 | #ifndef SIMULATOR | 54 | #ifndef SIMULATOR |
52 | 55 | ||
53 | /* Define this if you have a SH7034 */ | 56 | /* Define this if you have a SH7034 */ |
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 1d3e98ac0a..22673e82b3 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -37,6 +37,9 @@ | |||
37 | 37 | ||
38 | #define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ | 38 | #define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ |
39 | 39 | ||
40 | /* define this if you have a flash memory storage */ | ||
41 | #define HAVE_FLASH_STORAGE | ||
42 | |||
40 | #ifndef SIMULATOR | 43 | #ifndef SIMULATOR |
41 | 44 | ||
42 | /* Define this if you have a SH7034 */ | 45 | /* Define this if you have a SH7034 */ |
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 4ba3f7ead7..278eea4758 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -158,7 +158,7 @@ static int last_dma_tick = 0; | |||
158 | static int last_dma_chunk_size; | 158 | static int last_dma_chunk_size; |
159 | 159 | ||
160 | static long low_watermark; /* Dynamic low watermark level */ | 160 | static long low_watermark; /* Dynamic low watermark level */ |
161 | static long low_watermark_margin; /* Extra time in seconds for watermark */ | 161 | static long low_watermark_margin = 0; /* Extra time in seconds for watermark */ |
162 | static long lowest_watermark_level; /* Debug value to observe the buffer | 162 | static long lowest_watermark_level; /* Debug value to observe the buffer |
163 | usage */ | 163 | usage */ |
164 | #if CONFIG_CODEC == MAS3587F | 164 | #if CONFIG_CODEC == MAS3587F |
@@ -592,10 +592,12 @@ static void recalculate_watermark(int bitrate) | |||
592 | } | 592 | } |
593 | } | 593 | } |
594 | 594 | ||
595 | #ifndef HAVE_FLASH_STORAGE | ||
595 | void audio_set_buffer_margin(int seconds) | 596 | void audio_set_buffer_margin(int seconds) |
596 | { | 597 | { |
597 | low_watermark_margin = seconds; | 598 | low_watermark_margin = seconds; |
598 | } | 599 | } |
600 | #endif | ||
599 | 601 | ||
600 | void audio_get_debugdata(struct audio_debug *dbgdata) | 602 | void audio_get_debugdata(struct audio_debug *dbgdata) |
601 | { | 603 | { |