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

ata_adapter: check the secondary flag for the 2nd channel.

Browse Source 
* ide_adapter: likewise.
This commit is contained in:
Jérôme Duval
2013-11-28 18:25:20 +01:00
parent 7cf7fa23f4
commit 3746e83482
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp
+3 -3
View File
@@ -258,9 +258,9 @@ ata_adapter_prepare_dma(ata_adapter_channel_info *channel,
TRACE_DMA("ata_adapter: %#" B_PRIxPHYSADDR ", %" B_PRIuPHYSADDR " => " TRACE_DMA("ata_adapter: %#" B_PRIxPHYSADDR ", %" B_PRIuPHYSADDR " => "
"%#010" B_PRIx32 ", %" B_PRIu16 ", %d\n", "%#010" B_PRIx32 ", %" B_PRIu16 ", %d\n",
sgList->address, sgList->size, sgList->address, sgList->size,
prd->address, prd->count, prd->EOT); prd->address, prd->count, prd->EOT);
SHOW_FLOW( 4, "%#010" B_PRIx32 ", %" B_PRIu16 ", %d", SHOW_FLOW( 4, "%#010" B_PRIx32 ", %" B_PRIu16 ", %d",
prd->address, prd->count, prd->EOT); prd->address, prd->count, prd->EOT);
} }
@@ -545,7 +545,7 @@ ata_adapter_detect_channel(pci_device_module_info *pci, pci_device *pci_device,
TRACE("PCI-ATA: Controller in legacy mode: cmd %#x, ctrl %#x, irq %d\n", TRACE("PCI-ATA: Controller in legacy mode: cmd %#x, ctrl %#x, irq %d\n",
command_block_base, control_block_base, intnum); command_block_base, control_block_base, intnum);
} else if (supports_compatibility_mode } else if (supports_compatibility_mode
&& channel_index == 1 && (api & ATA_API_PRIMARY_NATIVE) == 0) { && channel_index == 1 && (api & ATA_API_SECONDARY_NATIVE) == 0) {
command_block_base = 0x170; command_block_base = 0x170;
control_block_base = 0x376; control_block_base = 0x376;
intnum = 15; intnum = 15;
src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp
+1 -1
View File
@@ -525,7 +525,7 @@ ide_adapter_detect_channel(pci_device_module_info *pci, pci_device *pci_device,
TRACE("PCI-IDE: Controller in legacy mode: cmd %#x, ctrl %#x, irq %d\n", TRACE("PCI-IDE: Controller in legacy mode: cmd %#x, ctrl %#x, irq %d\n",
command_block_base, control_block_base, intnum); command_block_base, control_block_base, intnum);
} else if (supports_compatibility_mode } else if (supports_compatibility_mode
&& channel_index == 1 && (api & IDE_API_PRIMARY_NATIVE) == 0) { && channel_index == 1 && (api & IDE_API_SECONDARY_NATIVE) == 0) {
command_block_base = 0x170; command_block_base = 0x170;
control_block_base = 0x376; control_block_base = 0x376;
intnum = 15; intnum = 15;