diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/sis/sis_main.h | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h index 70b6df371b8e..88e4f1e41470 100644 --- a/drivers/video/sis/sis_main.h +++ b/drivers/video/sis/sis_main.h | |||
@@ -67,15 +67,7 @@ static int sisfb_ypan = -1; | |||
67 | static int sisfb_max = -1; | 67 | static int sisfb_max = -1; |
68 | static int sisfb_userom = 1; | 68 | static int sisfb_userom = 1; |
69 | static int sisfb_useoem = -1; | 69 | static int sisfb_useoem = -1; |
70 | #ifdef MODULE | ||
71 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) | ||
72 | static int sisfb_mode_idx = -1; | ||
73 | #else | ||
74 | static int sisfb_mode_idx = MODE_INDEX_NONE; /* Don't use a mode by default if we are a module */ | ||
75 | #endif | ||
76 | #else | ||
77 | static int sisfb_mode_idx = -1; /* Use a default mode if we are inside the kernel */ | 70 | static int sisfb_mode_idx = -1; /* Use a default mode if we are inside the kernel */ |
78 | #endif | ||
79 | static int sisfb_parm_rate = -1; | 71 | static int sisfb_parm_rate = -1; |
80 | static int sisfb_crt1off = 0; | 72 | static int sisfb_crt1off = 0; |
81 | static int sisfb_forcecrt1 = -1; | 73 | static int sisfb_forcecrt1 = -1; |
@@ -93,10 +85,6 @@ static int sisfb_tvstd = -1; | |||
93 | static int sisfb_tvxposoffset = 0; | 85 | static int sisfb_tvxposoffset = 0; |
94 | static int sisfb_tvyposoffset = 0; | 86 | static int sisfb_tvyposoffset = 0; |
95 | static int sisfb_nocrt2rate = 0; | 87 | static int sisfb_nocrt2rate = 0; |
96 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) | ||
97 | static int sisfb_inverse = 0; | ||
98 | static char sisfb_fontname[40]; | ||
99 | #endif | ||
100 | #if !defined(__i386__) && !defined(__x86_64__) | 88 | #if !defined(__i386__) && !defined(__x86_64__) |
101 | static int sisfb_resetcard = 0; | 89 | static int sisfb_resetcard = 0; |
102 | static int sisfb_videoram = 0; | 90 | static int sisfb_videoram = 0; |
@@ -687,54 +675,8 @@ SISINITSTATIC int sisfb_init(void); | |||
687 | static int sisfb_get_fix(struct fb_fix_screeninfo *fix, int con, | 675 | static int sisfb_get_fix(struct fb_fix_screeninfo *fix, int con, |
688 | struct fb_info *info); | 676 | struct fb_info *info); |
689 | 677 | ||
690 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) | ||
691 | static int sisfb_get_fix(struct fb_fix_screeninfo *fix, | ||
692 | int con, | ||
693 | struct fb_info *info); | ||
694 | static int sisfb_get_var(struct fb_var_screeninfo *var, | ||
695 | int con, | ||
696 | struct fb_info *info); | ||
697 | static int sisfb_set_var(struct fb_var_screeninfo *var, | ||
698 | int con, | ||
699 | struct fb_info *info); | ||
700 | static void sisfb_crtc_to_var(struct sis_video_info *ivideo, | ||
701 | struct fb_var_screeninfo *var); | ||
702 | static int sisfb_get_cmap(struct fb_cmap *cmap, | ||
703 | int kspc, | ||
704 | int con, | ||
705 | struct fb_info *info); | ||
706 | static int sisfb_set_cmap(struct fb_cmap *cmap, | ||
707 | int kspc, | ||
708 | int con, | ||
709 | struct fb_info *info); | ||
710 | static int sisfb_update_var(int con, | ||
711 | struct fb_info *info); | ||
712 | static int sisfb_switch(int con, | ||
713 | struct fb_info *info); | ||
714 | static void sisfb_blank(int blank, | ||
715 | struct fb_info *info); | ||
716 | static void sisfb_set_disp(int con, | ||
717 | struct fb_var_screeninfo *var, | ||
718 | struct fb_info *info); | ||
719 | static int sis_getcolreg(unsigned regno, unsigned *red, unsigned *green, | ||
720 | unsigned *blue, unsigned *transp, | ||
721 | struct fb_info *fb_info); | ||
722 | static void sisfb_do_install_cmap(int con, | ||
723 | struct fb_info *info); | ||
724 | static int sisfb_ioctl(struct inode *inode, struct file *file, | ||
725 | unsigned int cmd, unsigned long arg, int con, | ||
726 | struct fb_info *info); | ||
727 | #endif | ||
728 | |||
729 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) | ||
730 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) | ||
731 | static int sisfb_ioctl(struct fb_info *info, unsigned int cmd, | 678 | static int sisfb_ioctl(struct fb_info *info, unsigned int cmd, |
732 | unsigned long arg); | 679 | unsigned long arg); |
733 | #else | ||
734 | static int sisfb_ioctl(struct inode *inode, struct file *file, | ||
735 | unsigned int cmd, unsigned long arg, | ||
736 | struct fb_info *info); | ||
737 | #endif | ||
738 | static int sisfb_set_par(struct fb_info *info); | 680 | static int sisfb_set_par(struct fb_info *info); |
739 | static int sisfb_blank(int blank, | 681 | static int sisfb_blank(int blank, |
740 | struct fb_info *info); | 682 | struct fb_info *info); |
@@ -743,7 +685,6 @@ extern void fbcon_sis_fillrect(struct fb_info *info, | |||
743 | extern void fbcon_sis_copyarea(struct fb_info *info, | 685 | extern void fbcon_sis_copyarea(struct fb_info *info, |
744 | const struct fb_copyarea *area); | 686 | const struct fb_copyarea *area); |
745 | extern int fbcon_sis_sync(struct fb_info *info); | 687 | extern int fbcon_sis_sync(struct fb_info *info); |
746 | #endif | ||
747 | 688 | ||
748 | /* Internal 2D accelerator functions */ | 689 | /* Internal 2D accelerator functions */ |
749 | extern int sisfb_initaccel(struct sis_video_info *ivideo); | 690 | extern int sisfb_initaccel(struct sis_video_info *ivideo); |
@@ -811,16 +752,10 @@ extern BOOLEAN SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr); | |||
811 | 752 | ||
812 | extern BOOLEAN sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, | 753 | extern BOOLEAN sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, |
813 | int *htotal, int *vtotal, unsigned char rateindex); | 754 | int *htotal, int *vtotal, unsigned char rateindex); |
814 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) | ||
815 | 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, |
816 | unsigned char modeno, unsigned char rateindex); | 756 | unsigned char modeno, unsigned char rateindex); |
817 | extern int sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno, | 757 | extern int sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno, |
818 | unsigned char rateindex, struct fb_var_screeninfo *var); | 758 | unsigned char rateindex, struct fb_var_screeninfo *var); |
819 | #endif | ||
820 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) | ||
821 | extern void SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata, int xres, | ||
822 | int yres, struct fb_var_screeninfo *var, BOOLEAN writeres); | ||
823 | #endif | ||
824 | 759 | ||
825 | /* Chrontel TV, DDC and DPMS functions */ | 760 | /* Chrontel TV, DDC and DPMS functions */ |
826 | extern unsigned short SiS_GetCH700x(struct SiS_Private *SiS_Pr, unsigned short reg); | 761 | extern unsigned short SiS_GetCH700x(struct SiS_Private *SiS_Pr, unsigned short reg); |