diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/buffering.c | 6 | ||||
-rw-r--r-- | apps/codecs.h | 4 | ||||
-rw-r--r-- | apps/main.c | 2 | ||||
-rw-r--r-- | apps/mpeg.c | 4 | ||||
-rw-r--r-- | apps/plugin.h | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 2 | ||||
-rw-r--r-- | apps/plugins/wavplay.c | 2 | ||||
-rw-r--r-- | apps/recorder/pcm_record.c | 8 | ||||
-rw-r--r-- | apps/settings_list.c | 4 | ||||
-rw-r--r-- | apps/talk.c | 2 |
10 files changed, 15 insertions, 23 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 46b6455178..8d41324190 100644 --- a/apps/buffering.c +++ b/apps/buffering.c | |||
@@ -119,7 +119,7 @@ static volatile size_t buf_ridx; /* current reading position */ | |||
119 | 119 | ||
120 | /* Configuration */ | 120 | /* Configuration */ |
121 | static size_t conf_watermark = 0; /* Level to trigger filebuf fill */ | 121 | static size_t conf_watermark = 0; /* Level to trigger filebuf fill */ |
122 | #if MEM > 8 | 122 | #if MEMORYSIZE > 8 |
123 | static size_t high_watermark = 0; /* High watermark for rebuffer */ | 123 | static size_t high_watermark = 0; /* High watermark for rebuffer */ |
124 | #endif | 124 | #endif |
125 | 125 | ||
@@ -1509,7 +1509,7 @@ void buffering_thread(void) | |||
1509 | #if 0 | 1509 | #if 0 |
1510 | /* TODO: This needs to be fixed to use the idle callback, disable it | 1510 | /* TODO: This needs to be fixed to use the idle callback, disable it |
1511 | * for simplicity until its done right */ | 1511 | * for simplicity until its done right */ |
1512 | #if MEM > 8 | 1512 | #if MEMORYSIZE > 8 |
1513 | /* If the disk is spinning, take advantage by filling the buffer */ | 1513 | /* If the disk is spinning, take advantage by filling the buffer */ |
1514 | else if (storage_disk_is_active() && queue_empty(&buffering_queue)) | 1514 | else if (storage_disk_is_active() && queue_empty(&buffering_queue)) |
1515 | { | 1515 | { |
@@ -1589,7 +1589,7 @@ bool buffering_reset(char *buf, size_t buflen) | |||
1589 | base_handle_id = -1; | 1589 | base_handle_id = -1; |
1590 | 1590 | ||
1591 | /* Set the high watermark as 75% full...or 25% empty :) */ | 1591 | /* Set the high watermark as 75% full...or 25% empty :) */ |
1592 | #if MEM > 8 | 1592 | #if MEMORYSIZE > 8 |
1593 | high_watermark = 3*buflen / 4; | 1593 | high_watermark = 3*buflen / 4; |
1594 | #endif | 1594 | #endif |
1595 | 1595 | ||
diff --git a/apps/codecs.h b/apps/codecs.h index 1c0b9da6ba..c3ef7c154e 100644 --- a/apps/codecs.h +++ b/apps/codecs.h | |||
@@ -27,10 +27,6 @@ | |||
27 | #define NO_REDEFINES_PLEASE | 27 | #define NO_REDEFINES_PLEASE |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #ifndef MEM | ||
31 | #define MEM 2 | ||
32 | #endif | ||
33 | |||
34 | #include <stdbool.h> | 30 | #include <stdbool.h> |
35 | #include <stdlib.h> | 31 | #include <stdlib.h> |
36 | #include "strlcpy.h" | 32 | #include "strlcpy.h" |
diff --git a/apps/main.c b/apps/main.c index a7d6dc395c..6378833973 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -430,7 +430,7 @@ static void init(void) | |||
430 | system_init(); | 430 | system_init(); |
431 | #if defined(IPOD_VIDEO) | 431 | #if defined(IPOD_VIDEO) |
432 | audiobufend=(unsigned char *)audiobufend_lds; | 432 | audiobufend=(unsigned char *)audiobufend_lds; |
433 | if(MEM==64 && probed_ramsize!=64) | 433 | if(MEMORYSIZE==64 && probed_ramsize!=64) |
434 | { | 434 | { |
435 | audiobufend -= (32<<20); | 435 | audiobufend -= (32<<20); |
436 | } | 436 | } |
diff --git a/apps/mpeg.c b/apps/mpeg.c index 583e4e2122..bdca92048f 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -1623,7 +1623,7 @@ static void mpeg_thread(void) | |||
1623 | #if (CONFIG_STORAGE & STORAGE_MMC) | 1623 | #if (CONFIG_STORAGE & STORAGE_MMC) |
1624 | /* MMC is slow, so don't read too large chunks */ | 1624 | /* MMC is slow, so don't read too large chunks */ |
1625 | amount_to_read = MIN(0x40000, amount_to_read); | 1625 | amount_to_read = MIN(0x40000, amount_to_read); |
1626 | #elif MEM == 8 | 1626 | #elif MEMORYSIZE == 8 |
1627 | amount_to_read = MIN(0x100000, amount_to_read); | 1627 | amount_to_read = MIN(0x100000, amount_to_read); |
1628 | #endif | 1628 | #endif |
1629 | 1629 | ||
@@ -1933,7 +1933,7 @@ static void mpeg_thread(void) | |||
1933 | #if (CONFIG_STORAGE & STORAGE_MMC) | 1933 | #if (CONFIG_STORAGE & STORAGE_MMC) |
1934 | /* MMC is slow, so don't save too large chunks at once */ | 1934 | /* MMC is slow, so don't save too large chunks at once */ |
1935 | amount_to_save = MIN(0x40000, amount_to_save); | 1935 | amount_to_save = MIN(0x40000, amount_to_save); |
1936 | #elif MEM == 8 | 1936 | #elif MEMORYSIZE == 8 |
1937 | amount_to_save = MIN(0x100000, amount_to_save); | 1937 | amount_to_save = MIN(0x100000, amount_to_save); |
1938 | #endif | 1938 | #endif |
1939 | rc = write(mpeg_file, audiobuf + audiobuf_read, | 1939 | rc = write(mpeg_file, audiobuf + audiobuf_read, |
diff --git a/apps/plugin.h b/apps/plugin.h index 4b11ac31e9..77dedc539a 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -27,10 +27,6 @@ | |||
27 | #define NO_REDEFINES_PLEASE | 27 | #define NO_REDEFINES_PLEASE |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #ifndef MEM | ||
31 | #define MEM 2 | ||
32 | #endif | ||
33 | |||
34 | #include <stdbool.h> | 30 | #include <stdbool.h> |
35 | #include <inttypes.h> | 31 | #include <inttypes.h> |
36 | #include <sys/types.h> | 32 | #include <sys/types.h> |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 01a706be45..4dc88fdf5a 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -430,7 +430,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
430 | = rb->plugin_get_audio_buffer(&audio_buffer_free); | 430 | = rb->plugin_get_audio_buffer(&audio_buffer_free); |
431 | plugbuf=false; | 431 | plugbuf=false; |
432 | } | 432 | } |
433 | #if MEM <= 8 && (CONFIG_PLATFORM & PLATFORM_NATIVE) | 433 | #if MEMORYSIZE <= 8 && (CONFIG_PLATFORM & PLATFORM_NATIVE) |
434 | /* loaded as an overlay plugin, protect from overwriting ourselves */ | 434 | /* loaded as an overlay plugin, protect from overwriting ourselves */ |
435 | if ((unsigned)(plugin_start_addr - (unsigned char *)audio_bufferbase) | 435 | if ((unsigned)(plugin_start_addr - (unsigned char *)audio_bufferbase) |
436 | < audio_buffer_free) | 436 | < audio_buffer_free) |
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c index 887c5cdd55..073af31280 100644 --- a/apps/plugins/wavplay.c +++ b/apps/plugins/wavplay.c | |||
@@ -3600,7 +3600,7 @@ int play_file(char* filename) | |||
3600 | wanted = MIN(free_space, aud_size - aud_write); | 3600 | wanted = MIN(free_space, aud_size - aud_write); |
3601 | #if (CONFIG_STORAGE & STORAGE_MMC) | 3601 | #if (CONFIG_STORAGE & STORAGE_MMC) |
3602 | wanted = MIN(wanted, 256*1024); | 3602 | wanted = MIN(wanted, 256*1024); |
3603 | #elif MEM == 8 | 3603 | #elif MEMORYSIZE == 8 |
3604 | wanted = MIN(wanted, 1024*1024); | 3604 | wanted = MIN(wanted, 1024*1024); |
3605 | #endif | 3605 | #endif |
3606 | if (available() < low_water) | 3606 | if (available() < low_water) |
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c index 0221963b2b..6ecb75f608 100644 --- a/apps/recorder/pcm_record.c +++ b/apps/recorder/pcm_record.c | |||
@@ -131,7 +131,7 @@ static unsigned long pre_record_ticks; /* pre-record time in ticks */ | |||
131 | ****************************************************************************/ | 131 | ****************************************************************************/ |
132 | 132 | ||
133 | /** buffer parameters where incoming PCM data is placed **/ | 133 | /** buffer parameters where incoming PCM data is placed **/ |
134 | #if MEM <= 2 | 134 | #if MEMORYSIZE <= 2 |
135 | #define PCM_NUM_CHUNKS 16 /* Power of 2 */ | 135 | #define PCM_NUM_CHUNKS 16 /* Power of 2 */ |
136 | #else | 136 | #else |
137 | #define PCM_NUM_CHUNKS 256 /* Power of 2 */ | 137 | #define PCM_NUM_CHUNKS 256 /* Power of 2 */ |
@@ -180,13 +180,13 @@ static int flood_watermark; /* boost thread priority when here */ | |||
180 | #ifdef HAVE_PRIORITY_SCHEDULING | 180 | #ifdef HAVE_PRIORITY_SCHEDULING |
181 | #define PRIO_SECONDS 10 /* max flush time before priority boost */ | 181 | #define PRIO_SECONDS 10 /* max flush time before priority boost */ |
182 | #endif | 182 | #endif |
183 | #if MEM <= 2 | 183 | #if MEMORYSIZE <= 2 |
184 | /* fractions must be integer fractions of 4 because they are evaluated with | 184 | /* fractions must be integer fractions of 4 because they are evaluated with |
185 | * X*4*XXX_SECONDS, that way we avoid float calculation */ | 185 | * X*4*XXX_SECONDS, that way we avoid float calculation */ |
186 | #define LOW_SECONDS 1/4 /* low watermark time till empty */ | 186 | #define LOW_SECONDS 1/4 /* low watermark time till empty */ |
187 | #define PANIC_SECONDS 1/2 /* flood watermark time until full */ | 187 | #define PANIC_SECONDS 1/2 /* flood watermark time until full */ |
188 | #define FLUSH_SECONDS 1 /* flush watermark time until full */ | 188 | #define FLUSH_SECONDS 1 /* flush watermark time until full */ |
189 | #elif MEM <= 16 | 189 | #elif MEMORYSIZE <= 16 |
190 | #define LOW_SECONDS 1 /* low watermark time till empty */ | 190 | #define LOW_SECONDS 1 /* low watermark time till empty */ |
191 | #define PANIC_SECONDS 5 /* flood watermark time until full */ | 191 | #define PANIC_SECONDS 5 /* flood watermark time until full */ |
192 | #define FLUSH_SECONDS 7 /* flush watermark time until full */ | 192 | #define FLUSH_SECONDS 7 /* flush watermark time until full */ |
@@ -194,7 +194,7 @@ static int flood_watermark; /* boost thread priority when here */ | |||
194 | #define LOW_SECONDS 1 /* low watermark time till empty */ | 194 | #define LOW_SECONDS 1 /* low watermark time till empty */ |
195 | #define PANIC_SECONDS 8 | 195 | #define PANIC_SECONDS 8 |
196 | #define FLUSH_SECONDS 10 | 196 | #define FLUSH_SECONDS 10 |
197 | #endif /* MEM */ | 197 | #endif /* MEMORYSIZE */ |
198 | 198 | ||
199 | /** encoder events **/ | 199 | /** encoder events **/ |
200 | static void (*enc_events_callback)(enum enc_events event, void *data); | 200 | static void (*enc_events_callback)(enum enc_events event, void *data); |
diff --git a/apps/settings_list.c b/apps/settings_list.c index c6f5e677eb..94910c0818 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -760,7 +760,7 @@ const struct settings_list settings[] = { | |||
760 | SYSTEM_SETTING(NVRAM(4), topruntime, 0), | 760 | SYSTEM_SETTING(NVRAM(4), topruntime, 0), |
761 | INT_SETTING(F_BANFROMQS, max_files_in_playlist, | 761 | INT_SETTING(F_BANFROMQS, max_files_in_playlist, |
762 | LANG_MAX_FILES_IN_PLAYLIST, | 762 | LANG_MAX_FILES_IN_PLAYLIST, |
763 | #if MEM > 1 | 763 | #if MEMORYSIZE > 1 |
764 | 10000, | 764 | 10000, |
765 | #else | 765 | #else |
766 | 400, | 766 | 400, |
@@ -768,7 +768,7 @@ const struct settings_list settings[] = { | |||
768 | "max files in playlist", UNIT_INT, 1000, 32000, 1000, | 768 | "max files in playlist", UNIT_INT, 1000, 32000, 1000, |
769 | NULL, NULL, NULL), | 769 | NULL, NULL, NULL), |
770 | INT_SETTING(F_BANFROMQS, max_files_in_dir, LANG_MAX_FILES_IN_DIR, | 770 | INT_SETTING(F_BANFROMQS, max_files_in_dir, LANG_MAX_FILES_IN_DIR, |
771 | #if MEM > 1 | 771 | #if MEMORYSIZE > 1 |
772 | 1000, | 772 | 1000, |
773 | #else | 773 | #else |
774 | 200, | 774 | 200, |
diff --git a/apps/talk.c b/apps/talk.c index 7dbfb2ef77..ad34437b0f 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -112,7 +112,7 @@ struct queue_entry /* one entry of the internal queue */ | |||
112 | /* The MMC storage on the Ondios is slow enough that we want to buffer the | 112 | /* The MMC storage on the Ondios is slow enough that we want to buffer the |
113 | * talk clips only when they are needed */ | 113 | * talk clips only when they are needed */ |
114 | # define TALK_PROGRESSIVE_LOAD | 114 | # define TALK_PROGRESSIVE_LOAD |
115 | #elif CONFIG_CODEC == SWCODEC && MEM <= 2 | 115 | #elif CONFIG_CODEC == SWCODEC && MEMORYSIZE <= 2 |
116 | /* The entire voice file wouldn't fit in memory together with codecs, so we | 116 | /* The entire voice file wouldn't fit in memory together with codecs, so we |
117 | * load clips each time they are accessed */ | 117 | * load clips each time they are accessed */ |
118 | # define TALK_PARTIAL_LOAD | 118 | # define TALK_PARTIAL_LOAD |