Skip to content

L
linux
Commit 22b2c526 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files
Options

USB: SisUSB2VGA: Lindent drivers/usb/misc/sisusbvga/sisusb_init.c 

Better indentation
Signed-off-by: default avatarFelipe Balbi <felipe.lima@indt.org.br>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1c1772a2
Show whitespace changes
Inline Side-by-side
Showing with 133 additions and 129 deletions
drivers/usb/misc/sisusbvga/sisusb_init.c
View file @ 22b2c526
...@@ -55,8 +55,7 @@ ...@@ -55,8 +55,7 @@
/* POINTER INITIALIZATION */ /* POINTER INITIALIZATION */
/*********************************************/ /*********************************************/
static void static void SiSUSB_InitPtr(struct SiS_Private *SiS_Pr)
SiSUSB_InitPtr(struct SiS_Private *SiS_Pr)
{ {
SiS_Pr->SiS_ModeResInfo = SiSUSB_ModeResInfo; SiS_Pr->SiS_ModeResInfo = SiSUSB_ModeResInfo;
SiS_Pr->SiS_StandTable = SiSUSB_StandTable; SiS_Pr->SiS_StandTable = SiSUSB_StandTable;
...@@ -88,8 +87,7 @@ SiS_SetRegByte(struct SiS_Private *SiS_Pr, unsigned long port, ...@@ -88,8 +87,7 @@ SiS_SetRegByte(struct SiS_Private *SiS_Pr, unsigned long port,
} }
static unsigned char static unsigned char
SiS_GetReg(struct SiS_Private *SiS_Pr, unsigned long port, SiS_GetReg(struct SiS_Private *SiS_Pr, unsigned long port, unsigned short index)
unsigned short index)
{ {
u8 data; u8 data;
...@@ -124,7 +122,7 @@ SiS_SetRegAND(struct SiS_Private *SiS_Pr, unsigned long port, ...@@ -124,7 +122,7 @@ SiS_SetRegAND(struct SiS_Private *SiS_Pr, unsigned long port,
} }
static void static void
SiS_SetRegOR(struct SiS_Private *SiS_Pr,unsigned long port, SiS_SetRegOR(struct SiS_Private *SiS_Pr, unsigned long port,
unsigned short index, unsigned short DataOR) unsigned short index, unsigned short DataOR)
{ {
sisusb_setidxregor(SiS_Pr->sisusb, port, index, DataOR); sisusb_setidxregor(SiS_Pr->sisusb, port, index, DataOR);
...@@ -134,8 +132,7 @@ SiS_SetRegOR(struct SiS_Private *SiS_Pr,unsigned long port, ...@@ -134,8 +132,7 @@ SiS_SetRegOR(struct SiS_Private *SiS_Pr,unsigned long port,
/* HELPER: DisplayOn, DisplayOff */ /* HELPER: DisplayOn, DisplayOff */
/*********************************************/ /*********************************************/
static void static void SiS_DisplayOn(struct SiS_Private *SiS_Pr)
SiS_DisplayOn(struct SiS_Private *SiS_Pr)
{ {
SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3c4, 0x01, 0xDF); SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3c4, 0x01, 0xDF);
} }
...@@ -144,8 +141,7 @@ SiS_DisplayOn(struct SiS_Private *SiS_Pr) ...@@ -144,8 +141,7 @@ SiS_DisplayOn(struct SiS_Private *SiS_Pr)
/* HELPER: Init Port Addresses */ /* HELPER: Init Port Addresses */
/*********************************************/ /*********************************************/
static void static void SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr)
SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr)
{ {
SiS_Pr->SiS_P3c4 = BaseAddr + 0x14; SiS_Pr->SiS_P3c4 = BaseAddr + 0x14;
SiS_Pr->SiS_P3d4 = BaseAddr + 0x24; SiS_Pr->SiS_P3d4 = BaseAddr + 0x24;
...@@ -168,8 +164,7 @@ SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr) ...@@ -168,8 +164,7 @@ SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr)
/* HELPER: GetSysFlags */ /* HELPER: GetSysFlags */
/*********************************************/ /*********************************************/
static void static void SiS_GetSysFlags(struct SiS_Private *SiS_Pr)
SiS_GetSysFlags(struct SiS_Private *SiS_Pr)
{ {
SiS_Pr->SiS_MyCR63 = 0x63; SiS_Pr->SiS_MyCR63 = 0x63;
} }
...@@ -178,8 +173,7 @@ SiS_GetSysFlags(struct SiS_Private *SiS_Pr) ...@@ -178,8 +173,7 @@ SiS_GetSysFlags(struct SiS_Private *SiS_Pr)
/* HELPER: Init PCI & Engines */ /* HELPER: Init PCI & Engines */
/*********************************************/ /*********************************************/
static void static void SiSInitPCIetc(struct SiS_Private *SiS_Pr)
SiSInitPCIetc(struct SiS_Private *SiS_Pr)
{ {
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x20, 0xa1); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x20, 0xa1);
/* - Enable 2D (0x40) /* - Enable 2D (0x40)
...@@ -195,8 +189,7 @@ SiSInitPCIetc(struct SiS_Private *SiS_Pr) ...@@ -195,8 +189,7 @@ SiSInitPCIetc(struct SiS_Private *SiS_Pr)
/* HELPER: SET SEGMENT REGISTERS */ /* HELPER: SET SEGMENT REGISTERS */
/*********************************************/ /*********************************************/
static void static void SiS_SetSegRegLower(struct SiS_Private *SiS_Pr, unsigned short value)
SiS_SetSegRegLower(struct SiS_Private *SiS_Pr, unsigned short value)
{ {
unsigned short temp; unsigned short temp;
...@@ -209,8 +202,7 @@ SiS_SetSegRegLower(struct SiS_Private *SiS_Pr, unsigned short value) ...@@ -209,8 +202,7 @@ SiS_SetSegRegLower(struct SiS_Private *SiS_Pr, unsigned short value)
SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3cd, temp); SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3cd, temp);
} }
static void static void SiS_SetSegRegUpper(struct SiS_Private *SiS_Pr, unsigned short value)
SiS_SetSegRegUpper(struct SiS_Private *SiS_Pr, unsigned short value)
{ {
unsigned short temp; unsigned short temp;
...@@ -223,15 +215,13 @@ SiS_SetSegRegUpper(struct SiS_Private *SiS_Pr, unsigned short value) ...@@ -223,15 +215,13 @@ SiS_SetSegRegUpper(struct SiS_Private *SiS_Pr, unsigned short value)
SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3cd, temp); SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3cd, temp);
} }
static void static void SiS_SetSegmentReg(struct SiS_Private *SiS_Pr, unsigned short value)
SiS_SetSegmentReg(struct SiS_Private *SiS_Pr, unsigned short value)
{ {
SiS_SetSegRegLower(SiS_Pr, value); SiS_SetSegRegLower(SiS_Pr, value);
SiS_SetSegRegUpper(SiS_Pr, value); SiS_SetSegRegUpper(SiS_Pr, value);
} }
static void static void SiS_ResetSegmentReg(struct SiS_Private *SiS_Pr)
SiS_ResetSegmentReg(struct SiS_Private *SiS_Pr)
{ {
SiS_SetSegmentReg(SiS_Pr, 0); SiS_SetSegmentReg(SiS_Pr, 0);
} }
...@@ -247,14 +237,12 @@ SiS_SetSegmentRegOver(struct SiS_Private *SiS_Pr, unsigned short value) ...@@ -247,14 +237,12 @@ SiS_SetSegmentRegOver(struct SiS_Private *SiS_Pr, unsigned short value)
SiS_SetSegmentReg(SiS_Pr, value); SiS_SetSegmentReg(SiS_Pr, value);
} }
static void static void SiS_ResetSegmentRegOver(struct SiS_Private *SiS_Pr)
SiS_ResetSegmentRegOver(struct SiS_Private *SiS_Pr)
{ {
SiS_SetSegmentRegOver(SiS_Pr, 0); SiS_SetSegmentRegOver(SiS_Pr, 0);
} }
static void static void SiS_ResetSegmentRegisters(struct SiS_Private *SiS_Pr)
SiS_ResetSegmentRegisters(struct SiS_Private *SiS_Pr)
{ {
SiS_ResetSegmentReg(SiS_Pr); SiS_ResetSegmentReg(SiS_Pr);
SiS_ResetSegmentRegOver(SiS_Pr); SiS_ResetSegmentRegOver(SiS_Pr);
...@@ -277,12 +265,14 @@ SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo, ...@@ -277,12 +265,14 @@ SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
} else { } else {
for(*ModeIdIndex = 0; ;(*ModeIdIndex)++) { for (*ModeIdIndex = 0;; (*ModeIdIndex)++) {
if (SiS_Pr->SiS_EModeIDTable[*ModeIdIndex].Ext_ModeID == (*ModeNo)) if (SiS_Pr->SiS_EModeIDTable[*ModeIdIndex].Ext_ModeID ==
(*ModeNo))
break; break;
if (SiS_Pr->SiS_EModeIDTable[*ModeIdIndex].Ext_ModeID == 0xFF) if (SiS_Pr->SiS_EModeIDTable[*ModeIdIndex].Ext_ModeID ==
0xFF)
return 0; return 0;
} }
...@@ -295,8 +285,7 @@ SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo, ...@@ -295,8 +285,7 @@ SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo,
/* HELPER: ENABLE CRT1 */ /* HELPER: ENABLE CRT1 */
/*********************************************/ /*********************************************/
static void static void SiS_HandleCRT1(struct SiS_Private *SiS_Pr)
SiS_HandleCRT1(struct SiS_Private *SiS_Pr)
{ {
/* Enable CRT1 gating */ /* Enable CRT1 gating */
SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4, SiS_Pr->SiS_MyCR63, 0xbf); SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4, SiS_Pr->SiS_MyCR63, 0xbf);
...@@ -310,7 +299,7 @@ static unsigned short ...@@ -310,7 +299,7 @@ static unsigned short
SiS_GetColorDepth(struct SiS_Private *SiS_Pr, unsigned short ModeNo, SiS_GetColorDepth(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
unsigned short ModeIdIndex) unsigned short ModeIdIndex)
{ {
static const unsigned short ColorDepth[6] = { 1, 2, 4, 4, 6, 8}; static const unsigned short ColorDepth[6] = { 1, 2, 4, 4, 6, 8 };
unsigned short modeflag; unsigned short modeflag;
short index; short index;
...@@ -321,7 +310,8 @@ SiS_GetColorDepth(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -321,7 +310,8 @@ SiS_GetColorDepth(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
} }
index = (modeflag & ModeTypeMask) - ModeEGA; index = (modeflag & ModeTypeMask) - ModeEGA;
if (index < 0) index = 0; if (index < 0)
index = 0;
return ColorDepth[index]; return ColorDepth[index];
} }
...@@ -368,8 +358,8 @@ SiS_SetSeqRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex) ...@@ -368,8 +358,8 @@ SiS_SetSeqRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex)
SRdata = SiS_Pr->SiS_StandTable[StandTableIndex].SR[0] | 0x20; SRdata = SiS_Pr->SiS_StandTable[StandTableIndex].SR[0] | 0x20;
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x01, SRdata); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x01, SRdata);
for(i = 2; i <= 4; i++) { for (i = 2; i <= 4; i++) {
SRdata = SiS_Pr->SiS_StandTable[StandTableIndex].SR[i-1]; SRdata = SiS_Pr->SiS_StandTable[StandTableIndex].SR[i - 1];
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, i, SRdata); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, i, SRdata);
} }
} }
...@@ -398,7 +388,7 @@ SiS_SetCRTCRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex) ...@@ -398,7 +388,7 @@ SiS_SetCRTCRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex)
SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4, 0x11, 0x7f); SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4, 0x11, 0x7f);
for(i = 0; i <= 0x18; i++) { for (i = 0; i <= 0x18; i++) {
CRTCdata = SiS_Pr->SiS_StandTable[StandTableIndex].CRTC[i]; CRTCdata = SiS_Pr->SiS_StandTable[StandTableIndex].CRTC[i];
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, i, CRTCdata); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, i, CRTCdata);
} }
...@@ -414,7 +404,7 @@ SiS_SetATTRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex) ...@@ -414,7 +404,7 @@ SiS_SetATTRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex)
unsigned char ARdata; unsigned char ARdata;
unsigned short i; unsigned short i;
for(i = 0; i <= 0x13; i++) { for (i = 0; i <= 0x13; i++) {
ARdata = SiS_Pr->SiS_StandTable[StandTableIndex].ATTR[i]; ARdata = SiS_Pr->SiS_StandTable[StandTableIndex].ATTR[i];
SiS_GetRegByte(SiS_Pr, SiS_Pr->SiS_P3da); SiS_GetRegByte(SiS_Pr, SiS_Pr->SiS_P3da);
SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3c0, i); SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3c0, i);
...@@ -439,7 +429,7 @@ SiS_SetGRCRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex) ...@@ -439,7 +429,7 @@ SiS_SetGRCRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex)
unsigned char GRdata; unsigned char GRdata;
unsigned short i; unsigned short i;
for(i = 0; i <= 0x08; i++) { for (i = 0; i <= 0x08; i++) {
GRdata = SiS_Pr->SiS_StandTable[StandTableIndex].GRC[i]; GRdata = SiS_Pr->SiS_StandTable[StandTableIndex].GRC[i];
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3ce, i, GRdata); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3ce, i, GRdata);
} }
...@@ -454,12 +444,11 @@ SiS_SetGRCRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex) ...@@ -454,12 +444,11 @@ SiS_SetGRCRegs(struct SiS_Private *SiS_Pr, unsigned short StandTableIndex)
/* CLEAR EXTENDED REGISTERS */ /* CLEAR EXTENDED REGISTERS */
/*********************************************/ /*********************************************/
static void static void SiS_ClearExt1Regs(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
SiS_ClearExt1Regs(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
{ {
int i; int i;
for(i = 0x0A; i <= 0x0E; i++) { for (i = 0x0A; i <= 0x0E; i++) {
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, i, 0x00); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, i, 0x00);
} }
...@@ -479,8 +468,9 @@ SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -479,8 +468,9 @@ SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
if (ModeNo <= 0x13) if (ModeNo <= 0x13)
return 0xFFFF; return 0xFFFF;
index = SiS_GetReg(SiS_Pr,SiS_Pr->SiS_P3d4, 0x33) & 0x0F; index = SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x33) & 0x0F;
if (index > 0) index--; if (index > 0)
index--;
rrti = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].REFindex; rrti = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].REFindex;
ModeNo = SiS_Pr->SiS_RefIndex[rrti].ModeID; ModeNo = SiS_Pr->SiS_RefIndex[rrti].ModeID;
...@@ -490,13 +480,14 @@ SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -490,13 +480,14 @@ SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
if (SiS_Pr->SiS_RefIndex[rrti + i].ModeID != ModeNo) if (SiS_Pr->SiS_RefIndex[rrti + i].ModeID != ModeNo)
break; break;
temp = SiS_Pr->SiS_RefIndex[rrti + i].Ext_InfoFlag & ModeTypeMask; temp =
SiS_Pr->SiS_RefIndex[rrti + i].Ext_InfoFlag & ModeTypeMask;
if (temp < SiS_Pr->SiS_ModeType) if (temp < SiS_Pr->SiS_ModeType)
break; break;
i++; i++;
index--; index--;
} while(index != 0xFFFF); } while (index != 0xFFFF);
i--; i--;
...@@ -507,8 +498,7 @@ SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -507,8 +498,7 @@ SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
/* SYNC */ /* SYNC */
/*********************************************/ /*********************************************/
static void static void SiS_SetCRT1Sync(struct SiS_Private *SiS_Pr, unsigned short rrti)
SiS_SetCRT1Sync(struct SiS_Private *SiS_Pr, unsigned short rrti)
{ {
unsigned short sync = SiS_Pr->SiS_RefIndex[rrti].Ext_InfoFlag >> 8; unsigned short sync = SiS_Pr->SiS_RefIndex[rrti].Ext_InfoFlag >> 8;
sync &= 0xC0; sync &= 0xC0;
...@@ -527,34 +517,35 @@ SiS_SetCRT1CRTC(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -527,34 +517,35 @@ SiS_SetCRT1CRTC(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
unsigned char index; unsigned char index;
unsigned short temp, i, j, modeflag; unsigned short temp, i, j, modeflag;
SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4,0x11,0x7f); SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4, 0x11, 0x7f);
modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag; modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
index = SiS_Pr->SiS_RefIndex[rrti].Ext_CRT1CRTC; index = SiS_Pr->SiS_RefIndex[rrti].Ext_CRT1CRTC;
for(i = 0,j = 0; i <= 7; i++, j++) { for (i = 0, j = 0; i <= 7; i++, j++) {
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j, SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j,
SiS_Pr->SiS_CRT1Table[index].CR[i]); SiS_Pr->SiS_CRT1Table[index].CR[i]);
} }
for(j = 0x10; i <= 10; i++, j++) { for (j = 0x10; i <= 10; i++, j++) {
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j, SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j,
SiS_Pr->SiS_CRT1Table[index].CR[i]); SiS_Pr->SiS_CRT1Table[index].CR[i]);
} }
for(j = 0x15; i <= 12; i++, j++) { for (j = 0x15; i <= 12; i++, j++) {
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j, SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j,
SiS_Pr->SiS_CRT1Table[index].CR[i]); SiS_Pr->SiS_CRT1Table[index].CR[i]);
} }
for(j = 0x0A; i <= 15; i++, j++) { for (j = 0x0A; i <= 15; i++, j++) {
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, j, SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, j,
SiS_Pr->SiS_CRT1Table[index].CR[i]); SiS_Pr->SiS_CRT1Table[index].CR[i]);
} }
temp = SiS_Pr->SiS_CRT1Table[index].CR[16] & 0xE0; temp = SiS_Pr->SiS_CRT1Table[index].CR[16] & 0xE0;
SiS_SetReg(SiS_Pr,SiS_Pr->SiS_P3c4, 0x0E, temp); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0E, temp);
temp = ((SiS_Pr->SiS_CRT1Table[index].CR[16]) & 0x01) << 5; temp = ((SiS_Pr->SiS_CRT1Table[index].CR[16]) & 0x01) << 5;
if (modeflag & DoubleScanMode) temp |= 0x80; if (modeflag & DoubleScanMode)
temp |= 0x80;
SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3d4, 0x09, 0x5F, temp); SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3d4, 0x09, 0x5F, temp);
if (SiS_Pr->SiS_ModeType > ModeVGA) if (SiS_Pr->SiS_ModeType > ModeVGA)
...@@ -580,11 +571,13 @@ SiS_SetCRT1Offset(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -580,11 +571,13 @@ SiS_SetCRT1Offset(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x13, (du & 0xFF)); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x13, (du & 0xFF));
if (infoflag & InterlaceMode) du >>= 1; if (infoflag & InterlaceMode)
du >>= 1;
du <<= 5; du <<= 5;
temp = (du >> 8) & 0xff; temp = (du >> 8) & 0xff;
if (du & 0xff) temp++; if (du & 0xff)
temp++;
temp++; temp++;
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x10, temp); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x10, temp);
} }
...@@ -601,11 +594,11 @@ SiS_SetCRT1VCLK(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -601,11 +594,11 @@ SiS_SetCRT1VCLK(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
unsigned short clka = SiS_Pr->SiS_VCLKData[index].SR2B; unsigned short clka = SiS_Pr->SiS_VCLKData[index].SR2B;
unsigned short clkb = SiS_Pr->SiS_VCLKData[index].SR2C; unsigned short clkb = SiS_Pr->SiS_VCLKData[index].SR2C;
SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3c4,0x31,0xCF); SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3c4, 0x31, 0xCF);
SiS_SetReg(SiS_Pr,SiS_Pr->SiS_P3c4,0x2B,clka); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x2B, clka);
SiS_SetReg(SiS_Pr,SiS_Pr->SiS_P3c4,0x2C,clkb); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x2C, clkb);
SiS_SetReg(SiS_Pr,SiS_Pr->SiS_P3c4,0x2D,0x01); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x2D, 0x01);
} }
/*********************************************/ /*********************************************/
...@@ -648,7 +641,8 @@ SiS_SetVCLKState(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -648,7 +641,8 @@ SiS_SetVCLKState(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
VCLK = SiS_Pr->SiS_VCLKData[index].CLOCK; VCLK = SiS_Pr->SiS_VCLKData[index].CLOCK;
} }
if (VCLK >= 166) data |= 0x0c; if (VCLK >= 166)
data |= 0x0c;
SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3c4, 0x32, 0xf3, data); SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3c4, 0x32, 0xf3, data);
if (VCLK >= 166) if (VCLK >= 166)
...@@ -688,17 +682,22 @@ SiS_SetCRT1ModeRegs(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -688,17 +682,22 @@ SiS_SetCRT1ModeRegs(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
data |= 0x02; data |= 0x02;
data |= ((SiS_Pr->SiS_ModeType - ModeVGA) << 2); data |= ((SiS_Pr->SiS_ModeType - ModeVGA) << 2);
} }
if (infoflag & InterlaceMode) data |= 0x20; if (infoflag & InterlaceMode)
data |= 0x20;
} }
SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3c4, 0x06, 0xC0, data); SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3c4, 0x06, 0xC0, data);
data = 0; data = 0;
if (infoflag & InterlaceMode) { if (infoflag & InterlaceMode) {
/* data = (Hsync / 8) - ((Htotal / 8) / 2) + 3 */ /* data = (Hsync / 8) - ((Htotal / 8) / 2) + 3 */
unsigned short hrs = (SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x04) | unsigned short hrs =
((SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0b) & 0xc0) << 2)) - 3; (SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x04) |
unsigned short hto = (SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x00) | ((SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0b) & 0xc0) << 2))
((SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0b) & 0x03) << 8)) + 5; - 3;
unsigned short hto =
(SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x00) |
((SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0b) & 0x03) << 8))
+ 5;
data = hrs - (hto >> 1) + 3; data = hrs - (hto >> 1) + 3;
} }
SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x19, (data & 0xFF)); SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x19, (data & 0xFF));
...@@ -746,13 +745,19 @@ SiS_WriteDAC(struct SiS_Private *SiS_Pr, unsigned long DACData, ...@@ -746,13 +745,19 @@ SiS_WriteDAC(struct SiS_Private *SiS_Pr, unsigned long DACData,
switch (dl) { switch (dl) {
case 0: case 0:
d1 = dh; d2 = ah; d3 = al; d1 = dh;
d2 = ah;
d3 = al;
break; break;
case 1: case 1:
d1 = ah; d2 = al; d3 = dh; d1 = ah;
d2 = al;
d3 = dh;
break; break;
default: default:
d1 = al; d2 = dh; d3 = ah; d1 = al;
d2 = dh;
d3 = ah;
} }
SiS_SetRegByte(SiS_Pr, DACData, (d1 << shiftflag)); SiS_SetRegByte(SiS_Pr, DACData, (d1 << shiftflag));
SiS_SetRegByte(SiS_Pr, DACData, (d2 << shiftflag)); SiS_SetRegByte(SiS_Pr, DACData, (d2 << shiftflag));
...@@ -760,7 +765,8 @@ SiS_WriteDAC(struct SiS_Private *SiS_Pr, unsigned long DACData, ...@@ -760,7 +765,8 @@ SiS_WriteDAC(struct SiS_Private *SiS_Pr, unsigned long DACData,
} }
static void static void
SiS_LoadDAC(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short mi) SiS_LoadDAC(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
unsigned short mi)
{ {
unsigned short data, data2, time, i, j, k, m, n, o; unsigned short data, data2, time, i, j, k, m, n, o;
unsigned short si, di, bx, sf; unsigned short si, di, bx, sf;
...@@ -794,37 +800,41 @@ SiS_LoadDAC(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short mi ...@@ -794,37 +800,41 @@ SiS_LoadDAC(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short mi
SiS_SetRegByte(SiS_Pr, DACAddr, 0x00); SiS_SetRegByte(SiS_Pr, DACAddr, 0x00);
for(i = 0; i < j; i++) { for (i = 0; i < j; i++) {
data = table[i]; data = table[i];
for(k = 0; k < 3; k++) { for (k = 0; k < 3; k++) {
data2 = 0; data2 = 0;
if (data & 0x01) data2 += 0x2A; if (data & 0x01)
if (data & 0x02) data2 += 0x15; data2 += 0x2A;
if (data & 0x02)
data2 += 0x15;
SiS_SetRegByte(SiS_Pr, DACData, (data2 << sf)); SiS_SetRegByte(SiS_Pr, DACData, (data2 << sf));
data >>= 2; data >>= 2;
} }
} }
if (time == 256) { if (time == 256) {
for(i = 16; i < 32; i++) { for (i = 16; i < 32; i++) {
data = table[i] << sf; data = table[i] << sf;
for(k = 0; k < 3; k++) for (k = 0; k < 3; k++)
SiS_SetRegByte(SiS_Pr, DACData, data); SiS_SetRegByte(SiS_Pr, DACData, data);
} }
si = 32; si = 32;
for(m = 0; m < 9; m++) { for (m = 0; m < 9; m++) {
di = si; di = si;
bx = si + 4; bx = si + 4;
for(n = 0; n < 3; n++) { for (n = 0; n < 3; n++) {
for(o = 0; o < 5; o++) { for (o = 0; o < 5; o++) {
SiS_WriteDAC(SiS_Pr, DACData, sf, n, SiS_WriteDAC(SiS_Pr, DACData, sf, n,
table[di], table[bx], table[si]); table[di], table[bx],
table[si]);
si++; si++;
} }
si -= 2; si -= 2;
for(o = 0; o < 3; o++) { for (o = 0; o < 3; o++) {
SiS_WriteDAC(SiS_Pr, DACData, sf, n, SiS_WriteDAC(SiS_Pr, DACData, sf, n,
table[di], table[si], table[bx]); table[di], table[si],
table[bx]);
si--; si--;
} }
} }
...@@ -880,8 +890,7 @@ SiS_SetCRT1Group(struct SiS_Private *SiS_Pr, unsigned short ModeNo, ...@@ -880,8 +890,7 @@ SiS_SetCRT1Group(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
/* SiSSetMode() */ /* SiSSetMode() */
/*********************************************/ /*********************************************/
int int SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
{ {
unsigned short ModeIdIndex; unsigned short ModeIdIndex;
unsigned long BaseAddr = SiS_Pr->IOAddress; unsigned long BaseAddr = SiS_Pr->IOAddress;
...@@ -918,8 +927,7 @@ SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo) ...@@ -918,8 +927,7 @@ SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
return 1; return 1;
} }
int int SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo)
SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo)
{ {
unsigned short ModeNo = 0; unsigned short ModeNo = 0;
int i; int i;
...@@ -951,7 +959,3 @@ SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo) ...@@ -951,7 +959,3 @@ SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo)
} }
#endif /* INCL_SISUSB_CON */ #endif /* INCL_SISUSB_CON */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7