From 46573019a53dca411f754d40d0f21c1e4eafaedf Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Tue, 7 Oct 2008 19:37:33 +0000 Subject: add HAVE_DISK_STORAGE, and use that instead of HAVE_FLASH_STORAGE when checking for an actual disk (i.e. related to spindown, skipping,...) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18735 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/audio.h | 2 +- firmware/export/config-creativezv.h | 4 ++++ firmware/export/config-creativezvm.h | 4 ++++ firmware/export/config-creativezvm60gb.h | 4 ++++ firmware/export/config-fmrecorder.h | 4 ++++ firmware/export/config-gigabeat-s.h | 4 ++++ firmware/export/config-gigabeat.h | 4 ++++ firmware/export/config-h10.h | 4 ++++ firmware/export/config-h100.h | 4 ++++ firmware/export/config-h10_5gb.h | 4 ++++ firmware/export/config-h120.h | 4 ++++ firmware/export/config-h300.h | 4 ++++ firmware/export/config-hdd1630.h | 4 ++++ firmware/export/config-iaudiom3.h | 4 ++++ firmware/export/config-iaudiom5.h | 4 ++++ firmware/export/config-iaudiox5.h | 4 ++++ firmware/export/config-ipod1g2g.h | 4 ++++ firmware/export/config-ipod3g.h | 4 ++++ firmware/export/config-ipod4g.h | 4 ++++ firmware/export/config-ipodcolor.h | 4 ++++ firmware/export/config-ipodmini.h | 4 ++++ firmware/export/config-ipodmini2g.h | 4 ++++ firmware/export/config-ipodvideo.h | 4 ++++ firmware/export/config-mrobe100.h | 4 ++++ firmware/export/config-mrobe500.h | 4 ++++ firmware/export/config-player.h | 4 ++++ firmware/export/config-recorder.h | 4 ++++ firmware/export/config-recorderv2.h | 4 ++++ firmware/export/config-tpj1022.h | 4 ++++ 29 files changed, 113 insertions(+), 1 deletion(-) (limited to 'firmware/export') diff --git a/firmware/export/audio.h b/firmware/export/audio.h index b10d5863d7..aedaffbe89 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h @@ -92,7 +92,7 @@ struct mp3entry* audio_current_track(void); struct mp3entry* audio_next_track(void); bool audio_has_changed_track(void); void audio_get_debugdata(struct audio_debug *dbgdata); -#ifndef HAVE_FLASH_STORAGE +#ifdef HAVE_DISK_STORAGE void audio_set_buffer_margin(int seconds); #endif unsigned int audio_error(void); diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h index b8850a3af6..0cb487ad6d 100644 --- a/firmware/export/config-creativezv.h +++ b/firmware/export/config-creativezv.h @@ -85,6 +85,10 @@ /* define this if you have a real-time clock */ //#define CONFIG_RTC RTC_RX5X348AB +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ //#define HAVE_BACKLIGHT diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h index 4c1f4624b3..e4ccfc775f 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h @@ -85,6 +85,10 @@ /* define this if you have a real-time clock */ //#define CONFIG_RTC RTC_RX5X348AB +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ //#define HAVE_BACKLIGHT diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config-creativezvm60gb.h index 3f98059a28..bcf361690d 100644 --- a/firmware/export/config-creativezvm60gb.h +++ b/firmware/export/config-creativezvm60gb.h @@ -85,6 +85,10 @@ /* define this if you have a real-time clock */ //#define CONFIG_RTC RTC_RX5X348AB +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ //#define HAVE_BACKLIGHT diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index fd85e51b46..1908f6a29d 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h @@ -65,6 +65,10 @@ /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + #define CONFIG_I2C I2C_PLAYREC #define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */ diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h index 1f40339065..92813c6b00 100644 --- a/firmware/export/config-gigabeat-s.h +++ b/firmware/export/config-gigabeat-s.h @@ -56,6 +56,10 @@ /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this if you have a software controlled poweroff */ #define HAVE_SW_POWEROFF diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h index 27bd51e3ab..c2ac7a9483 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h @@ -62,6 +62,10 @@ /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_S3C2440 +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index d38a5df636..6f66555d7d 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -79,6 +79,10 @@ #define HAVE_RTC_ALARM #endif +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this if you have a software controlled poweroff */ #define HAVE_SW_POWEROFF diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index f250c5f862..dcb0e6d9f0 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -66,6 +66,10 @@ #define CONFIG_LCD LCD_S1D15E06 +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index 56a61c8be5..29f0e55b6b 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h @@ -83,6 +83,10 @@ #define CONFIG_TUNER TEA5767 #define CONFIG_TUNER_XTAL 32768 +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 9cea95eb6f..c75734f7b7 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -53,6 +53,10 @@ /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 4aae255daa..134e90cd17 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -55,6 +55,10 @@ /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_PCF50606 +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD diff --git a/firmware/export/config-hdd1630.h b/firmware/export/config-hdd1630.h index 55ad5a1340..5a311993fe 100755 --- a/firmware/export/config-hdd1630.h +++ b/firmware/export/config-hdd1630.h @@ -101,6 +101,10 @@ /* #define CONFIG_TUNER TEA5767 */ /* #define CONFIG_TUNER_XTAL 32768 */ +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT /* #define HAVE_BACKLIGHT_BRIGHTNESS */ diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config-iaudiom3.h index b8dc52c91e..429e922529 100644 --- a/firmware/export/config-iaudiom3.h +++ b/firmware/export/config-iaudiom3.h @@ -71,6 +71,10 @@ /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this if you have a software controlled poweroff */ #define HAVE_SW_POWEROFF diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index a5b0f3d7bd..eb3b1216eb 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h @@ -78,6 +78,10 @@ /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this if you have a software controlled poweroff */ #define HAVE_SW_POWEROFF diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index c29d4242fe..be21006295 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -91,6 +91,10 @@ #define HAVE_BACKLIGHT #define HAVE_BACKLIGHT_BRIGHTNESS +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this if you have a software controlled poweroff */ #define HAVE_SW_POWEROFF diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h index 2d3dff1edc..5727e46616 100644 --- a/firmware/export/config-ipod1g2g.h +++ b/firmware/export/config-ipod1g2g.h @@ -78,6 +78,10 @@ /* Define this if you have the WM8731L audio codec */ #define HAVE_WM8721 +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* WM8721 has no tone controls, so we use the software ones */ #define HAVE_SW_TONE_CONTROLS diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index d5b593388e..285043a77f 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -91,6 +91,10 @@ /* WM8731 has no tone controls, so we use the software ones */ #define HAVE_SW_TONE_CONTROLS +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index c5c592dfca..dddda21e07 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h @@ -91,6 +91,10 @@ #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index cda0857b19..f4db7d8b98 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h @@ -78,6 +78,10 @@ #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index eadd3a6b1d..37fb083af4 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -93,6 +93,10 @@ #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 259cb2f874..a96e71dbc7 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -93,6 +93,10 @@ #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index 4c56d74c72..9b322f2ffd 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -78,6 +78,10 @@ #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT #define HAVE_BACKLIGHT_BRIGHTNESS diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index 6aaa2b005a..03011745eb 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h @@ -61,6 +61,10 @@ #define AB_REPEAT_ENABLE 1 +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index b9b8ee65ab..3eab1209f4 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h @@ -96,6 +96,10 @@ /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_RX5X348AB +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 186bd5a58d..a88e75e743 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h @@ -30,6 +30,10 @@ /* Define this if you have a DAC3550A */ #define HAVE_DAC3550A +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index b86e31630a..f6ddb88af6 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h @@ -53,6 +53,10 @@ /* Define this if you have a MAS3587F */ #define CONFIG_CODEC MAS3587F +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index fd00b78887..5d62ec464c 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h @@ -59,6 +59,10 @@ /* Define this if you have a MAS3587F */ #define CONFIG_CODEC MAS3587F +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config-tpj1022.h index 5307074aa1..6f23b86f06 100644 --- a/firmware/export/config-tpj1022.h +++ b/firmware/export/config-tpj1022.h @@ -67,6 +67,10 @@ #define AB_REPEAT_ENABLE 1 +/* define this if you have a disk storage, i.e. something + that needs spinups and can cause skips when shaked */ +#define HAVE_DISK_STORAGE + /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT -- cgit v1.2.3