From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
To: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: Andrew Morton <akpm@osdl.org>,
Thomas Winischhofer <thomas@winischhofer.net>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [RFC] [PATCH 8/10] drivers/video/sis/sis_main.h Removal of old code
Date: Sat, 12 Aug 2006 19:02:53 +0200 [thread overview]
Message-ID: <44DE09BD.6050603@gmail.com> (raw)
In-Reply-To: <44DE05FC.2090001@gmail.com>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
diff -uprN -X linux-work/Documentation/dontdiff linux-work-clean/drivers/video/sis/sis_main.h linux-work/drivers/video/sis/sis_main.h
--- linux-work-clean/drivers/video/sis/sis_main.h 2006-03-20 06:53:29.000000000 +0100
+++ linux-work/drivers/video/sis/sis_main.h 2006-08-12 18:00:31.000000000 +0200
@@ -68,12 +68,6 @@ 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;
@@ -93,10 +87,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 +677,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 +687,6 @@ extern void fbcon_sis_fillrect(struct fb
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 +754,10 @@ extern BOOLEAN SiSDetermineROMLayout661
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);
next prev parent reply other threads:[~2006-08-12 17:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <44DE05FC.2090001@gmail.com>
2006-08-12 17:01 ` [RFC] [PATCH 1/10] drivers/video/sis/init301.h Removal of old code Michal Piotrowski
2006-08-12 17:01 ` [RFC] [PATCH 2/10] drivers/video/sis/initextlfb.c " Michal Piotrowski
2006-08-12 17:01 ` [RFC] [PATCH 3/10] drivers/video/sis/init.h " Michal Piotrowski
2006-08-12 17:01 ` [RFC] [PATCH 4/10] drivers/video/sis/osdef.h " Michal Piotrowski
2006-08-12 17:01 ` [RFC] [PATCH 5/10] drivers/video/sis/sis_accel.c " Michal Piotrowski
2006-08-12 17:02 ` [RFC] [PATCH 6/10] drivers/video/sis/sis_accel.h " Michal Piotrowski
2006-08-12 17:02 ` [RFC] [PATCH 7/10] drivers/video/sis/sis_main.c " Michal Piotrowski
2006-08-14 19:35 ` Michal Piotrowski
2006-08-12 17:02 ` Michal Piotrowski [this message]
2006-08-14 19:40 ` [RFC] [PATCH 8/10] drivers/video/sis/sis_main.h " Michal Piotrowski
2006-08-12 17:02 ` [RFC] [PATCH 9/10] drivers/video/sis/vgatypes.h " Michal Piotrowski
2006-08-12 17:03 ` [RFC] [PATCH 10/10] fs/jffs2/jffs2_fs_i.h " Michal Piotrowski
2006-08-13 8:47 ` David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44DE09BD.6050603@gmail.com \
--to=michal.k.k.piotrowski@gmail.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas@winischhofer.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.