This commit is contained in:
pvvx 2016-12-06 22:09:02 +03:00
parent 7de420b89f
commit 3c4de184c7
2 changed files with 8 additions and 5 deletions

View file

@ -246,7 +246,7 @@ void sdio_sd_deinit() {
//----- //-----
s8 sdio_sd_setClock(SD_CLK_FREQUENCY SDCLK) { s8 sdio_sd_setClock(SD_CLK_FREQUENCY SDCLK) {
HAL_Status sta; HAL_Status sta;
if ((signed int) sdio_status <= SDIO_SD_NONE) { if (sdio_status <= SDIO_SD_NONE) {
return -1; return -1;
} }
ADMA2_DESC_FMT * padma = rtw_zmalloc(sizeof(ADMA2_DESC_FMT)); ADMA2_DESC_FMT * padma = rtw_zmalloc(sizeof(ADMA2_DESC_FMT));
@ -254,6 +254,7 @@ s8 sdio_sd_setClock(SD_CLK_FREQUENCY SDCLK) {
DBG_SDIO_ERR("Malloc ADMA2 table fail.\n"); DBG_SDIO_ERR("Malloc ADMA2 table fail.\n");
return -1; return -1;
} }
DBG_SDIO_INFO("SD card set CLK %d Hz\n", PLATFORM_CLOCK/(4<<(8-SDCLK)));
sta = HalSdioHostOp.HalSdioHostChangeSdClock(&SdioHostAdapter, SDCLK); sta = HalSdioHostOp.HalSdioHostChangeSdClock(&SdioHostAdapter, SDCLK);
rtw_mfree(padma, sizeof(ADMA2_DESC_FMT)); rtw_mfree(padma, sizeof(ADMA2_DESC_FMT));
if (sta) if (sta)
@ -287,11 +288,13 @@ s8 sdio_sd_setProtection(bool protection) {
result = -1; result = -1;
goto LABEL_17; goto LABEL_17;
} }
LABEL_8: sd_protected = protection; LABEL_8:
LABEL_7: sd_protected = protection;
LABEL_7:
DBG_SDIO_INFO("Set SD card Protection done.\n"); DBG_SDIO_INFO("Set SD card Protection done.\n");
result = 0; result = 0;
LABEL_17: rtw_mfree(padma, sizeof(ADMA2_DESC_FMT)); LABEL_17:
rtw_mfree(padma, sizeof(ADMA2_DESC_FMT));
return result; return result;
} }
return -1; return -1;

View file

@ -93,7 +93,7 @@ HAL_Status HalSdioHostDisable(IN VOID *Data) {
//----- HalSdioHostOpInit(PHAL_SDIO_HOST_ADAPTER) //----- HalSdioHostOpInit(PHAL_SDIO_HOST_ADAPTER)
void HalSdioHostOpInit(void *Data) { void HalSdioHostOpInit(void *Data) {
PHAL_SDIO_HOST_OP phsha = Data; PHAL_SDIO_HOST_OP phsha = (PHAL_SDIO_HOST_ADAPTER)Data;
phsha->HalSdioHostInitHost = &HalSdioHostInitHostRtl8195a; phsha->HalSdioHostInitHost = &HalSdioHostInitHostRtl8195a;
phsha->HalSdioHostInitCard = &HalSdioHostInitCardRtl8195a; phsha->HalSdioHostInitCard = &HalSdioHostInitCardRtl8195a;
phsha->HalSdioHostDeInit = &HalSdioHostDeInitRtl8195a; phsha->HalSdioHostDeInit = &HalSdioHostDeInitRtl8195a;