diff for duplicates of <1290203931-25188-4-git-send-email-aaro.koskinen@iki.fi>
diff --git a/a/1.txt b/N1/1.txt
index ca110c0..de80b22 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -64,7 +64,7 @@ index c311ad3..53e30ea 100644
- unsigned short HDisplay = pSiS->scrnPitch2 >> 3;
-
- /* Unlock CRT2 */
-- if(pSiS->VGAEngine == SIS_315_VGA)
+- if(pSiS->VGAEngine = SIS_315_VGA)
- SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2F, 0x01);
- else
- SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x24, 0x01);
@@ -80,10 +80,10 @@ index c311ad3..53e30ea 100644
- bool isslavemode = false;
-
- if( (pSiS->VBFlags2 & VB2_VIDEOBRIDGE) &&
-- ( ((pSiS->VGAEngine == SIS_300_VGA) &&
-- (SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0xa0) == 0x20) ||
-- ((pSiS->VGAEngine == SIS_315_VGA) &&
-- (SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0x50) == 0x10) ) ) {
+- ( ((pSiS->VGAEngine = SIS_300_VGA) &&
+- (SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0xa0) = 0x20) ||
+- ((pSiS->VGAEngine = SIS_315_VGA) &&
+- (SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0x50) = 0x10) ) ) {
- isslavemode = true;
- }
-
@@ -245,7 +245,7 @@ index c311ad3..53e30ea 100644
- pSiSEnt->CRT2CR38 = SiS_GetReg(SiS_Pr->SiS_P3d4,0x38);
-#if 0
- /* We can't set CRT2 mode before CRT1 mode is set - says who...? */
-- if(pSiSEnt->CRT1ModeNo == -1) {
+- if(pSiSEnt->CRT1ModeNo = -1) {
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "Setting CRT2 mode delayed until after setting CRT1 mode\n");
- return true;
@@ -311,7 +311,7 @@ index c311ad3..53e30ea 100644
-
- /* Set mode on CRT2 */
- if( (SiS_Pr->SiS_VBType & VB_SISVB) ||
-- (SiS_Pr->SiS_IF_DEF_LVDS == 1) ||
+- (SiS_Pr->SiS_IF_DEF_LVDS = 1) ||
- (SiS_Pr->SiS_IF_DEF_CH70xx != 0) ||
- (SiS_Pr->SiS_IF_DEF_TRUMPION != 0) ) {
- SiS_SetCRT2Group(SiS_Pr, ModeNo);
@@ -323,7 +323,7 @@ index c311ad3..53e30ea 100644
- SiS_SetRegByte(SiS_Pr->SiS_P3c6,0xFF);
-
- if(SiS_Pr->ChipType >= SIS_315H) {
-- if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+- if(SiS_Pr->SiS_IF_DEF_LVDS = 1) {
- if(!(SiS_IsDualEdge(SiS_Pr))) {
- SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x13,0xfb);
- }
@@ -345,8 +345,8 @@ index c311ad3..53e30ea 100644
- if(SiS_GetReg(SiS_Pr->SiS_P3d4,0x30) & SetCRT2ToLCD) {
- SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x38,0xfc);
- }
-- } else if((SiS_Pr->ChipType == SIS_630) ||
-- (SiS_Pr->ChipType == SIS_730)) {
+- } else if((SiS_Pr->ChipType = SIS_630) ||
+- (SiS_Pr->ChipType = SIS_730)) {
- SiS_SetReg(SiS_Pr->SiS_P3d4,0x35,backupreg);
- }
- }
@@ -525,8 +525,8 @@ index c311ad3..53e30ea 100644
- if(SiS_Pr->SiS_VBType & VB_SIS30xBLV) {
- if(SiS_Pr->ChipType >= SIS_315H) {
- SiS_SetReg(SiS_Pr->SiS_P3d4,0x38,backupreg);
-- } else if((SiS_Pr->ChipType == SIS_630) ||
-- (SiS_Pr->ChipType == SIS_730)) {
+- } else if((SiS_Pr->ChipType = SIS_630) ||
+- (SiS_Pr->ChipType = SIS_730)) {
- SiS_SetReg(SiS_Pr->SiS_P3d4,0x35,backupreg);
- }
- }
@@ -657,8 +657,7 @@ index b96005c..4a75c73 100644
#ifdef SIS_LINUX_KERNEL
#include "vgatypes.h"
#include "vstruct.h"
-@@ -1521,10 +1510,6 @@ static const struct SiS_LVDSCRT1Data SiS_LVDSCRT1640x480_1_H[] =
- };
+@@ -1521,10 +1510,6 @@ static const struct SiS_LVDSCRT1Data SiS_LVDSCRT1640x480_1_H[] };
bool SiSInitPtr(struct SiS_Private *SiS_Pr);
-#ifdef SIS_XORG_XF86
@@ -763,8 +762,7 @@ index da33d80..a4b344e 100644
if((temp = SISGETROMW(6)) != SiS_Pr->PanelHT) {
SiS_Pr->SiS_NeedRomModeData = true;
@@ -1480,18 +1456,6 @@ SiS_GetLCDInfoBIOS(struct SiS_Private *SiS_Pr)
- SiS_Pr->SiS_VCLKData[VCLK_CUSTOM_315].SR2C =
- SiS_Pr->SiS_VBVCLKData[VCLK_CUSTOM_315].Part4_B = ROMAddr[20];
+ SiS_Pr->SiS_VCLKData[VCLK_CUSTOM_315].SR2C SiS_Pr->SiS_VBVCLKData[VCLK_CUSTOM_315].Part4_B = ROMAddr[20];
-#ifdef SIS_XORG_XF86
-#ifdef TWDEBUG
@@ -1014,7 +1012,7 @@ index da33d80..a4b344e 100644
}
if(!failed) {
@@ -9324,11 +9176,6 @@ SiS_DoProbeDDC(struct SiS_Private *SiS_Pr)
- if(temp == value) ret = 0;
+ if(temp = value) ret = 0;
else {
ret = 0xFFFF;
-#ifdef SIS_XORG_XF86
@@ -1022,8 +1020,8 @@ index da33d80..a4b344e 100644
- xf86DrvMsg(0, X_INFO, "Probe: Read 2 failed\n");
-#endif
-#endif
- if(SiS_Pr->SiS_DDC_DeviceAddr == 0xa0) {
- if(temp == 0x30) ret = 0;
+ if(SiS_Pr->SiS_DDC_DeviceAddr = 0xa0) {
+ if(temp = 0x30) ret = 0;
}
@@ -9338,9 +9185,7 @@ SiS_DoProbeDDC(struct SiS_Private *SiS_Pr)
return ret;
diff --git a/a/content_digest b/N1/content_digest
index 8526a86..c233212 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 3/9] sisfb: delete dead SIS_XORG_XF86 code\0"
]
[
- "Date\0Fri, 19 Nov 2010 23:58:45 +0200\0"
+ "Date\0Fri, 19 Nov 2010 21:58:45 +0000\0"
]
[
"To\0linux-fbdev\@vger.kernel.org",
@@ -91,7 +91,7 @@
"- unsigned short HDisplay = pSiS->scrnPitch2 >> 3;\n",
"-\n",
"- /* Unlock CRT2 */\n",
- "- if(pSiS->VGAEngine == SIS_315_VGA)\n",
+ "- if(pSiS->VGAEngine = SIS_315_VGA)\n",
"- SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2F, 0x01);\n",
"- else\n",
"- SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x24, 0x01);\n",
@@ -107,10 +107,10 @@
"- bool isslavemode = false;\n",
"-\n",
"- if( (pSiS->VBFlags2 & VB2_VIDEOBRIDGE) &&\n",
- "- ( ((pSiS->VGAEngine == SIS_300_VGA) &&\n",
- "-\t (SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0xa0) == 0x20) ||\n",
- "-\t ((pSiS->VGAEngine == SIS_315_VGA) &&\n",
- "-\t (SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0x50) == 0x10) ) ) {\n",
+ "- ( ((pSiS->VGAEngine = SIS_300_VGA) &&\n",
+ "-\t (SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0xa0) = 0x20) ||\n",
+ "-\t ((pSiS->VGAEngine = SIS_315_VGA) &&\n",
+ "-\t (SiS_GetReg(SiS_Pr->SiS_Part1Port,0x00) & 0x50) = 0x10) ) ) {\n",
"- isslavemode = true;\n",
"- }\n",
"-\n",
@@ -272,7 +272,7 @@
"- pSiSEnt->CRT2CR38 = SiS_GetReg(SiS_Pr->SiS_P3d4,0x38);\n",
"-#if 0\n",
"- /* We can't set CRT2 mode before CRT1 mode is set - says who...? */\n",
- "- if(pSiSEnt->CRT1ModeNo == -1) {\n",
+ "- if(pSiSEnt->CRT1ModeNo = -1) {\n",
"-\t xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,\n",
"-\t\t\"Setting CRT2 mode delayed until after setting CRT1 mode\\n\");\n",
"-\t return true;\n",
@@ -338,7 +338,7 @@
"-\n",
"- /* Set mode on CRT2 */\n",
"- if( (SiS_Pr->SiS_VBType & VB_SISVB) ||\n",
- "- (SiS_Pr->SiS_IF_DEF_LVDS == 1) ||\n",
+ "- (SiS_Pr->SiS_IF_DEF_LVDS = 1) ||\n",
"- (SiS_Pr->SiS_IF_DEF_CH70xx != 0) ||\n",
"- (SiS_Pr->SiS_IF_DEF_TRUMPION != 0) ) {\n",
"- SiS_SetCRT2Group(SiS_Pr, ModeNo);\n",
@@ -350,7 +350,7 @@
"- SiS_SetRegByte(SiS_Pr->SiS_P3c6,0xFF);\n",
"-\n",
"- if(SiS_Pr->ChipType >= SIS_315H) {\n",
- "- if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {\n",
+ "- if(SiS_Pr->SiS_IF_DEF_LVDS = 1) {\n",
"-\t if(!(SiS_IsDualEdge(SiS_Pr))) {\n",
"-\t SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x13,0xfb);\n",
"-\t }\n",
@@ -372,8 +372,8 @@
"-\t if(SiS_GetReg(SiS_Pr->SiS_P3d4,0x30) & SetCRT2ToLCD) {\n",
"-\t SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x38,0xfc);\n",
"-\t }\n",
- "- } else if((SiS_Pr->ChipType == SIS_630) ||\n",
- "-\t (SiS_Pr->ChipType == SIS_730)) {\n",
+ "- } else if((SiS_Pr->ChipType = SIS_630) ||\n",
+ "-\t (SiS_Pr->ChipType = SIS_730)) {\n",
"- SiS_SetReg(SiS_Pr->SiS_P3d4,0x35,backupreg);\n",
"- }\n",
"- }\n",
@@ -552,8 +552,8 @@
"- if(SiS_Pr->SiS_VBType & VB_SIS30xBLV) {\n",
"- if(SiS_Pr->ChipType >= SIS_315H) {\n",
"-\t SiS_SetReg(SiS_Pr->SiS_P3d4,0x38,backupreg);\n",
- "- } else if((SiS_Pr->ChipType == SIS_630) ||\n",
- "- (SiS_Pr->ChipType == SIS_730)) {\n",
+ "- } else if((SiS_Pr->ChipType = SIS_630) ||\n",
+ "- (SiS_Pr->ChipType = SIS_730)) {\n",
"- SiS_SetReg(SiS_Pr->SiS_P3d4,0x35,backupreg);\n",
"- }\n",
"- }\n",
@@ -684,8 +684,7 @@
" #ifdef SIS_LINUX_KERNEL\n",
" #include \"vgatypes.h\"\n",
" #include \"vstruct.h\"\n",
- "\@\@ -1521,10 +1510,6 \@\@ static const struct SiS_LVDSCRT1Data SiS_LVDSCRT1640x480_1_H[] =\n",
- " };\n",
+ "\@\@ -1521,10 +1510,6 \@\@ static const struct SiS_LVDSCRT1Data SiS_LVDSCRT1640x480_1_H[] };\n",
" \n",
" bool\t\tSiSInitPtr(struct SiS_Private *SiS_Pr);\n",
"-#ifdef SIS_XORG_XF86\n",
@@ -790,8 +789,7 @@
" if((temp = SISGETROMW(6)) != SiS_Pr->PanelHT) {\n",
" \t SiS_Pr->SiS_NeedRomModeData = true;\n",
"\@\@ -1480,18 +1456,6 \@\@ SiS_GetLCDInfoBIOS(struct SiS_Private *SiS_Pr)\n",
- " SiS_Pr->SiS_VCLKData[VCLK_CUSTOM_315].SR2C =\n",
- " \t SiS_Pr->SiS_VBVCLKData[VCLK_CUSTOM_315].Part4_B = ROMAddr[20];\n",
+ " SiS_Pr->SiS_VCLKData[VCLK_CUSTOM_315].SR2C \t SiS_Pr->SiS_VBVCLKData[VCLK_CUSTOM_315].Part4_B = ROMAddr[20];\n",
" \n",
"-#ifdef SIS_XORG_XF86\n",
"-#ifdef TWDEBUG\n",
@@ -1041,7 +1039,7 @@
" }\n",
" if(!failed) {\n",
"\@\@ -9324,11 +9176,6 \@\@ SiS_DoProbeDDC(struct SiS_Private *SiS_Pr)\n",
- " if(temp == value) ret = 0;\n",
+ " if(temp = value) ret = 0;\n",
" else {\n",
" ret = 0xFFFF;\n",
"-#ifdef SIS_XORG_XF86\n",
@@ -1049,8 +1047,8 @@
"- xf86DrvMsg(0, X_INFO, \"Probe: Read 2 failed\\n\");\n",
"-#endif\n",
"-#endif\n",
- " if(SiS_Pr->SiS_DDC_DeviceAddr == 0xa0) {\n",
- " if(temp == 0x30) ret = 0;\n",
+ " if(SiS_Pr->SiS_DDC_DeviceAddr = 0xa0) {\n",
+ " if(temp = 0x30) ret = 0;\n",
" }\n",
"\@\@ -9338,9 +9185,7 \@\@ SiS_DoProbeDDC(struct SiS_Private *SiS_Pr)\n",
" return ret;\n",
@@ -1206,4 +1204,4 @@
"1.5.6.5"
]
-7106e632288e19a06c9d77126e8e0b3366de50cf854fb9390e30829de5079ee0
+2c6aaf15fff00ca9e8da062d0161b4af8a7967b63770fc4703e045b6636f1f99
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.