hrev52174 adds 1 changeset to branch 'master'
old head: 8d86b84d18535654da5b693537802d6ca115efe0
new head: daad9a3c1cf5fa4884b0adf4e66ce9b03dc3e0b4
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=daad9a3c1cf5+%5E8d86b84d1853
----------------------------------------------------------------------------
daad9a3c1cf5: kernel: Revert MMC bus changes to device_manager.
This broke booting on most (all?) systems.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52174
Commit: daad9a3c1cf5fa4884b0adf4e66ce9b03dc3e0b4
URL: https://git.haiku-os.org/haiku/commit/?id=daad9a3c1cf5
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Aug 6 01:56:54 2018 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 14 deletions(-)
src/system/kernel/device_manager/device_manager.cpp | 16 ++--------------
----------------------------------------------------------------------------
diff --git a/src/system/kernel/device_manager/device_manager.cpp
b/src/system/kernel/device_manager/device_manager.cpp
index 233f9b6fd4..f42a03094d 100644
--- a/src/system/kernel/device_manager/device_manager.cpp
+++ b/src/system/kernel/device_manager/device_manager.cpp
@@ -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);
