From b31d5cd2b6ff9059eebb15b0e33bd8c4c8e3143a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 14 Nov 2014 15:59:04 +0100 Subject: [PATCH] AHCI: make debug messages more compact Put more information on a single line. This makes it easier to keep track of things when debugging higher level parts of the disk stack (partitionning and file systems). --- src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp | 8 +++----- src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp b/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp index a83f4d6b7b..a045771926 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp @@ -239,7 +239,6 @@ AHCIPort::ResetDevice() } - status_t AHCIPort::ResetPort(bool forceDeviceReset) { @@ -366,10 +365,9 @@ AHCIPort::InterruptErrorHandler(uint32 is) B_PRIx32 ", is 0x%08" B_PRIx32 ", ci 0x%08" B_PRIx32 "\n", fIndex, fCommandsActive, is, ci); - TRACE("ssts 0x%08" B_PRIx32 "\n", fRegs->ssts); - TRACE("sctl 0x%08" B_PRIx32 "\n", fRegs->sctl); - TRACE("serr 0x%08" B_PRIx32 "\n", fRegs->serr); - TRACE("sact 0x%08" B_PRIx32 "\n", fRegs->sact); + TRACE("ssts 0x%08" B_PRIx32 ", sctl 0x%08" B_PRIx32 ", serr 0x%08" + B_PRIx32 ", sact 0x%08" B_PRIx32 "\n", + fRegs->ssts, fRegs->sctl, fRegs->serr, fRegs->sact); } // read and clear SError diff --git a/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp b/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp index 9114978bfd..6a53fcf08e 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp +++ b/src/add-ons/kernel/busses/scsi/ahci/sata_request.cpp @@ -126,10 +126,8 @@ sata_request::Finish(int tfd, size_t bytesTransfered) uint8 error = (tfd >> 8) & 0xff; if (!IsTestUnitReady()) { - dprintf("ahci: sata_request::finish ATA command 0x%02x failed\n", - fFis[2]); - dprintf("ahci: sata_request::finish status 0x%02x, error 0x%02x\n", - status, error); + dprintf("ahci: sata_request::finish ATA command 0x%02x failed:" + " status 0x%02x, error 0x%02x\n", fFis[2], status, error); } }