forked from len0rd/rockbox
Sansa AMS : use SD controller status to notify end of data transfer
Retry blocks transfer if a problem happened Remove unneeded blocking API from DMA code git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19714 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré
parent
dba556f33f
commit
c7e83bd017
3 changed files with 33 additions and 40 deletions
|
|
@ -72,6 +72,9 @@
|
|||
#define MCI_SELECT(i) (*(volatile unsigned long *) (pl180_base[i]+0x44))
|
||||
#define MCI_FIFO_CNT(i) (*(volatile unsigned long *) (pl180_base[i]+0x48))
|
||||
|
||||
#define MCI_ERROR \
|
||||
(MCI_DATA_CRC_FAIL | MCI_DATA_TIMEOUT | MCI_RX_OVERRUN | MCI_TX_UNDERRUN)
|
||||
|
||||
#define MCI_FIFO(i) ((unsigned long *) (pl180_base[i]+0x80))
|
||||
/* volumes */
|
||||
#define INTERNAL_AS3525 0 /* embedded SD card */
|
||||
|
|
@ -106,6 +109,9 @@ static struct event_queue sd_queue;
|
|||
static bool sd_enabled = false;
|
||||
#endif
|
||||
|
||||
static struct wakeup transfer_completion_signal;
|
||||
bool retry;
|
||||
|
||||
static inline void mci_delay(void) { int i = 0xffff; while(i--) ; }
|
||||
|
||||
static void mci_set_clock_divider(const int drive, int divider)
|
||||
|
|
@ -134,25 +140,6 @@ static void mci_set_clock_divider(const int drive, int divider)
|
|||
mci_delay();
|
||||
}
|
||||
|
||||
static void sd_panic(IF_MV2(const int drive,) const int status)
|
||||
{
|
||||
char error[32];
|
||||
error[0] = '\0';
|
||||
|
||||
#ifdef HAVE_MULTIVOLUME
|
||||
snprintf(error, sizeof(error),
|
||||
(drive == INTERNAL_AS3525) ? "Internal storage : " : "SD Slot : " );
|
||||
#endif
|
||||
|
||||
panicf("SD : %s%s%s%s%s%s%s", error,
|
||||
(status & MCI_DATA_CRC_FAIL) ? "DATA CRC FAIL, " : "",
|
||||
(status & MCI_DATA_TIMEOUT) ? "DATA TIMEOUT, " : "",
|
||||
(status & MCI_RX_OVERRUN) ? "RX OVERRUN, " : "",
|
||||
(status & MCI_TX_UNDERRUN) ? "TX UNDERRUN, " : "",
|
||||
(status & MCI_RX_FIFO_FULL) ? "RXR FIFO FULL, " : "",
|
||||
(status & MCI_TX_FIFO_EMPTY) ? "TX FIFO EMPTY" : "");
|
||||
}
|
||||
|
||||
#ifdef HAVE_HOTSWAP
|
||||
#if defined(SANSA_E200V2) || defined(SANSA_FUZE)
|
||||
static bool sd1_oneshot_callback(struct timeout *tmo)
|
||||
|
|
@ -170,6 +157,7 @@ static bool sd1_oneshot_callback(struct timeout *tmo)
|
|||
|
||||
return false;
|
||||
}
|
||||
|
||||
void INT_GPIOA(void)
|
||||
{
|
||||
static struct timeout sd1_oneshot;
|
||||
|
|
@ -182,13 +170,25 @@ void INT_GPIOA(void)
|
|||
|
||||
void INT_NAND(void)
|
||||
{
|
||||
sd_panic(IF_MV2(INTERNAL_AS3525,) MCI_STATUS(INTERNAL_AS3525));
|
||||
const int status = MCI_STATUS(INTERNAL_AS3525);
|
||||
|
||||
if(status & MCI_ERROR)
|
||||
retry = true;
|
||||
|
||||
wakeup_signal(&transfer_completion_signal);
|
||||
MCI_CLEAR(INTERNAL_AS3525) = status;
|
||||
}
|
||||
|
||||
#ifdef HAVE_MULTIVOLUME
|
||||
void INT_MCI0(void)
|
||||
{
|
||||
sd_panic(SD_SLOT_AS3525, MCI_STATUS(SD_SLOT_AS3525));
|
||||
const int status = MCI_STATUS(SD_SLOT_AS3525);
|
||||
|
||||
if(status & MCI_ERROR)
|
||||
retry = true;
|
||||
|
||||
wakeup_signal(&transfer_completion_signal);
|
||||
MCI_CLEAR(SD_SLOT_AS3525) = status;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -424,13 +424,13 @@ static void sd_thread(void)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void init_pl180_controller(const int drive)
|
||||
{
|
||||
MCI_COMMAND(drive) = MCI_DATA_CTRL(drive) = 0;
|
||||
MCI_CLEAR(drive) = 0x7ff;
|
||||
|
||||
MCI_MASK0(drive) = MCI_MASK1(drive) =
|
||||
MCI_DATA_CRC_FAIL | MCI_DATA_TIMEOUT | MCI_RX_OVERRUN | MCI_TX_UNDERRUN;
|
||||
MCI_MASK0(drive) = MCI_MASK1(drive) = MCI_ERROR | MCI_DATA_END;
|
||||
|
||||
#ifdef HAVE_MULTIVOLUME
|
||||
VIC_INT_ENABLE |=
|
||||
|
|
@ -481,6 +481,8 @@ int sd_init(void)
|
|||
CGU_PERI |= CGU_MCI_CLOCK_ENABLE;
|
||||
#endif
|
||||
|
||||
wakeup_init(&transfer_completion_signal);
|
||||
|
||||
init_pl180_controller(INTERNAL_AS3525);
|
||||
ret = sd_init_card(INTERNAL_AS3525);
|
||||
if(ret < 0)
|
||||
|
|
@ -655,11 +657,15 @@ static int sd_transfer_sectors(IF_MV2(int drive,) unsigned long start,
|
|||
(1<<3) /* DMA */ |
|
||||
(9<<4) /* 2^9 = 512 */ ;
|
||||
|
||||
dma_wait_transfer(0);
|
||||
retry = false;
|
||||
wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK);
|
||||
if(!retry)
|
||||
{
|
||||
buf += transfer * SECTOR_SIZE;
|
||||
start += transfer;
|
||||
count -= transfer;
|
||||
}
|
||||
|
||||
buf += transfer * SECTOR_SIZE;
|
||||
start += transfer;
|
||||
count -= transfer;
|
||||
last_disk_activity = current_tick;
|
||||
|
||||
if(!send_cmd(drive, SD_STOP_TRANSMISSION, 0, MCI_NO_FLAGS, NULL))
|
||||
|
|
|
|||
|
|
@ -24,17 +24,10 @@
|
|||
#include "pl081.h"
|
||||
#include "dma-target.h"
|
||||
#include "panic.h"
|
||||
#include "kernel.h"
|
||||
|
||||
static int dma_used = 0;
|
||||
static struct wakeup transfer_completion_signal[2]; /* 2 channels */
|
||||
static void (*dma_callback[2])(void); /* 2 channels */
|
||||
|
||||
inline void dma_wait_transfer(int channel)
|
||||
{
|
||||
wakeup_wait(&transfer_completion_signal[channel], TIMEOUT_BLOCK);
|
||||
}
|
||||
|
||||
void dma_retain(void)
|
||||
{
|
||||
if(++dma_used == 1)
|
||||
|
|
@ -57,9 +50,6 @@ void dma_init(void)
|
|||
{
|
||||
DMAC_SYNC = 0;
|
||||
VIC_INT_ENABLE |= INTERRUPT_DMAC;
|
||||
|
||||
wakeup_init(&transfer_completion_signal[0]);
|
||||
wakeup_init(&transfer_completion_signal[1]);
|
||||
}
|
||||
|
||||
inline void dma_disable_channel(int channel)
|
||||
|
|
@ -130,7 +120,5 @@ void INT_DMAC(void)
|
|||
|
||||
if(dma_callback[channel])
|
||||
dma_callback[channel]();
|
||||
|
||||
wakeup_signal(&transfer_completion_signal[channel]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ void dma_enable_channel(int channel, void *src, void *dst, int peri,
|
|||
int flow_controller, bool src_inc, bool dst_inc,
|
||||
size_t size, int nwords, void (*callback)(void));
|
||||
inline void dma_disable_channel(int channel);
|
||||
inline void dma_wait_transfer(int channel);
|
||||
|
||||
void dma_retain(void);
|
||||
void dma_release(void);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue