bslathi19/super6502
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite readRes1, consolidate res1 commands

Browse Source
This commit is contained in:
Byron Lathi
2023-07-23 17:26:40 -07:00
parent 709c60cf36
commit 60072603d9
2 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sw/bootloader/devices/sd_card.c
View File

@@ -114,6 +114,7 @@ void SD_command(uint8_t cmd, uint32_t arg, uint8_t crc)
/*******************************************************************************
Read R1 from SD card
*******************************************************************************/
/*
uint8_t SD_readRes1()
{
uint8_t i = 0, res1;
@@ -129,6 +130,7 @@ uint8_t SD_readRes1()
return res1;
}
*/
/*******************************************************************************
Read R2 from SD card
@@ -405,20 +407,17 @@ void SD_readOCR(uint8_t *res)
spi_exchange(0xFF);
}
/*******************************************************************************
Send application command (CMD55)
*******************************************************************************/
uint8_t SD_sendApp()
// Send a command with starting end ending clock pulses
uint8_t res1_cmd(uint8_t cmd, uint32_t arg, uint8_t crc)
{
uint8_t res1;
// assert chip select
spi_exchange(0xFF);
spi_select(0);
spi_exchange(0xFF);
// send CMD0
SD_command(CMD55, CMD55_ARG, CMD55_CRC);
SD_command(cmd, arg, crc);
// read response
res1 = SD_readRes1();
@@ -431,27 +430,18 @@ uint8_t SD_sendApp()
return res1;
}
/*******************************************************************************
Send application command (CMD55)
*******************************************************************************/
uint8_t SD_sendApp()
{
return res1_cmd(CMD55, CMD55_ARG, CMD55_CRC);;
}
/*******************************************************************************
Send operating condition (ACMD41)
*******************************************************************************/
uint8_t SD_sendOpCond()
{
uint8_t res1;
// assert chip select
spi_exchange(0xFF);
spi_select(0);
spi_exchange(0xFF);
// send CMD0
SD_command(ACMD41, ACMD41_ARG, ACMD41_CRC);
// read response
res1 = SD_readRes1();
// deassert chip select
spi_exchange(0xFF);
spi_deselect(0);
spi_exchange(0xFF);
return res1;
return res1_cmd(ACMD41, ACMD41_ARG, ACMD41_CRC);
}

22
sw/bootloader/devices/sd_card_asm.s
View File

@@ -1,4 +1,5 @@
.export _SD_command
.export _SD_readRes1
.importzp sp
@@ -30,3 +31,24 @@ arg_loop: ; send ARG
rts
.endproc
; uint8_t SD_readRes1 (void)
.proc _SD_readRes1: near
; Try to read/write up to 8 times, then return value
ldx #$08
tryread:
lda #$ff
jsr _spi_exchange
cmp #$ff
bne end
dex
bne tryread
end:
rts
.endproc