* Unify Onda VX747 and VX747+ config files

* Conditionalise (void)drive; in NAND & SD drivers


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20256 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-03-09 20:41:59 +00:00
parent 081c63b20b
commit c6bf842eca
5 changed files with 36 additions and 180 deletions

View file

@ -345,7 +345,10 @@ static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst)
struct nand_param *nandp = &internal_param;
int page_size, oob_size, page_per_block;
int row_cycle, bus_width, ecc_count;
int i, j;
int i;
#ifdef USE_ECC
int j;
#endif
unsigned char *data_buf;
unsigned char oob_buf[nandp->oob_size];
@ -629,6 +632,9 @@ static inline int read_sector(unsigned long start, unsigned int count,
int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf)
{
#ifdef HAVE_MULTIVOLUME
(void)drive;
#endif
int ret = 0;
unsigned int i, _count, chip_size = chip_info->page_size;
unsigned long _start;
@ -672,6 +678,10 @@ int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const
(void)start;
(void)count;
(void)buf;
#ifdef HAVE_MULTIVOLUME
(void)drive;
#endif
return -1;
}
@ -712,7 +722,9 @@ void nand_enable(bool on)
#ifdef STORAGE_GET_INFO
void nand_get_info(IF_MV2(int drive,) struct storage_info *info)
{
#ifdef HAVE_MULTIVOLUME
(void)drive;
#endif
/* firmware version */
info->revision="0.00";

View file

@ -1697,7 +1697,9 @@ tCardInfo* card_get_info_target(int card_no)
int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf)
{
#ifdef HAVE_MULTIVOLUME
(void)drive;
#endif
struct mmc_request request;
struct mmc_response_r1 r1;
int retval;
@ -1741,7 +1743,9 @@ int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf
int sd_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf)
{
#ifdef HAVE_MULTIVOLUME
(void)drive;
#endif
struct mmc_request request;
struct mmc_response_r1 r1;
int retval;
@ -1802,7 +1806,9 @@ void sd_spindown(int seconds)
#ifdef HAVE_HOTSWAP
bool sd_removable(IF_MV_NONVOID(int drive))
{
#ifdef HAVE_MULTIVOLUME
(void)drive;
#endif
//return true;
return false;
}
@ -1810,14 +1816,18 @@ bool sd_removable(IF_MV_NONVOID(int drive))
bool sd_present(IF_MV_NONVOID(int drive))
{
#ifdef HAVE_MULTIVOLUME
(void)drive;
#endif
return (mmcinfo.block_num > 0 && card_detect_target());
}
#ifdef STORAGE_GET_INFO
void sd_get_info(IF_MV2(int drive,) struct storage_info *info)
{
#ifdef HAVE_MULTIVOLUME
(void)drive;
#endif
/* firmware version */
info->revision="0.00";