|
|
@@ -33,7 +33,6 @@
|
|
|
*
|
|
|
*/
|
|
|
|
|
|
-#include <linux/version.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/moduleparam.h>
|
|
|
#include <linux/kernel.h>
|
|
|
@@ -41,13 +40,7 @@
|
|
|
#include <linux/errno.h>
|
|
|
#include <linux/string.h>
|
|
|
#include <linux/mm.h>
|
|
|
-
|
|
|
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
|
|
|
-#include <linux/tty.h>
|
|
|
-#else
|
|
|
#include <linux/screen_info.h>
|
|
|
-#endif
|
|
|
-
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/fb.h>
|
|
|
#include <linux/selection.h>
|
|
|
@@ -1167,11 +1160,7 @@ sisfb_set_mode(struct sis_video_info *ivideo, int clrscrn)
|
|
|
unsigned short modeno = ivideo->mode_no;
|
|
|
|
|
|
/* >=2.6.12's fbcon clears the screen anyway */
|
|
|
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
|
|
|
- if(!clrscrn) modeno |= 0x80;
|
|
|
-#else
|
|
|
modeno |= 0x80;
|
|
|
-#endif
|
|
|
|
|
|
outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD);
|
|
|
|
|
|
@@ -1436,11 +1425,8 @@ sisfb_set_par(struct fb_info *info)
|
|
|
if((err = sisfb_do_set_var(&info->var, 1, info)))
|
|
|
return err;
|
|
|
|
|
|
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
|
|
|
- sisfb_get_fix(&info->fix, info->currcon, info);
|
|
|
-#else
|
|
|
sisfb_get_fix(&info->fix, -1, info);
|
|
|
-#endif
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
@@ -1676,14 +1662,8 @@ sisfb_blank(int blank, struct fb_info *info)
|
|
|
|
|
|
/* ----------- FBDev related routines for all series ---------- */
|
|
|
|
|
|
-#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
|
|
|
{
|
|
|
struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
|
|
|
struct sis_memreq sismemreq;
|
|
|
@@ -3986,8 +3966,7 @@ sisfb_handle_command(struct sis_video_info *ivideo, struct sisfb_cmd *sisfb_comm
|
|
|
}
|
|
|
|
|
|
#ifndef MODULE
|
|
|
-SISINITSTATIC int __init
|
|
|
-sisfb_setup(char *options)
|
|
|
+static int __init sisfb_setup(char *options)
|
|
|
{
|
|
|
char *this_opt;
|
|
|
|
|
|
@@ -4086,9 +4065,9 @@ sisfb_setup(char *options)
|
|
|
#endif
|
|
|
|
|
|
static int __devinit
|
|
|
-sisfb_check_rom(SIS_IOTYPE1 *rom_base, struct sis_video_info *ivideo)
|
|
|
+sisfb_check_rom(void __iomem *rom_base, struct sis_video_info *ivideo)
|
|
|
{
|
|
|
- SIS_IOTYPE1 *rom;
|
|
|
+ void __iomem *rom;
|
|
|
int romptr;
|
|
|
|
|
|
if((readb(rom_base) != 0x55) || (readb(rom_base + 1) != 0xaa))
|
|
|
@@ -4117,10 +4096,9 @@ static unsigned char * __devinit
|
|
|
sisfb_find_rom(struct pci_dev *pdev)
|
|
|
{
|
|
|
struct sis_video_info *ivideo = pci_get_drvdata(pdev);
|
|
|
- SIS_IOTYPE1 *rom_base;
|
|
|
+ void __iomem *rom_base;
|
|
|
unsigned char *myrombase = NULL;
|
|
|
u32 temp;
|
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
|
|
|
size_t romsize;
|
|
|
|
|
|
/* First, try the official pci ROM functions (except
|
|
|
@@ -4151,7 +4129,6 @@ sisfb_find_rom(struct pci_dev *pdev)
|
|
|
}
|
|
|
|
|
|
if(myrombase) return myrombase;
|
|
|
-#endif
|
|
|
|
|
|
/* Otherwise do it the conventional way. */
|
|
|
|
|
|
@@ -4225,7 +4202,7 @@ sisfb_post_map_vram(struct sis_video_info *ivideo, unsigned int *mapsize,
|
|
|
static int __devinit
|
|
|
sisfb_post_300_buswidth(struct sis_video_info *ivideo)
|
|
|
{
|
|
|
- SIS_IOTYPE1 *FBAddress = ivideo->video_vbase;
|
|
|
+ void __iomem *FBAddress = ivideo->video_vbase;
|
|
|
unsigned short temp;
|
|
|
unsigned char reg;
|
|
|
int i, j;
|
|
|
@@ -4273,7 +4250,7 @@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth
|
|
|
int PseudoRankCapacity, int PseudoAdrPinCount,
|
|
|
unsigned int mapsize)
|
|
|
{
|
|
|
- SIS_IOTYPE1 *FBAddr = ivideo->video_vbase;
|
|
|
+ void __iomem *FBAddr = ivideo->video_vbase;
|
|
|
unsigned short sr14;
|
|
|
unsigned int k, RankCapacity, PageCapacity, BankNumHigh, BankNumMid;
|
|
|
unsigned int PhysicalAdrOtherPage, PhysicalAdrHigh, PhysicalAdrHalfPage;
|
|
|
@@ -5829,7 +5806,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
ivideo->engineok = 0;
|
|
|
|
|
|
ivideo->sisfb_was_boot_device = 0;
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
|
|
|
+
|
|
|
if(pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW) {
|
|
|
if(ivideo->sisvga_enabled)
|
|
|
ivideo->sisfb_was_boot_device = 1;
|
|
|
@@ -5840,7 +5817,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
"as the primary VGA device\n");
|
|
|
}
|
|
|
}
|
|
|
-#endif
|
|
|
|
|
|
ivideo->sisfb_parm_mem = sisfb_parm_mem;
|
|
|
ivideo->sisfb_accel = sisfb_accel;
|
|
|
@@ -6010,7 +5986,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
ivideo->modeprechange = reg & 0x7f;
|
|
|
} else if(ivideo->sisvga_enabled) {
|
|
|
#if defined(__i386__) || defined(__x86_64__)
|
|
|
- unsigned char SIS_IOTYPE2 *tt = ioremap(0x400, 0x100);
|
|
|
+ unsigned char __iomem *tt = ioremap(0x400, 0x100);
|
|
|
if(tt) {
|
|
|
ivideo->modeprechange = readb(tt + 0x49);
|
|
|
iounmap(tt);
|
|
|
@@ -6503,7 +6479,7 @@ static struct pci_driver sisfb_driver = {
|
|
|
.remove = __devexit_p(sisfb_remove)
|
|
|
};
|
|
|
|
|
|
-SISINITSTATIC int __init sisfb_init(void)
|
|
|
+static int __init sisfb_init(void)
|
|
|
{
|
|
|
#ifndef MODULE
|
|
|
char *options = NULL;
|
Adrian Bunk