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

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.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23199 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2008-01-01 12:56:45 +00:00
parent 4d85dcbce8
commit 576bb2455b
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
+25 -19
View File
@@ -121,7 +121,7 @@ controller_supports(device_node_handle parent, bool *_noConnection)
static status_t static status_t
controller_probe(device_node_handle parent) controller_probe(device_node_handle parent)
{ {
device_node_handle controller_node; device_node_handle controller_node;
device_node_handle channels[4]; device_node_handle channels[4];
uint16 command_block_base[4]; uint16 command_block_base[4];
uint16 control_block_base[4]; uint16 control_block_base[4];
@@ -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");
@@ -176,35 +177,40 @@ controller_probe(device_node_handle parent)
case ID(PCI_vendor_ALI, PCI_device_ALI5287): case ID(PCI_vendor_ALI, PCI_device_ALI5287):
num_channels = 4; num_channels = 4;
command_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 0, 4) + 8; command_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 0, 4) + 8;
control_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 4, 4) + 4; control_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 4, 4) + 4;
command_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 8, 4) + 8; command_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 8, 4) + 8;
control_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 12, 4) + 4; control_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 12, 4) + 4;
break; break;
} }
res = ide_adapter->detect_controller(pci, device, parent, bus_master_base, for (index = 0; index < num_channels; index++) {
CONTROLLER_MODULE_NAME, "" /* XXX: unused: controller_driver_type*/, CONTROLLER_NAME, true, command_block_base[index] &= ~PCI_address_space;
true, 1, 0xffff, 0x10000, &controller_node); control_block_base[index] &= ~PCI_address_space;
// don't register if controller is already registered! }
// (happens during rescan; registering new channels would kick out old channels)
if (res != B_OK) res = ide_adapter->detect_controller(pci, device, parent, bus_master_base,
CONTROLLER_MODULE_NAME, "" /* XXX: unused: controller_driver_type*/, CONTROLLER_NAME, true,
true, 1, 0xffff, 0x10000, &controller_node);
// don't register if controller is already registered!
// (happens during rescan; registering new channels would kick out old channels)
if (res != B_OK)
goto err; goto err;
if (controller_node == NULL) { if (controller_node == NULL) {
res = B_IO_ERROR; res = B_IO_ERROR;
goto err; goto err;
} }
// ignore errors during registration of channels - could be a simple rescan collision // ignore errors during registration of channels - could be a simple rescan collision
res = ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME, res = ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
true, command_block_base[0], control_block_base[0], bus_master_base, true, command_block_base[0], control_block_base[0], bus_master_base,
int_num, true, "Primary Channel", &channels[0], false); int_num, true, "Primary Channel", &channels[0], false);
dprintf("Primary Channel: %s\n", strerror(res)); dprintf("Primary Channel: %s\n", strerror(res));
res = ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME, res = ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
true, command_block_base[1], control_block_base[1], bus_master_base, true, command_block_base[1], control_block_base[1], bus_master_base,
int_num, false, "Secondary Channel", &channels[1], false); int_num, false, "Secondary Channel", &channels[1], false);
dprintf("Secondary Channel: %s\n", strerror(res)); dprintf("Secondary Channel: %s\n", strerror(res));