diff options
Diffstat (limited to 'drivers/video/sis/init301.h')
-rw-r--r-- | drivers/video/sis/init301.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h index 4f3a28699d37..7708e1e1d99e 100644 --- a/drivers/video/sis/init301.h +++ b/drivers/video/sis/init301.h | |||
@@ -363,8 +363,8 @@ void SiS_LockCRT2(struct SiS_Private *SiS_Pr); | |||
363 | void SiS_EnableCRT2(struct SiS_Private *SiS_Pr); | 363 | void SiS_EnableCRT2(struct SiS_Private *SiS_Pr); |
364 | unsigned short SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex); | 364 | unsigned short SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex); |
365 | void SiS_WaitRetrace1(struct SiS_Private *SiS_Pr); | 365 | void SiS_WaitRetrace1(struct SiS_Private *SiS_Pr); |
366 | BOOLEAN SiS_IsDualEdge(struct SiS_Private *SiS_Pr); | 366 | bool SiS_IsDualEdge(struct SiS_Private *SiS_Pr); |
367 | BOOLEAN SiS_IsVAMode(struct SiS_Private *SiS_Pr); | 367 | bool SiS_IsVAMode(struct SiS_Private *SiS_Pr); |
368 | void SiS_GetVBInfo(struct SiS_Private *SiS_Pr, unsigned short ModeNo, | 368 | void SiS_GetVBInfo(struct SiS_Private *SiS_Pr, unsigned short ModeNo, |
369 | unsigned short ModeIdIndex, int checkcrt2mode); | 369 | unsigned short ModeIdIndex, int checkcrt2mode); |
370 | void SiS_SetYPbPr(struct SiS_Private *SiS_Pr); | 370 | void SiS_SetYPbPr(struct SiS_Private *SiS_Pr); |
@@ -379,7 +379,7 @@ void SiS_DisableBridge(struct SiS_Private *SiS_Pr); | |||
379 | #ifndef SIS_LINUX_KERNEL | 379 | #ifndef SIS_LINUX_KERNEL |
380 | void SiS_EnableBridge(struct SiS_Private *SiS_Pr); | 380 | void SiS_EnableBridge(struct SiS_Private *SiS_Pr); |
381 | #endif | 381 | #endif |
382 | BOOLEAN SiS_SetCRT2Group(struct SiS_Private *SiS_Pr, unsigned short ModeNo); | 382 | bool SiS_SetCRT2Group(struct SiS_Private *SiS_Pr, unsigned short ModeNo); |
383 | void SiS_SiS30xBLOn(struct SiS_Private *SiS_Pr); | 383 | void SiS_SiS30xBLOn(struct SiS_Private *SiS_Pr); |
384 | void SiS_SiS30xBLOff(struct SiS_Private *SiS_Pr); | 384 | void SiS_SiS30xBLOff(struct SiS_Private *SiS_Pr); |
385 | 385 | ||
@@ -403,7 +403,7 @@ void SiS_Chrontel701xBLOff(struct SiS_Private *SiS_Pr); | |||
403 | #endif /* 315 */ | 403 | #endif /* 315 */ |
404 | 404 | ||
405 | #ifdef SIS300 | 405 | #ifdef SIS300 |
406 | static BOOLEAN SiS_SetTrumpionBlock(struct SiS_Private *SiS_Pr, unsigned char *dataptr); | 406 | static bool SiS_SetTrumpionBlock(struct SiS_Private *SiS_Pr, unsigned char *dataptr); |
407 | void SiS_SetChrontelGPIO(struct SiS_Private *SiS_Pr, unsigned short myvbinfo); | 407 | void SiS_SetChrontelGPIO(struct SiS_Private *SiS_Pr, unsigned short myvbinfo); |
408 | #endif | 408 | #endif |
409 | 409 | ||
@@ -416,14 +416,14 @@ unsigned short SiS_HandleDDC(struct SiS_Private *SiS_Pr, unsigned int VBFlags, i | |||
416 | #ifdef SIS_XORG_XF86 | 416 | #ifdef SIS_XORG_XF86 |
417 | unsigned short SiS_InitDDCRegs(struct SiS_Private *SiS_Pr, unsigned int VBFlags, | 417 | unsigned short SiS_InitDDCRegs(struct SiS_Private *SiS_Pr, unsigned int VBFlags, |
418 | int VGAEngine, unsigned short adaptnum, unsigned short DDCdatatype, | 418 | int VGAEngine, unsigned short adaptnum, unsigned short DDCdatatype, |
419 | BOOLEAN checkcr32, unsigned int VBFlags2); | 419 | bool checkcr32, unsigned int VBFlags2); |
420 | unsigned short SiS_ProbeDDC(struct SiS_Private *SiS_Pr); | 420 | unsigned short SiS_ProbeDDC(struct SiS_Private *SiS_Pr); |
421 | unsigned short SiS_ReadDDC(struct SiS_Private *SiS_Pr, unsigned short DDCdatatype, | 421 | unsigned short SiS_ReadDDC(struct SiS_Private *SiS_Pr, unsigned short DDCdatatype, |
422 | unsigned char *buffer); | 422 | unsigned char *buffer); |
423 | #else | 423 | #else |
424 | static unsigned short SiS_InitDDCRegs(struct SiS_Private *SiS_Pr, unsigned int VBFlags, | 424 | static unsigned short SiS_InitDDCRegs(struct SiS_Private *SiS_Pr, unsigned int VBFlags, |
425 | int VGAEngine, unsigned short adaptnum, unsigned short DDCdatatype, | 425 | int VGAEngine, unsigned short adaptnum, unsigned short DDCdatatype, |
426 | BOOLEAN checkcr32, unsigned int VBFlags2); | 426 | bool checkcr32, unsigned int VBFlags2); |
427 | static unsigned short SiS_ProbeDDC(struct SiS_Private *SiS_Pr); | 427 | static unsigned short SiS_ProbeDDC(struct SiS_Private *SiS_Pr); |
428 | static unsigned short SiS_ReadDDC(struct SiS_Private *SiS_Pr, unsigned short DDCdatatype, | 428 | static unsigned short SiS_ReadDDC(struct SiS_Private *SiS_Pr, unsigned short DDCdatatype, |
429 | unsigned char *buffer); | 429 | unsigned char *buffer); |
@@ -469,7 +469,7 @@ extern void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); | |||
469 | extern void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); | 469 | extern void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); |
470 | extern void SiS_DisplayOff(struct SiS_Private *SiS_Pr); | 470 | extern void SiS_DisplayOff(struct SiS_Private *SiS_Pr); |
471 | extern void SiS_DisplayOn(struct SiS_Private *SiS_Pr); | 471 | extern void SiS_DisplayOn(struct SiS_Private *SiS_Pr); |
472 | extern BOOLEAN SiS_SearchModeID(struct SiS_Private *, unsigned short *, unsigned short *); | 472 | extern bool SiS_SearchModeID(struct SiS_Private *, unsigned short *, unsigned short *); |
473 | extern unsigned short SiS_GetModeFlag(struct SiS_Private *SiS_Pr, unsigned short ModeNo, | 473 | extern unsigned short SiS_GetModeFlag(struct SiS_Private *SiS_Pr, unsigned short ModeNo, |
474 | unsigned short ModeIdIndex); | 474 | unsigned short ModeIdIndex); |
475 | extern unsigned short SiS_GetModePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex); | 475 | extern unsigned short SiS_GetModePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short ModeIdIndex); |