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

Although this should simply enable IO decoding and bus master

Browse Source 
functionality when not set by bios, it currently crashes.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23143 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-12-19 22:22:23 +00:00
parent 5aa9034e50
commit b53df1b383
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/generic/ide_adapter/ide_adapter.c
+16
View File
@@ -565,6 +565,7 @@ ide_adapter_init_controller(device_node_handle node, void *user_cookie,
pci_device device; pci_device device;
ide_adapter_controller_info *controller; ide_adapter_controller_info *controller;
uint16 bus_master_base; uint16 bus_master_base;
uint16 pcicmd;
// get device data // get device data
if (pnp->get_attr_uint16(node, IDE_ADAPTER_BUS_MASTER_BASE, &bus_master_base, false) != B_OK) if (pnp->get_attr_uint16(node, IDE_ADAPTER_BUS_MASTER_BASE, &bus_master_base, false) != B_OK)
@@ -577,6 +578,21 @@ ide_adapter_init_controller(device_node_handle node, void *user_cookie,
if (controller == NULL) if (controller == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
#if 0
pcicmd = pci->read_pci_config(node, PCI_command, 2);
TRACE("PCI-IDE: adapter init: pcicmd old setting 0x%04x\n", pcicmd);
if ((pcicmd & PCI_command_io) == 0) {
TRACE("PCI-IDE: adapter init: enabling io decoder\n");
pcicmd |= PCI_command_io;
}
if ((pcicmd & PCI_command_master) == 0) {
TRACE("PCI-IDE: adapter init: enabling bus mastering\n");
pcicmd |= PCI_command_master;
}
pci->write_pci_config(node, PCI_command, 2, pcicmd);
TRACE("PCI-IDE: adapter init: pcicmd new setting 0x%04x\n", pci->read_pci_config(node, PCI_command, 2));
#endif
controller->node = node; controller->node = node;
controller->pci = pci; controller->pci = pci;
controller->device = device; controller->device = device;