From 96fc96eccd0aaf3cbcdbb3c74d6fa407aa224cb4 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Wed, 10 Jun 2020 07:40:08 +0200 Subject: [PATCH] software/liblitesdcard: remove read_block prototype, minor cleanup. --- litex/soc/software/liblitesdcard/sdcard.h | 2 -- litex/soc/software/liblitesdcard/spisdcard.c | 12 ++++++------ litex/soc/software/liblitesdcard/spisdcard.h | 7 ++++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/litex/soc/software/liblitesdcard/sdcard.h b/litex/soc/software/liblitesdcard/sdcard.h index bb13392ab..a62ed4f44 100644 --- a/litex/soc/software/liblitesdcard/sdcard.h +++ b/litex/soc/software/liblitesdcard/sdcard.h @@ -108,8 +108,6 @@ int sdcard_sddatawriter_wait(void); int sdcard_sddatareader_wait(void); int sdcard_test(unsigned int blocks); -uint8_t sdcard_read_block(uint32_t addr, uint8_t *buf); - #endif /* CSR_SDCORE_BASE */ #endif /* __SDCARD_H */ diff --git a/litex/soc/software/liblitesdcard/spisdcard.c b/litex/soc/software/liblitesdcard/spisdcard.c index 3ffe8933e..069d638b1 100644 --- a/litex/soc/software/liblitesdcard/spisdcard.c +++ b/litex/soc/software/liblitesdcard/spisdcard.c @@ -60,7 +60,7 @@ static uint8_t spi_xfer(uint8_t byte) { } /*-----------------------------------------------------------------------*/ -/* SDCard Select/Deselect functions */ +/* SPI SDCard Select/Deselect functions */ /*-----------------------------------------------------------------------*/ static void spisdcard_deselect(void) { @@ -95,7 +95,7 @@ static int spisdcard_select(void) { } /*-----------------------------------------------------------------------*/ -/* SDCard bytes Xfer functions */ +/* SPI SDCard bytes Xfer functions */ /*-----------------------------------------------------------------------*/ static void spisdcardwrite_bytes(uint8_t* buf, uint16_t n) { @@ -111,7 +111,7 @@ static void spisdcardread_bytes(uint8_t* buf, uint16_t n) { } /*-----------------------------------------------------------------------*/ -/* SDCard block Xfer functions */ +/* SPI SDCard blocks Xfer functions */ /*-----------------------------------------------------------------------*/ static uint8_t spisdcardreceive_block(uint8_t *buf) { @@ -139,7 +139,7 @@ static uint8_t spisdcardreceive_block(uint8_t *buf) { } /*-----------------------------------------------------------------------*/ -/* SDCard Command functions */ +/* SPI SDCard Command functions */ /*-----------------------------------------------------------------------*/ static uint8_t spisdcardsend_cmd(uint8_t cmd, uint32_t arg) @@ -192,7 +192,7 @@ static uint8_t spisdcardsend_cmd(uint8_t cmd, uint32_t arg) } /*-----------------------------------------------------------------------*/ -/* SDCard Initialization functions */ +/* SPI SDCard Initialization functions */ /*-----------------------------------------------------------------------*/ uint8_t spisdcard_init(void) { @@ -243,7 +243,7 @@ uint8_t spisdcard_init(void) { } /*-----------------------------------------------------------------------*/ -/* SDCard FatFs disk functions */ +/* SPI SDCard FatFs functions */ /*-----------------------------------------------------------------------*/ static DSTATUS spisdcardstatus = STA_NOINIT; diff --git a/litex/soc/software/liblitesdcard/spisdcard.h b/litex/soc/software/liblitesdcard/spisdcard.h index 5e331e99e..58d5e3137 100644 --- a/litex/soc/software/liblitesdcard/spisdcard.h +++ b/litex/soc/software/liblitesdcard/spisdcard.h @@ -20,7 +20,7 @@ #define SPI_LENGTH (1 << 8) /*-----------------------------------------------------------------------*/ -/* SDCard SPI Commands */ +/* SPI SDCard Commands */ /*-----------------------------------------------------------------------*/ #define CMD0 (0) /* GO_IDLE_STATE */ @@ -45,10 +45,11 @@ #define CMD55 (55) /* APP_CMD */ #define CMD58 (58) /* READ_OCR */ - +/*-----------------------------------------------------------------------*/ +/* SPI SDCard User functions */ +/*-----------------------------------------------------------------------*/ uint8_t spisdcard_init(void); -uint8_t spisdcard_read_block(uint32_t addr, uint8_t *buf); #endif /* CSR_SPISDCARD_BASE */