devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

conditionalise *_get_info() to get some binsize back

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18965 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2008-11-01 17:33:21 +00:00
parent 94b6a0be99
commit 19eb800f75
11 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/drivers/ata.c
View file

@ -1403,6 +1403,7 @@ int ata_spinup_time(void)
return spinup_time; return spinup_time;
} }
#ifdef STORAGE_GET_INFO
void ata_get_info(struct storage_info *info) void ata_get_info(struct storage_info *info)
{ {
unsigned short *src,*dest; unsigned short *src,*dest;
@ -1432,3 +1433,4 @@ void ata_get_info(struct storage_info *info)
dest[i] = htobe16(src[i]); dest[i] = htobe16(src[i]);
info->revision=revision; info->revision=revision;
} }
#endif

2
firmware/drivers/ata_flash.c
View file

@ -450,6 +450,7 @@ long nand_last_disk_activity(void)
return last_disk_activity; return last_disk_activity;
} }
#ifdef STORAGE_GET_INFO
void nand_get_info(struct storage_info *info) void nand_get_info(struct storage_info *info)
{ {
unsigned long blocks; unsigned long blocks;
@ -469,4 +470,5 @@ void nand_get_info(struct storage_info *info)
info->serial=0; info->serial=0;
} }
#endif

2
firmware/drivers/ata_mmc.c
View file

@ -963,6 +963,7 @@ long mmc_last_disk_activity(void)
return last_disk_activity; return last_disk_activity;
} }
#ifdef STORAGE_GET_INFO
void mmc_get_info(IF_MV2(int drive,) struct storage_info *info) void mmc_get_info(IF_MV2(int drive,) struct storage_info *info)
{ {
#ifndef HAVE_MULTIVOLUME #ifndef HAVE_MULTIVOLUME
@ -981,6 +982,7 @@ void mmc_get_info(IF_MV2(int drive,) struct storage_info *info)
} }
info->revision="0.00"; info->revision="0.00";
} }
#endif
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
bool mmc_removable(IF_MV_NONVOID(int drive)) bool mmc_removable(IF_MV_NONVOID(int drive))

3
firmware/export/ata.h
View file

@ -47,7 +47,10 @@ void ata_spin(void);
void ata_set_led_enabled(bool enabled); void ata_set_led_enabled(bool enabled);
#endif #endif
unsigned short* ata_get_identify(void); unsigned short* ata_get_identify(void);
#ifdef STORAGE_GET_INFO
void ata_get_info(IF_MV2(int drive,) struct storage_info *info); void ata_get_info(IF_MV2(int drive,) struct storage_info *info);
#endif
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
bool ata_removable(IF_MV_NONVOID(int drive)); bool ata_removable(IF_MV_NONVOID(int drive));
bool ata_present(IF_MV_NONVOID(int drive)); bool ata_present(IF_MV_NONVOID(int drive));

4
firmware/export/config.h
View file

@ -624,4 +624,8 @@
#endif #endif
#endif /* HAVE_HEADPHONE_DETECTION */ #endif /* HAVE_HEADPHONE_DETECTION */
#if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND)
#define STORAGE_GET_INFO
#endif
#endif /* __CONFIG_H__ */ #endif /* __CONFIG_H__ */

2
firmware/export/mmc.h
View file

@ -44,7 +44,9 @@ void mmc_spin(void);
void mmc_set_led_enabled(bool enabled); void mmc_set_led_enabled(bool enabled);
#endif #endif
#ifdef STORAGE_GET_INFO
void mmc_get_info(IF_MV2(int drive,) struct storage_info *info); void mmc_get_info(IF_MV2(int drive,) struct storage_info *info);
#endif
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
bool mmc_removable(IF_MV_NONVOID(int drive)); bool mmc_removable(IF_MV_NONVOID(int drive));
bool mmc_present(IF_MV_NONVOID(int drive)); bool mmc_present(IF_MV_NONVOID(int drive));

2
firmware/export/nand.h
View file

@ -43,7 +43,9 @@ void nand_spin(void);
void nand_set_led_enabled(bool enabled); void nand_set_led_enabled(bool enabled);
#endif #endif
#ifdef STORAGE_GET_INFO
void nand_get_info(IF_MV2(int drive,) struct storage_info *info); void nand_get_info(IF_MV2(int drive,) struct storage_info *info);
#endif
long nand_last_disk_activity(void); long nand_last_disk_activity(void);

2
firmware/export/sd.h
View file

@ -43,7 +43,9 @@ void sd_spin(void);
void sd_set_led_enabled(bool enabled); void sd_set_led_enabled(bool enabled);
#endif #endif
#ifdef STORAGE_GET_INFO
void sd_get_info(IF_MV2(int drive,) struct storage_info *info); void sd_get_info(IF_MV2(int drive,) struct storage_info *info);
#endif
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
bool sd_removable(IF_MV_NONVOID(int drive)); bool sd_removable(IF_MV_NONVOID(int drive));
bool sd_present(IF_MV_NONVOID(int drive)); bool sd_present(IF_MV_NONVOID(int drive));

4
firmware/export/storage.h
View file

@ -197,6 +197,7 @@ static inline int storage_spinup_time(void)
#endif #endif
} }
#ifdef STORAGE_GET_INFO
static inline void storage_get_info(IF_MV2(int drive,) struct storage_info *info) static inline void storage_get_info(IF_MV2(int drive,) struct storage_info *info)
{ {
#if (CONFIG_STORAGE & STORAGE_ATA) #if (CONFIG_STORAGE & STORAGE_ATA)
@ -211,6 +212,7 @@ static inline void storage_get_info(IF_MV2(int drive,) struct storage_info *info
#error No storage driver! #error No storage driver!
#endif #endif
} }
#endif
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
static inline bool storage_removable(IF_MV_NONVOID(int drive)) static inline bool storage_removable(IF_MV_NONVOID(int drive))
@ -310,11 +312,13 @@ static inline int storage_spinup_time(void)
return 0; return 0;
} }
#ifdef STORAGE_GET_INFO
static inline void storage_get_info(IF_MV2(int drive,) struct storage_info *info) static inline void storage_get_info(IF_MV2(int drive,) struct storage_info *info)
{ {
IF_MV((void)drive;) IF_MV((void)drive;)
(void)info; (void)info;
} }
#endif
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
static inline bool storage_removable(IF_MV_NONVOID(int drive)) static inline bool storage_removable(IF_MV_NONVOID(int drive))

2
firmware/target/arm/ata-nand-telechips.c
View file

@ -714,6 +714,7 @@ int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count,
return -1; return -1;
} }
#ifdef STORAGE_GET_INFO
void nand_get_info(struct storage_info *info) void nand_get_info(struct storage_info *info)
{ {
/* firmware version */ /* firmware version */
@ -727,6 +728,7 @@ void nand_get_info(struct storage_info *info)
* page_size * total_banks; * page_size * total_banks;
info->sector_size=SECTOR_SIZE; info->sector_size=SECTOR_SIZE;
} }
#endif
int nand_init(void) int nand_init(void)
{ {

2
firmware/target/arm/ata-sd-pp.c
View file

@ -1300,6 +1300,7 @@ long sd_last_disk_activity(void)
return last_disk_activity; return last_disk_activity;
} }
#ifdef STORAGE_GET_INFO
void sd_get_info(IF_MV2(int drive,) struct storage_info *info) void sd_get_info(IF_MV2(int drive,) struct storage_info *info)
{ {
#ifndef HAVE_MULTIVOLUME #ifndef HAVE_MULTIVOLUME
@ -1318,6 +1319,7 @@ void sd_get_info(IF_MV2(int drive,) struct storage_info *info)
} }
info->revision="0.00"; info->revision="0.00";
} }
#endif
#ifdef HAVE_HOTSWAP #ifdef HAVE_HOTSWAP
bool sd_removable(IF_MV_NONVOID(int drive)) bool sd_removable(IF_MV_NONVOID(int drive))