From 3746e83482816099ffd3ef4637b3fdb2712d54bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 28 Nov 2013 18:24:32 +0100 Subject: [PATCH] ata_adapter: check the secondary flag for the 2nd channel. * ide_adapter: likewise. --- src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp | 6 +++--- src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp index e0a258a7b9..1b654a5dae 100644 --- a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp +++ b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp @@ -258,9 +258,9 @@ ata_adapter_prepare_dma(ata_adapter_channel_info *channel, TRACE_DMA("ata_adapter: %#" B_PRIxPHYSADDR ", %" B_PRIuPHYSADDR " => " "%#010" B_PRIx32 ", %" B_PRIu16 ", %d\n", - sgList->address, sgList->size, + sgList->address, sgList->size, 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); } @@ -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", command_block_base, control_block_base, intnum); } 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; control_block_base = 0x376; intnum = 15; diff --git a/src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp b/src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp index f7a5d2c7e0..bce5b4a25e 100644 --- a/src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp +++ b/src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp @@ -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", command_block_base, control_block_base, intnum); } 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; control_block_base = 0x376; intnum = 15;