Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #642 from gsomlo/gls-sdcard-blk-vs-sec

Browse source 
RFC: bios/sdcard: use (512 byte) blocks as the smallest addressable data unit
This commit is contained in:
enjoy-digital 2020-09-07 17:41:50 +02:00 committed by GitHub
commit 5ee074f422
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
litex/soc/software/bios/cmds/cmd_litesdcard.c
View file

@ -73,7 +73,7 @@ static void sdread(int nb_params, char **params)
return;
}
sdcard_read(block*512, 1, buf);
sdcard_read(block, 1, buf);
dump_bytes((uint32_t *)buf, 512, (unsigned long) buf);
}
@ -115,7 +115,7 @@ static void sdwrite(int nb_params, char **params)
}
}
dump_bytes((uint32_t *)buf, 512, (unsigned long) buf);
sdcard_write(block*512, 1, buf);
sdcard_write(block, 1, buf);
}
define_command(sdwrite, sdwrite, "Write SDCard block", LITESDCARD_CMDS);

18
litex/soc/software/liblitesdcard/sdcard.c
View file

@ -464,7 +464,7 @@ int sdcard_init(void) {
#ifdef CSR_SDBLOCK2MEM_BASE
void sdcard_read(uint32_t sector, uint32_t count, uint8_t* buf)
void sdcard_read(uint32_t block, uint32_t count, uint8_t* buf)
{
/* Initialize DMA Writer */
sdblock2mem_dma_enable_write(0);
@ -476,7 +476,7 @@ void sdcard_read(uint32_t sector, uint32_t count, uint8_t* buf)
#ifdef SDCARD_CMD23_SUPPORT
sdcard_set_block_count(count);
#endif
sdcard_read_multiple_block(sector, count);
sdcard_read_multiple_block(block, count);
/* Wait for DMA Writer to complete */
while ((sdblock2mem_dma_done_read() & 0x1) == 0);
@ -496,7 +496,7 @@ void sdcard_read(uint32_t sector, uint32_t count, uint8_t* buf)
#ifdef CSR_SDMEM2BLOCK_BASE
void sdcard_write(uint32_t sector, uint32_t count, uint8_t* buf)
void sdcard_write(uint32_t block, uint32_t count, uint8_t* buf)
{
while (count--) {
/* Initialize DMA Reader */
@ -509,13 +509,13 @@ void sdcard_write(uint32_t sector, uint32_t count, uint8_t* buf)
#ifdef SDCARD_CMD23_SUPPORT
sdcard_set_block_count(1);
#endif
sdcard_write_single_block(sector);
sdcard_write_single_block(block);
sdcard_stop_transmission();
/* Update buf/sector */
buf += 512;
sector += 1;
/* Update buf/block */
buf += 512;
block += 1;
}
}
#endif
@ -538,8 +538,8 @@ DSTATUS disk_initialize(uint8_t drv) {
return sdcardstatus;
}
DRESULT disk_read(uint8_t drv, uint8_t *buf, uint32_t sector, uint32_t count) {
sdcard_read(sector, count, buf);
DRESULT disk_read(uint8_t drv, uint8_t *buf, uint32_t block, uint32_t count) {
sdcard_read(block, count, buf);
return RES_OK;
}