[haiku-commits] haiku: hrev44638 - src/add-ons/kernel/busses/scsi/ahci
- From: marcusoverhagen@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 14 Sep 2012 20:26:47 +0200 (CEST)
hrev44638 adds 1 changeset to branch 'master'
old head: 87b33446e13a699d703d4c1678d0fe91901a2e98
new head: 1f6d0a79c927877cdf2aa5a6c6475a2488090f5f
----------------------------------------------------------------------------
1f6d0a7: use template max() instead of max_c() macro
[ Marcus Overhagen <marcus@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44638
Commit: 1f6d0a79c927877cdf2aa5a6c6475a2488090f5f
URL: http://cgit.haiku-os.org/haiku/commit/?id=1f6d0a7
Author: Marcus Overhagen <marcus@xxxxxxxxxxxx>
Date: Fri Sep 14 18:20:29 2012 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 1 deletion(-)
.../kernel/busses/scsi/ahci/ahci_controller.cpp | 3 ++-
----------------------------------------------------------------------------
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 0d7655a..b5ed575 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
@@ -6,6 +6,7 @@
#include "ahci_controller.h"
#include "util.h"
+#include <algorithm>
#include <KernelExport.h>
#include <stdio.h>
#include <string.h>
@@ -281,7 +282,7 @@ AHCIController::ResetController()
if (fPCIVendorID == PCI_VENDOR_INTEL) {
// Intel PCS—Port Control and Status
// SATA port enable bits must be set
- int portCount = max_c(fls(fRegs->pi), 1 + (int)((fRegs->cap >>
CAP_NP_SHIFT) & CAP_NP_MASK));
+ int portCount = std::max(fls(fRegs->pi), 1 + (int)((fRegs->cap
>> CAP_NP_SHIFT) & CAP_NP_MASK));
if (portCount > 8) {
// TODO: fix this when specification available
TRACE("don't know how to enable SATA ports 9 to %d\n",
portCount);
Other related posts:
- » [haiku-commits] haiku: hrev44638 - src/add-ons/kernel/busses/scsi/ahci - marcusoverhagen
