i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix device type check

Browse Source 
B_DEVICE_TYPE is a 16-bit numeric ID.
This commit is contained in:
Andreas Faerber
2018-01-31 20:26:11 +00:00
committed by Alexander von Gluck IV
parent 66fa3b1847
commit 0ae2a0c4d7
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/ppc/arch_int.cpp
+8 -10
View File
@@ -27,6 +27,7 @@
#include <vm/vm.h> #include <vm/vm.h>
#include <vm/vm_priv.h> #include <vm/vm_priv.h>
#include <vm/VMAddressSpace.h> #include <vm/VMAddressSpace.h>
#include <PCI.h>
#include <string.h> #include <string.h>
@@ -515,16 +516,13 @@ arch_int_init_post_device_manager(struct kernel_args *args)
// iterate through the tree again and get an interrupt controller node // iterate through the tree again and get an interrupt controller node
iterator.Rewind(); iterator.Rewind();
while (device_node *node = iterator.Next()) { while (device_node *node = iterator.Next()) {
const char *deviceType; uint16 pciBaseClass, pciSubType;
if (deviceManager->get_attr_string(node, B_DEVICE_TYPE, if (deviceManager->get_attr_uint16(node, B_DEVICE_TYPE,
&deviceType, false) == B_OK) { &pciBaseClass, false) == B_OK &&
bool isPIC = false; deviceManager->get_attr_uint16(node, B_DEVICE_SUB_TYPE,
&pciSubType, false) == B_OK) {
/* bool isPIC = (pciBaseClass == PCI_base_peripheral)
bool isPIC && (pciSubType == PCI_pic);
= (strcmp(deviceType, B_INTERRUPT_CONTROLLER_DRIVER_TYPE) == 0);
free(deviceType);
*/
if (isPIC) { if (isPIC) {
driver_module_info *driver; driver_module_info *driver;