i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* remove superfluous parentheses as per Axel

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42411 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-07-11 18:46:37 +00:00
parent 70d8929d63
commit 3fe7883778
4 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/accelerant.cpp
+35 -35
View File
@@ -247,52 +247,52 @@ init_registers(uint8 crtid)
// r600 - r700 are D1 or D2 based on primary / secondary crt // r600 - r700 are D1 or D2 based on primary / secondary crt
gRegister->vgaControl gRegister->vgaControl
= (crtid == 1) ? D2VGA_CONTROL : D1VGA_CONTROL; = crtid == 1 ? D2VGA_CONTROL : D1VGA_CONTROL;
gRegister->grphEnable gRegister->grphEnable
= (crtid == 1) ? D2GRPH_ENABLE : D1GRPH_ENABLE; = crtid == 1 ? D2GRPH_ENABLE : D1GRPH_ENABLE;
gRegister->grphControl gRegister->grphControl
= (crtid == 1) ? D2GRPH_CONTROL : D1GRPH_CONTROL; = crtid == 1 ? D2GRPH_CONTROL : D1GRPH_CONTROL;
gRegister->grphSwapControl gRegister->grphSwapControl
= (crtid == 1) ? D2GRPH_SWAP_CNTL : D1GRPH_SWAP_CNTL; = crtid == 1 ? D2GRPH_SWAP_CNTL : D1GRPH_SWAP_CNTL;
gRegister->grphPrimarySurfaceAddr gRegister->grphPrimarySurfaceAddr
= (crtid == 1) ? D2GRPH_PRIMARY_SURFACE_ADDRESS = crtid == 1 ? D2GRPH_PRIMARY_SURFACE_ADDRESS
: D1GRPH_PRIMARY_SURFACE_ADDRESS; : D1GRPH_PRIMARY_SURFACE_ADDRESS;
gRegister->grphSecondarySurfaceAddr gRegister->grphSecondarySurfaceAddr
= (crtid == 1) ? D2GRPH_SECONDARY_SURFACE_ADDRESS = crtid == 1 ? D2GRPH_SECONDARY_SURFACE_ADDRESS
: D1GRPH_SECONDARY_SURFACE_ADDRESS; : D1GRPH_SECONDARY_SURFACE_ADDRESS;
// Surface Address high only used on r770+ // Surface Address high only used on r770+
gRegister->grphPrimarySurfaceAddrHigh gRegister->grphPrimarySurfaceAddrHigh
= (crtid == 1) ? R700_D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH = crtid == 1 ? R700_D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH
: R700_D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH; : R700_D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH;
gRegister->grphSecondarySurfaceAddrHigh gRegister->grphSecondarySurfaceAddrHigh
= (crtid == 1) ? R700_D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH = crtid == 1 ? R700_D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH
: R700_D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH; : R700_D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH;
gRegister->grphPitch gRegister->grphPitch
= (crtid == 1) ? D2GRPH_PITCH : D1GRPH_PITCH; = crtid == 1 ? D2GRPH_PITCH : D1GRPH_PITCH;
gRegister->grphSurfaceOffsetX gRegister->grphSurfaceOffsetX
= (crtid == 1) ? D2GRPH_SURFACE_OFFSET_X : D1GRPH_SURFACE_OFFSET_X; = crtid == 1 ? D2GRPH_SURFACE_OFFSET_X : D1GRPH_SURFACE_OFFSET_X;
gRegister->grphSurfaceOffsetY gRegister->grphSurfaceOffsetY
= (crtid == 1) ? D2GRPH_SURFACE_OFFSET_Y : D1GRPH_SURFACE_OFFSET_Y; = crtid == 1 ? D2GRPH_SURFACE_OFFSET_Y : D1GRPH_SURFACE_OFFSET_Y;
gRegister->grphXStart gRegister->grphXStart
= (crtid == 1) ? D2GRPH_X_START : D1GRPH_X_START; = crtid == 1 ? D2GRPH_X_START : D1GRPH_X_START;
gRegister->grphYStart gRegister->grphYStart
= (crtid == 1) ? D2GRPH_Y_START : D1GRPH_Y_START; = crtid == 1 ? D2GRPH_Y_START : D1GRPH_Y_START;
gRegister->grphXEnd gRegister->grphXEnd
= (crtid == 1) ? D2GRPH_X_END : D1GRPH_X_END; = crtid == 1 ? D2GRPH_X_END : D1GRPH_X_END;
gRegister->grphYEnd gRegister->grphYEnd
= (crtid == 1) ? D2GRPH_Y_END : D1GRPH_Y_END; = crtid == 1 ? D2GRPH_Y_END : D1GRPH_Y_END;
gRegister->crtControl gRegister->crtControl
= (crtid == 1) ? D2CRTC_CONTROL : D1CRTC_CONTROL; = crtid == 1 ? D2CRTC_CONTROL : D1CRTC_CONTROL;
gRegister->modeDesktopHeight gRegister->modeDesktopHeight
= (crtid == 1) ? D2MODE_DESKTOP_HEIGHT : D1MODE_DESKTOP_HEIGHT; = crtid == 1 ? D2MODE_DESKTOP_HEIGHT : D1MODE_DESKTOP_HEIGHT;
gRegister->modeDataFormat gRegister->modeDataFormat
= (crtid == 1) ? D2MODE_DATA_FORMAT : D1MODE_DATA_FORMAT; = crtid == 1 ? D2MODE_DATA_FORMAT : D1MODE_DATA_FORMAT;
gRegister->viewportStart gRegister->viewportStart
= (crtid == 1) ? D2MODE_VIEWPORT_START : D1MODE_VIEWPORT_START; = crtid == 1 ? D2MODE_VIEWPORT_START : D1MODE_VIEWPORT_START;
gRegister->viewportSize gRegister->viewportSize
= (crtid == 1) ? D2MODE_VIEWPORT_SIZE : D1MODE_VIEWPORT_SIZE; = crtid == 1 ? D2MODE_VIEWPORT_SIZE : D1MODE_VIEWPORT_SIZE;
} else { } else {
// this really shouldn't happen unless a driver PCIID chipset is wrong // this really shouldn't happen unless a driver PCIID chipset is wrong
TRACE("%s, unknown Radeon chipset: r%X\n", __func__, TRACE("%s, unknown Radeon chipset: r%X\n", __func__,
@@ -305,35 +305,35 @@ init_registers(uint8 crtid)
gRegister->crtid = crtid; gRegister->crtid = crtid;
gRegister->modeCenter gRegister->modeCenter
= (crtid == 1) ? D2MODE_CENTER : D1MODE_CENTER; = crtid == 1 ? D2MODE_CENTER : D1MODE_CENTER;
gRegister->grphUpdate gRegister->grphUpdate
= (crtid == 1) ? D2GRPH_UPDATE : D1GRPH_UPDATE; = crtid == 1 ? D2GRPH_UPDATE : D1GRPH_UPDATE;
gRegister->crtHPolarity gRegister->crtHPolarity
= (crtid == 1) ? D2CRTC_H_SYNC_A_CNTL : D1CRTC_H_SYNC_A_CNTL; = crtid == 1 ? D2CRTC_H_SYNC_A_CNTL : D1CRTC_H_SYNC_A_CNTL;
gRegister->crtVPolarity gRegister->crtVPolarity
= (crtid == 1) ? D2CRTC_V_SYNC_A_CNTL : D1CRTC_V_SYNC_A_CNTL; = crtid == 1 ? D2CRTC_V_SYNC_A_CNTL : D1CRTC_V_SYNC_A_CNTL;
gRegister->crtHTotal gRegister->crtHTotal
= (crtid == 1) ? D2CRTC_H_TOTAL : D1CRTC_H_TOTAL; = crtid == 1 ? D2CRTC_H_TOTAL : D1CRTC_H_TOTAL;
gRegister->crtVTotal gRegister->crtVTotal
= (crtid == 1) ? D2CRTC_V_TOTAL : D1CRTC_V_TOTAL; = crtid == 1 ? D2CRTC_V_TOTAL : D1CRTC_V_TOTAL;
gRegister->crtHSync gRegister->crtHSync
= (crtid == 1) ? D2CRTC_H_SYNC_A : D1CRTC_H_SYNC_A; = crtid == 1 ? D2CRTC_H_SYNC_A : D1CRTC_H_SYNC_A;
gRegister->crtVSync gRegister->crtVSync
= (crtid == 1) ? D2CRTC_V_SYNC_A : D1CRTC_V_SYNC_A; = crtid == 1 ? D2CRTC_V_SYNC_A : D1CRTC_V_SYNC_A;
gRegister->crtHBlank gRegister->crtHBlank
= (crtid == 1) ? D2CRTC_H_BLANK_START_END : D1CRTC_H_BLANK_START_END; = crtid == 1 ? D2CRTC_H_BLANK_START_END : D1CRTC_H_BLANK_START_END;
gRegister->crtVBlank gRegister->crtVBlank
= (crtid == 1) ? D2CRTC_V_BLANK_START_END : D1CRTC_V_BLANK_START_END; = crtid == 1 ? D2CRTC_V_BLANK_START_END : D1CRTC_V_BLANK_START_END;
gRegister->crtInterlace gRegister->crtInterlace
= (crtid == 1) ? D2CRTC_INTERLACE_CONTROL : D1CRTC_INTERLACE_CONTROL; = crtid == 1 ? D2CRTC_INTERLACE_CONTROL : D1CRTC_INTERLACE_CONTROL;
gRegister->crtCountControl gRegister->crtCountControl
= (crtid == 1) ? D2CRTC_COUNT_CONTROL : D1CRTC_COUNT_CONTROL; = crtid == 1 ? D2CRTC_COUNT_CONTROL : D1CRTC_COUNT_CONTROL;
gRegister->sclUpdate gRegister->sclUpdate
= (crtid == 1) ? D2SCL_UPDATE : D1SCL_UPDATE; = crtid == 1 ? D2SCL_UPDATE : D1SCL_UPDATE;
gRegister->sclEnable gRegister->sclEnable
= (crtid == 1) ? D2SCL_ENABLE : D1SCL_ENABLE; = crtid == 1 ? D2SCL_ENABLE : D1SCL_ENABLE;
gRegister->sclTapControl gRegister->sclTapControl
= (crtid == 1) ? D2SCL_TAP_CONTROL : D1SCL_TAP_CONTROL; = crtid == 1 ? D2SCL_TAP_CONTROL : D1SCL_TAP_CONTROL;
TRACE("%s, registers for ATI chipset r%X crt #%d loaded\n", __func__, TRACE("%s, registers for ATI chipset r%X crt #%d loaded\n", __func__,
info.device_chipset, crtid); info.device_chipset, crtid);
src/add-ons/accelerants/radeon_hd/dac.cpp
+6 -6
View File
@@ -25,7 +25,7 @@ extern "C" void _sPrintf(const char *format, ...);
bool bool
DACSense(uint8 dacIndex) DACSense(uint8 dacIndex)
{ {
uint32 dacOffset = (dacIndex == 1) ? REG_DACB_OFFSET : REG_DACA_OFFSET; uint32 dacOffset = dacIndex == 1 ? REG_DACB_OFFSET : REG_DACA_OFFSET;
// Backup current DAC values // Backup current DAC values
uint32 compEnable = Read32(OUT, dacOffset + DACA_COMPARATOR_ENABLE); uint32 compEnable = Read32(OUT, dacOffset + DACA_COMPARATOR_ENABLE);
@@ -183,7 +183,7 @@ DACSetModern(uint8 dacIndex, uint32 crtid)
if (whiteFine) if (whiteFine)
mask |= 0xFF << 8; mask |= 0xFF << 8;
uint32 dacOffset = (dacIndex == 1) ? RV620_REG_DACA_OFFSET uint32 dacOffset = dacIndex == 1 ? RV620_REG_DACA_OFFSET
: RV620_REG_DACB_OFFSET; : RV620_REG_DACB_OFFSET;
Write32Mask(OUT, dacOffset + RV620_DACA_MACRO_CNTL, mode, 0xFF); Write32Mask(OUT, dacOffset + RV620_DACA_MACRO_CNTL, mode, 0xFF);
@@ -203,7 +203,7 @@ DACSetModern(uint8 dacIndex, uint32 crtid)
// reset the FMT register // reset the FMT register
// TODO : ah-la external DxFMTSet // TODO : ah-la external DxFMTSet
uint32 fmtOffset = (crtid == 0) ? FMT1_REG_OFFSET : FMT2_REG_OFFSET; uint32 fmtOffset = crtid == 0 ? FMT1_REG_OFFSET : FMT2_REG_OFFSET;
Write32(OUT, fmtOffset + RV620_FMT1_BIT_DEPTH_CONTROL, 0); Write32(OUT, fmtOffset + RV620_FMT1_BIT_DEPTH_CONTROL, 0);
Write32Mask(OUT, fmtOffset + RV620_FMT1_CONTROL, 0, Write32Mask(OUT, fmtOffset + RV620_FMT1_CONTROL, 0,
@@ -234,7 +234,7 @@ DACSetLegacy(uint8 dacIndex, uint32 crtid)
if (whiteFine) if (whiteFine)
mask |= 0xFF << 8; mask |= 0xFF << 8;
uint32 dacOffset = (dacIndex == 1) ? REG_DACB_OFFSET : REG_DACA_OFFSET; uint32 dacOffset = dacIndex == 1 ? REG_DACB_OFFSET : REG_DACA_OFFSET;
Write32Mask(OUT, dacOffset + DACA_CONTROL1, standard, 0x000000FF); Write32Mask(OUT, dacOffset + DACA_CONTROL1, standard, 0x000000FF);
/* white level fine adjust */ /* white level fine adjust */
@@ -286,7 +286,7 @@ DACPowerModern(uint8 dacIndex, int mode)
{ {
TRACE("%s: dacIndex: %d; mode: %d\n", __func__, dacIndex, mode); TRACE("%s: dacIndex: %d; mode: %d\n", __func__, dacIndex, mode);
uint32 dacOffset = (dacIndex == 1) ? RV620_REG_DACB_OFFSET uint32 dacOffset = dacIndex == 1 ? RV620_REG_DACB_OFFSET
: RV620_REG_DACA_OFFSET; : RV620_REG_DACA_OFFSET;
uint32 powerdown; uint32 powerdown;
@@ -328,7 +328,7 @@ DACPowerModern(uint8 dacIndex, int mode)
void void
DACPowerLegacy(uint8 dacIndex, int mode) DACPowerLegacy(uint8 dacIndex, int mode)
{ {
uint32 dacOffset = (dacIndex == 1) ? REG_DACB_OFFSET : REG_DACA_OFFSET; uint32 dacOffset = dacIndex == 1 ? REG_DACB_OFFSET : REG_DACA_OFFSET;
uint32 powerdown; uint32 powerdown;
switch (mode) { switch (mode) {
src/add-ons/accelerants/radeon_hd/mode.cpp
+2 -2
View File
@@ -131,9 +131,9 @@ static void
CardBlankSet(uint8 crtid, bool blank) CardBlankSet(uint8 crtid, bool blank)
{ {
int blackColorReg int blackColorReg
= (crtid == 1) ? D2CRTC_BLACK_COLOR : D1CRTC_BLACK_COLOR; = crtid == 1 ? D2CRTC_BLACK_COLOR : D1CRTC_BLACK_COLOR;
int blankControlReg int blankControlReg
= (crtid == 1) ? D2CRTC_BLANK_CONTROL : D1CRTC_BLANK_CONTROL; = crtid == 1 ? D2CRTC_BLANK_CONTROL : D1CRTC_BLANK_CONTROL;
Write32(CRT, blackColorReg, 0); Write32(CRT, blackColorReg, 0);
Write32Mask(CRT, blankControlReg, blank ? 1 << 8 : 0, 1 << 8); Write32Mask(CRT, blankControlReg, blank ? 1 << 8 : 0, 1 << 8);
src/add-ons/accelerants/radeon_hd/pll.cpp
+28 -28
View File
@@ -133,7 +133,7 @@ PLLCalculate(uint32 pixelClock, uint16 *reference, uint16 *feedback,
status_t status_t
PLLPower(uint8 pllIndex, int command) PLLPower(uint8 pllIndex, int command)
{ {
uint16 pllControlReg = (pllIndex == 1) ? P2PLL_CNTL : P1PLL_CNTL; uint16 pllControlReg = pllIndex == 1 ? P2PLL_CNTL : P1PLL_CNTL;
bool hasDccg = DCCGCLKAvailable(pllIndex); bool hasDccg = DCCGCLKAvailable(pllIndex);
@@ -188,10 +188,10 @@ PLLPower(uint8 pllIndex, int command)
if (info.device_chipset >= (RADEON_R600 | 0x20)) { if (info.device_chipset >= (RADEON_R600 | 0x20)) {
uint16 pllDiffPostReg uint16 pllDiffPostReg
= (pllIndex == 1) ? RV620_EXT2_DIFF_POST_DIV_CNTL = pllIndex == 1 ? RV620_EXT2_DIFF_POST_DIV_CNTL
: RV620_EXT1_DIFF_POST_DIV_CNTL; : RV620_EXT1_DIFF_POST_DIV_CNTL;
uint16 pllDiffDriverEnable uint16 pllDiffDriverEnable
= (pllIndex == 1) ? (uint16)RV62_EXT2_DIFF_DRIVER_ENABLE = pllIndex == 1 ? (uint16)RV62_EXT2_DIFF_DRIVER_ENABLE
: (uint16)RV62_EXT1_DIFF_DRIVER_ENABLE; : (uint16)RV62_EXT1_DIFF_DRIVER_ENABLE;
// Sometimes we have to keep an unused PLL running. X Bug #18016 // Sometimes we have to keep an unused PLL running. X Bug #18016
@@ -255,27 +255,27 @@ PLLSetLowLegacy(uint8 pllIndex, uint32 pixelClock, uint16 reference,
uint32 referenceTemp = reference; uint32 referenceTemp = reference;
/* Internal PLL Registers */ /* Internal PLL Registers */
uint16 pllCntl = (pllIndex == 1) ? P2PLL_CNTL : P1PLL_CNTL; uint16 pllCntl = pllIndex == 1 ? P2PLL_CNTL : P1PLL_CNTL;
uint16 pllIntSSCntl uint16 pllIntSSCntl
= (pllIndex == 1) ? P2PLL_INT_SS_CNTL : P1PLL_INT_SS_CNTL; = pllIndex == 1 ? P2PLL_INT_SS_CNTL : P1PLL_INT_SS_CNTL;
/* External PLL Registers */ /* External PLL Registers */
uint16 pllExtCntl uint16 pllExtCntl
= (pllIndex == 1) ? EXT2_PPLL_CNTL : EXT1_PPLL_CNTL; = pllIndex == 1 ? EXT2_PPLL_CNTL : EXT1_PPLL_CNTL;
uint16 pllExtUpdateCntl uint16 pllExtUpdateCntl
= (pllIndex == 1) ? EXT2_PPLL_UPDATE_CNTL : EXT1_PPLL_UPDATE_CNTL; = pllIndex == 1 ? EXT2_PPLL_UPDATE_CNTL : EXT1_PPLL_UPDATE_CNTL;
uint16 pllExtUpdateLock uint16 pllExtUpdateLock
= (pllIndex == 1) ? EXT2_PPLL_UPDATE_LOCK : EXT1_PPLL_UPDATE_LOCK; = pllIndex == 1 ? EXT2_PPLL_UPDATE_LOCK : EXT1_PPLL_UPDATE_LOCK;
uint16 pllExtPostDiv uint16 pllExtPostDiv
= (pllIndex == 1) ? EXT2_PPLL_POST_DIV : EXT1_PPLL_POST_DIV; = pllIndex == 1 ? EXT2_PPLL_POST_DIV : EXT1_PPLL_POST_DIV;
uint16 pllExtPostDivSrc uint16 pllExtPostDivSrc
= (pllIndex == 1) ? EXT2_PPLL_POST_DIV_SRC : EXT1_PPLL_POST_DIV_SRC; = pllIndex == 1 ? EXT2_PPLL_POST_DIV_SRC : EXT1_PPLL_POST_DIV_SRC;
uint16 pllExtFeedbackDiv uint16 pllExtFeedbackDiv
= (pllIndex == 1) ? EXT2_PPLL_FB_DIV : EXT1_PPLL_FB_DIV; = pllIndex == 1 ? EXT2_PPLL_FB_DIV : EXT1_PPLL_FB_DIV;
uint16 pllExtRefDiv uint16 pllExtRefDiv
= (pllIndex == 1) ? EXT2_PPLL_REF_DIV : EXT1_PPLL_REF_DIV; = pllIndex == 1 ? EXT2_PPLL_REF_DIV : EXT1_PPLL_REF_DIV;
uint16 pllExtRefDivSrc uint16 pllExtRefDivSrc
= (pllIndex == 1) ? EXT2_PPLL_REF_DIV_SRC : EXT1_PPLL_REF_DIV_SRC; = pllIndex == 1 ? EXT2_PPLL_REF_DIV_SRC : EXT1_PPLL_REF_DIV_SRC;
radeon_shared_info &info = *gInfo->shared_info; radeon_shared_info &info = *gInfo->shared_info;
@@ -364,31 +364,31 @@ PLLSetLowR620(uint8 pllIndex, uint32 pixelClock, uint16 reference,
DCCGCLKSet(pllIndex, RV620_DCCGCLK_RESET); DCCGCLKSet(pllIndex, RV620_DCCGCLK_RESET);
/* Internal PLL Registers */ /* Internal PLL Registers */
uint16 pllCntl = (pllIndex == 1) ? P2PLL_CNTL : P1PLL_CNTL; uint16 pllCntl = pllIndex == 1 ? P2PLL_CNTL : P1PLL_CNTL;
uint16 pllIntSSCntl uint16 pllIntSSCntl
= (pllIndex == 1) ? P2PLL_INT_SS_CNTL : P1PLL_INT_SS_CNTL; = pllIndex == 1 ? P2PLL_INT_SS_CNTL : P1PLL_INT_SS_CNTL;
/* External PLL Registers */ /* External PLL Registers */
uint16 pllExtCntl uint16 pllExtCntl
= (pllIndex == 1) ? EXT2_PPLL_CNTL : EXT1_PPLL_CNTL; = pllIndex == 1 ? EXT2_PPLL_CNTL : EXT1_PPLL_CNTL;
//uint16 pllExtUpdateCntl //uint16 pllExtUpdateCntl
// = (pllIndex == 1) ? EXT2_PPLL_UPDATE_CNTL : EXT1_PPLL_UPDATE_CNTL; // = pllIndex == 1 ? EXT2_PPLL_UPDATE_CNTL : EXT1_PPLL_UPDATE_CNTL;
uint16 pllExtUpdateLock uint16 pllExtUpdateLock
= (pllIndex == 1) ? EXT2_PPLL_UPDATE_LOCK : EXT1_PPLL_UPDATE_LOCK; = pllIndex == 1 ? EXT2_PPLL_UPDATE_LOCK : EXT1_PPLL_UPDATE_LOCK;
uint16 pllExtPostDiv uint16 pllExtPostDiv
= (pllIndex == 1) ? EXT2_PPLL_POST_DIV : EXT1_PPLL_POST_DIV; = pllIndex == 1 ? EXT2_PPLL_POST_DIV : EXT1_PPLL_POST_DIV;
uint16 pllExtPostDivSrc uint16 pllExtPostDivSrc
= (pllIndex == 1) ? EXT2_PPLL_POST_DIV_SRC : EXT1_PPLL_POST_DIV_SRC; = pllIndex == 1 ? EXT2_PPLL_POST_DIV_SRC : EXT1_PPLL_POST_DIV_SRC;
uint16 pllExtPostDivSym uint16 pllExtPostDivSym
= (pllIndex == 1) ? EXT2_SYM_PPLL_POST_DIV : EXT1_SYM_PPLL_POST_DIV; = pllIndex == 1 ? EXT2_SYM_PPLL_POST_DIV : EXT1_SYM_PPLL_POST_DIV;
uint16 pllExtFeedbackDiv uint16 pllExtFeedbackDiv
= (pllIndex == 1) ? EXT2_PPLL_FB_DIV : EXT1_PPLL_FB_DIV; = pllIndex == 1 ? EXT2_PPLL_FB_DIV : EXT1_PPLL_FB_DIV;
uint16 pllExtRefDiv uint16 pllExtRefDiv
= (pllIndex == 1) ? EXT2_PPLL_REF_DIV : EXT1_PPLL_REF_DIV; = pllIndex == 1 ? EXT2_PPLL_REF_DIV : EXT1_PPLL_REF_DIV;
//uint16 pllExtRefDivSrc //uint16 pllExtRefDivSrc
// = (pllIndex == 1) ? EXT2_PPLL_REF_DIV_SRC : EXT1_PPLL_REF_DIV_SRC; // = pllIndex == 1 ? EXT2_PPLL_REF_DIV_SRC : EXT1_PPLL_REF_DIV_SRC;
uint16 pllExtDispClkCntl uint16 pllExtDispClkCntl
= (pllIndex == 1) ? P2PLL_DISP_CLK_CNTL : P1PLL_DISP_CLK_CNTL; = pllIndex == 1 ? P2PLL_DISP_CLK_CNTL : P1PLL_DISP_CLK_CNTL;
Write32Mask(PLL, pllIntSSCntl, 0, 0x00000001); Write32Mask(PLL, pllIntSSCntl, 0, 0x00000001);
// Disable Spread Spectrum // Disable Spread Spectrum
@@ -474,7 +474,7 @@ PLLSetLowR620(uint8 pllIndex, uint32 pixelClock, uint16 reference,
status_t status_t
PLLCalibrate(uint8 pllIndex) PLLCalibrate(uint8 pllIndex)
{ {
uint16 pllControlReg = (pllIndex == 1) ? P2PLL_CNTL : P1PLL_CNTL; uint16 pllControlReg = pllIndex == 1 ? P2PLL_CNTL : P1PLL_CNTL;
Write32Mask(PLL, pllControlReg, 1, 0x01); Write32Mask(PLL, pllControlReg, 1, 0x01);
// PLL Reset // PLL Reset
@@ -513,12 +513,12 @@ PLLCRTCGrab(uint8 pllIndex, uint8 crtid)
if (crtid == 0) { if (crtid == 0) {
pll2IsCurrent = Read32(PLL, PCLK_CRTC1_CNTL) & 0x00010000; pll2IsCurrent = Read32(PLL, PCLK_CRTC1_CNTL) & 0x00010000;
Write32Mask(PLL, PCLK_CRTC1_CNTL, (pllIndex == 0) ? 0x00010000 : 0, Write32Mask(PLL, PCLK_CRTC1_CNTL, pllIndex == 0 ? 0x00010000 : 0,
0x00010000); 0x00010000);
} else { } else {
pll2IsCurrent = Read32(PLL, PCLK_CRTC2_CNTL) & 0x00010000; pll2IsCurrent = Read32(PLL, PCLK_CRTC2_CNTL) & 0x00010000;
Write32Mask(PLL, PCLK_CRTC2_CNTL, (pllIndex == 0) ? 0x00010000 : 0, Write32Mask(PLL, PCLK_CRTC2_CNTL, pllIndex == 0 ? 0x00010000 : 0,
0x00010000); 0x00010000);
} }