Replace spi_recv with macro

* Set baudrate prescaler to 2
This commit is contained in:
iabdalkader 2014-07-07 04:59:14 +02:00
parent d30c06f55a
commit 366171b042

View File

@ -82,23 +82,19 @@ bool sdcard_is_present(void)
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static BYTE spi_send(BYTE out) static BYTE spi_send(BYTE out)
{ {
if (HAL_SPI_Transmit(&SPIHandle, &out, 1, SPI_TIMEOUT) != HAL_OK) { if (HAL_SPI_TransmitReceive(&SPIHandle, &out, &out, 1, SPI_TIMEOUT) != HAL_OK) {
BREAK(); BREAK();
} }
return out; return out;
} }
static bool spi_send_buff(const BYTE *buff, uint32_t size) static bool spi_send_buff(const BYTE *buff, uint32_t size)
{ {
return HAL_SPI_Transmit(&SPIHandle, (void*)buff, size , SPI_TIMEOUT)== HAL_OK; return HAL_SPI_TransmitReceive(&SPIHandle, (void*)buff, (void*)buff, size , SPI_TIMEOUT)== HAL_OK;
} }
static BYTE spi_recv() #define spi_recv() spi_send(0xFF)
{
BYTE out=0xFF;
HAL_SPI_TransmitReceive(&SPIHandle, &out, &out, 1, SPI_TIMEOUT);
return out;
}
static bool spi_recv_buff(BYTE *buff, uint32_t size) static bool spi_recv_buff(BYTE *buff, uint32_t size)
{ {
@ -302,7 +298,7 @@ void sdcard_init(void)
if (ty) { if (ty) {
/* Initialization succeeded */ /* Initialization succeeded */
Stat &= ~STA_NOINIT; /* Clear STA_NOINIT */ Stat &= ~STA_NOINIT; /* Clear STA_NOINIT */
sdcard_hw_init(SPI_BAUDRATEPRESCALER_2); sdcard_hw_init(SPI_BAUDRATEPRESCALER_4);
} else { } else {
/* Initialization failed */ /* Initialization failed */
BREAK(); BREAK();