diff options
author | Richard Knutsson <ricknu-0@student.ltu.se> | 2007-02-12 03:55:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:42 -0500 |
commit | c30660ead2dd6ced47ac6ad4c099fb9305263ffb (patch) | |
tree | b85e8c6db87e0627924568ac6ad2b5d71965bcfb /drivers/video/sis/sis_main.h | |
parent | 3aebbd8f92ef1aa3048800b4991db60403b85964 (diff) |
[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>
Diffstat (limited to 'drivers/video/sis/sis_main.h')
-rw-r--r-- | drivers/video/sis/sis_main.h | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h index 88e4f1e41470..3e3b7fa05d6c 100644 --- a/drivers/video/sis/sis_main.h +++ b/drivers/video/sis/sis_main.h | |||
@@ -411,54 +411,54 @@ static const struct _sis_vrate { | |||
411 | u16 xres; | 411 | u16 xres; |
412 | u16 yres; | 412 | u16 yres; |
413 | u16 refresh; | 413 | u16 refresh; |
414 | BOOLEAN SiS730valid32bpp; | 414 | bool SiS730valid32bpp; |
415 | } sisfb_vrate[] = { | 415 | } sisfb_vrate[] = { |
416 | {1, 320, 200, 70, TRUE}, | 416 | {1, 320, 200, 70, true}, |
417 | {1, 320, 240, 60, TRUE}, | 417 | {1, 320, 240, 60, true}, |
418 | {1, 400, 300, 60, TRUE}, | 418 | {1, 400, 300, 60, true}, |
419 | {1, 512, 384, 60, TRUE}, | 419 | {1, 512, 384, 60, true}, |
420 | {1, 640, 400, 72, TRUE}, | 420 | {1, 640, 400, 72, true}, |
421 | {1, 640, 480, 60, TRUE}, {2, 640, 480, 72, TRUE}, {3, 640, 480, 75, TRUE}, | 421 | {1, 640, 480, 60, true}, {2, 640, 480, 72, true}, {3, 640, 480, 75, true}, |
422 | {4, 640, 480, 85, TRUE}, {5, 640, 480, 100, TRUE}, {6, 640, 480, 120, TRUE}, | 422 | {4, 640, 480, 85, true}, {5, 640, 480, 100, true}, {6, 640, 480, 120, true}, |
423 | {7, 640, 480, 160, TRUE}, {8, 640, 480, 200, TRUE}, | 423 | {7, 640, 480, 160, true}, {8, 640, 480, 200, true}, |
424 | {1, 720, 480, 60, TRUE}, | 424 | {1, 720, 480, 60, true}, |
425 | {1, 720, 576, 58, TRUE}, | 425 | {1, 720, 576, 58, true}, |
426 | {1, 768, 576, 58, TRUE}, | 426 | {1, 768, 576, 58, true}, |
427 | {1, 800, 480, 60, TRUE}, {2, 800, 480, 75, TRUE}, {3, 800, 480, 85, TRUE}, | 427 | {1, 800, 480, 60, true}, {2, 800, 480, 75, true}, {3, 800, 480, 85, true}, |
428 | {1, 800, 600, 56, TRUE}, {2, 800, 600, 60, TRUE}, {3, 800, 600, 72, TRUE}, | 428 | {1, 800, 600, 56, true}, {2, 800, 600, 60, true}, {3, 800, 600, 72, true}, |
429 | {4, 800, 600, 75, TRUE}, {5, 800, 600, 85, TRUE}, {6, 800, 600, 105, TRUE}, | 429 | {4, 800, 600, 75, true}, {5, 800, 600, 85, true}, {6, 800, 600, 105, true}, |
430 | {7, 800, 600, 120, TRUE}, {8, 800, 600, 160, TRUE}, | 430 | {7, 800, 600, 120, true}, {8, 800, 600, 160, true}, |
431 | {1, 848, 480, 39, TRUE}, {2, 848, 480, 60, TRUE}, | 431 | {1, 848, 480, 39, true}, {2, 848, 480, 60, true}, |
432 | {1, 856, 480, 39, TRUE}, {2, 856, 480, 60, TRUE}, | 432 | {1, 856, 480, 39, true}, {2, 856, 480, 60, true}, |
433 | {1, 960, 540, 60, TRUE}, | 433 | {1, 960, 540, 60, true}, |
434 | {1, 960, 600, 60, TRUE}, | 434 | {1, 960, 600, 60, true}, |
435 | {1, 1024, 576, 60, TRUE}, {2, 1024, 576, 75, TRUE}, {3, 1024, 576, 85, TRUE}, | 435 | {1, 1024, 576, 60, true}, {2, 1024, 576, 75, true}, {3, 1024, 576, 85, true}, |
436 | {1, 1024, 600, 60, TRUE}, | 436 | {1, 1024, 600, 60, true}, |
437 | {1, 1024, 768, 43, TRUE}, {2, 1024, 768, 60, TRUE}, {3, 1024, 768, 70, FALSE}, | 437 | {1, 1024, 768, 43, true}, {2, 1024, 768, 60, true}, {3, 1024, 768, 70, false}, |
438 | {4, 1024, 768, 75, FALSE}, {5, 1024, 768, 85, TRUE}, {6, 1024, 768, 100, TRUE}, | 438 | {4, 1024, 768, 75, false}, {5, 1024, 768, 85, true}, {6, 1024, 768, 100, true}, |
439 | {7, 1024, 768, 120, TRUE}, | 439 | {7, 1024, 768, 120, true}, |
440 | {1, 1152, 768, 60, TRUE}, | 440 | {1, 1152, 768, 60, true}, |
441 | {1, 1152, 864, 60, TRUE}, {2, 1152, 864, 75, TRUE}, {3, 1152, 864, 84, TRUE}, | 441 | {1, 1152, 864, 60, true}, {2, 1152, 864, 75, true}, {3, 1152, 864, 84, true}, |
442 | {1, 1280, 720, 60, TRUE}, {2, 1280, 720, 75, TRUE}, {3, 1280, 720, 85, TRUE}, | 442 | {1, 1280, 720, 60, true}, {2, 1280, 720, 75, true}, {3, 1280, 720, 85, true}, |
443 | {1, 1280, 768, 60, TRUE}, | 443 | {1, 1280, 768, 60, true}, |
444 | {1, 1280, 800, 60, TRUE}, | 444 | {1, 1280, 800, 60, true}, |
445 | {1, 1280, 854, 60, TRUE}, | 445 | {1, 1280, 854, 60, true}, |
446 | {1, 1280, 960, 60, TRUE}, {2, 1280, 960, 85, TRUE}, | 446 | {1, 1280, 960, 60, true}, {2, 1280, 960, 85, true}, |
447 | {1, 1280, 1024, 43, TRUE}, {2, 1280, 1024, 60, TRUE}, {3, 1280, 1024, 75, TRUE}, | 447 | {1, 1280, 1024, 43, true}, {2, 1280, 1024, 60, true}, {3, 1280, 1024, 75, true}, |
448 | {4, 1280, 1024, 85, TRUE}, | 448 | {4, 1280, 1024, 85, true}, |
449 | {1, 1360, 768, 60, TRUE}, | 449 | {1, 1360, 768, 60, true}, |
450 | {1, 1360, 1024, 59, TRUE}, | 450 | {1, 1360, 1024, 59, true}, |
451 | {1, 1400, 1050, 60, TRUE}, {2, 1400, 1050, 75, TRUE}, | 451 | {1, 1400, 1050, 60, true}, {2, 1400, 1050, 75, true}, |
452 | {1, 1600, 1200, 60, TRUE}, {2, 1600, 1200, 65, TRUE}, {3, 1600, 1200, 70, TRUE}, | 452 | {1, 1600, 1200, 60, true}, {2, 1600, 1200, 65, true}, {3, 1600, 1200, 70, true}, |
453 | {4, 1600, 1200, 75, TRUE}, {5, 1600, 1200, 85, TRUE}, {6, 1600, 1200, 100, TRUE}, | 453 | {4, 1600, 1200, 75, true}, {5, 1600, 1200, 85, true}, {6, 1600, 1200, 100, true}, |
454 | {7, 1600, 1200, 120, TRUE}, | 454 | {7, 1600, 1200, 120, true}, |
455 | {1, 1680, 1050, 60, TRUE}, | 455 | {1, 1680, 1050, 60, true}, |
456 | {1, 1920, 1080, 30, TRUE}, | 456 | {1, 1920, 1080, 30, true}, |
457 | {1, 1920, 1440, 60, TRUE}, {2, 1920, 1440, 65, TRUE}, {3, 1920, 1440, 70, TRUE}, | 457 | {1, 1920, 1440, 60, true}, {2, 1920, 1440, 65, true}, {3, 1920, 1440, 70, true}, |
458 | {4, 1920, 1440, 75, TRUE}, {5, 1920, 1440, 85, TRUE}, {6, 1920, 1440, 100, TRUE}, | 458 | {4, 1920, 1440, 75, true}, {5, 1920, 1440, 85, true}, {6, 1920, 1440, 100, true}, |
459 | {1, 2048, 1536, 60, TRUE}, {2, 2048, 1536, 65, TRUE}, {3, 2048, 1536, 70, TRUE}, | 459 | {1, 2048, 1536, 60, true}, {2, 2048, 1536, 65, true}, {3, 2048, 1536, 70, true}, |
460 | {4, 2048, 1536, 75, TRUE}, {5, 2048, 1536, 85, TRUE}, | 460 | {4, 2048, 1536, 75, true}, {5, 2048, 1536, 85, true}, |
461 | {0, 0, 0, 0, FALSE} | 461 | {0, 0, 0, 0, false} |
462 | }; | 462 | }; |
463 | 463 | ||
464 | static struct _sisfbddcsmodes { | 464 | static struct _sisfbddcsmodes { |
@@ -691,7 +691,7 @@ extern int sisfb_initaccel(struct sis_video_info *ivideo); | |||
691 | extern void sisfb_syncaccel(struct sis_video_info *ivideo); | 691 | extern void sisfb_syncaccel(struct sis_video_info *ivideo); |
692 | 692 | ||
693 | /* Internal general routines */ | 693 | /* Internal general routines */ |
694 | static void sisfb_search_mode(char *name, BOOLEAN quiet); | 694 | static void sisfb_search_mode(char *name, bool quiet); |
695 | static int sisfb_validate_mode(struct sis_video_info *ivideo, int modeindex, u32 vbflags); | 695 | static int sisfb_validate_mode(struct sis_video_info *ivideo, int modeindex, u32 vbflags); |
696 | static u8 sisfb_search_refresh_rate(struct sis_video_info *ivideo, unsigned int rate, | 696 | static u8 sisfb_search_refresh_rate(struct sis_video_info *ivideo, unsigned int rate, |
697 | int index); | 697 | int index); |
@@ -702,10 +702,10 @@ static int sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive, | |||
702 | struct fb_info *info); | 702 | struct fb_info *info); |
703 | static void sisfb_pre_setmode(struct sis_video_info *ivideo); | 703 | static void sisfb_pre_setmode(struct sis_video_info *ivideo); |
704 | static void sisfb_post_setmode(struct sis_video_info *ivideo); | 704 | static void sisfb_post_setmode(struct sis_video_info *ivideo); |
705 | static BOOLEAN sisfb_CheckVBRetrace(struct sis_video_info *ivideo); | 705 | static bool sisfb_CheckVBRetrace(struct sis_video_info *ivideo); |
706 | static BOOLEAN sisfbcheckvretracecrt2(struct sis_video_info *ivideo); | 706 | static bool sisfbcheckvretracecrt2(struct sis_video_info *ivideo); |
707 | static BOOLEAN sisfbcheckvretracecrt1(struct sis_video_info *ivideo); | 707 | static bool sisfbcheckvretracecrt1(struct sis_video_info *ivideo); |
708 | static BOOLEAN sisfb_bridgeisslave(struct sis_video_info *ivideo); | 708 | static bool sisfb_bridgeisslave(struct sis_video_info *ivideo); |
709 | static void sisfb_detect_VB_connect(struct sis_video_info *ivideo); | 709 | static void sisfb_detect_VB_connect(struct sis_video_info *ivideo); |
710 | static void sisfb_get_VB_type(struct sis_video_info *ivideo); | 710 | static void sisfb_get_VB_type(struct sis_video_info *ivideo); |
711 | static void sisfb_set_TVxposoffset(struct sis_video_info *ivideo, int val); | 711 | 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); | |||
737 | 737 | ||
738 | /* Routines from init.c/init301.c */ | 738 | /* Routines from init.c/init301.c */ |
739 | extern unsigned short SiS_GetModeID_LCD(int VGAEngine, unsigned int VBFlags, int HDisplay, | 739 | extern unsigned short SiS_GetModeID_LCD(int VGAEngine, unsigned int VBFlags, int HDisplay, |
740 | int VDisplay, int Depth, BOOLEAN FSTN, unsigned short CustomT, | 740 | int VDisplay, int Depth, bool FSTN, unsigned short CustomT, |
741 | int LCDwith, int LCDheight, unsigned int VBFlags2); | 741 | int LCDwith, int LCDheight, unsigned int VBFlags2); |
742 | extern unsigned short SiS_GetModeID_TV(int VGAEngine, unsigned int VBFlags, int HDisplay, | 742 | extern unsigned short SiS_GetModeID_TV(int VGAEngine, unsigned int VBFlags, int HDisplay, |
743 | int VDisplay, int Depth, unsigned int VBFlags2); | 743 | int VDisplay, int Depth, unsigned int VBFlags2); |
744 | extern unsigned short SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, | 744 | extern unsigned short SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, |
745 | int VDisplay, int Depth, unsigned int VBFlags2); | 745 | int VDisplay, int Depth, unsigned int VBFlags2); |
746 | extern void SiSRegInit(struct SiS_Private *SiS_Pr, SISIOADDRESS BaseAddr); | 746 | extern void SiSRegInit(struct SiS_Private *SiS_Pr, SISIOADDRESS BaseAddr); |
747 | extern BOOLEAN SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo); | 747 | extern bool SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo); |
748 | extern void SiS_SetEnableDstn(struct SiS_Private *SiS_Pr, int enable); | 748 | extern void SiS_SetEnableDstn(struct SiS_Private *SiS_Pr, int enable); |
749 | extern void SiS_SetEnableFstn(struct SiS_Private *SiS_Pr, int enable); | 749 | extern void SiS_SetEnableFstn(struct SiS_Private *SiS_Pr, int enable); |
750 | 750 | ||
751 | extern BOOLEAN SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr); | 751 | extern bool SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr); |
752 | 752 | ||
753 | extern BOOLEAN sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, | 753 | extern bool sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, |
754 | int *htotal, int *vtotal, unsigned char rateindex); | 754 | int *htotal, int *vtotal, unsigned char rateindex); |
755 | extern int sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr, | 755 | extern int sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr, |
756 | unsigned char modeno, unsigned char rateindex); | 756 | unsigned char modeno, unsigned char rateindex); |