Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe27e676 authored by Michal Piotrowski's avatar Michal Piotrowski Committed by Linus Torvalds
Browse files

[PATCH] drivers/video/sis/sis_main.h Removal of old code 



Signed-off-by: default avatarMichal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 86702ad4

drivers/video/sis/sis_main.h

+0 −65
Original line number Diff line number Diff line
@@ -67,15 +67,7 @@ static int sisfb_ypan = -1; 
static int sisfb_max = -1;

static int sisfb_userom = 1;

static int sisfb_useoem = -1;

#ifdef MODULE

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

static int sisfb_mode_idx = -1;

#else

static int sisfb_mode_idx = MODE_INDEX_NONE;  /* Don't use a mode by default if we are a module */

#endif

#else

static int sisfb_mode_idx = -1;               /* Use a default mode if we are inside the kernel */

#endif

static int sisfb_parm_rate = -1;

static int sisfb_crt1off = 0;

static int sisfb_forcecrt1 = -1;
@@ -93,10 +85,6 @@ static int sisfb_tvstd = -1; 
static int sisfb_tvxposoffset = 0;

static int sisfb_tvyposoffset = 0;

static int sisfb_nocrt2rate = 0;

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

static int  sisfb_inverse = 0;

static char sisfb_fontname[40];

#endif

#if !defined(__i386__) && !defined(__x86_64__)

static int sisfb_resetcard = 0;

static int sisfb_videoram = 0;
@@ -687,54 +675,8 @@ SISINITSTATIC int sisfb_init(void); 
static int	sisfb_get_fix(struct fb_fix_screeninfo *fix, int con,

				struct fb_info *info);



#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

static int	sisfb_get_fix(struct fb_fix_screeninfo *fix,

				int con,

				struct fb_info *info);

static int	sisfb_get_var(struct fb_var_screeninfo *var,

				int con,

				struct fb_info *info);

static int	sisfb_set_var(struct fb_var_screeninfo *var,

				int con,

				struct fb_info *info);

static void	sisfb_crtc_to_var(struct sis_video_info *ivideo,

				struct fb_var_screeninfo *var);

static int	sisfb_get_cmap(struct fb_cmap *cmap,

				int kspc,

				int con,

				struct fb_info *info);

static int	sisfb_set_cmap(struct fb_cmap *cmap,

				int kspc,

				int con,

				struct fb_info *info);

static int	sisfb_update_var(int con,

				struct fb_info *info);

static int	sisfb_switch(int con,

			     struct fb_info *info);

static void	sisfb_blank(int blank,

				struct fb_info *info);

static void	sisfb_set_disp(int con,

				struct fb_var_screeninfo *var,

				struct fb_info *info);

static int	sis_getcolreg(unsigned regno, unsigned *red, unsigned *green,

				unsigned *blue, unsigned *transp,

				struct fb_info *fb_info);

static void	sisfb_do_install_cmap(int con,

				struct fb_info *info);

static int	sisfb_ioctl(struct inode *inode, struct file *file,

				unsigned int cmd, unsigned long arg, int con,

				struct fb_info *info);

#endif



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)

static int	sisfb_ioctl(struct fb_info *info, unsigned int cmd,

			    unsigned long arg);

#else

static int	sisfb_ioctl(struct inode *inode, struct file *file,

				unsigned int cmd, unsigned long arg,

				struct fb_info *info);

#endif

static int	sisfb_set_par(struct fb_info *info);

static int	sisfb_blank(int blank,

				struct fb_info *info);
@@ -743,7 +685,6 @@ extern void fbcon_sis_fillrect(struct fb_info *info, 
extern void	fbcon_sis_copyarea(struct fb_info *info,

				const struct fb_copyarea *area);

extern int	fbcon_sis_sync(struct fb_info *info);

#endif



/* Internal 2D accelerator functions */

extern int	sisfb_initaccel(struct sis_video_info *ivideo);
@@ -811,16 +752,10 @@ extern BOOLEAN SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr); 


extern BOOLEAN		sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno,

				int *htotal, int *vtotal, unsigned char rateindex);

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

extern int		sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr,

				unsigned char modeno, unsigned char rateindex);

extern int		sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno,

				unsigned char rateindex, struct fb_var_screeninfo *var);

#endif

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

extern void		SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata, int xres,

				int yres, struct fb_var_screeninfo *var, BOOLEAN writeres);

#endif



/* Chrontel TV, DDC and DPMS functions */

extern unsigned short	SiS_GetCH700x(struct SiS_Private *SiS_Pr, unsigned short reg);