Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sdhci_pci: fix computation of bar index

Browse Source 
I think this bug was introduced when modifying the code to handle
multiple slots. It would result in slots after the first two to use
incorrect bar offsets.

Should fix one of the problems seen in #16778.
This commit is contained in:
Adrien Destugues 2021-03-15 19:22:56 +01:00
parent 9274ca847b
commit e440740ad1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/add-ons/kernel/busses/mmc/sdhci_pci.cpp
View File

@ -35,7 +35,6 @@
#define SDHCI_PCI_DEVICE_MODULE_NAME "busses/mmc/sdhci_pci/driver_v1"
#define SDHCI_PCI_MMC_BUS_MODULE_NAME "busses/mmc/sdhci_pci/device/v1"
#define SLOTS_COUNT "device/slots_count"
#define SLOT_NUMBER "device/slot"
#define BAR_INDEX "device/bar"
@ -781,8 +780,6 @@ register_child_devices(void* cookie)
}
for (uint8_t slot = 0; slot <= slots_count; slot++) {
bar = bar + slot;
sprintf(prettyName, "SDHC bus %" B_PRIu8, slot);
device_attr attrs[] = {
// properties of this controller for mmc bus manager
@ -803,7 +800,7 @@ register_child_devices(void* cookie)
// private data to identify device
{ SLOT_NUMBER, B_UINT8_TYPE, { ui8: slot} },
{ BAR_INDEX, B_UINT8_TYPE, { ui8: bar} },
{ BAR_INDEX, B_UINT8_TYPE, { ui8: bar + slot} },
{ NULL }
};
device_node* node;