From d60fa63b38e1e16b7d04ff85df155c927ee89ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 15 Mar 2009 10:13:59 +0000 Subject: [PATCH] * Turned off sync debug output. * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29542 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/busses/scsi/ahci/ahci_port.cpp | 37 +++++++++++-------- .../kernel/busses/scsi/ahci/ahci_tracing.h | 1 + 2 files changed, 22 insertions(+), 16 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 f8d3187cf5..753fcd9d3f 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp @@ -18,7 +18,12 @@ #include "ahci_tracing.h" -#define TRACE(a...) dprintf("\33[34mahci:\33[0m " a) +#define TRACE_AHCI +#ifdef TRACE_AHCI +# define TRACE(a...) dprintf("\33[34mahci:\33[0m " a) +#else +# define TRACE(a...) +#endif //#define FLOW(a...) dprintf("ahci: " a) //#define RWTRACE(a...) dprintf("\33[34mahci:\33[0m " a) #define FLOW(a...) @@ -26,20 +31,20 @@ AHCIPort::AHCIPort(AHCIController *controller, int index) - : fController(controller) - , fIndex(index) - , fRegs(&controller->fRegs->port[index]) - , fArea(-1) - , fCommandsActive(0) - , fRequestSem(-1) - , fResponseSem(-1) - , fDevicePresent(false) - , fUse48BitCommands(false) - , fSectorSize(0) - , fSectorCount(0) - , fIsATAPI(false) - , fResetPort(false) - , fError(false) + : fController(controller), + fIndex(index), + fRegs(&controller->fRegs->port[index]), + fArea(-1), + fCommandsActive(0), + fRequestSem(-1), + fResponseSem(-1), + fDevicePresent(false), + fUse48BitCommands(false), + fSectorSize(0), + fSectorCount(0), + fIsATAPI(false), + fResetPort(false), + fError(false) { B_INITIALIZE_SPINLOCK(&fSpinlock); fRequestSem = create_sem(1, "ahci request"); @@ -634,7 +639,7 @@ AHCIPort::ScsiInquiry(scsi_ccb *request) void AHCIPort::ScsiSynchronizeCache(scsi_ccb *request) { - TRACE("AHCIPort::ScsiSynchronizeCache port %d\n", fIndex); + //TRACE("AHCIPort::ScsiSynchronizeCache port %d\n", fIndex); sata_request *sreq = new(std::nothrow) sata_request(request); sreq->set_ata_cmd(fUse48BitCommands ? 0xea : 0xe7); // Flush Cache diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_tracing.h b/src/add-ons/kernel/busses/scsi/ahci/ahci_tracing.h index 308e8dd834..a910585f9b 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci_tracing.h +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_tracing.h @@ -2,6 +2,7 @@ * Copyright 2008, Bruno G. Albuquerque. All rights reserved. * Distributed under the terms of the MIT License. */ + #include