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

gcc2 buildfix; few style adjustments

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42347 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-06-30 21:57:39 +00:00
parent b0b8840701
commit 26e18b1f89
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/dac.cpp
+5 -5
View File
@@ -93,15 +93,15 @@ DACGetElectrical(uint8 type, uint8 dac,
void void
DACSetModern(uint8 dacIndex, uint32 crtid) DACSetModern(uint8 dacIndex, uint32 crtid)
{ {
uint8 bandGap; bool istv = false;
uint8 whiteFine;
// BIG TODO : NTSC, PAL, ETC. We assume VGA for now // BIG TODO : NTSC, PAL, ETC. We assume VGA for now
uint8 standard = FORMAT_VGA; /* VGA */ uint8 standard = FORMAT_VGA; /* VGA */
uint32 mode = 2; uint32 mode = 2;
bool istv = false;
uint32 source = istv ? 0x2 : crtid; uint32 source = istv ? 0x2 : crtid;
uint8 bandGap;
uint8 whiteFine;
DACGetElectrical(standard, dacIndex, &bandGap, &whiteFine); DACGetElectrical(standard, dacIndex, &bandGap, &whiteFine);
uint32 mask = 0; uint32 mask = 0;
@@ -147,12 +147,12 @@ void
DACSetLegacy(uint8 dacIndex, uint32 crtid) DACSetLegacy(uint8 dacIndex, uint32 crtid)
{ {
bool istv = false; bool istv = false;
uint8 bandGap;
uint8 whiteFine;
// BIG TODO : NTSC, PAL, ETC. We assume VGA for now // BIG TODO : NTSC, PAL, ETC. We assume VGA for now
uint8 standard = FORMAT_VGA; /* VGA */ uint8 standard = FORMAT_VGA; /* VGA */
uint8 bandGap;
uint8 whiteFine;
DACGetElectrical(standard, dacIndex, &bandGap, &whiteFine); DACGetElectrical(standard, dacIndex, &bandGap, &whiteFine);
uint32 mask = 0; uint32 mask = 0;
src/add-ons/accelerants/radeon_hd/dac.h
+1
View File
@@ -21,6 +21,7 @@
#define FORMAT_VGA 0x2 #define FORMAT_VGA 0x2
#define FORMAT_TvCV 0x3 #define FORMAT_TvCV 0x3
void DACGetElectrical(uint8 type, uint8 dac, uint8 *bandgap, uint8 *whitefine); void DACGetElectrical(uint8 type, uint8 dac, uint8 *bandgap, uint8 *whitefine);
void DACSet(uint8 dacIndex, uint32 crtid); void DACSet(uint8 dacIndex, uint32 crtid);
void DACPower(uint8 dacIndex, int mode); void DACPower(uint8 dacIndex, int mode);
src/add-ons/accelerants/radeon_hd/pll.cpp
+2 -3
View File
@@ -262,11 +262,10 @@ PLLSetLowLegacy(uint8 pllIndex, uint32 pixelClock, uint16 reference,
uint32 control; uint32 control;
if (info.device_chipset == RADEON_R600) if (info.device_chipset == RADEON_R600)
control = 0x01130704; control = 0x01130704;
else else {
PLLControlTable(RV610PLLControl, feedback); PLLControlTable(RV610PLLControl, feedback);
if (!control)
control = Read32(PLL, EXT1_PPLL_CNTL); control = Read32(PLL, EXT1_PPLL_CNTL);
}
Write32Mask(PLL, P1PLL_INT_SS_CNTL, 0, 0x00000001); Write32Mask(PLL, P1PLL_INT_SS_CNTL, 0, 0x00000001);
// Disable Spread Spectrum // Disable Spread Spectrum