The-Homebrew-Cloud/mini
2
0
Fork 0
mirror of https://github.com/fail0verflow/mini.git synced 2024-11-24 12:19:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge loader/sdhc.c and mini/sdhc.c

Browse Source
This commit is contained in:
Sven Peter 2009-05-12 19:20:33 +02:00 committed by bushing
parent 8366174042
commit 9211533614
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdhc.c
View File

@ -382,7 +382,10 @@ sdhc_host_reset(sdmmc_chipset_handle_t sch)
HWRITE1(hp, SDHC_TIMEOUT_CTL, SDHC_TIMEOUT_MAX); HWRITE1(hp, SDHC_TIMEOUT_CTL, SDHC_TIMEOUT_MAX);
/* Enable interrupts. */ /* Enable interrupts. */
imask = SDHC_CARD_REMOVAL | SDHC_CARD_INSERTION | imask =
#ifndef LOADER
SDHC_CARD_REMOVAL | SDHC_CARD_INSERTION |
#endif
SDHC_BUFFER_READ_READY | SDHC_BUFFER_WRITE_READY | SDHC_BUFFER_READ_READY | SDHC_BUFFER_WRITE_READY |
SDHC_DMA_INTERRUPT | SDHC_BLOCK_GAP_EVENT | SDHC_DMA_INTERRUPT | SDHC_BLOCK_GAP_EVENT |
SDHC_TRANSFER_COMPLETE | SDHC_COMMAND_COMPLETE; SDHC_TRANSFER_COMPLETE | SDHC_COMMAND_COMPLETE;
@ -924,17 +927,12 @@ sdhc_intr(void *arg)
/* Acknowledge error interrupts. */ /* Acknowledge error interrupts. */
error = HREAD2(hp, SDHC_EINTR_STATUS); error = HREAD2(hp, SDHC_EINTR_STATUS);
signal = HREAD2(hp, SDHC_EINTR_SIGNAL_EN);
HWRITE2(hp, SDHC_EINTR_SIGNAL_EN, 0);
(void)sdhc_soft_reset(hp, SDHC_RESET_DAT|SDHC_RESET_CMD);
HWRITE2(hp, SDHC_EINTR_STATUS, error);
HWRITE2(hp, SDHC_EINTR_SIGNAL_EN, signal);
/* IOS does this */
if (error == 0) {
signal = HREAD2(hp, SDHC_EINTR_SIGNAL_EN);
HWRITE2(hp, SDHC_EINTR_SIGNAL_EN, 0);
(void)sdhc_soft_reset(hp, SDHC_RESET_DAT|SDHC_RESET_CMD);
HWRITE2(hp, SDHC_EINTR_STATUS, 0xffff);
HWRITE2(hp, SDHC_EINTR_SIGNAL_EN, signal);
}
else
HWRITE2(hp, SDHC_EINTR_STATUS, error);
// DPRINTF(2,("%s: error interrupt, status=%d\n", // DPRINTF(2,("%s: error interrupt, status=%d\n",
// HDEVNAME(hp), error)); // HDEVNAME(hp), error));
@ -945,6 +943,7 @@ sdhc_intr(void *arg)
} }
} }
#ifdef CAN_HAZ_IPC
/* /*
* Wake up the sdmmc event thread to scan for cards. * Wake up the sdmmc event thread to scan for cards.
*/ */
@ -954,6 +953,7 @@ sdhc_intr(void *arg)
ipc_enqueue_slow(IPC_DEV_SDHC, IPC_SDHC_DISCOVER, 1, ipc_enqueue_slow(IPC_DEV_SDHC, IPC_SDHC_DISCOVER, 1,
(u32) hp->sdmmc); (u32) hp->sdmmc);
} }
#endif
/* /*
* Wake up the blocking process to service command * Wake up the blocking process to service command