Page MenuHomeFreeBSD
Files F144317819

D12471.id33374.diff
No OneTemporary
Actions

D12471.id33374.diff
View Options

Index: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
===================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
+++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
@@ -255,11 +255,7 @@
bus_generic_probe(dev);
bus_generic_attach(dev);
-#ifdef MMCCAM
- sdhci_cam_start_slot(&sc->sc_slot);
-#else
sdhci_start_slot(&sc->sc_slot);
-#endif
return (0);
Index: head/sys/arm/ti/ti_sdhci.c
===================================================================
--- head/sys/arm/ti/ti_sdhci.c
+++ head/sys/arm/ti/ti_sdhci.c
@@ -683,11 +683,7 @@
bus_generic_probe(dev);
bus_generic_attach(dev);
-#ifdef MMCCAM
- sdhci_cam_start_slot(&sc->slot);
-#else
sdhci_start_slot(&sc->slot);
-#endif
return (0);
fail:
Index: head/sys/dev/sdhci/fsl_sdhci.c
===================================================================
--- head/sys/dev/sdhci/fsl_sdhci.c
+++ head/sys/dev/sdhci/fsl_sdhci.c
@@ -913,11 +913,7 @@
bus_generic_probe(dev);
bus_generic_attach(dev);
-#ifdef MMCCAM
- sdhci_cam_start_slot(&sc->slot);
-#else
sdhci_start_slot(&sc->slot);
-#endif
return (0);
Index: head/sys/dev/sdhci/sdhci.h
===================================================================
--- head/sys/dev/sdhci/sdhci.h
+++ head/sys/dev/sdhci/sdhci.h
@@ -430,9 +430,4 @@
void sdhci_generic_set_uhs_timing(device_t brdev, struct sdhci_slot *slot);
void sdhci_handle_card_present(struct sdhci_slot *slot, bool is_present);
-#ifdef MMCCAM
-/* CAM-related */
-void sdhci_cam_start_slot(struct sdhci_slot *slot);
-#endif
-
#endif /* __SDHCI_H__ */
Index: head/sys/dev/sdhci/sdhci.c
===================================================================
--- head/sys/dev/sdhci/sdhci.c
+++ head/sys/dev/sdhci/sdhci.c
@@ -1051,12 +1051,14 @@
return (0);
}
+#ifndef MMCCAM
void
sdhci_start_slot(struct sdhci_slot *slot)
{
sdhci_card_task(slot, 0);
}
+#endif
int
sdhci_cleanup_slot(struct sdhci_slot *slot)
@@ -2383,7 +2385,7 @@
#ifdef MMCCAM
void
-sdhci_cam_start_slot(struct sdhci_slot *slot)
+sdhci_start_slot(struct sdhci_slot *slot)
{
if ((slot->devq = cam_simq_alloc(1)) == NULL) {
goto fail;
Index: head/sys/dev/sdhci/sdhci_pci.c
===================================================================
--- head/sys/dev/sdhci/sdhci_pci.c
+++ head/sys/dev/sdhci/sdhci_pci.c
@@ -395,11 +395,7 @@
pci_enable_busmaster(dev);
/* Process cards detection. */
for (i = 0; i < sc->num_slots; i++) {
-#ifdef MMCCAM
- sdhci_cam_start_slot(&sc->slots[i]);
-#else
sdhci_start_slot(&sc->slots[i]);
-#endif
}
return (0);

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 8, 7:52 PM (14 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28462737
Default Alt Text
D12471.id33374.diff (2 KB)

Event Timeline