XLibre/xf86-video-xgi
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-xgi.git synced 2026-03-24 01:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminiate need for XGI_VGAINFO structure field, remove field.

Browse Source
This commit is contained in:
Ian Romanick
2007-05-02 15:19:53 -07:00
parent 70f35e2661
commit 3ef757f055
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/init.c
View File

@@ -1156,6 +1156,7 @@ XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo,
XGIIOADDRESS BaseAddr = HwInfo->pjIOAddress;
USHORT ModeIdIndex, ModeNo=0;
UCHAR backupreg=0;
unsigned vga_info;
#ifdef XGIDUALHEAD
XGIEntPtr pXGIEnt = pXGI->entityPrivate;
UCHAR backupcr30, backupcr31, backupcr38, backupcr35, backupp40d=0;
@@ -1172,17 +1173,16 @@ XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo,
XGIRegInit(XGI_Pr, BaseAddr);
#if (defined(i386) || defined(__i386) || defined(__i386__) || defined(__AMD64__))
XGI_Pr->XGI_VGAINFO = XGI_GetSetBIOSScratch(pScrn, 0x489, 0xff);
vga_info = XGI_GetSetBIOSScratch(pScrn, 0x489, 0xff);
#else
XGI_Pr->XGI_VGAINFO = 0x11;
vga_info = 0x11;
#endif
XGIInitPCIetc(XGI_Pr, HwInfo);
XGI_SetReg(XGI_Pr->XGI_P3c4,0x05,0x86);
if (!XGI_SearchModeID(XGI_Pr->XGI_SModeIDTable,
XGI_Pr->XGI_EModeIDTable,
XGI_Pr->XGI_VGAINFO, &ModeNo, &ModeIdIndex)) {
if (!XGI_SearchModeID(XGI_Pr->XGI_SModeIDTable, XGI_Pr->XGI_EModeIDTable,
vga_info, &ModeNo, &ModeIdIndex)) {
return FALSE;
}

2
src/vstruct.h
View File

@@ -93,8 +93,6 @@ typedef struct _XGI_Private
/* FIXME: This field is tested but is never set. */
USHORT XGI_IF_DEF_CONEX;
UCHAR XGI_VGAINFO;
/* FIXME: These 9 fields are set but never used. */
BOOLEAN PanelSelfDetected;
int XGI_UseOEM;