diff for duplicates of <1292881822-32630-9-git-send-email-aaro.koskinen@iki.fi>
diff --git a/a/1.txt b/N1/1.txt
index 707aeeb..8a99d3f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -58,7 +58,7 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISCR, 0x0D, base & 0xFF);
+ SiS_SetReg(SISCR, 0x0C, (base >> 8) & 0xFF);
+ SiS_SetReg(SISSR, 0x0D, (base >> 16) & 0xFF);
- if(ivideo->sisvga_engine == SIS_315_VGA) {
+ if(ivideo->sisvga_engine = SIS_315_VGA) {
setSISIDXREG(SISSR, 0x37, 0xFE, (base >> 24) & 0x01);
}
@@ -1323,9 +1323,9 @@ sisfb_set_base_CRT2(struct sis_video_info *ivideo, unsigned int base)
@@ -71,7 +71,7 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISPART1, 0x06, (base & 0xFF));
+ SiS_SetReg(SISPART1, 0x05, ((base >> 8) & 0xFF));
+ SiS_SetReg(SISPART1, 0x04, ((base >> 16) & 0xFF));
- if(ivideo->sisvga_engine == SIS_315_VGA) {
+ if(ivideo->sisvga_engine = SIS_315_VGA) {
setSISIDXREG(SISPART1, 0x02, 0x7F, ((base >> 24) & 0x01) << 7);
}
@@ -2216,8 +2216,8 @@ sisfb_sense_crt1(struct sis_video_info *ivideo)
@@ -126,7 +126,7 @@ index 6ea71b8..59a567c 100644
SiS_DDC2Delay(&ivideo->SiS_Pr, 0x1500);
@@ -2377,7 +2377,7 @@ SISDoSense(struct sis_video_info *ivideo, u16 type, u16 test)
temp &= mytest;
- if(temp == mytest) result++;
+ if(temp = mytest) result++;
#if 1
- outSISIDXREG(SISPART4,0x11,0x00);
+ SiS_SetReg(SISPART4, 0x11, 0x00);
@@ -150,7 +150,7 @@ index 6ea71b8..59a567c 100644
@@ -2482,7 +2482,7 @@ SiS_Sense30x(struct sis_video_info *ivideo)
}
- if((ivideo->sisvga_engine == SIS_315_VGA) && (ivideo->vbflags2 & VB2_SISYPBPRBRIDGE)) {
+ if((ivideo->sisvga_engine = SIS_315_VGA) && (ivideo->vbflags2 & VB2_SISYPBPRBRIDGE)) {
- outSISIDXREG(SISPART2,0x4d,(backupP2_4d | 0x10));
+ SiS_SetReg(SISPART2, 0x4d, (backupP2_4d | 0x10));
SiS_DDC2Delay(&ivideo->SiS_Pr, 0x2000);
@@ -348,8 +348,8 @@ index 6ea71b8..59a567c 100644
temp = 0x1234;
@@ -4288,8 +4288,8 @@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth
sr14 = (SiS_DRAMType[k][3] * buswidth) - 1;
- if(buswidth == 4) sr14 |= 0x80;
- else if(buswidth == 2) sr14 |= 0x40;
+ if(buswidth = 4) sr14 |= 0x80;
+ else if(buswidth = 2) sr14 |= 0x40;
- outSISIDXREG(SISSR, 0x13, SiS_DRAMType[k][4]);
- outSISIDXREG(SISSR, 0x14, sr14);
+ SiS_SetReg(SISSR, 0x13, SiS_DRAMType[k][4]);
@@ -458,7 +458,7 @@ index 6ea71b8..59a567c 100644
v2 &= ~0x01;
reg = SiS_GetReg(SISPART4, 0x00);
- if((reg == 1) || (reg == 2)) {
+ if((reg = 1) || (reg = 2)) {
- outSISIDXREG(SISCR, 0x37, 0x02);
- outSISIDXREG(SISPART2, 0x00, 0x1c);
+ SiS_SetReg(SISCR, 0x37, 0x02);
@@ -566,7 +566,7 @@ index 6ea71b8..59a567c 100644
- outSISIDXREG(SISSR, 0x1c, 0x00);
+ SiS_SetReg(SISSR, 0x1c, 0x00);
- if(ivideo->chip == XGI_20) {
+ if(ivideo->chip = XGI_20) {
@@ -4687,52 +4687,52 @@ sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)
reg = SiS_GetReg(SISCR, 0x97);
@@ -637,7 +637,7 @@ index 6ea71b8..59a567c 100644
} else { /* XGI_40 */
@@ -4747,52 +4747,52 @@ sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)
buswidth = 32;
- if(ivideo->revision_id == 2) {
+ if(ivideo->revision_id = 2) {
channelab = 2;
- outSISIDXREG(SISSR, 0x13, 0xa1);
- outSISIDXREG(SISSR, 0x14, 0x44);
@@ -704,7 +704,7 @@ index 6ea71b8..59a567c 100644
}
@@ -4803,26 +4803,26 @@ sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)
buswidth = 64;
- if(ivideo->revision_id == 2) {
+ if(ivideo->revision_id = 2) {
channelab = 1;
- outSISIDXREG(SISSR, 0x13, 0xa1);
- outSISIDXREG(SISSR, 0x14, 0x52);
@@ -775,7 +775,7 @@ index 6ea71b8..59a567c 100644
@@ -5014,13 +5014,13 @@ sisfb_post_xgi(struct pci_dev *pdev)
/* Clear some regs */
for(i = 0; i < 0x22; i++) {
- if(0x06 + i == 0x20) continue;
+ if(0x06 + i = 0x20) continue;
- outSISIDXREG(SISSR, 0x06 + i, 0x00);
+ SiS_SetReg(SISSR, 0x06 + i, 0x00);
}
@@ -832,8 +832,8 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISSR, 0x31 + i, ptr[i]);
}
- if(ivideo->chip == XGI_40) {
- if(ivideo->revision_id == 2) {
+ if(ivideo->chip = XGI_40) {
+ if(ivideo->revision_id = 2) {
setSISIDXREG(SISSR, 0x3b, 0x3f, 0xc0);
}
- outSISIDXREG(SISCR, 0x7d, 0xfe);
@@ -841,12 +841,12 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISCR, 0x7d, 0xfe);
+ SiS_SetReg(SISCR, 0x7e, 0x0f);
}
- if(ivideo->revision_id == 0) { /* 40 *and* 20? */
+ if(ivideo->revision_id = 0) { /* 40 *and* 20? */
andSISIDXREG(SISCR, 0x58, 0xd7);
@@ -5078,36 +5078,36 @@ sisfb_post_xgi(struct pci_dev *pdev)
setSISIDXREG(SISCR, 0x38, 0x1f, reg);
- if(ivideo->chip == XGI_20) {
+ if(ivideo->chip = XGI_20) {
- outSISIDXREG(SISSR, 0x36, 0x70);
+ SiS_SetReg(SISSR, 0x36, 0x70);
} else {
@@ -875,7 +875,7 @@ index 6ea71b8..59a567c 100644
andSISIDXREG(SISPART1, 0x50, 0xfe);
reg = SiS_GetReg(SISPART4, 0x00);
- if(reg == 1 || reg == 2) {
+ if(reg = 1 || reg = 2) {
- outSISIDXREG(SISPART2, 0x00, 0x1c);
- outSISIDXREG(SISPART4, 0x0d, bios[0x7f]);
- outSISIDXREG(SISPART4, 0x0e, bios[0x80]);
@@ -902,7 +902,7 @@ index 6ea71b8..59a567c 100644
- outSISIDXREG(SISSR, 0x22, v1);
+ SiS_SetReg(SISSR, 0x22, v1);
- if(ivideo->revision_id == 2) {
+ if(ivideo->revision_id = 2) {
v1 = SiS_GetReg(SISSR, 0x3b);
@@ -5179,7 +5179,7 @@ sisfb_post_xgi(struct pci_dev *pdev)
v2 = SiS_GetReg(SISCR, 0x5f);
@@ -1045,9 +1045,9 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISCR, 0x83, 0x09);
+ SiS_SetReg(SISCR, 0x87, 0x00);
- if(ivideo->chip == XGI_40) {
- if( (ivideo->revision_id == 1) ||
- (ivideo->revision_id == 2) ) {
+ if(ivideo->chip = XGI_40) {
+ if( (ivideo->revision_id = 1) ||
+ (ivideo->revision_id = 2) ) {
- outSISIDXREG(SISCR, 0x8c, 0x87);
+ SiS_SetReg(SISCR, 0x8c, 0x87);
}
@@ -1058,7 +1058,7 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISSR, 0x17, 0x00);
+ SiS_SetReg(SISSR, 0x1a, 0x87);
- if(ivideo->chip == XGI_20) {
+ if(ivideo->chip = XGI_20) {
- outSISIDXREG(SISSR, 0x15, 0x00);
- outSISIDXREG(SISSR, 0x1c, 0x00);
+ SiS_SetReg(SISSR, 0x15, 0x00);
@@ -1069,7 +1069,7 @@ index 6ea71b8..59a567c 100644
@@ -5382,7 +5382,7 @@ sisfb_post_xgi(struct pci_dev *pdev)
}
if(!(ramtype & 0x80)) {
- if(ivideo->chip == XGI_20) {
+ if(ivideo->chip = XGI_20) {
- outSISIDXREG(SISCR, 0x97, v1);
+ SiS_SetReg(SISCR, 0x97, v1);
reg = SiS_GetReg(SISCR, 0x97);
@@ -1109,7 +1109,7 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISCR, 0x85, bios[regb + 0x160]);
+ SiS_SetReg(SISCR, 0x82, bios[regb + 0x158]);
}
- if(ivideo->chip == XGI_40) {
+ if(ivideo->chip = XGI_40) {
- outSISIDXREG(SISCR, 0x97, 0x00);
+ SiS_SetReg(SISCR, 0x97, 0x00);
}
@@ -1120,8 +1120,8 @@ index 6ea71b8..59a567c 100644
- outSISIDXREG(SISSR, 0x18, 0x01);
+ SiS_SetReg(SISSR, 0x18, 0x01);
- if((ivideo->chip == XGI_20) ||
- (ivideo->revision_id == 2)) {
+ if((ivideo->chip = XGI_20) ||
+ (ivideo->revision_id = 2)) {
- outSISIDXREG(SISSR, 0x19, 0x40);
+ SiS_SetReg(SISSR, 0x19, 0x40);
} else {
@@ -1132,21 +1132,21 @@ index 6ea71b8..59a567c 100644
- outSISIDXREG(SISSR, 0x16, 0x80);
+ SiS_SetReg(SISSR, 0x16, 0x00);
+ SiS_SetReg(SISSR, 0x16, 0x80);
- if((ivideo->chip == XGI_20) || (bios[0x1cb] != 0x0c)) {
+ if((ivideo->chip = XGI_20) || (bios[0x1cb] != 0x0c)) {
sisfb_post_xgi_delay(ivideo, 0x43);
sisfb_post_xgi_delay(ivideo, 0x43);
sisfb_post_xgi_delay(ivideo, 0x43);
- outSISIDXREG(SISSR, 0x18, 0x00);
+ SiS_SetReg(SISSR, 0x18, 0x00);
- if((ivideo->chip == XGI_20) ||
- (ivideo->revision_id == 2)) {
+ if((ivideo->chip = XGI_20) ||
+ (ivideo->revision_id = 2)) {
- outSISIDXREG(SISSR, 0x19, 0x40);
+ SiS_SetReg(SISSR, 0x19, 0x40);
} else {
- outSISIDXREG(SISSR, 0x19, 0x20);
+ SiS_SetReg(SISSR, 0x19, 0x20);
}
- } else if((ivideo->chip == XGI_40) && (bios[0x1cb] == 0x0c)) {
+ } else if((ivideo->chip = XGI_40) && (bios[0x1cb] = 0x0c)) {
- /* outSISIDXREG(SISSR, 0x16, 0x0c); */ /* ? */
+ /* SiS_SetReg(SISSR, 0x16, 0x0c); */ /* ? */
}
@@ -1162,11 +1162,11 @@ index 6ea71b8..59a567c 100644
v5 = bios[index + 3];
}
- outSISIDXREG(SISSR, 0x18, v1);
-- outSISIDXREG(SISSR, 0x19, ((ivideo->chip == XGI_20) ? 0x02 : 0x01));
+- outSISIDXREG(SISSR, 0x19, ((ivideo->chip = XGI_20) ? 0x02 : 0x01));
- outSISIDXREG(SISSR, 0x16, v2);
- outSISIDXREG(SISSR, 0x16, v3);
+ SiS_SetReg(SISSR, 0x18, v1);
-+ SiS_SetReg(SISSR, 0x19, ((ivideo->chip == XGI_20) ? 0x02 : 0x01));
++ SiS_SetReg(SISSR, 0x19, ((ivideo->chip = XGI_20) ? 0x02 : 0x01));
+ SiS_SetReg(SISSR, 0x16, v2);
+ SiS_SetReg(SISSR, 0x16, v3);
sisfb_post_xgi_delay(ivideo, 0x43);
@@ -1275,9 +1275,9 @@ index 6ea71b8..59a567c 100644
break;
default:
@@ -5546,85 +5546,85 @@ sisfb_post_xgi(struct pci_dev *pdev)
- if((ivideo->chip == XGI_40) &&
- ((ivideo->revision_id == 1) ||
- (ivideo->revision_id == 2))) {
+ if((ivideo->chip = XGI_40) &&
+ ((ivideo->revision_id = 1) ||
+ (ivideo->revision_id = 2))) {
- outSISIDXREG(SISCR, 0x82, bios[regb + 0x158]);
- outSISIDXREG(SISCR, 0x85, bios[regb + 0x160]);
- outSISIDXREG(SISCR, 0x86, bios[regb + 0x168]);
@@ -1310,11 +1310,11 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISCR, 0x85, v1);
+ SiS_SetReg(SISCR, 0x82, v2);
}
- if(ivideo->chip == XGI_40) {
+ if(ivideo->chip = XGI_40) {
- outSISIDXREG(SISCR, 0x97, 0x11);
+ SiS_SetReg(SISCR, 0x97, 0x11);
}
- if((ivideo->chip == XGI_40) && (ivideo->revision_id == 2)) {
+ if((ivideo->chip = XGI_40) && (ivideo->revision_id = 2)) {
- outSISIDXREG(SISCR, 0x98, 0x01);
+ SiS_SetReg(SISCR, 0x98, 0x01);
} else {
@@ -1324,7 +1324,7 @@ index 6ea71b8..59a567c 100644
- outSISIDXREG(SISCR, 0x9a, 0x02);
+ SiS_SetReg(SISCR, 0x9a, 0x02);
- if(ivideo->chip == XGI_40) {
+ if(ivideo->chip = XGI_40) {
- outSISIDXREG(SISSR, 0x18, 0x01);
+ SiS_SetReg(SISSR, 0x18, 0x01);
} else {
@@ -1337,7 +1337,7 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISSR, 0x19, 0x40);
+ SiS_SetReg(SISSR, 0x16, 0x00);
+ SiS_SetReg(SISSR, 0x16, 0x80);
- if((ivideo->chip == XGI_40) && (bios[0x1cb] != 0x0c)) {
+ if((ivideo->chip = XGI_40) && (bios[0x1cb] != 0x0c)) {
sisfb_post_xgi_delay(ivideo, 0x43);
sisfb_post_xgi_delay(ivideo, 0x43);
sisfb_post_xgi_delay(ivideo, 0x43);
@@ -1359,7 +1359,7 @@ index 6ea71b8..59a567c 100644
- outSISIDXREG(SISSR, 0x19, 0x01);
+ SiS_SetReg(SISSR, 0x18, v1);
+ SiS_SetReg(SISSR, 0x19, 0x01);
- if(ivideo->chip == XGI_40) {
+ if(ivideo->chip = XGI_40) {
- outSISIDXREG(SISSR, 0x16, bios[0x53e]);
- outSISIDXREG(SISSR, 0x16, bios[0x53f]);
+ SiS_SetReg(SISSR, 0x16, bios[0x53e]);
@@ -1371,7 +1371,7 @@ index 6ea71b8..59a567c 100644
+ SiS_SetReg(SISSR, 0x16, 0x85);
}
sisfb_post_xgi_delay(ivideo, 0x43);
- if(ivideo->chip == XGI_40) {
+ if(ivideo->chip = XGI_40) {
- outSISIDXREG(SISSR, 0x1b, 0x01);
+ SiS_SetReg(SISSR, 0x1b, 0x01);
} else {
@@ -1383,7 +1383,7 @@ index 6ea71b8..59a567c 100644
- outSISIDXREG(SISSR, 0x19, 0x00);
+ SiS_SetReg(SISSR, 0x18, v1);
+ SiS_SetReg(SISSR, 0x19, 0x00);
- if(ivideo->chip == XGI_40) {
+ if(ivideo->chip = XGI_40) {
- outSISIDXREG(SISSR, 0x16, bios[0x540]);
- outSISIDXREG(SISSR, 0x16, bios[0x541]);
+ SiS_SetReg(SISSR, 0x16, bios[0x540]);
diff --git a/a/content_digest b/N1/content_digest
index 357cd9a..1415b1f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 08/13] sisfb: replace outSISIDXREG with SiS_SetReg\0"
]
[
- "Date\0Mon, 20 Dec 2010 23:50:17 +0200\0"
+ "Date\0Mon, 20 Dec 2010 21:50:17 +0000\0"
]
[
"To\0linux-fbdev\@vger.kernel.org",
@@ -85,7 +85,7 @@
"+\tSiS_SetReg(SISCR, 0x0D, base & 0xFF);\n",
"+\tSiS_SetReg(SISCR, 0x0C, (base >> 8) & 0xFF);\n",
"+\tSiS_SetReg(SISSR, 0x0D, (base >> 16) & 0xFF);\n",
- " \tif(ivideo->sisvga_engine == SIS_315_VGA) {\n",
+ " \tif(ivideo->sisvga_engine = SIS_315_VGA) {\n",
" \t\tsetSISIDXREG(SISSR, 0x37, 0xFE, (base >> 24) & 0x01);\n",
" \t}\n",
"\@\@ -1323,9 +1323,9 \@\@ sisfb_set_base_CRT2(struct sis_video_info *ivideo, unsigned int base)\n",
@@ -98,7 +98,7 @@
"+\t\tSiS_SetReg(SISPART1, 0x06, (base & 0xFF));\n",
"+\t\tSiS_SetReg(SISPART1, 0x05, ((base >> 8) & 0xFF));\n",
"+\t\tSiS_SetReg(SISPART1, 0x04, ((base >> 16) & 0xFF));\n",
- " \t\tif(ivideo->sisvga_engine == SIS_315_VGA) {\n",
+ " \t\tif(ivideo->sisvga_engine = SIS_315_VGA) {\n",
" \t\t\tsetSISIDXREG(SISPART1, 0x02, 0x7F, ((base >> 24) & 0x01) << 7);\n",
" \t\t}\n",
"\@\@ -2216,8 +2216,8 \@\@ sisfb_sense_crt1(struct sis_video_info *ivideo)\n",
@@ -153,7 +153,7 @@
" SiS_DDC2Delay(&ivideo->SiS_Pr, 0x1500);\n",
"\@\@ -2377,7 +2377,7 \@\@ SISDoSense(struct sis_video_info *ivideo, u16 type, u16 test)\n",
" temp &= mytest;\n",
- " if(temp == mytest) result++;\n",
+ " if(temp = mytest) result++;\n",
" #if 1\n",
"-\t outSISIDXREG(SISPART4,0x11,0x00);\n",
"+\t SiS_SetReg(SISPART4, 0x11, 0x00);\n",
@@ -177,7 +177,7 @@
"\@\@ -2482,7 +2482,7 \@\@ SiS_Sense30x(struct sis_video_info *ivideo)\n",
" }\n",
" \n",
- " if((ivideo->sisvga_engine == SIS_315_VGA) && (ivideo->vbflags2 & VB2_SISYPBPRBRIDGE)) {\n",
+ " if((ivideo->sisvga_engine = SIS_315_VGA) && (ivideo->vbflags2 & VB2_SISYPBPRBRIDGE)) {\n",
"- outSISIDXREG(SISPART2,0x4d,(backupP2_4d | 0x10));\n",
"+ SiS_SetReg(SISPART2, 0x4d, (backupP2_4d | 0x10));\n",
" SiS_DDC2Delay(&ivideo->SiS_Pr, 0x2000);\n",
@@ -375,8 +375,8 @@
" \t\ttemp = 0x1234;\n",
"\@\@ -4288,8 +4288,8 \@\@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth\n",
" \t\tsr14 = (SiS_DRAMType[k][3] * buswidth) - 1;\n",
- " \t\tif(buswidth == 4) sr14 |= 0x80;\n",
- " \t\telse if(buswidth == 2) sr14 |= 0x40;\n",
+ " \t\tif(buswidth = 4) sr14 |= 0x80;\n",
+ " \t\telse if(buswidth = 2) sr14 |= 0x40;\n",
"-\t\toutSISIDXREG(SISSR, 0x13, SiS_DRAMType[k][4]);\n",
"-\t\toutSISIDXREG(SISSR, 0x14, sr14);\n",
"+\t\tSiS_SetReg(SISSR, 0x13, SiS_DRAMType[k][4]);\n",
@@ -485,7 +485,7 @@
" \t\tv2 &= ~0x01;\n",
" \n",
" \treg = SiS_GetReg(SISPART4, 0x00);\n",
- " \tif((reg == 1) || (reg == 2)) {\n",
+ " \tif((reg = 1) || (reg = 2)) {\n",
"-\t\toutSISIDXREG(SISCR, 0x37, 0x02);\n",
"-\t\toutSISIDXREG(SISPART2, 0x00, 0x1c);\n",
"+\t\tSiS_SetReg(SISCR, 0x37, 0x02);\n",
@@ -593,7 +593,7 @@
"-\toutSISIDXREG(SISSR, 0x1c, 0x00);\n",
"+\tSiS_SetReg(SISSR, 0x1c, 0x00);\n",
" \n",
- " \tif(ivideo->chip == XGI_20) {\n",
+ " \tif(ivideo->chip = XGI_20) {\n",
" \n",
"\@\@ -4687,52 +4687,52 \@\@ sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)\n",
" \t\treg = SiS_GetReg(SISCR, 0x97);\n",
@@ -664,7 +664,7 @@
" \t} else {\t/* XGI_40 */\n",
"\@\@ -4747,52 +4747,52 \@\@ sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)\n",
" \t\t\tbuswidth = 32;\n",
- " \t\t\tif(ivideo->revision_id == 2) {\n",
+ " \t\t\tif(ivideo->revision_id = 2) {\n",
" \t\t\t\tchannelab = 2;\n",
"-\t\t\t\toutSISIDXREG(SISSR, 0x13, 0xa1);\n",
"-\t\t\t\toutSISIDXREG(SISSR, 0x14, 0x44);\n",
@@ -731,7 +731,7 @@
" \t\t\t}\n",
"\@\@ -4803,26 +4803,26 \@\@ sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)\n",
" \t\t\tbuswidth = 64;\n",
- " \t\t\tif(ivideo->revision_id == 2) {\n",
+ " \t\t\tif(ivideo->revision_id = 2) {\n",
" \t\t\t\tchannelab = 1;\n",
"-\t\t\t\toutSISIDXREG(SISSR, 0x13, 0xa1);\n",
"-\t\t\t\toutSISIDXREG(SISSR, 0x14, 0x52);\n",
@@ -802,7 +802,7 @@
"\@\@ -5014,13 +5014,13 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
" \t/* Clear some regs */\n",
" \tfor(i = 0; i < 0x22; i++) {\n",
- " \t\tif(0x06 + i == 0x20) continue;\n",
+ " \t\tif(0x06 + i = 0x20) continue;\n",
"-\t\toutSISIDXREG(SISSR, 0x06 + i, 0x00);\n",
"+\t\tSiS_SetReg(SISSR, 0x06 + i, 0x00);\n",
" \t}\n",
@@ -859,8 +859,8 @@
"+\t\tSiS_SetReg(SISSR, 0x31 + i, ptr[i]);\n",
" \t}\n",
" \n",
- " \tif(ivideo->chip == XGI_40) {\n",
- " \t\tif(ivideo->revision_id == 2) {\n",
+ " \tif(ivideo->chip = XGI_40) {\n",
+ " \t\tif(ivideo->revision_id = 2) {\n",
" \t\t\tsetSISIDXREG(SISSR, 0x3b, 0x3f, 0xc0);\n",
" \t\t}\n",
"-\t\toutSISIDXREG(SISCR, 0x7d, 0xfe);\n",
@@ -868,12 +868,12 @@
"+\t\tSiS_SetReg(SISCR, 0x7d, 0xfe);\n",
"+\t\tSiS_SetReg(SISCR, 0x7e, 0x0f);\n",
" \t}\n",
- " \tif(ivideo->revision_id == 0) {\t/* 40 *and* 20? */\n",
+ " \tif(ivideo->revision_id = 0) {\t/* 40 *and* 20? */\n",
" \t\tandSISIDXREG(SISCR, 0x58, 0xd7);\n",
"\@\@ -5078,36 +5078,36 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
" \tsetSISIDXREG(SISCR, 0x38, 0x1f, reg);\n",
" \n",
- " \tif(ivideo->chip == XGI_20) {\n",
+ " \tif(ivideo->chip = XGI_20) {\n",
"-\t\toutSISIDXREG(SISSR, 0x36, 0x70);\n",
"+\t\tSiS_SetReg(SISSR, 0x36, 0x70);\n",
" \t} else {\n",
@@ -902,7 +902,7 @@
" \t\tandSISIDXREG(SISPART1, 0x50, 0xfe);\n",
" \n",
" \t\treg = SiS_GetReg(SISPART4, 0x00);\n",
- " \t\tif(reg == 1 || reg == 2) {\n",
+ " \t\tif(reg = 1 || reg = 2) {\n",
"-\t\t\toutSISIDXREG(SISPART2, 0x00, 0x1c);\n",
"-\t\t\toutSISIDXREG(SISPART4, 0x0d, bios[0x7f]);\n",
"-\t\t\toutSISIDXREG(SISPART4, 0x0e, bios[0x80]);\n",
@@ -929,7 +929,7 @@
"-\t\toutSISIDXREG(SISSR, 0x22, v1);\n",
"+\t\tSiS_SetReg(SISSR, 0x22, v1);\n",
" \n",
- " \t\tif(ivideo->revision_id == 2) {\n",
+ " \t\tif(ivideo->revision_id = 2) {\n",
" \t\t\tv1 = SiS_GetReg(SISSR, 0x3b);\n",
"\@\@ -5179,7 +5179,7 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
" \t\tv2 = SiS_GetReg(SISCR, 0x5f);\n",
@@ -1072,9 +1072,9 @@
"+\tSiS_SetReg(SISCR, 0x83, 0x09);\n",
"+\tSiS_SetReg(SISCR, 0x87, 0x00);\n",
" \n",
- " \tif(ivideo->chip == XGI_40) {\n",
- " \t\tif( (ivideo->revision_id == 1) ||\n",
- " \t\t (ivideo->revision_id == 2) ) {\n",
+ " \tif(ivideo->chip = XGI_40) {\n",
+ " \t\tif( (ivideo->revision_id = 1) ||\n",
+ " \t\t (ivideo->revision_id = 2) ) {\n",
"-\t\t\toutSISIDXREG(SISCR, 0x8c, 0x87);\n",
"+\t\t\tSiS_SetReg(SISCR, 0x8c, 0x87);\n",
" \t\t}\n",
@@ -1085,7 +1085,7 @@
"+\tSiS_SetReg(SISSR, 0x17, 0x00);\n",
"+\tSiS_SetReg(SISSR, 0x1a, 0x87);\n",
" \n",
- " \tif(ivideo->chip == XGI_20) {\n",
+ " \tif(ivideo->chip = XGI_20) {\n",
"-\t\toutSISIDXREG(SISSR, 0x15, 0x00);\n",
"-\t\toutSISIDXREG(SISSR, 0x1c, 0x00);\n",
"+\t\tSiS_SetReg(SISSR, 0x15, 0x00);\n",
@@ -1096,7 +1096,7 @@
"\@\@ -5382,7 +5382,7 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
" \t}\n",
" \tif(!(ramtype & 0x80)) {\n",
- " \t\tif(ivideo->chip == XGI_20) {\n",
+ " \t\tif(ivideo->chip = XGI_20) {\n",
"-\t\t\toutSISIDXREG(SISCR, 0x97, v1);\n",
"+\t\t\tSiS_SetReg(SISCR, 0x97, v1);\n",
" \t\t\treg = SiS_GetReg(SISCR, 0x97);\n",
@@ -1136,7 +1136,7 @@
"+\t\t\tSiS_SetReg(SISCR, 0x85, bios[regb + 0x160]);\n",
"+\t\t\tSiS_SetReg(SISCR, 0x82, bios[regb + 0x158]);\n",
" \t\t}\n",
- " \t\tif(ivideo->chip == XGI_40) {\n",
+ " \t\tif(ivideo->chip = XGI_40) {\n",
"-\t\t\toutSISIDXREG(SISCR, 0x97, 0x00);\n",
"+\t\t\tSiS_SetReg(SISCR, 0x97, 0x00);\n",
" \t\t}\n",
@@ -1147,8 +1147,8 @@
" \n",
"-\t\toutSISIDXREG(SISSR, 0x18, 0x01);\n",
"+\t\tSiS_SetReg(SISSR, 0x18, 0x01);\n",
- " \t\tif((ivideo->chip == XGI_20) ||\n",
- " \t\t (ivideo->revision_id == 2)) {\n",
+ " \t\tif((ivideo->chip = XGI_20) ||\n",
+ " \t\t (ivideo->revision_id = 2)) {\n",
"-\t\t\toutSISIDXREG(SISSR, 0x19, 0x40);\n",
"+\t\t\tSiS_SetReg(SISSR, 0x19, 0x40);\n",
" \t\t} else {\n",
@@ -1159,21 +1159,21 @@
"-\t\toutSISIDXREG(SISSR, 0x16, 0x80);\n",
"+\t\tSiS_SetReg(SISSR, 0x16, 0x00);\n",
"+\t\tSiS_SetReg(SISSR, 0x16, 0x80);\n",
- " \t\tif((ivideo->chip == XGI_20) || (bios[0x1cb] != 0x0c)) {\n",
+ " \t\tif((ivideo->chip = XGI_20) || (bios[0x1cb] != 0x0c)) {\n",
" \t\t\tsisfb_post_xgi_delay(ivideo, 0x43);\n",
" \t\t\tsisfb_post_xgi_delay(ivideo, 0x43);\n",
" \t\t\tsisfb_post_xgi_delay(ivideo, 0x43);\n",
"-\t\t\toutSISIDXREG(SISSR, 0x18, 0x00);\n",
"+\t\t\tSiS_SetReg(SISSR, 0x18, 0x00);\n",
- " \t\t\tif((ivideo->chip == XGI_20) ||\n",
- " \t\t\t (ivideo->revision_id == 2)) {\n",
+ " \t\t\tif((ivideo->chip = XGI_20) ||\n",
+ " \t\t\t (ivideo->revision_id = 2)) {\n",
"-\t\t\t\toutSISIDXREG(SISSR, 0x19, 0x40);\n",
"+\t\t\t\tSiS_SetReg(SISSR, 0x19, 0x40);\n",
" \t\t\t} else {\n",
"-\t\t\t\toutSISIDXREG(SISSR, 0x19, 0x20);\n",
"+\t\t\t\tSiS_SetReg(SISSR, 0x19, 0x20);\n",
" \t\t\t}\n",
- " \t\t} else if((ivideo->chip == XGI_40) && (bios[0x1cb] == 0x0c)) {\n",
+ " \t\t} else if((ivideo->chip = XGI_40) && (bios[0x1cb] = 0x0c)) {\n",
"-\t\t\t/* outSISIDXREG(SISSR, 0x16, 0x0c); */ /* ? */\n",
"+\t\t\t/* SiS_SetReg(SISSR, 0x16, 0x0c); */ /* ? */\n",
" \t\t}\n",
@@ -1189,11 +1189,11 @@
" \t\t\tv5 = bios[index + 3];\n",
" \t\t}\n",
"-\t\toutSISIDXREG(SISSR, 0x18, v1);\n",
- "-\t\toutSISIDXREG(SISSR, 0x19, ((ivideo->chip == XGI_20) ? 0x02 : 0x01));\n",
+ "-\t\toutSISIDXREG(SISSR, 0x19, ((ivideo->chip = XGI_20) ? 0x02 : 0x01));\n",
"-\t\toutSISIDXREG(SISSR, 0x16, v2);\n",
"-\t\toutSISIDXREG(SISSR, 0x16, v3);\n",
"+\t\tSiS_SetReg(SISSR, 0x18, v1);\n",
- "+\t\tSiS_SetReg(SISSR, 0x19, ((ivideo->chip == XGI_20) ? 0x02 : 0x01));\n",
+ "+\t\tSiS_SetReg(SISSR, 0x19, ((ivideo->chip = XGI_20) ? 0x02 : 0x01));\n",
"+\t\tSiS_SetReg(SISSR, 0x16, v2);\n",
"+\t\tSiS_SetReg(SISSR, 0x16, v3);\n",
" \t\tsisfb_post_xgi_delay(ivideo, 0x43);\n",
@@ -1302,9 +1302,9 @@
" \t\tbreak;\n",
" \tdefault:\n",
"\@\@ -5546,85 +5546,85 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
- " \t\tif((ivideo->chip == XGI_40) &&\n",
- " \t\t ((ivideo->revision_id == 1) ||\n",
- " \t\t (ivideo->revision_id == 2))) {\n",
+ " \t\tif((ivideo->chip = XGI_40) &&\n",
+ " \t\t ((ivideo->revision_id = 1) ||\n",
+ " \t\t (ivideo->revision_id = 2))) {\n",
"-\t\t\toutSISIDXREG(SISCR, 0x82, bios[regb + 0x158]);\n",
"-\t\t\toutSISIDXREG(SISCR, 0x85, bios[regb + 0x160]);\n",
"-\t\t\toutSISIDXREG(SISCR, 0x86, bios[regb + 0x168]);\n",
@@ -1337,11 +1337,11 @@
"+\t\t\tSiS_SetReg(SISCR, 0x85, v1);\n",
"+\t\t\tSiS_SetReg(SISCR, 0x82, v2);\n",
" \t\t}\n",
- " \t\tif(ivideo->chip == XGI_40) {\n",
+ " \t\tif(ivideo->chip = XGI_40) {\n",
"-\t\t\toutSISIDXREG(SISCR, 0x97, 0x11);\n",
"+\t\t\tSiS_SetReg(SISCR, 0x97, 0x11);\n",
" \t\t}\n",
- " \t\tif((ivideo->chip == XGI_40) && (ivideo->revision_id == 2)) {\n",
+ " \t\tif((ivideo->chip = XGI_40) && (ivideo->revision_id = 2)) {\n",
"-\t\t\toutSISIDXREG(SISCR, 0x98, 0x01);\n",
"+\t\t\tSiS_SetReg(SISCR, 0x98, 0x01);\n",
" \t\t} else {\n",
@@ -1351,7 +1351,7 @@
"-\t\toutSISIDXREG(SISCR, 0x9a, 0x02);\n",
"+\t\tSiS_SetReg(SISCR, 0x9a, 0x02);\n",
" \n",
- " \t\tif(ivideo->chip == XGI_40) {\n",
+ " \t\tif(ivideo->chip = XGI_40) {\n",
"-\t\t\toutSISIDXREG(SISSR, 0x18, 0x01);\n",
"+\t\t\tSiS_SetReg(SISSR, 0x18, 0x01);\n",
" \t\t} else {\n",
@@ -1364,7 +1364,7 @@
"+\t\tSiS_SetReg(SISSR, 0x19, 0x40);\n",
"+\t\tSiS_SetReg(SISSR, 0x16, 0x00);\n",
"+\t\tSiS_SetReg(SISSR, 0x16, 0x80);\n",
- " \t\tif((ivideo->chip == XGI_40) && (bios[0x1cb] != 0x0c)) {\n",
+ " \t\tif((ivideo->chip = XGI_40) && (bios[0x1cb] != 0x0c)) {\n",
" \t\t\tsisfb_post_xgi_delay(ivideo, 0x43);\n",
" \t\t\tsisfb_post_xgi_delay(ivideo, 0x43);\n",
" \t\t\tsisfb_post_xgi_delay(ivideo, 0x43);\n",
@@ -1386,7 +1386,7 @@
"-\t\toutSISIDXREG(SISSR, 0x19, 0x01);\n",
"+\t\tSiS_SetReg(SISSR, 0x18, v1);\n",
"+\t\tSiS_SetReg(SISSR, 0x19, 0x01);\n",
- " \t\tif(ivideo->chip == XGI_40) {\n",
+ " \t\tif(ivideo->chip = XGI_40) {\n",
"-\t\t\toutSISIDXREG(SISSR, 0x16, bios[0x53e]);\n",
"-\t\t\toutSISIDXREG(SISSR, 0x16, bios[0x53f]);\n",
"+\t\t\tSiS_SetReg(SISSR, 0x16, bios[0x53e]);\n",
@@ -1398,7 +1398,7 @@
"+\t\t\tSiS_SetReg(SISSR, 0x16, 0x85);\n",
" \t\t}\n",
" \t\tsisfb_post_xgi_delay(ivideo, 0x43);\n",
- " \t\tif(ivideo->chip == XGI_40) {\n",
+ " \t\tif(ivideo->chip = XGI_40) {\n",
"-\t\t\toutSISIDXREG(SISSR, 0x1b, 0x01);\n",
"+\t\t\tSiS_SetReg(SISSR, 0x1b, 0x01);\n",
" \t\t} else {\n",
@@ -1410,7 +1410,7 @@
"-\t\toutSISIDXREG(SISSR, 0x19, 0x00);\n",
"+\t\tSiS_SetReg(SISSR, 0x18, v1);\n",
"+\t\tSiS_SetReg(SISSR, 0x19, 0x00);\n",
- " \t\tif(ivideo->chip == XGI_40) {\n",
+ " \t\tif(ivideo->chip = XGI_40) {\n",
"-\t\t\toutSISIDXREG(SISSR, 0x16, bios[0x540]);\n",
"-\t\t\toutSISIDXREG(SISSR, 0x16, bios[0x541]);\n",
"+\t\t\tSiS_SetReg(SISSR, 0x16, bios[0x540]);\n",
@@ -1493,4 +1493,4 @@
"1.5.6.5"
]
-cd5f95a2ef4dcc8763d6ecbc5ca87b4acb57a04112d31dc56761ac794ad78a11
+1a708f50b1f81488a7a92c99976973a24eecb581b0034a7bb611b1891dda44ba
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.