From ac0e48d9287206e80163f9def683991e7eda7ef6 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 8 Mar 2011 22:16:09 +0200 Subject: [PATCH] --- yaml --- r: 236357 b: refs/heads/master c: 66c2458c7943c29a2221896c213ec1d244c64ded h: refs/heads/master i: 236355: 6e936d59d65ff39e145e34c3569637aa777eab51 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 4 ---- trunk/drivers/staging/xgifb/vgatypes.h | 29 ----------------------- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/[refs] b/[refs] index 4527314d395b..4a9ed54efe13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3259bb5a1384c58935f8d95f1dbbab7f51b17e25 +refs/heads/master: 66c2458c7943c29a2221896c213ec1d244c64ded diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index aeccdeece6a2..fa30a2614b07 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -2287,7 +2287,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, break; } - XGIhw_ext.pDevice = NULL; if ((xgi_video_info.chip == XG21) || (XGIfb_userom)) { XGIhw_ext.pjVirtualRomBase = xgifb_copy_rom(pdev); if (XGIhw_ext.pjVirtualRomBase) @@ -2298,10 +2297,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, XGIhw_ext.pjVirtualRomBase = NULL; printk(KERN_INFO "XGIfb: Video ROM usage disabled\n"); } - XGIhw_ext.pjCustomizedROMImage = NULL; XGIhw_ext.pQueryVGAConfigSpace = &XGIfb_query_VGA_config_space; - /* XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space; */ - strcpy(XGIhw_ext.szVBIOSVer, "0.84"); if (!XGIvga_enabled) { /* Mapping Max FB Size for 315 Init */ diff --git a/trunk/drivers/staging/xgifb/vgatypes.h b/trunk/drivers/staging/xgifb/vgatypes.h index dacdac3e204c..13c02be38130 100644 --- a/trunk/drivers/staging/xgifb/vgatypes.h +++ b/trunk/drivers/staging/xgifb/vgatypes.h @@ -4,10 +4,6 @@ #include -#ifndef VBIOS_VER_MAX_LENGTH -#define VBIOS_VER_MAX_LENGTH 5 -#endif - #ifndef XGI_VB_CHIP_TYPE enum XGI_VB_CHIP_TYPE { VB_CHIP_Legacy = 0, @@ -65,10 +61,6 @@ struct xgi_hw_device_info unsigned char *pjVirtualRomBase; /* ROM image */ - unsigned char UseROM; /* Use the ROM image if provided */ - - void *pDevice; - unsigned char *pjVideoMemoryAddress;/* base virtual memory address */ /* of Linear VGA memory */ @@ -76,12 +68,6 @@ struct xgi_hw_device_info unsigned char *pjIOAddress; /* base I/O address of VGA ports (0x3B0) */ - unsigned char *pjCustomizedROMImage; - - unsigned char *pj2ndVideoMemoryAddress; - unsigned long ul2ndVideoMemorySize; - - unsigned char *pj2ndIOAddress; unsigned char jChipType; /* Used to Identify Graphics Chip */ /* defined in the data structure type */ /* "XGI_CHIP_TYPE" */ @@ -92,30 +78,15 @@ struct xgi_hw_device_info /* defined in the data structure type */ /* "XGI_VB_CHIP_TYPE" */ - unsigned char bNewScratch; - unsigned long ulCRT2LCDType; /* defined in the data structure type */ - unsigned long usExternalChip; /* NO VB or other video bridge (other than */ - /* video bridge) */ - unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */ unsigned char bSkipSense; - unsigned char bIsPowerSaving; /* True: XGIInit() is invoked by power management, - otherwise by 2nd adapter's initialzation */ - unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *, unsigned long, unsigned long, unsigned long *); - - unsigned char(*pQueryNorthBridgeSpace)(struct xgi_hw_device_info *, - unsigned long, unsigned long, - unsigned long *); - - unsigned char szVBIOSVer[VBIOS_VER_MAX_LENGTH]; - }; /* Addtional IOCTL for communication xgifb <> X driver */