hrev48919 adds 1 changeset to branch 'master' old head: aa239e96dfbf95654c3ab37e3662bbe79dde1a8f new head: 673f931b62e47bc6570765b27f0ffc000d2c8fe3 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=673f931b62e4+%5Eaa239e96dfbf ---------------------------------------------------------------------------- 673f931b62e4: ahci: correctly display version * merge traces a bit. [ Jérôme Duval <jerome.duval@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev48919 Commit: 673f931b62e47bc6570765b27f0ffc000d2c8fe3 URL: http://cgit.haiku-os.org/haiku/commit/?id=673f931b62e4 Author: Jérôme Duval <jerome.duval@xxxxxxxxx> Date: Thu Mar 19 16:49:36 2015 UTC ---------------------------------------------------------------------------- 1 file changed, 6 insertions(+), 5 deletions(-) src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp | 11 ++++++----- ---------------------------------------------------------------------------- diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp index e94b576..b86e756 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp @@ -210,11 +210,12 @@ AHCIController::Init() TRACE("cap2: BIOS/OS Handoff: %s\n", (fRegs->cap2 & CAP2_BOH) ? "yes" : "no"); } - TRACE("ghc: AHCI Enable: %s\n", (fRegs->ghc & GHC_AE) ? "yes" : "no"); - TRACE("Ports Implemented Mask: %#08" B_PRIx32 "\n", fPortImplementedMask); - TRACE("Number of Available Ports: %d\n", count_bits_set(fPortImplementedMask)); - TRACE("AHCI Version %" B_PRIu32 ".%" B_PRIu32 "\n", fRegs->vs >> 16, fRegs->vs & 0xff); - TRACE("Interrupt %u\n", fIRQ); + TRACE("ghc: AHCI Enable: %s\n", (fRegs->ghc & GHC_AE) ? "yes" : "no"); + TRACE("Ports Implemented Mask: %#08" B_PRIx32 " Number of Available Ports:" + " %d\n", fPortImplementedMask, count_bits_set(fPortImplementedMask)); + TRACE("AHCI Version %02x%02x.%02x.%02x Interrupt %u\n", fRegs->vs >> 24, + (fRegs->vs >> 16) & 0xff, (fRegs->vs >> 8) & 0xff, fRegs->vs & 0xff, + fIRQ); // setup interrupt handler if (install_io_interrupt_handler(fIRQ, Interrupt, this, 0) < B_OK) {