len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 21:25:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sd-as3525: enable writing, sd_enable() and card_get_info_target() in bootloader

Browse source 
They will be needed for USB

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26904 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-06-18 01:47:34 +00:00
parent 48313f58e3
commit 6470a9ffd1
1 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
firmware/target/arm/as3525/sd-as3525.c
View file

@ -123,9 +123,7 @@ static long sd_stack [(DEFAULT_STACK_SIZE*2 + 0x200)/sizeof(long)];
static const char sd_thread_name[] = "ata/sd"; static const char sd_thread_name[] = "ata/sd";
static struct mutex sd_mtx; static struct mutex sd_mtx;
static struct event_queue sd_queue; static struct event_queue sd_queue;
#ifndef BOOTLOADER
bool sd_enabled = false; bool sd_enabled = false;
#endif
#if defined(HAVE_MULTIDRIVE) #if defined(HAVE_MULTIDRIVE)
static bool hs_card = false; static bool hs_card = false;
@ -557,10 +555,9 @@ int sd_init(void)
create_thread(sd_thread, sd_stack, sizeof(sd_stack), 0, create_thread(sd_thread, sd_stack, sizeof(sd_stack), 0,
sd_thread_name IF_PRIO(, PRIORITY_USER_INTERFACE) IF_COP(, CPU)); sd_thread_name IF_PRIO(, PRIORITY_USER_INTERFACE) IF_COP(, CPU));
#ifndef BOOTLOADER
sd_enabled = true; sd_enabled = true;
sd_enable(false); sd_enable(false);
#endif
return 0; return 0;
} }
@ -674,8 +671,8 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
unsigned loops = 0; unsigned loops = 0;
mutex_lock(&sd_mtx); mutex_lock(&sd_mtx);
#ifndef BOOTLOADER
sd_enable(true); sd_enable(true);
#ifndef BOOTLOADER
led(true); led(true);
#endif #endif
@ -829,8 +826,8 @@ sd_transfer_error_nodma:
#ifndef BOOTLOADER #ifndef BOOTLOADER
led(false); led(false);
sd_enable(false);
#endif #endif
sd_enable(false);
if (ret) /* error */ if (ret) /* error */
card_info[drive].initialized = 0; card_info[drive].initialized = 0;
@ -848,18 +845,7 @@ int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int count,
int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
const void* buf) const void* buf)
{ {
#ifdef BOOTLOADER /* we don't need write support in bootloader */
#ifdef HAVE_MULTIDRIVE
(void) drive;
#endif
(void) start;
(void) count;
(void) buf;
return -1;
#else
return sd_transfer_sectors(IF_MD2(drive,) start, count, (void*)buf, true); return sd_transfer_sectors(IF_MD2(drive,) start, count, (void*)buf, true);
#endif
} }
#ifndef BOOTLOADER #ifndef BOOTLOADER
@ -867,6 +853,7 @@ long sd_last_disk_activity(void)
{ {
return last_disk_activity; return last_disk_activity;
} }
#endif /* !BOOTLOADER */
void sd_enable(bool on) void sd_enable(bool on)
{ {
@ -926,8 +913,6 @@ tCardInfo *card_get_info_target(int card_no)
return &card_info[card_no]; return &card_info[card_no];
} }
#endif /* !BOOTLOADER */
#ifdef CONFIG_STORAGE_MULTI #ifdef CONFIG_STORAGE_MULTI
int sd_num_drives(int first_drive) int sd_num_drives(int first_drive)
{ {