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

kernel: Revert MMC bus changes to device_manager.

Browse Source 
This broke booting on most (all?) systems.
This commit is contained in:
Augustin Cavalier 2018-08-05 21:56:54 -04:00
parent 8d86b84d18
commit daad9a3c1c
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/system/kernel/device_manager/device_manager.cpp
View File

@ -42,6 +42,7 @@
# define TRACE(a) ;
#endif
#define DEVICE_MANAGER_ROOT_NAME "system/devices_root/driver_v1"
#define DEVICE_MANAGER_GENERIC_NAME "system/devices_generic/driver_v1"
@ -1537,9 +1538,7 @@ device_node::_GetNextDriverPath(void*& cookie, KPath& _path)
if (get_attr_uint16(this, B_DEVICE_TYPE, &type, false) != B_OK
|| get_attr_uint16(this, B_DEVICE_SUB_TYPE, &subType, false)
!= B_OK)
{
generic = true;
}
get_attr_uint16(this, B_DEVICE_INTERFACE, &interface, false);
@ -1600,16 +1599,6 @@ device_node::_GetNextDriverPath(void*& cookie, KPath& _path)
break;
}
break;
case PCI_base_peripheral:
switch (subType) {
case PCI_sd_host:
_AddPath(*stack, "busses", "mmc");
break;
default:
_AddPath(*stack, "drivers");
break;
}
break;
default:
if (sRootNode == this) {
_AddPath(*stack, "busses/pci");
@ -1896,8 +1885,7 @@ device_node::Probe(const char* devicePath, uint32 updateCycle)
// Check if this node matches the device path
// TODO: maybe make this extendible via settings file?
if (!strcmp(devicePath, "disk")) {
matches = type == PCI_mass_storage
&& (type == PCI_base_peripheral || subType == PCI_sd_host);
matches = type == PCI_mass_storage;
} else if (!strcmp(devicePath, "audio")) {
matches = type == PCI_multimedia
&& (subType == PCI_audio || subType == PCI_hd_audio);