dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

staging: xgifb: rename XGINew_SetReg1() to xgifb_reg_set() 

Rename XGINew_SetReg1() to xgifb_reg_set().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-03-13 12:26:22 +02:00 committed by Greg Kroah-Hartman
parent 3d2a60a29e
commit 8104e32996
6 changed files with 654 additions and 660 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/xgifb/XGI_main_26.c
View File

@ -2321,7 +2321,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
for (m = 0; m < sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct); m++) {
if ((XGI21_LCDCapList[m].LVDSHDE == XGIbios_mode[xgifb_mode_idx].xres) &&
(XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_mode_idx].yres)) {
XGINew_SetReg1(XGI_Pr.P3d4, 0x36, m);
xgifb_reg_set(XGI_Pr.P3d4, 0x36, m);
}
}
}

16
drivers/staging/xgifb/vb_ext.c
View File

@ -31,7 +31,7 @@ static unsigned char XGINew_Sense(unsigned short tempbx, unsigned short tempcx,
unsigned short temp, i, tempch;
temp = tempbx & 0xFF;
XGINew_SetReg1(pVBInfo->Part4Port, 0x11, temp);
xgifb_reg_set(pVBInfo->Part4Port, 0x11, temp);
temp = (tempbx & 0xFF00) >> 8;
temp |= (tempcx & 0x00FF);
XGINew_SetRegANDOR(pVBInfo->Part4Port, 0x10, ~0x1F, temp);
@ -143,7 +143,7 @@ static unsigned char XGINew_GetPanelID(struct vb_device_info *pVBInfo)
tempbx = tempbx >> 1;
temp = tempbx & 0x00F;
XGINew_SetReg1(pVBInfo->P3d4, 0x36, temp);
xgifb_reg_set(pVBInfo->P3d4, 0x36, temp);
tempbx--;
tempbx = PanelTypeTable[tempbx];
@ -179,7 +179,7 @@ static unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtensi
tempcx = 0x0604;
temp = tempbx & 0xFF;
XGINew_SetReg1(pVBInfo->Part4Port, 0x11, temp);
xgifb_reg_set(pVBInfo->Part4Port, 0x11, temp);
temp = (tempbx & 0xFF00) >> 8;
temp |= (tempcx & 0x00FF);
XGINew_SetRegANDOR(pVBInfo->Part4Port, 0x10, ~0x1F, temp);
@ -199,7 +199,7 @@ static unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtensi
tempcx = 0x0804;
temp = tempbx & 0xFF;
XGINew_SetReg1(pVBInfo->Part4Port, 0x11, temp);
xgifb_reg_set(pVBInfo->Part4Port, 0x11, temp);
temp = (tempbx & 0xFF00) >> 8;
temp |= (tempcx & 0x00FF);
XGINew_SetRegANDOR(pVBInfo->Part4Port, 0x10, ~0x1F, temp);
@ -218,7 +218,7 @@ static unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtensi
tempbx = 0x3FF;
tempcx = 0x0804;
temp = tempbx & 0xFF;
XGINew_SetReg1(pVBInfo->Part4Port, 0x11, temp);
xgifb_reg_set(pVBInfo->Part4Port, 0x11, temp);
temp = (tempbx & 0xFF00) >> 8;
temp |= (tempcx & 0x00FF);
XGINew_SetRegANDOR(pVBInfo->Part4Port, 0x10, ~0x1F, temp);
@ -276,7 +276,7 @@ void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_
P2reg0 = XGINew_GetReg1(pVBInfo->Part2Port, 0x00);
if (!XGINew_BridgeIsEnable(HwDeviceExtension, pVBInfo)) {
SenseModeNo = 0x2e;
/* XGINew_SetReg1(pVBInfo->P3d4, 0x30, 0x41); */
/* xgifb_reg_set(pVBInfo->P3d4, 0x30, 0x41); */
/* XGISetModeNew(HwDeviceExtension, 0x2e); // ynlai InitMode */
temp = XGI_SearchModeID(SenseModeNo, &ModeIdIndex, pVBInfo);
@ -295,7 +295,7 @@ void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_
for (i = 0; i < 20; i++)
XGI_LongWait(pVBInfo);
}
XGINew_SetReg1(pVBInfo->Part2Port, 0x00, 0x1c);
xgifb_reg_set(pVBInfo->Part2Port, 0x00, 0x1c);
tempax = 0;
tempbx = *pVBInfo->pRGBSenseData;
@ -366,7 +366,7 @@ void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_
XGINew_Sense(tempbx, tempcx, pVBInfo);
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~0xDF, tempax);
XGINew_SetReg1(pVBInfo->Part2Port, 0x00, P2reg0);
xgifb_reg_set(pVBInfo->Part2Port, 0x00, P2reg0);
if (!(P2reg0 & 0x20)) {
pVBInfo->VBInfo = DisableCRT2Display;

578
drivers/staging/xgifb/vb_init.c
View File

File diff suppressed because it is too large Load Diff

702
drivers/staging/xgifb/vb_setmode.c
View File

File diff suppressed because it is too large Load Diff

14
drivers/staging/xgifb/vb_util.c
View File

@ -8,13 +8,7 @@
#include "vb_util.h"
/* --------------------------------------------------------------------- */
/* Function : XGINew_SetReg1 */
/* Input : */
/* Output : */
/* Description : SR CRTC GR */
/* --------------------------------------------------------------------- */
void XGINew_SetReg1(unsigned long port, unsigned short index,
void xgifb_reg_set(unsigned long port, unsigned short index,
unsigned short data)
{
outb(index, port);
@ -37,7 +31,7 @@ void XGINew_SetRegANDOR(unsigned long Port, unsigned short Index,
temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp = (temp & (DataAND)) | DataOR;
XGINew_SetReg1(Port, Index, temp);
xgifb_reg_set(Port, Index, temp);
}
void XGINew_SetRegAND(unsigned long Port, unsigned short Index,
@ -47,7 +41,7 @@ void XGINew_SetRegAND(unsigned long Port, unsigned short Index,
temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp &= DataAND;
XGINew_SetReg1(Port, Index, temp);
xgifb_reg_set(Port, Index, temp);
}
void XGINew_SetRegOR(unsigned long Port, unsigned short Index,
@ -57,5 +51,5 @@ void XGINew_SetRegOR(unsigned long Port, unsigned short Index,
temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp |= DataOR;
XGINew_SetReg1(Port, Index, temp);
xgifb_reg_set(Port, Index, temp);
}

2
drivers/staging/xgifb/vb_util.h
View File

@ -1,6 +1,6 @@
#ifndef _VBUTIL_
#define _VBUTIL_
extern void XGINew_SetReg1(unsigned long, unsigned short, unsigned short);
extern void xgifb_reg_set(unsigned long, unsigned short, unsigned short);
extern unsigned char XGINew_GetReg1(unsigned long, unsigned short);
extern void XGINew_SetRegOR(unsigned long Port,unsigned short Index,unsigned short DataOR);
extern void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND);