You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[PATCH] drivers/video/sis: Convert to generic boolean
Convert: FALSE -> false TRUE -> true BOOLEAN -> bool Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Cc: Thomas Hellstrom <thomas@tungstengraphics.com> Cc: James Simmons <jsimmons@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Richard Knutsson
committed by
Linus Torvalds
Linus Torvalds
parent
3aebbd8f92
commit
c30660ead2
+70
-70
@@ -317,23 +317,23 @@ InitTo310Pointer(struct SiS_Private *SiS_Pr)
|
||||
}
|
||||
#endif
|
||||
|
||||
BOOLEAN
|
||||
bool
|
||||
SiSInitPtr(struct SiS_Private *SiS_Pr)
|
||||
{
|
||||
if(SiS_Pr->ChipType < SIS_315H) {
|
||||
#ifdef SIS300
|
||||
InitTo300Pointer(SiS_Pr);
|
||||
#else
|
||||
return FALSE;
|
||||
return false;
|
||||
#endif
|
||||
} else {
|
||||
#ifdef SIS315H
|
||||
InitTo310Pointer(SiS_Pr);
|
||||
#else
|
||||
return FALSE;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*********************************************/
|
||||
@@ -345,7 +345,7 @@ static
|
||||
#endif
|
||||
unsigned short
|
||||
SiS_GetModeID(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay,
|
||||
int Depth, BOOLEAN FSTN, int LCDwidth, int LCDheight)
|
||||
int Depth, bool FSTN, int LCDwidth, int LCDheight)
|
||||
{
|
||||
unsigned short ModeIndex = 0;
|
||||
|
||||
@@ -483,7 +483,7 @@ SiS_GetModeID(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay,
|
||||
|
||||
unsigned short
|
||||
SiS_GetModeID_LCD(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay,
|
||||
int Depth, BOOLEAN FSTN, unsigned short CustomT, int LCDwidth, int LCDheight,
|
||||
int Depth, bool FSTN, unsigned short CustomT, int LCDwidth, int LCDheight,
|
||||
unsigned int VBFlags2)
|
||||
{
|
||||
unsigned short ModeIndex = 0;
|
||||
@@ -873,7 +873,7 @@ SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDispl
|
||||
break;
|
||||
}
|
||||
|
||||
return SiS_GetModeID(VGAEngine, 0, HDisplay, VDisplay, Depth, FALSE, 0, 0);
|
||||
return SiS_GetModeID(VGAEngine, 0, HDisplay, VDisplay, Depth, false, 0, 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -1020,12 +1020,12 @@ SiS_GetSysFlags(struct SiS_Private *SiS_Pr)
|
||||
|
||||
/* 661 and newer: NEVER write non-zero to SR11[7:4] */
|
||||
/* (SR11 is used for DDC and in enable/disablebridge) */
|
||||
SiS_Pr->SiS_SensibleSR11 = FALSE;
|
||||
SiS_Pr->SiS_SensibleSR11 = false;
|
||||
SiS_Pr->SiS_MyCR63 = 0x63;
|
||||
if(SiS_Pr->ChipType >= SIS_330) {
|
||||
SiS_Pr->SiS_MyCR63 = 0x53;
|
||||
if(SiS_Pr->ChipType >= SIS_661) {
|
||||
SiS_Pr->SiS_SensibleSR11 = TRUE;
|
||||
SiS_Pr->SiS_SensibleSR11 = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1253,7 +1253,7 @@ SiS_GetModeFlag(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
/* HELPER: Determine ROM usage */
|
||||
/*********************************************/
|
||||
|
||||
BOOLEAN
|
||||
bool
|
||||
SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr)
|
||||
{
|
||||
unsigned char *ROMAddr = SiS_Pr->VirtualRomBase;
|
||||
@@ -1261,16 +1261,16 @@ SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr)
|
||||
|
||||
if(SiS_Pr->ChipType >= XGI_20) {
|
||||
/* XGI ROMs don't qualify */
|
||||
return FALSE;
|
||||
return false;
|
||||
} else if(SiS_Pr->ChipType >= SIS_761) {
|
||||
/* I very much assume 761, 340 and newer will use new layout */
|
||||
return TRUE;
|
||||
return true;
|
||||
} else if(SiS_Pr->ChipType >= SIS_661) {
|
||||
if((ROMAddr[0x1a] == 'N') &&
|
||||
(ROMAddr[0x1b] == 'e') &&
|
||||
(ROMAddr[0x1c] == 'w') &&
|
||||
(ROMAddr[0x1d] == 'V')) {
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
romversoffs = ROMAddr[0x16] | (ROMAddr[0x17] << 8);
|
||||
if(romversoffs) {
|
||||
@@ -1280,17 +1280,17 @@ SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr)
|
||||
}
|
||||
}
|
||||
if((romvmaj != 0) || (romvmin >= 92)) {
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
} else if(IS_SIS650740) {
|
||||
if((ROMAddr[0x1a] == 'N') &&
|
||||
(ROMAddr[0x1b] == 'e') &&
|
||||
(ROMAddr[0x1c] == 'w') &&
|
||||
(ROMAddr[0x1d] == 'V')) {
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -1299,8 +1299,8 @@ SiSDetermineROMUsage(struct SiS_Private *SiS_Pr)
|
||||
unsigned char *ROMAddr = SiS_Pr->VirtualRomBase;
|
||||
unsigned short romptr = 0;
|
||||
|
||||
SiS_Pr->SiS_UseROM = FALSE;
|
||||
SiS_Pr->SiS_ROMNew = FALSE;
|
||||
SiS_Pr->SiS_UseROM = false;
|
||||
SiS_Pr->SiS_ROMNew = false;
|
||||
SiS_Pr->SiS_PWDOffset = 0;
|
||||
|
||||
if(SiS_Pr->ChipType >= XGI_20) return;
|
||||
@@ -1312,15 +1312,15 @@ SiSDetermineROMUsage(struct SiS_Private *SiS_Pr)
|
||||
* of the BIOS image.
|
||||
*/
|
||||
if((ROMAddr[3] == 0xe9) && ((ROMAddr[5] << 8) | ROMAddr[4]) > 0x21a)
|
||||
SiS_Pr->SiS_UseROM = TRUE;
|
||||
SiS_Pr->SiS_UseROM = true;
|
||||
} else if(SiS_Pr->ChipType < SIS_315H) {
|
||||
/* Sony's VAIO BIOS 1.09 follows the standard, so perhaps
|
||||
* the others do as well
|
||||
*/
|
||||
SiS_Pr->SiS_UseROM = TRUE;
|
||||
SiS_Pr->SiS_UseROM = true;
|
||||
} else {
|
||||
/* 315/330 series stick to the standard(s) */
|
||||
SiS_Pr->SiS_UseROM = TRUE;
|
||||
SiS_Pr->SiS_UseROM = true;
|
||||
if((SiS_Pr->SiS_ROMNew = SiSDetermineROMLayout661(SiS_Pr))) {
|
||||
SiS_Pr->SiS_EMIOffset = 14;
|
||||
SiS_Pr->SiS_PWDOffset = 17;
|
||||
@@ -1488,7 +1488,7 @@ SiS_GetVBType(struct SiS_Private *SiS_Pr)
|
||||
/*********************************************/
|
||||
|
||||
#ifdef SIS_LINUX_KERNEL
|
||||
static BOOLEAN
|
||||
static bool
|
||||
SiS_CheckMemorySize(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short ModeIdIndex)
|
||||
{
|
||||
@@ -1496,10 +1496,10 @@ SiS_CheckMemorySize(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short modeflag = SiS_GetModeFlag(SiS_Pr, ModeNo, ModeIdIndex);
|
||||
unsigned short memorysize = ((modeflag & MemoryInfoFlag) >> MemorySizeShift) + 1;
|
||||
|
||||
if(!AdapterMemSize) return TRUE;
|
||||
if(!AdapterMemSize) return true;
|
||||
|
||||
if(AdapterMemSize < memorysize) return FALSE;
|
||||
return TRUE;
|
||||
if(AdapterMemSize < memorysize) return false;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1605,7 +1605,7 @@ SiS_ClearBuffer(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
/* HELPER: SearchModeID */
|
||||
/*********************************************/
|
||||
|
||||
BOOLEAN
|
||||
bool
|
||||
SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
|
||||
unsigned short *ModeIdIndex)
|
||||
{
|
||||
@@ -1617,7 +1617,7 @@ SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
|
||||
|
||||
for((*ModeIdIndex) = 0; ;(*ModeIdIndex)++) {
|
||||
if(SiS_Pr->SiS_SModeIDTable[(*ModeIdIndex)].St_ModeID == (*ModeNo)) break;
|
||||
if(SiS_Pr->SiS_SModeIDTable[(*ModeIdIndex)].St_ModeID == 0xFF) return FALSE;
|
||||
if(SiS_Pr->SiS_SModeIDTable[(*ModeIdIndex)].St_ModeID == 0xFF) return false;
|
||||
}
|
||||
|
||||
if((*ModeNo) == 0x07) {
|
||||
@@ -1635,11 +1635,11 @@ SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
|
||||
|
||||
for((*ModeIdIndex) = 0; ;(*ModeIdIndex)++) {
|
||||
if(SiS_Pr->SiS_EModeIDTable[(*ModeIdIndex)].Ext_ModeID == (*ModeNo)) break;
|
||||
if(SiS_Pr->SiS_EModeIDTable[(*ModeIdIndex)].Ext_ModeID == 0xFF) return FALSE;
|
||||
if(SiS_Pr->SiS_EModeIDTable[(*ModeIdIndex)].Ext_ModeID == 0xFF) return false;
|
||||
}
|
||||
|
||||
}
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*********************************************/
|
||||
@@ -1696,13 +1696,13 @@ SiS_GetRefCRT1CRTC(struct SiS_Private *SiS_Pr, unsigned short Index, int UseWide
|
||||
/* HELPER: LowModeTests */
|
||||
/*********************************************/
|
||||
|
||||
static BOOLEAN
|
||||
static bool
|
||||
SiS_DoLowModeTest(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
{
|
||||
unsigned short temp, temp1, temp2;
|
||||
|
||||
if((ModeNo != 0x03) && (ModeNo != 0x10) && (ModeNo != 0x12))
|
||||
return TRUE;
|
||||
return true;
|
||||
temp = SiS_GetReg(SiS_Pr->SiS_P3d4,0x11);
|
||||
SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x11,0x80);
|
||||
temp1 = SiS_GetReg(SiS_Pr->SiS_P3d4,0x00);
|
||||
@@ -1712,13 +1712,13 @@ SiS_DoLowModeTest(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
SiS_SetReg(SiS_Pr->SiS_P3d4,0x11,temp);
|
||||
if((SiS_Pr->ChipType >= SIS_315H) ||
|
||||
(SiS_Pr->ChipType == SIS_300)) {
|
||||
if(temp2 == 0x55) return FALSE;
|
||||
else return TRUE;
|
||||
if(temp2 == 0x55) return false;
|
||||
else return true;
|
||||
} else {
|
||||
if(temp2 != 0x55) return TRUE;
|
||||
if(temp2 != 0x55) return true;
|
||||
else {
|
||||
SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x35,0x01);
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3237,14 +3237,14 @@ static void
|
||||
SiS_SetPitch(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn)
|
||||
{
|
||||
SISPtr pSiS = SISPTR(pScrn);
|
||||
BOOLEAN isslavemode = FALSE;
|
||||
bool isslavemode = false;
|
||||
|
||||
if( (pSiS->VBFlags2 & VB2_VIDEOBRIDGE) &&
|
||||
( ((pSiS->VGAEngine == SIS_300_VGA) &&
|
||||
(SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0xa0) == 0x20) ||
|
||||
((pSiS->VGAEngine == SIS_315_VGA) &&
|
||||
(SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0x50) == 0x10) ) ) {
|
||||
isslavemode = TRUE;
|
||||
isslavemode = true;
|
||||
}
|
||||
|
||||
/* We need to set pitch for CRT1 if bridge is in slave mode, too */
|
||||
@@ -3264,10 +3264,10 @@ SiS_SetPitch(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn)
|
||||
|
||||
#ifdef SIS_XORG_XF86
|
||||
/* We need pScrn for setting the pitch correctly */
|
||||
BOOLEAN
|
||||
SiSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn, unsigned short ModeNo, BOOLEAN dosetpitch)
|
||||
bool
|
||||
SiSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn, unsigned short ModeNo, bool dosetpitch)
|
||||
#else
|
||||
BOOLEAN
|
||||
bool
|
||||
SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
#endif
|
||||
{
|
||||
@@ -3277,8 +3277,8 @@ SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
#ifdef SIS_LINUX_KERNEL
|
||||
unsigned short KeepLockReg;
|
||||
|
||||
SiS_Pr->UseCustomMode = FALSE;
|
||||
SiS_Pr->CRT1UsesCustomMode = FALSE;
|
||||
SiS_Pr->UseCustomMode = false;
|
||||
SiS_Pr->CRT1UsesCustomMode = false;
|
||||
#endif
|
||||
|
||||
SiS_Pr->SiS_flag_clearbuffer = 0;
|
||||
@@ -3317,7 +3317,7 @@ SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
SiS_UnLockCRT2(SiS_Pr);
|
||||
|
||||
if(!SiS_Pr->UseCustomMode) {
|
||||
if(!(SiS_SearchModeID(SiS_Pr, &ModeNo, &ModeIdIndex))) return FALSE;
|
||||
if(!(SiS_SearchModeID(SiS_Pr, &ModeNo, &ModeIdIndex))) return false;
|
||||
} else {
|
||||
ModeIdIndex = 0;
|
||||
}
|
||||
@@ -3347,18 +3347,18 @@ SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
#ifdef SIS_LINUX_KERNEL
|
||||
/* Check memory size (kernel framebuffer driver only) */
|
||||
if(!SiS_CheckMemorySize(SiS_Pr, ModeNo, ModeIdIndex)) {
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
SiS_OpenCRTC(SiS_Pr);
|
||||
|
||||
if(SiS_Pr->UseCustomMode) {
|
||||
SiS_Pr->CRT1UsesCustomMode = TRUE;
|
||||
SiS_Pr->CRT1UsesCustomMode = true;
|
||||
SiS_Pr->CSRClock_CRT1 = SiS_Pr->CSRClock;
|
||||
SiS_Pr->CModeFlag_CRT1 = SiS_Pr->CModeFlag;
|
||||
} else {
|
||||
SiS_Pr->CRT1UsesCustomMode = FALSE;
|
||||
SiS_Pr->CRT1UsesCustomMode = false;
|
||||
}
|
||||
|
||||
/* Set mode on CRT1 */
|
||||
@@ -3445,7 +3445,7 @@ SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
if(KeepLockReg != 0xA1) SiS_SetReg(SiS_Pr->SiS_P3c4,0x05,0x00);
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*********************************************/
|
||||
@@ -3454,14 +3454,14 @@ SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
|
||||
/*********************************************/
|
||||
|
||||
#ifdef SIS_XORG_XF86
|
||||
BOOLEAN
|
||||
bool
|
||||
SiSBIOSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, BOOLEAN IsCustom)
|
||||
DisplayModePtr mode, bool IsCustom)
|
||||
{
|
||||
SISPtr pSiS = SISPTR(pScrn);
|
||||
unsigned short ModeNo = 0;
|
||||
|
||||
SiS_Pr->UseCustomMode = FALSE;
|
||||
SiS_Pr->UseCustomMode = false;
|
||||
|
||||
if((IsCustom) && (SiS_CheckBuildCustomMode(pScrn, mode, pSiS->VBFlags))) {
|
||||
|
||||
@@ -3475,13 +3475,13 @@ SiSBIOSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
|
||||
/* Don't need vbflags here; checks done earlier */
|
||||
ModeNo = SiS_GetModeNumber(pScrn, mode, pSiS->VBFlags);
|
||||
if(!ModeNo) return FALSE;
|
||||
if(!ModeNo) return false;
|
||||
|
||||
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "Setting standard mode 0x%x\n", ModeNo);
|
||||
|
||||
}
|
||||
|
||||
return(SiSSetMode(SiS_Pr, pScrn, ModeNo, TRUE));
|
||||
return(SiSSetMode(SiS_Pr, pScrn, ModeNo, true));
|
||||
}
|
||||
|
||||
/*********************************************/
|
||||
@@ -3489,9 +3489,9 @@ SiSBIOSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
/* for Dual-Head modes */
|
||||
/*********************************************/
|
||||
|
||||
BOOLEAN
|
||||
bool
|
||||
SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, BOOLEAN IsCustom)
|
||||
DisplayModePtr mode, bool IsCustom)
|
||||
{
|
||||
SISIOADDRESS BaseAddr = SiS_Pr->IOAddress;
|
||||
SISPtr pSiS = SISPTR(pScrn);
|
||||
@@ -3502,7 +3502,7 @@ SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
unsigned short ModeNo = 0;
|
||||
unsigned char backupreg = 0;
|
||||
|
||||
SiS_Pr->UseCustomMode = FALSE;
|
||||
SiS_Pr->UseCustomMode = false;
|
||||
|
||||
/* Remember: Custom modes for CRT2 are ONLY supported
|
||||
* -) on the 30x/B/C, and
|
||||
@@ -3516,7 +3516,7 @@ SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
} else {
|
||||
|
||||
ModeNo = SiS_GetModeNumber(pScrn, mode, pSiS->VBFlags);
|
||||
if(!ModeNo) return FALSE;
|
||||
if(!ModeNo) return false;
|
||||
|
||||
}
|
||||
|
||||
@@ -3550,10 +3550,10 @@ SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
if(pSiSEnt->CRT1ModeNo == -1) {
|
||||
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
|
||||
"Setting CRT2 mode delayed until after setting CRT1 mode\n");
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
pSiSEnt->CRT2ModeSet = TRUE;
|
||||
pSiSEnt->CRT2ModeSet = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -3578,7 +3578,7 @@ SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
SiS_UnLockCRT2(SiS_Pr);
|
||||
|
||||
if(!SiS_Pr->UseCustomMode) {
|
||||
if(!(SiS_SearchModeID(SiS_Pr, &ModeNo, &ModeIdIndex))) return FALSE;
|
||||
if(!(SiS_SearchModeID(SiS_Pr, &ModeNo, &ModeIdIndex))) return false;
|
||||
} else {
|
||||
ModeIdIndex = 0;
|
||||
}
|
||||
@@ -3658,7 +3658,7 @@ SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
|
||||
SiS_Handle760(SiS_Pr);
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*********************************************/
|
||||
@@ -3666,9 +3666,9 @@ SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
/* for Dual-Head modes */
|
||||
/*********************************************/
|
||||
|
||||
BOOLEAN
|
||||
bool
|
||||
SiSBIOSSetModeCRT1(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, BOOLEAN IsCustom)
|
||||
DisplayModePtr mode, bool IsCustom)
|
||||
{
|
||||
SISIOADDRESS BaseAddr = SiS_Pr->IOAddress;
|
||||
SISPtr pSiS = SISPTR(pScrn);
|
||||
@@ -3677,10 +3677,10 @@ SiSBIOSSetModeCRT1(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
#ifdef SISDUALHEAD
|
||||
SISEntPtr pSiSEnt = pSiS->entityPrivate;
|
||||
unsigned char backupcr30, backupcr31, backupcr38, backupcr35, backupp40d=0;
|
||||
BOOLEAN backupcustom;
|
||||
bool backupcustom;
|
||||
#endif
|
||||
|
||||
SiS_Pr->UseCustomMode = FALSE;
|
||||
SiS_Pr->UseCustomMode = false;
|
||||
|
||||
if((IsCustom) && (SiS_CheckBuildCustomMode(pScrn, mode, pSiS->VBFlags))) {
|
||||
|
||||
@@ -3697,7 +3697,7 @@ SiSBIOSSetModeCRT1(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
} else {
|
||||
|
||||
ModeNo = SiS_GetModeNumber(pScrn, mode, 0); /* don't give VBFlags */
|
||||
if(!ModeNo) return FALSE;
|
||||
if(!ModeNo) return false;
|
||||
|
||||
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
|
||||
"Setting standard mode 0x%x on CRT1\n", ModeNo);
|
||||
@@ -3721,7 +3721,7 @@ SiSBIOSSetModeCRT1(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
SiS_UnLockCRT2(SiS_Pr);
|
||||
|
||||
if(!SiS_Pr->UseCustomMode) {
|
||||
if(!(SiS_SearchModeID(SiS_Pr, &ModeNo, &ModeIdIndex))) return FALSE;
|
||||
if(!(SiS_SearchModeID(SiS_Pr, &ModeNo, &ModeIdIndex))) return false;
|
||||
} else {
|
||||
ModeIdIndex = 0;
|
||||
}
|
||||
@@ -3771,11 +3771,11 @@ SiSBIOSSetModeCRT1(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
#endif
|
||||
|
||||
if(SiS_Pr->UseCustomMode) {
|
||||
SiS_Pr->CRT1UsesCustomMode = TRUE;
|
||||
SiS_Pr->CRT1UsesCustomMode = true;
|
||||
SiS_Pr->CSRClock_CRT1 = SiS_Pr->CSRClock;
|
||||
SiS_Pr->CModeFlag_CRT1 = SiS_Pr->CModeFlag;
|
||||
} else {
|
||||
SiS_Pr->CRT1UsesCustomMode = FALSE;
|
||||
SiS_Pr->CRT1UsesCustomMode = false;
|
||||
}
|
||||
|
||||
/* Reset CRT2 if changing mode on CRT1 */
|
||||
@@ -3838,7 +3838,7 @@ SiSBIOSSetModeCRT1(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
/* Backup/Set ModeNo in BIOS scratch area */
|
||||
SiS_GetSetModeID(pScrn,ModeNo);
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
#endif /* Linux_XF86 */
|
||||
|
||||
@@ -4082,7 +4082,7 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
|
||||
DisplayModePtr current
|
||||
#endif
|
||||
#ifdef SIS_LINUX_KERNEL
|
||||
struct fb_var_screeninfo *var, BOOLEAN writeres
|
||||
struct fb_var_screeninfo *var, bool writeres
|
||||
#endif
|
||||
)
|
||||
{
|
||||
|
||||
+18
-18
@@ -1521,13 +1521,13 @@ static const struct SiS_LVDSCRT1Data SiS_LVDSCRT1640x480_1_H[] =
|
||||
0x00}}
|
||||
};
|
||||
|
||||
BOOLEAN SiSInitPtr(struct SiS_Private *SiS_Pr);
|
||||
bool SiSInitPtr(struct SiS_Private *SiS_Pr);
|
||||
#ifdef SIS_XORG_XF86
|
||||
unsigned short SiS_GetModeID(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay,
|
||||
int Depth, BOOLEAN FSTN, int LCDwith, int LCDheight);
|
||||
int Depth, bool FSTN, int LCDwith, int LCDheight);
|
||||
#endif
|
||||
unsigned short SiS_GetModeID_LCD(int VGAEngine, unsigned int VBFlags, int HDisplay,
|
||||
int VDisplay, int Depth, BOOLEAN FSTN,
|
||||
int VDisplay, int Depth, bool FSTN,
|
||||
unsigned short CustomT, int LCDwith, int LCDheight,
|
||||
unsigned int VBFlags2);
|
||||
unsigned short SiS_GetModeID_TV(int VGAEngine, unsigned int VBFlags, int HDisplay,
|
||||
@@ -1558,12 +1558,12 @@ void SiS_SetEnableDstn(struct SiS_Private *SiS_Pr, int enable);
|
||||
void SiS_SetEnableFstn(struct SiS_Private *SiS_Pr, int enable);
|
||||
unsigned short SiS_GetModeFlag(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short ModeIdIndex);
|
||||
BOOLEAN SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr);
|
||||
bool SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr);
|
||||
#ifndef SIS_LINUX_KERNEL
|
||||
void SiS_GetVBType(struct SiS_Private *SiS_Pr);
|
||||
#endif
|
||||
|
||||
BOOLEAN SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
|
||||
bool SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
|
||||
unsigned short *ModeIdIndex);
|
||||
unsigned short SiS_GetModePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short ModeIdIndex);
|
||||
@@ -1581,17 +1581,17 @@ unsigned short SiS_GetLatencyFactor630(struct SiS_Private *SiS_Pr, unsigned shor
|
||||
#endif
|
||||
void SiS_LoadDAC(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex);
|
||||
#ifdef SIS_XORG_XF86
|
||||
BOOLEAN SiSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn, unsigned short ModeNo,
|
||||
BOOLEAN dosetpitch);
|
||||
BOOLEAN SiSBIOSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, BOOLEAN IsCustom);
|
||||
BOOLEAN SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, BOOLEAN IsCustom);
|
||||
BOOLEAN SiSBIOSSetModeCRT1(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, BOOLEAN IsCustom);
|
||||
bool SiSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn, unsigned short ModeNo,
|
||||
bool dosetpitch);
|
||||
bool SiSBIOSSetMode(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, bool IsCustom);
|
||||
bool SiSBIOSSetModeCRT2(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, bool IsCustom);
|
||||
bool SiSBIOSSetModeCRT1(struct SiS_Private *SiS_Pr, ScrnInfoPtr pScrn,
|
||||
DisplayModePtr mode, bool IsCustom);
|
||||
#endif
|
||||
#ifdef SIS_LINUX_KERNEL
|
||||
BOOLEAN SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
|
||||
bool SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
|
||||
#endif
|
||||
void SiS_CalcCRRegisters(struct SiS_Private *SiS_Pr, int depth);
|
||||
void SiS_CalcLCDACRT1Timing(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
@@ -1602,7 +1602,7 @@ void SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdat
|
||||
#endif
|
||||
#ifdef SIS_LINUX_KERNEL
|
||||
void SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata, int xres,
|
||||
int yres, struct fb_var_screeninfo *var, BOOLEAN writeres);
|
||||
int yres, struct fb_var_screeninfo *var, bool writeres);
|
||||
#endif
|
||||
|
||||
/* From init301.c: */
|
||||
@@ -1615,7 +1615,7 @@ extern void SiS_SetTVMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short ModeIdIndex);
|
||||
extern void SiS_UnLockCRT2(struct SiS_Private *SiS_Pr);
|
||||
extern void SiS_DisableBridge(struct SiS_Private *);
|
||||
extern BOOLEAN SiS_SetCRT2Group(struct SiS_Private *, unsigned short);
|
||||
extern bool SiS_SetCRT2Group(struct SiS_Private *, unsigned short);
|
||||
extern unsigned short SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short ModeIdIndex);
|
||||
extern void SiS_WaitRetrace1(struct SiS_Private *SiS_Pr);
|
||||
@@ -1624,8 +1624,8 @@ extern unsigned short SiS_GetResInfo(struct SiS_Private *SiS_Pr, unsigned short
|
||||
extern unsigned short SiS_GetCH700x(struct SiS_Private *SiS_Pr, unsigned short tempax);
|
||||
extern unsigned short SiS_GetVCLK2Ptr(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short ModeIdIndex, unsigned short RRTI);
|
||||
extern BOOLEAN SiS_IsVAMode(struct SiS_Private *);
|
||||
extern BOOLEAN SiS_IsDualEdge(struct SiS_Private *);
|
||||
extern bool SiS_IsVAMode(struct SiS_Private *);
|
||||
extern bool SiS_IsDualEdge(struct SiS_Private *);
|
||||
|
||||
#ifdef SIS_XORG_XF86
|
||||
/* From other modules: */
|
||||
|
||||
+130
-130
File diff suppressed because it is too large
Load Diff
@@ -363,8 +363,8 @@ void SiS_LockCRT2(struct SiS_Private *SiS_Pr);
|
||||
void SiS_EnableCRT2(struct SiS_Private *SiS_Pr);
|
||||
unsigned short SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex);
|
||||
void SiS_WaitRetrace1(struct SiS_Private *SiS_Pr);
|
||||
BOOLEAN SiS_IsDualEdge(struct SiS_Private *SiS_Pr);
|
||||
BOOLEAN SiS_IsVAMode(struct SiS_Private *SiS_Pr);
|
||||
bool SiS_IsDualEdge(struct SiS_Private *SiS_Pr);
|
||||
bool SiS_IsVAMode(struct SiS_Private *SiS_Pr);
|
||||
void SiS_GetVBInfo(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short ModeIdIndex, int checkcrt2mode);
|
||||
void SiS_SetYPbPr(struct SiS_Private *SiS_Pr);
|
||||
@@ -379,7 +379,7 @@ void SiS_DisableBridge(struct SiS_Private *SiS_Pr);
|
||||
#ifndef SIS_LINUX_KERNEL
|
||||
void SiS_EnableBridge(struct SiS_Private *SiS_Pr);
|
||||
#endif
|
||||
BOOLEAN SiS_SetCRT2Group(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
|
||||
bool SiS_SetCRT2Group(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
|
||||
void SiS_SiS30xBLOn(struct SiS_Private *SiS_Pr);
|
||||
void SiS_SiS30xBLOff(struct SiS_Private *SiS_Pr);
|
||||
|
||||
@@ -403,7 +403,7 @@ void SiS_Chrontel701xBLOff(struct SiS_Private *SiS_Pr);
|
||||
#endif /* 315 */
|
||||
|
||||
#ifdef SIS300
|
||||
static BOOLEAN SiS_SetTrumpionBlock(struct SiS_Private *SiS_Pr, unsigned char *dataptr);
|
||||
static bool SiS_SetTrumpionBlock(struct SiS_Private *SiS_Pr, unsigned char *dataptr);
|
||||
void SiS_SetChrontelGPIO(struct SiS_Private *SiS_Pr, unsigned short myvbinfo);
|
||||
#endif
|
||||
|
||||
@@ -416,14 +416,14 @@ unsigned short SiS_HandleDDC(struct SiS_Private *SiS_Pr, unsigned int VBFlags, i
|
||||
#ifdef SIS_XORG_XF86
|
||||
unsigned short SiS_InitDDCRegs(struct SiS_Private *SiS_Pr, unsigned int VBFlags,
|
||||
int VGAEngine, unsigned short adaptnum, unsigned short DDCdatatype,
|
||||
BOOLEAN checkcr32, unsigned int VBFlags2);
|
||||
bool checkcr32, unsigned int VBFlags2);
|
||||
unsigned short SiS_ProbeDDC(struct SiS_Private *SiS_Pr);
|
||||
unsigned short SiS_ReadDDC(struct SiS_Private *SiS_Pr, unsigned short DDCdatatype,
|
||||
unsigned char *buffer);
|
||||
#else
|
||||
static unsigned short SiS_InitDDCRegs(struct SiS_Private *SiS_Pr, unsigned int VBFlags,
|
||||
int VGAEngine, unsigned short adaptnum, unsigned short DDCdatatype,
|
||||
BOOLEAN checkcr32, unsigned int VBFlags2);
|
||||
bool checkcr32, unsigned int VBFlags2);
|
||||
static unsigned short SiS_ProbeDDC(struct SiS_Private *SiS_Pr);
|
||||
static unsigned short SiS_ReadDDC(struct SiS_Private *SiS_Pr, unsigned short DDCdatatype,
|
||||
unsigned char *buffer);
|
||||
@@ -469,7 +469,7 @@ extern void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short);
|
||||
extern void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short);
|
||||
extern void SiS_DisplayOff(struct SiS_Private *SiS_Pr);
|
||||
extern void SiS_DisplayOn(struct SiS_Private *SiS_Pr);
|
||||
extern BOOLEAN SiS_SearchModeID(struct SiS_Private *, unsigned short *, unsigned short *);
|
||||
extern bool SiS_SearchModeID(struct SiS_Private *, unsigned short *, unsigned short *);
|
||||
extern unsigned short SiS_GetModeFlag(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
|
||||
unsigned short ModeIdIndex);
|
||||
extern unsigned short SiS_GetModePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex);
|
||||
|
||||
@@ -38,14 +38,14 @@ int sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr,
|
||||
unsigned char modeno, unsigned char rateindex);
|
||||
int sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno,
|
||||
unsigned char rateindex, struct fb_var_screeninfo *var);
|
||||
BOOLEAN sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno,
|
||||
bool sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno,
|
||||
int *htotal, int *vtotal, unsigned char rateindex);
|
||||
|
||||
extern BOOLEAN SiSInitPtr(struct SiS_Private *SiS_Pr);
|
||||
extern BOOLEAN SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
|
||||
extern bool SiSInitPtr(struct SiS_Private *SiS_Pr);
|
||||
extern bool SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
|
||||
unsigned short *ModeIdIndex);
|
||||
extern void SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
|
||||
int xres, int yres, struct fb_var_screeninfo *var, BOOLEAN writeres);
|
||||
int xres, int yres, struct fb_var_screeninfo *var, bool writeres);
|
||||
|
||||
int
|
||||
sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr, unsigned char modeno,
|
||||
@@ -131,7 +131,7 @@ sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno,
|
||||
(unsigned char *)&SiS_Pr->SiS_CRT1Table[index].CR[0],
|
||||
SiS_Pr->SiS_RefIndex[RRTI].XRes,
|
||||
SiS_Pr->SiS_RefIndex[RRTI].YRes,
|
||||
var, FALSE);
|
||||
var, false);
|
||||
|
||||
if(SiS_Pr->SiS_RefIndex[RRTI].Ext_InfoFlag & 0x8000)
|
||||
var->sync &= ~FB_SYNC_VERT_HIGH_ACT;
|
||||
@@ -175,7 +175,7 @@ sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno,
|
||||
return 1;
|
||||
}
|
||||
|
||||
BOOLEAN
|
||||
bool
|
||||
sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, int *htotal,
|
||||
int *vtotal, unsigned char rateindex)
|
||||
{
|
||||
@@ -184,7 +184,7 @@ sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, int *ht
|
||||
unsigned short RRTI = 0;
|
||||
unsigned char sr_data, cr_data, cr_data2;
|
||||
|
||||
if(!SiSInitPtr(SiS_Pr)) return FALSE;
|
||||
if(!SiSInitPtr(SiS_Pr)) return false;
|
||||
|
||||
if(rateindex > 0) rateindex--;
|
||||
|
||||
@@ -195,7 +195,7 @@ sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, int *ht
|
||||
}
|
||||
#endif
|
||||
|
||||
if(!(SiS_SearchModeID(SiS_Pr, &ModeNo, &ModeIdIndex))) return FALSE;
|
||||
if(!(SiS_SearchModeID(SiS_Pr, &ModeNo, &ModeIdIndex))) return false;
|
||||
|
||||
RRTI = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].REFindex;
|
||||
if(SiS_Pr->SiS_RefIndex[RRTI].Ext_InfoFlag & HaveWideTiming) {
|
||||
@@ -226,7 +226,7 @@ sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, int *ht
|
||||
if(SiS_Pr->SiS_RefIndex[RRTI].Ext_InfoFlag & InterlaceMode)
|
||||
*vtotal *= 2;
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -526,7 +526,7 @@ struct sis_video_info {
|
||||
u16 vmax;
|
||||
u32 dclockmax;
|
||||
u8 feature;
|
||||
BOOLEAN datavalid;
|
||||
bool datavalid;
|
||||
} sisfb_thismonitor;
|
||||
|
||||
unsigned short chip_id; /* PCI ID of chip */
|
||||
|
||||
+107
-107
File diff suppressed because it is too large
Load Diff
@@ -411,54 +411,54 @@ static const struct _sis_vrate {
|
||||
u16 xres;
|
||||
u16 yres;
|
||||
u16 refresh;
|
||||
BOOLEAN SiS730valid32bpp;
|
||||
bool SiS730valid32bpp;
|
||||
} sisfb_vrate[] = {
|
||||
{1, 320, 200, 70, TRUE},
|
||||
{1, 320, 240, 60, TRUE},
|
||||
{1, 400, 300, 60, TRUE},
|
||||
{1, 512, 384, 60, TRUE},
|
||||
{1, 640, 400, 72, TRUE},
|
||||
{1, 640, 480, 60, TRUE}, {2, 640, 480, 72, TRUE}, {3, 640, 480, 75, TRUE},
|
||||
{4, 640, 480, 85, TRUE}, {5, 640, 480, 100, TRUE}, {6, 640, 480, 120, TRUE},
|
||||
{7, 640, 480, 160, TRUE}, {8, 640, 480, 200, TRUE},
|
||||
{1, 720, 480, 60, TRUE},
|
||||
{1, 720, 576, 58, TRUE},
|
||||
{1, 768, 576, 58, TRUE},
|
||||
{1, 800, 480, 60, TRUE}, {2, 800, 480, 75, TRUE}, {3, 800, 480, 85, TRUE},
|
||||
{1, 800, 600, 56, TRUE}, {2, 800, 600, 60, TRUE}, {3, 800, 600, 72, TRUE},
|
||||
{4, 800, 600, 75, TRUE}, {5, 800, 600, 85, TRUE}, {6, 800, 600, 105, TRUE},
|
||||
{7, 800, 600, 120, TRUE}, {8, 800, 600, 160, TRUE},
|
||||
{1, 848, 480, 39, TRUE}, {2, 848, 480, 60, TRUE},
|
||||
{1, 856, 480, 39, TRUE}, {2, 856, 480, 60, TRUE},
|
||||
{1, 960, 540, 60, TRUE},
|
||||
{1, 960, 600, 60, TRUE},
|
||||
{1, 1024, 576, 60, TRUE}, {2, 1024, 576, 75, TRUE}, {3, 1024, 576, 85, TRUE},
|
||||
{1, 1024, 600, 60, TRUE},
|
||||
{1, 1024, 768, 43, TRUE}, {2, 1024, 768, 60, TRUE}, {3, 1024, 768, 70, FALSE},
|
||||
{4, 1024, 768, 75, FALSE}, {5, 1024, 768, 85, TRUE}, {6, 1024, 768, 100, TRUE},
|
||||
{7, 1024, 768, 120, TRUE},
|
||||
{1, 1152, 768, 60, TRUE},
|
||||
{1, 1152, 864, 60, TRUE}, {2, 1152, 864, 75, TRUE}, {3, 1152, 864, 84, TRUE},
|
||||
{1, 1280, 720, 60, TRUE}, {2, 1280, 720, 75, TRUE}, {3, 1280, 720, 85, TRUE},
|
||||
{1, 1280, 768, 60, TRUE},
|
||||
{1, 1280, 800, 60, TRUE},
|
||||
{1, 1280, 854, 60, TRUE},
|
||||
{1, 1280, 960, 60, TRUE}, {2, 1280, 960, 85, TRUE},
|
||||
{1, 1280, 1024, 43, TRUE}, {2, 1280, 1024, 60, TRUE}, {3, 1280, 1024, 75, TRUE},
|
||||
{4, 1280, 1024, 85, TRUE},
|
||||
{1, 1360, 768, 60, TRUE},
|
||||
{1, 1360, 1024, 59, TRUE},
|
||||
{1, 1400, 1050, 60, TRUE}, {2, 1400, 1050, 75, TRUE},
|
||||
{1, 1600, 1200, 60, TRUE}, {2, 1600, 1200, 65, TRUE}, {3, 1600, 1200, 70, TRUE},
|
||||
{4, 1600, 1200, 75, TRUE}, {5, 1600, 1200, 85, TRUE}, {6, 1600, 1200, 100, TRUE},
|
||||
{7, 1600, 1200, 120, TRUE},
|
||||
{1, 1680, 1050, 60, TRUE},
|
||||
{1, 1920, 1080, 30, TRUE},
|
||||
{1, 1920, 1440, 60, TRUE}, {2, 1920, 1440, 65, TRUE}, {3, 1920, 1440, 70, TRUE},
|
||||
{4, 1920, 1440, 75, TRUE}, {5, 1920, 1440, 85, TRUE}, {6, 1920, 1440, 100, TRUE},
|
||||
{1, 2048, 1536, 60, TRUE}, {2, 2048, 1536, 65, TRUE}, {3, 2048, 1536, 70, TRUE},
|
||||
{4, 2048, 1536, 75, TRUE}, {5, 2048, 1536, 85, TRUE},
|
||||
{0, 0, 0, 0, FALSE}
|
||||
{1, 320, 200, 70, true},
|
||||
{1, 320, 240, 60, true},
|
||||
{1, 400, 300, 60, true},
|
||||
{1, 512, 384, 60, true},
|
||||
{1, 640, 400, 72, true},
|
||||
{1, 640, 480, 60, true}, {2, 640, 480, 72, true}, {3, 640, 480, 75, true},
|
||||
{4, 640, 480, 85, true}, {5, 640, 480, 100, true}, {6, 640, 480, 120, true},
|
||||
{7, 640, 480, 160, true}, {8, 640, 480, 200, true},
|
||||
{1, 720, 480, 60, true},
|
||||
{1, 720, 576, 58, true},
|
||||
{1, 768, 576, 58, true},
|
||||
{1, 800, 480, 60, true}, {2, 800, 480, 75, true}, {3, 800, 480, 85, true},
|
||||
{1, 800, 600, 56, true}, {2, 800, 600, 60, true}, {3, 800, 600, 72, true},
|
||||
{4, 800, 600, 75, true}, {5, 800, 600, 85, true}, {6, 800, 600, 105, true},
|
||||
{7, 800, 600, 120, true}, {8, 800, 600, 160, true},
|
||||
{1, 848, 480, 39, true}, {2, 848, 480, 60, true},
|
||||
{1, 856, 480, 39, true}, {2, 856, 480, 60, true},
|
||||
{1, 960, 540, 60, true},
|
||||
{1, 960, 600, 60, true},
|
||||
{1, 1024, 576, 60, true}, {2, 1024, 576, 75, true}, {3, 1024, 576, 85, true},
|
||||
{1, 1024, 600, 60, true},
|
||||
{1, 1024, 768, 43, true}, {2, 1024, 768, 60, true}, {3, 1024, 768, 70, false},
|
||||
{4, 1024, 768, 75, false}, {5, 1024, 768, 85, true}, {6, 1024, 768, 100, true},
|
||||
{7, 1024, 768, 120, true},
|
||||
{1, 1152, 768, 60, true},
|
||||
{1, 1152, 864, 60, true}, {2, 1152, 864, 75, true}, {3, 1152, 864, 84, true},
|
||||
{1, 1280, 720, 60, true}, {2, 1280, 720, 75, true}, {3, 1280, 720, 85, true},
|
||||
{1, 1280, 768, 60, true},
|
||||
{1, 1280, 800, 60, true},
|
||||
{1, 1280, 854, 60, true},
|
||||
{1, 1280, 960, 60, true}, {2, 1280, 960, 85, true},
|
||||
{1, 1280, 1024, 43, true}, {2, 1280, 1024, 60, true}, {3, 1280, 1024, 75, true},
|
||||
{4, 1280, 1024, 85, true},
|
||||
{1, 1360, 768, 60, true},
|
||||
{1, 1360, 1024, 59, true},
|
||||
{1, 1400, 1050, 60, true}, {2, 1400, 1050, 75, true},
|
||||
{1, 1600, 1200, 60, true}, {2, 1600, 1200, 65, true}, {3, 1600, 1200, 70, true},
|
||||
{4, 1600, 1200, 75, true}, {5, 1600, 1200, 85, true}, {6, 1600, 1200, 100, true},
|
||||
{7, 1600, 1200, 120, true},
|
||||
{1, 1680, 1050, 60, true},
|
||||
{1, 1920, 1080, 30, true},
|
||||
{1, 1920, 1440, 60, true}, {2, 1920, 1440, 65, true}, {3, 1920, 1440, 70, true},
|
||||
{4, 1920, 1440, 75, true}, {5, 1920, 1440, 85, true}, {6, 1920, 1440, 100, true},
|
||||
{1, 2048, 1536, 60, true}, {2, 2048, 1536, 65, true}, {3, 2048, 1536, 70, true},
|
||||
{4, 2048, 1536, 75, true}, {5, 2048, 1536, 85, true},
|
||||
{0, 0, 0, 0, false}
|
||||
};
|
||||
|
||||
static struct _sisfbddcsmodes {
|
||||
@@ -691,7 +691,7 @@ extern int sisfb_initaccel(struct sis_video_info *ivideo);
|
||||
extern void sisfb_syncaccel(struct sis_video_info *ivideo);
|
||||
|
||||
/* Internal general routines */
|
||||
static void sisfb_search_mode(char *name, BOOLEAN quiet);
|
||||
static void sisfb_search_mode(char *name, bool quiet);
|
||||
static int sisfb_validate_mode(struct sis_video_info *ivideo, int modeindex, u32 vbflags);
|
||||
static u8 sisfb_search_refresh_rate(struct sis_video_info *ivideo, unsigned int rate,
|
||||
int index);
|
||||
@@ -702,10 +702,10 @@ static int sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
|
||||
struct fb_info *info);
|
||||
static void sisfb_pre_setmode(struct sis_video_info *ivideo);
|
||||
static void sisfb_post_setmode(struct sis_video_info *ivideo);
|
||||
static BOOLEAN sisfb_CheckVBRetrace(struct sis_video_info *ivideo);
|
||||
static BOOLEAN sisfbcheckvretracecrt2(struct sis_video_info *ivideo);
|
||||
static BOOLEAN sisfbcheckvretracecrt1(struct sis_video_info *ivideo);
|
||||
static BOOLEAN sisfb_bridgeisslave(struct sis_video_info *ivideo);
|
||||
static bool sisfb_CheckVBRetrace(struct sis_video_info *ivideo);
|
||||
static bool sisfbcheckvretracecrt2(struct sis_video_info *ivideo);
|
||||
static bool sisfbcheckvretracecrt1(struct sis_video_info *ivideo);
|
||||
static bool sisfb_bridgeisslave(struct sis_video_info *ivideo);
|
||||
static void sisfb_detect_VB_connect(struct sis_video_info *ivideo);
|
||||
static void sisfb_get_VB_type(struct sis_video_info *ivideo);
|
||||
static void sisfb_set_TVxposoffset(struct sis_video_info *ivideo, int val);
|
||||
@@ -737,20 +737,20 @@ static void sisfb_free_node(struct SIS_HEAP *memheap, struct SIS_OH *poh);
|
||||
|
||||
/* Routines from init.c/init301.c */
|
||||
extern unsigned short SiS_GetModeID_LCD(int VGAEngine, unsigned int VBFlags, int HDisplay,
|
||||
int VDisplay, int Depth, BOOLEAN FSTN, unsigned short CustomT,
|
||||
int VDisplay, int Depth, bool FSTN, unsigned short CustomT,
|
||||
int LCDwith, int LCDheight, unsigned int VBFlags2);
|
||||
extern unsigned short SiS_GetModeID_TV(int VGAEngine, unsigned int VBFlags, int HDisplay,
|
||||
int VDisplay, int Depth, unsigned int VBFlags2);
|
||||
extern unsigned short SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay,
|
||||
int VDisplay, int Depth, unsigned int VBFlags2);
|
||||
extern void SiSRegInit(struct SiS_Private *SiS_Pr, SISIOADDRESS BaseAddr);
|
||||
extern BOOLEAN SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
|
||||
extern bool SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
|
||||
extern void SiS_SetEnableDstn(struct SiS_Private *SiS_Pr, int enable);
|
||||
extern void SiS_SetEnableFstn(struct SiS_Private *SiS_Pr, int enable);
|
||||
|
||||
extern BOOLEAN SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr);
|
||||
extern bool SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr);
|
||||
|
||||
extern BOOLEAN sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno,
|
||||
extern bool sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno,
|
||||
int *htotal, int *vtotal, unsigned char rateindex);
|
||||
extern int sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr,
|
||||
unsigned char modeno, unsigned char rateindex);
|
||||
|
||||
@@ -57,18 +57,6 @@
|
||||
#include <linux/version.h>
|
||||
#endif
|
||||
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
|
||||
#ifndef BOOLEAN
|
||||
typedef unsigned int BOOLEAN;
|
||||
#endif
|
||||
|
||||
#define SISIOMEMTYPE
|
||||
|
||||
#ifdef SIS_LINUX_KERNEL
|
||||
|
||||
+22
-22
@@ -240,7 +240,7 @@ struct SiS_Private
|
||||
void *ivideo;
|
||||
#endif
|
||||
unsigned char *VirtualRomBase;
|
||||
BOOLEAN UseROM;
|
||||
bool UseROM;
|
||||
#ifdef SIS_LINUX_KERNEL
|
||||
unsigned char SISIOMEMTYPE *VideoMemoryAddress;
|
||||
unsigned int VideoMemorySize;
|
||||
@@ -283,24 +283,24 @@ struct SiS_Private
|
||||
#ifdef SIS_XORG_XF86
|
||||
unsigned short SiS_CP1, SiS_CP2, SiS_CP3, SiS_CP4;
|
||||
#endif
|
||||
BOOLEAN SiS_UseROM;
|
||||
BOOLEAN SiS_ROMNew;
|
||||
BOOLEAN SiS_XGIROM;
|
||||
BOOLEAN SiS_NeedRomModeData;
|
||||
BOOLEAN PanelSelfDetected;
|
||||
BOOLEAN DDCPortMixup;
|
||||
bool SiS_UseROM;
|
||||
bool SiS_ROMNew;
|
||||
bool SiS_XGIROM;
|
||||
bool SiS_NeedRomModeData;
|
||||
bool PanelSelfDetected;
|
||||
bool DDCPortMixup;
|
||||
int SiS_CHOverScan;
|
||||
BOOLEAN SiS_CHSOverScan;
|
||||
BOOLEAN SiS_ChSW;
|
||||
BOOLEAN SiS_UseLCDA;
|
||||
bool SiS_CHSOverScan;
|
||||
bool SiS_ChSW;
|
||||
bool SiS_UseLCDA;
|
||||
int SiS_UseOEM;
|
||||
unsigned int SiS_CustomT;
|
||||
int SiS_UseWide, SiS_UseWideCRT2;
|
||||
int SiS_TVBlue;
|
||||
unsigned short SiS_Backup70xx;
|
||||
BOOLEAN HaveEMI;
|
||||
BOOLEAN HaveEMILCD;
|
||||
BOOLEAN OverruleEMI;
|
||||
bool HaveEMI;
|
||||
bool HaveEMILCD;
|
||||
bool OverruleEMI;
|
||||
unsigned char EMI_30,EMI_31,EMI_32,EMI_33;
|
||||
unsigned short SiS_EMIOffset;
|
||||
unsigned short SiS_PWDOffset;
|
||||
@@ -352,7 +352,7 @@ struct SiS_Private
|
||||
unsigned short SiS_DDC_ReadAddr;
|
||||
unsigned short SiS_DDC_SecAddr;
|
||||
unsigned short SiS_ChrontelInit;
|
||||
BOOLEAN SiS_SensibleSR11;
|
||||
bool SiS_SensibleSR11;
|
||||
unsigned short SiS661LCD2TableSize;
|
||||
|
||||
unsigned short SiS_PanelMinLVDS;
|
||||
@@ -494,10 +494,10 @@ struct SiS_Private
|
||||
unsigned short PanelVRS, PanelVRE;
|
||||
unsigned short PanelVCLKIdx300;
|
||||
unsigned short PanelVCLKIdx315;
|
||||
BOOLEAN Alternate1600x1200;
|
||||
bool Alternate1600x1200;
|
||||
|
||||
BOOLEAN UseCustomMode;
|
||||
BOOLEAN CRT1UsesCustomMode;
|
||||
bool UseCustomMode;
|
||||
bool CRT1UsesCustomMode;
|
||||
unsigned short CHDisplay;
|
||||
unsigned short CHSyncStart;
|
||||
unsigned short CHSyncEnd;
|
||||
@@ -523,7 +523,7 @@ struct SiS_Private
|
||||
|
||||
int LVDSHL;
|
||||
|
||||
BOOLEAN Backup;
|
||||
bool Backup;
|
||||
unsigned char Backup_Mode;
|
||||
unsigned char Backup_14;
|
||||
unsigned char Backup_15;
|
||||
@@ -542,12 +542,12 @@ struct SiS_Private
|
||||
int CenterScreen;
|
||||
|
||||
unsigned short CP_Vendor, CP_Product;
|
||||
BOOLEAN CP_HaveCustomData;
|
||||
bool CP_HaveCustomData;
|
||||
int CP_PreferredX, CP_PreferredY, CP_PreferredIndex;
|
||||
int CP_MaxX, CP_MaxY, CP_MaxClock;
|
||||
unsigned char CP_PrefSR2B, CP_PrefSR2C;
|
||||
unsigned short CP_PrefClock;
|
||||
BOOLEAN CP_Supports64048075;
|
||||
bool CP_Supports64048075;
|
||||
int CP_HDisplay[7], CP_VDisplay[7]; /* For Custom LCD panel dimensions */
|
||||
int CP_HTotal[7], CP_VTotal[7];
|
||||
int CP_HSyncStart[7], CP_VSyncStart[7];
|
||||
@@ -555,8 +555,8 @@ struct SiS_Private
|
||||
int CP_HBlankStart[7], CP_VBlankStart[7];
|
||||
int CP_HBlankEnd[7], CP_VBlankEnd[7];
|
||||
int CP_Clock[7];
|
||||
BOOLEAN CP_DataValid[7];
|
||||
BOOLEAN CP_HSync_P[7], CP_VSync_P[7], CP_SyncValid[7];
|
||||
bool CP_DataValid[7];
|
||||
bool CP_HSync_P[7], CP_VSync_P[7], CP_SyncValid[7];
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user