aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorMichal Piotrowski <michal.k.k.piotrowski@gmail.com>2006-10-03 04:15:01 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 11:04:12 -0400
commitfe27e67616e300f2c891a669ea3b0e29f1e3bead (patch)
tree8b0b71944162e708248bf377559657758f4f6460 /drivers/video
parent86702ad483fa50e09f9535a0e5d2ecad2202facc (diff)
[PATCH] drivers/video/sis/sis_main.h Removal of old code
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Thomas Winischhofer <thomas@winischhofer.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/sis/sis_main.h65
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;
67static int sisfb_max = -1; 67static int sisfb_max = -1;
68static int sisfb_userom = 1; 68static int sisfb_userom = 1;
69static int sisfb_useoem = -1; 69static int sisfb_useoem = -1;
70#ifdef MODULE
71#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
72static int sisfb_mode_idx = -1;
73#else
74static int sisfb_mode_idx = MODE_INDEX_NONE; /* Don't use a mode by default if we are a module */
75#endif
76#else
77static int sisfb_mode_idx = -1; /* Use a default mode if we are inside the kernel */ 70static int sisfb_mode_idx = -1; /* Use a default mode if we are inside the kernel */
78#endif
79static int sisfb_parm_rate = -1; 71static int sisfb_parm_rate = -1;
80static int sisfb_crt1off = 0; 72static int sisfb_crt1off = 0;
81static int sisfb_forcecrt1 = -1; 73static int sisfb_forcecrt1 = -1;
@@ -93,10 +85,6 @@ static int sisfb_tvstd = -1;
93static int sisfb_tvxposoffset = 0; 85static int sisfb_tvxposoffset = 0;
94static int sisfb_tvyposoffset = 0; 86static int sisfb_tvyposoffset = 0;
95static int sisfb_nocrt2rate = 0; 87static int sisfb_nocrt2rate = 0;
96#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
97static int sisfb_inverse = 0;
98static char sisfb_fontname[40];
99#endif
100#if !defined(__i386__) && !defined(__x86_64__) 88#if !defined(__i386__) && !defined(__x86_64__)
101static int sisfb_resetcard = 0; 89static int sisfb_resetcard = 0;
102static int sisfb_videoram = 0; 90static int sisfb_videoram = 0;
@@ -687,54 +675,8 @@ SISINITSTATIC int sisfb_init(void);
687static int sisfb_get_fix(struct fb_fix_screeninfo *fix, int con, 675static 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)
691static int sisfb_get_fix(struct fb_fix_screeninfo *fix,
692 int con,
693 struct fb_info *info);
694static int sisfb_get_var(struct fb_var_screeninfo *var,
695 int con,
696 struct fb_info *info);
697static int sisfb_set_var(struct fb_var_screeninfo *var,
698 int con,
699 struct fb_info *info);
700static void sisfb_crtc_to_var(struct sis_video_info *ivideo,
701 struct fb_var_screeninfo *var);
702static int sisfb_get_cmap(struct fb_cmap *cmap,
703 int kspc,
704 int con,
705 struct fb_info *info);
706static int sisfb_set_cmap(struct fb_cmap *cmap,
707 int kspc,
708 int con,
709 struct fb_info *info);
710static int sisfb_update_var(int con,
711 struct fb_info *info);
712static int sisfb_switch(int con,
713 struct fb_info *info);
714static void sisfb_blank(int blank,
715 struct fb_info *info);
716static void sisfb_set_disp(int con,
717 struct fb_var_screeninfo *var,
718 struct fb_info *info);
719static int sis_getcolreg(unsigned regno, unsigned *red, unsigned *green,
720 unsigned *blue, unsigned *transp,
721 struct fb_info *fb_info);
722static void sisfb_do_install_cmap(int con,
723 struct fb_info *info);
724static 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)
731static int sisfb_ioctl(struct fb_info *info, unsigned int cmd, 678static int sisfb_ioctl(struct fb_info *info, unsigned int cmd,
732 unsigned long arg); 679 unsigned long arg);
733#else
734static int sisfb_ioctl(struct inode *inode, struct file *file,
735 unsigned int cmd, unsigned long arg,
736 struct fb_info *info);
737#endif
738static int sisfb_set_par(struct fb_info *info); 680static int sisfb_set_par(struct fb_info *info);
739static int sisfb_blank(int blank, 681static 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,
743extern void fbcon_sis_copyarea(struct fb_info *info, 685extern void fbcon_sis_copyarea(struct fb_info *info,
744 const struct fb_copyarea *area); 686 const struct fb_copyarea *area);
745extern int fbcon_sis_sync(struct fb_info *info); 687extern int fbcon_sis_sync(struct fb_info *info);
746#endif
747 688
748/* Internal 2D accelerator functions */ 689/* Internal 2D accelerator functions */
749extern int sisfb_initaccel(struct sis_video_info *ivideo); 690extern int sisfb_initaccel(struct sis_video_info *ivideo);
@@ -811,16 +752,10 @@ extern BOOLEAN SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr);
811 752
812extern BOOLEAN sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, 753extern 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)
815extern int sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr, 755extern 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);
817extern int sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno, 757extern 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)
821extern 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 */
826extern unsigned short SiS_GetCH700x(struct SiS_Private *SiS_Pr, unsigned short reg); 761extern unsigned short SiS_GetCH700x(struct SiS_Private *SiS_Pr, unsigned short reg);