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

Modified bus mastering enable code, but remains disabled because it crashes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32877 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2009-08-31 22:43:10 +00:00
parent d196ea6045
commit 5a5f7ad65e
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/generic/ata_adapter/ata_adapter.c
+12 -9
View File
@@ -558,7 +558,8 @@ ata_adapter_init_controller(device_node *node,
pci_device *device; pci_device *device;
ata_adapter_controller_info *controller; ata_adapter_controller_info *controller;
uint16 bus_master_base; uint16 bus_master_base;
// uint16 pcicmd; uint16 pcicmdOld;
uint16 pcicmdNew;
// get device data // get device data
if (sDeviceManager->get_attr_uint16(node, ATA_ADAPTER_BUS_MASTER_BASE, &bus_master_base, false) != B_OK) if (sDeviceManager->get_attr_uint16(node, ATA_ADAPTER_BUS_MASTER_BASE, &bus_master_base, false) != B_OK)
@@ -575,18 +576,20 @@ ata_adapter_init_controller(device_node *node,
return B_NO_MEMORY; return B_NO_MEMORY;
#if 0 #if 0
pcicmd = pci->read_pci_config(node, PCI_command, 2); pcicmdOld = pcicmdNew = pci->read_pci_config(node, PCI_command, 2);
TRACE("PCI-ATA: adapter init: pcicmd old setting 0x%04x\n", pcicmd); if ((pcicmdNew & PCI_command_io) == 0) {
if ((pcicmd & PCI_command_io) == 0) {
TRACE("PCI-ATA: adapter init: enabling io decoder\n"); TRACE("PCI-ATA: adapter init: enabling io decoder\n");
pcicmd |= PCI_command_io; pcicmdNew |= PCI_command_io;
} }
if ((pcicmd & PCI_command_master) == 0) { if ((pcicmdNew & PCI_command_master) == 0) {
TRACE("PCI-ATA: adapter init: enabling bus mastering\n"); TRACE("PCI-ATA: adapter init: enabling bus mastering\n");
pcicmd |= PCI_command_master; pcicmdNew |= PCI_command_master;
}
if (pcicmdOld != pcicmdNew) {
pci->write_pci_config(node, PCI_command, 2, pcicmdNew);
TRACE("PCI-ATA: adapter init: pcicmd old 0x%04x, new 0x%04x\n",
pcicmdOld, pcicmdNew);
} }
pci->write_pci_config(node, PCI_command, 2, pcicmd);
TRACE("PCI-ATA: adapter init: pcicmd new setting 0x%04x\n", pci->read_pci_config(node, PCI_command, 2));
#endif #endif
controller->node = node; controller->node = node;