chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #723 from JianRuiqian/patch-1 

[DeviceDrivers] Fix the sdio_irq_wakeup issue; Fix sdio_unregister_driver issue.
This commit is contained in:
Bernard Xiong 2017-04-19 21:16:31 +08:00 committed by GitHub
parent 9804753614 f136f8895a
commit d320c43d2d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/drivers/sdio/sdio.c
View File

@ -1169,6 +1169,7 @@ rt_int32_t sdio_detach_irq(struct rt_sdio_function *func)
void sdio_irq_wakeup(struct rt_mmcsd_host *host) void sdio_irq_wakeup(struct rt_mmcsd_host *host)
{ {
if (host->flags & MMCSD_SUP_SDIO_IRQ)
host->ops->enable_sdio_irq(host, 0); host->ops->enable_sdio_irq(host, 0);
rt_sem_release(host->sdio_irq_sem); rt_sem_release(host->sdio_irq_sem);
} }
@ -1197,7 +1198,7 @@ rt_int32_t sdio_enable_func(struct rt_sdio_function *func)
if (ret) if (ret)
goto err; goto err;
timeout = rt_tick_get() + func->enable_timeout_val * 1000 / RT_TICK_PER_SECOND; timeout = rt_tick_get() + func->enable_timeout_val * RT_TICK_PER_SECOND / 1000;
while (1) while (1)
{ {
@ -1287,7 +1288,7 @@ rt_inline rt_int32_t sdio_match_card(struct rt_mmcsd_card *card,
(id->manufacturer != card->cis.manufacturer)) (id->manufacturer != card->cis.manufacturer))
return 0; return 0;
if ((id->product != SDIO_ANY_PROD_ID) && if ((id->product != SDIO_ANY_PROD_ID) &&
(id->product != card->cis.product)) (id->product != (card->cis.product | 1)))
return 0; return 0;
return 1; return 1;
@ -1334,11 +1335,11 @@ rt_int32_t sdio_register_driver(struct rt_sdio_driver *driver)
card = sdio_match_driver(driver->id); card = sdio_match_driver(driver->id);
if (card != RT_NULL) if (card != RT_NULL)
{ {
driver->probe(card); return driver->probe(card);
} }
} }
return 0; return -RT_EEMPTY;
} }
rt_int32_t sdio_unregister_driver(struct rt_sdio_driver *driver) rt_int32_t sdio_unregister_driver(struct rt_sdio_driver *driver)
@ -1347,9 +1348,6 @@ rt_int32_t sdio_unregister_driver(struct rt_sdio_driver *driver)
struct sdio_driver *sd = RT_NULL; struct sdio_driver *sd = RT_NULL;
struct rt_mmcsd_card *card; struct rt_mmcsd_card *card;
rt_list_insert_after(&sdio_drivers, &sd->list);
for (l = (&sdio_drivers)->next; l != &sdio_drivers; l = l->next) for (l = (&sdio_drivers)->next; l != &sdio_drivers; l = l->next)
{ {
sd = (struct sdio_driver *)rt_list_entry(l, struct sdio_driver, list); sd = (struct sdio_driver *)rt_list_entry(l, struct sdio_driver, list);