From 414b6dd98edf3cb27b9f768367e17c38dd2a161a Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 11 Jul 2011 17:59:36 +0000 Subject: [PATCH] DeadYak gave a better solution to r42407, simply typecast the defines as we don't want to modify the AMD radeon_hd register headers git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42409 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/radeon_hd/pll.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/pll.cpp b/src/add-ons/accelerants/radeon_hd/pll.cpp index 8175212271..3e27c0cad7 100644 --- a/src/add-ons/accelerants/radeon_hd/pll.cpp +++ b/src/add-ons/accelerants/radeon_hd/pll.cpp @@ -190,10 +190,9 @@ PLLPower(uint8 pllIndex, int command) uint16 pllDiffPostReg = (pllIndex == 1) ? RV620_EXT2_DIFF_POST_DIV_CNTL : RV620_EXT1_DIFF_POST_DIV_CNTL; - - uint16 pllDiffDriverEnable = (pllIndex == 1) ? 3 << 8 : 1 << 8; - // AKA RV62_EXT2_DIFF_DRIVER_ENABLE : RV62_EXT1_DIFF_DRIVER_ENABLE - // this prevents enumeral mismatch without a long static_cast + uint16 pllDiffDriverEnable + = (pllIndex == 1) ? (uint16)RV62_EXT2_DIFF_DRIVER_ENABLE + : (uint16)RV62_EXT1_DIFF_DRIVER_ENABLE; // Sometimes we have to keep an unused PLL running. X Bug #18016 if ((Read32(PLL, pllDiffPostReg)