Since r23142 the ide_adapter does not clear the PCI_address_space bit when detecting a channel. Drivers that use the ide_adapter therefore have to do that themselfs, which broke legacy_sata (probably this is also the case for the promise_tx2 driver). I investigated this as it broke my attempt of a it8211 driver too. This might fix bug #1683 but I cannot test that. Also cleaned out some space indent in that file.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23199 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -133,6 +133,7 @@ controller_probe(device_node_handle parent)
|
|||||||
uint16 vendor_id;
|
uint16 vendor_id;
|
||||||
uint8 int_num;
|
uint8 int_num;
|
||||||
status_t res;
|
status_t res;
|
||||||
|
uint8 index;
|
||||||
|
|
||||||
TRACE("controller_probe\n");
|
TRACE("controller_probe\n");
|
||||||
|
|
||||||
@@ -183,6 +184,11 @@ controller_probe(device_node_handle parent)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (index = 0; index < num_channels; index++) {
|
||||||
|
command_block_base[index] &= ~PCI_address_space;
|
||||||
|
control_block_base[index] &= ~PCI_address_space;
|
||||||
|
}
|
||||||
|
|
||||||
res = ide_adapter->detect_controller(pci, device, parent, bus_master_base,
|
res = ide_adapter->detect_controller(pci, device, parent, bus_master_base,
|
||||||
CONTROLLER_MODULE_NAME, "" /* XXX: unused: controller_driver_type*/, CONTROLLER_NAME, true,
|
CONTROLLER_MODULE_NAME, "" /* XXX: unused: controller_driver_type*/, CONTROLLER_NAME, true,
|
||||||
true, 1, 0xffff, 0x10000, &controller_node);
|
true, 1, 0xffff, 0x10000, &controller_node);
|
||||||
|
|||||||
Reference in New Issue
Block a user