Author: kallisti5 Date: 2011-07-11 19:59:36 +0200 (Mon, 11 Jul 2011) New Revision: 42409 Changeset: https://dev.haiku-os.org/changeset/42409 Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/pll.cpp Log: DeadYak gave a better solution to r42407, simply typecast the defines as we don't want to modify the AMD radeon_hd register headers Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/pll.cpp =================================================================== --- haiku/trunk/src/add-ons/accelerants/radeon_hd/pll.cpp 2011-07-11 17:50:58 UTC (rev 42408) +++ haiku/trunk/src/add-ons/accelerants/radeon_hd/pll.cpp 2011-07-11 17:59:36 UTC (rev 42409) @@ -190,11 +190,10 @@ uint16 pllDiffPostReg = (pllIndex == 1) ? RV620_EXT2_DIFF_POST_DIV_CNTL : RV620_EXT1_DIFF_POST_DIV_CNTL; + uint16 pllDiffDriverEnable + = (pllIndex == 1) ? (uint16)RV62_EXT2_DIFF_DRIVER_ENABLE + : (uint16)RV62_EXT1_DIFF_DRIVER_ENABLE; - 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 - // Sometimes we have to keep an unused PLL running. X Bug #18016 if ((Read32(PLL, pllDiffPostReg) & pllDiffDriverEnable) == 0) {