diff for duplicates of <1292881822-32630-8-git-send-email-aaro.koskinen@iki.fi>
diff --git a/a/1.txt b/N1/1.txt
index 5304631..455e24c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,8 +16,8 @@ index fa8f01c..6ea71b8 100644
- inSISIDXREG(SISPART1,0x00,P1_00);
+ P1_00 = SiS_GetReg(SISPART1, 0x00);
- if( ((ivideo->sisvga_engine == SIS_300_VGA) && (P1_00 & 0xa0) == 0x20) ||
- ((ivideo->sisvga_engine == SIS_315_VGA) && (P1_00 & 0x50) == 0x10) ) {
+ if( ((ivideo->sisvga_engine = SIS_300_VGA) && (P1_00 & 0xa0) = 0x20) ||
+ ((ivideo->sisvga_engine = SIS_315_VGA) && (P1_00 & 0x50) = 0x10) ) {
return true;
@@ -751,11 +751,11 @@ sisfballowretracecrt1(struct sis_video_info *ivideo)
{
@@ -126,7 +126,7 @@ index fa8f01c..6ea71b8 100644
+ reg = SiS_GetReg(SISCR, 0x78);
reg &= 0x30;
if(reg) {
- if(reg == 0x10) {
+ if(reg = 0x10) {
@@ -2027,7 +2027,7 @@ sisfb_get_dram_size(struct sis_video_info *ivideo)
case SIS_340:
case XGI_20:
@@ -139,7 +139,7 @@ index fa8f01c..6ea71b8 100644
@@ -2061,11 +2061,11 @@ sisfb_detect_VB_connect(struct sis_video_info *ivideo)
#ifdef CONFIG_FB_SIS_300
- if(ivideo->sisvga_engine == SIS_300_VGA) {
+ if(ivideo->sisvga_engine = SIS_300_VGA) {
- inSISIDXREG(SISSR, 0x17, temp);
+ temp = SiS_GetReg(SISSR, 0x17);
if((temp & 0x0F) && (ivideo->chip != SIS_300)) {
@@ -162,7 +162,7 @@ index fa8f01c..6ea71b8 100644
@@ -2151,15 +2151,15 @@ sisfb_detect_VB_connect(struct sis_video_info *ivideo)
}
if(!(ivideo->vbflags & (TV_PAL | TV_NTSC | TV_PALM | TV_PALN | TV_NTSCJ))) {
- if(ivideo->sisvga_engine == SIS_300_VGA) {
+ if(ivideo->sisvga_engine = SIS_300_VGA) {
- inSISIDXREG(SISSR, 0x38, temp);
+ temp = SiS_GetReg(SISSR, 0x38);
if(temp & 0x01) ivideo->vbflags |= TV_PAL;
@@ -189,7 +189,7 @@ index fa8f01c..6ea71b8 100644
if(sr1F & 0xc0) mustwait = true;
#ifdef CONFIG_FB_SIS_315
- if(ivideo->sisvga_engine == SIS_315_VGA) {
+ if(ivideo->sisvga_engine = SIS_315_VGA) {
- inSISIDXREG(SISCR,ivideo->SiS_Pr.SiS_MyCR63,cr63);
+ cr63 = SiS_GetReg(SISCR, ivideo->SiS_Pr.SiS_MyCR63);
cr63 &= 0x40;
@@ -219,7 +219,7 @@ index fa8f01c..6ea71b8 100644
+ temp = SiS_GetReg(SISPART4, 0x03);
temp ^= 0x0e;
temp &= mytest;
- if(temp == mytest) result++;
+ if(temp = mytest) result++;
@@ -2400,7 +2400,7 @@ SiS_Sense30x(struct sis_video_info *ivideo)
if(ivideo->vbflags2 & VB2_301) {
@@ -232,7 +232,7 @@ index fa8f01c..6ea71b8 100644
@@ -2430,7 +2430,7 @@ SiS_Sense30x(struct sis_video_info *ivideo)
}
- if(ivideo->chip == SIS_300) {
+ if(ivideo->chip = SIS_300) {
- inSISIDXREG(SISSR,0x3b,myflag);
+ myflag = SiS_GetReg(SISSR, 0x3b);
if(!(myflag & 0x01)) vga2 = vga2_c = 0;
@@ -274,7 +274,7 @@ index fa8f01c..6ea71b8 100644
for(myflag = 2; myflag > 0; myflag--) {
biosflag ^= 0x20;
@@ -2665,10 +2665,10 @@ sisfb_get_VB_type(struct sis_video_info *ivideo)
- if(ivideo->chip == XGI_20)
+ if(ivideo->chip = XGI_20)
return;
- inSISIDXREG(SISPART4, 0x00, vb_chipid);
@@ -301,7 +301,7 @@ index fa8f01c..6ea71b8 100644
} else if(reg <= 0xe1) {
- inSISIDXREG(SISPART4,0x39,reg);
+ reg = SiS_GetReg(SISPART4, 0x39);
- if(reg == 0xff) {
+ if(reg = 0xff) {
ivideo->vbflags |= VB_302LV; /* Deprecated */
ivideo->vbflags2 |= VB2_302LV;
@@ -2718,7 +2718,7 @@ sisfb_get_VB_type(struct sis_video_info *ivideo)
@@ -312,7 +312,7 @@ index fa8f01c..6ea71b8 100644
+ reg = SiS_GetReg(SISCR, 0x37);
reg &= SIS_EXTERNAL_CHIP_MASK;
reg >>= 1;
- if(ivideo->sisvga_engine == SIS_300_VGA) {
+ if(ivideo->sisvga_engine = SIS_300_VGA) {
@@ -2759,7 +2759,7 @@ sisfb_get_VB_type(struct sis_video_info *ivideo)
#endif
} else if(ivideo->chip >= SIS_661) {
@@ -338,10 +338,10 @@ index fa8f01c..6ea71b8 100644
- inSISIDXREG(SISCR, 0x36, reg);
+ reg = SiS_GetReg(SISCR, 0x36);
reg &= 0x0f;
- if(ivideo->sisvga_engine == SIS_300_VGA) {
+ if(ivideo->sisvga_engine = SIS_300_VGA) {
ivideo->CRT2LCDType = sis300paneltype[reg];
@@ -2980,10 +2980,10 @@ sisfb_save_pdc_emi(struct sis_video_info *ivideo)
- if(ivideo->sisvga_engine == SIS_300_VGA) {
+ if(ivideo->sisvga_engine = SIS_300_VGA) {
if(ivideo->vbflags2 & (VB2_LVDS | VB2_30xBDH)) {
int tmp;
- inSISIDXREG(SISCR,0x30,tmp);
@@ -351,7 +351,7 @@ index fa8f01c..6ea71b8 100644
- inSISIDXREG(SISPART1,0x13,ivideo->detectedpdc);
+ ivideo->detectedpdc = SiS_GetReg(SISPART1, 0x13);
ivideo->detectedpdc &= 0x3c;
- if(ivideo->SiS_Pr.PDC == -1) {
+ if(ivideo->SiS_Pr.PDC = -1) {
/* Let option override detection */
@@ -3007,7 +3007,7 @@ sisfb_save_pdc_emi(struct sis_video_info *ivideo)
/* Try to find about LCDA */
@@ -429,7 +429,7 @@ index fa8f01c..6ea71b8 100644
@@ -3535,11 +3535,11 @@ sisfb_pre_setmode(struct sis_video_info *ivideo)
#ifdef CONFIG_FB_SIS_315
- if(ivideo->sisvga_engine == SIS_315_VGA) {
+ if(ivideo->sisvga_engine = SIS_315_VGA) {
if(ivideo->chip >= SIS_661) {
- inSISIDXREG(SISCR, 0x38, cr38);
+ cr38 = SiS_GetReg(SISCR, 0x38);
@@ -443,7 +443,7 @@ index fa8f01c..6ea71b8 100644
}
@@ -3547,7 +3547,7 @@ sisfb_pre_setmode(struct sis_video_info *ivideo)
#ifdef CONFIG_FB_SIS_300
- if(ivideo->sisvga_engine == SIS_300_VGA) {
+ if(ivideo->sisvga_engine = SIS_300_VGA) {
tvregnum = 0x35;
- inSISIDXREG(SISCR, tvregnum, cr38);
+ cr38 = SiS_GetReg(SISCR, tvregnum);
@@ -485,10 +485,10 @@ index fa8f01c..6ea71b8 100644
+ ivideo->p2_01 = SiS_GetReg(SISPART2, 0x01);
+ ivideo->p2_02 = SiS_GetReg(SISPART2, 0x02);
} else if(ivideo->vbflags2 & VB2_CHRONTEL) {
- if(ivideo->chronteltype == 1) {
+ if(ivideo->chronteltype = 1) {
ivideo->tvx = SiS_GetCH700x(&ivideo->SiS_Pr, 0x0a);
@@ -4206,11 +4206,11 @@ sisfb_post_300_buswidth(struct sis_video_info *ivideo)
- if(readw(FBAddress) == temp)
+ if(readw(FBAddress) = temp)
break;
orSISIDXREG(SISSR, 0x3c, 0x01);
- inSISIDXREG(SISSR, 0x05, reg);
@@ -510,7 +510,7 @@ index fa8f01c..6ea71b8 100644
- inSISIDXREG(SISSR, 0x3b, reg);
+ reg = SiS_GetReg(SISSR, 0x3b);
if(reg & 0x01) {
- if(readl((FBAddress + 12)) == 0xCDEF0123L)
+ if(readl((FBAddress + 12)) = 0xCDEF0123L)
return 4; /* Channel A 128bit */
@@ -4362,7 +4362,7 @@ sisfb_post_sis300(struct pci_dev *pdev)
if(bios[0x52] & 0x80) {
@@ -527,7 +527,7 @@ index fa8f01c..6ea71b8 100644
- inSISIDXREG(SISPART4, 0x00, reg);
+ reg = SiS_GetReg(SISPART4, 0x00);
- if((reg == 1) || (reg == 2)) {
+ if((reg = 1) || (reg = 2)) {
outSISIDXREG(SISCR, 0x37, 0x02);
outSISIDXREG(SISPART2, 0x00, 0x1c);
@@ -4473,9 +4473,9 @@ sisfb_post_sis300(struct pci_dev *pdev)
@@ -557,7 +557,7 @@ index fa8f01c..6ea71b8 100644
} else {
- inSISIDXREG(SISSR, 0x3a, reg);
+ reg = SiS_GetReg(SISSR, 0x3a);
- if((reg & 0x30) == 0x30) {
+ if((reg & 0x30) = 0x30) {
v1 = 0x04; /* PCI */
v2 = 0x92;
@@ -4570,7 +4570,7 @@ sisfb_post_xgi_delay(struct sis_video_info *ivideo, int delay)
@@ -570,7 +570,7 @@ index fa8f01c..6ea71b8 100644
}
}
@@ -4684,7 +4684,7 @@ sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)
- if(ivideo->chip == XGI_20) {
+ if(ivideo->chip = XGI_20) {
channelab = 1;
- inSISIDXREG(SISCR, 0x97, reg);
@@ -591,14 +591,14 @@ index fa8f01c..6ea71b8 100644
}
@@ -4846,7 +4846,7 @@ bail_out:
- ranksize = (ivideo->chip == XGI_20) ?
+ ranksize = (ivideo->chip = XGI_20) ?
dramsr13[(i * 5) + 3] : dramsr13_4[(i * 5) + 3];
- inSISIDXREG(SISSR, 0x13, reg);
+ reg = SiS_GetReg(SISSR, 0x13);
if(reg & 0x80) ranksize <<= 1;
- if(ivideo->chip == XGI_20) {
+ if(ivideo->chip = XGI_20) {
@@ -5007,7 +5007,7 @@ sisfb_post_xgi(struct pci_dev *pdev)
/* Unlock SR */
@@ -610,7 +610,7 @@ index fa8f01c..6ea71b8 100644
@@ -5068,7 +5068,7 @@ sisfb_post_xgi(struct pci_dev *pdev)
}
- if(ivideo->revision_id == 0) { /* 40 *and* 20? */
+ if(ivideo->revision_id = 0) { /* 40 *and* 20? */
andSISIDXREG(SISCR, 0x58, 0xd7);
- inSISIDXREG(SISCR, 0xcb, reg);
+ reg = SiS_GetReg(SISCR, 0xcb);
@@ -623,7 +623,7 @@ index fa8f01c..6ea71b8 100644
- inSISIDXREG(SISPART4, 0x00, reg);
+ reg = SiS_GetReg(SISPART4, 0x00);
- if(reg == 1 || reg == 2) {
+ if(reg = 1 || reg = 2) {
outSISIDXREG(SISPART2, 0x00, 0x1c);
outSISIDXREG(SISPART4, 0x0d, bios[0x7f]);
@@ -5103,9 +5103,9 @@ sisfb_post_xgi(struct pci_dev *pdev)
@@ -657,7 +657,7 @@ index fa8f01c..6ea71b8 100644
@@ -5158,8 +5158,8 @@ sisfb_post_xgi(struct pci_dev *pdev)
outSISIDXREG(SISSR, 0x22, v1);
- if(ivideo->revision_id == 2) {
+ if(ivideo->revision_id = 2) {
- inSISIDXREG(SISSR, 0x3b, v1);
- inSISIDXREG(SISSR, 0x3a, v2);
+ v1 = SiS_GetReg(SISSR, 0x3b);
@@ -711,7 +711,7 @@ index fa8f01c..6ea71b8 100644
@@ -5383,15 +5383,15 @@ sisfb_post_xgi(struct pci_dev *pdev)
if(!(ramtype & 0x80)) {
- if(ivideo->chip == XGI_20) {
+ if(ivideo->chip = XGI_20) {
outSISIDXREG(SISCR, 0x97, v1);
- inSISIDXREG(SISCR, 0x97, reg);
+ reg = SiS_GetReg(SISCR, 0x97);
@@ -804,18 +804,18 @@ index fa8f01c..6ea71b8 100644
}
printk(KERN_DEBUG "-----------------\n");
@@ -5684,7 +5684,7 @@ sisfb_post_xgi(struct pci_dev *pdev)
- if(ivideo->chip == XGI_20) {
+ if(ivideo->chip = XGI_20) {
orSISIDXREG(SISCR, 0x32, 0x20);
} else {
- inSISIDXREG(SISPART4, 0x00, reg);
+ reg = SiS_GetReg(SISPART4, 0x00);
- if((reg == 1) || (reg == 2)) {
+ if((reg = 1) || (reg = 2)) {
sisfb_sense_crt1(ivideo);
} else {
@@ -5711,8 +5711,8 @@ sisfb_post_xgi(struct pci_dev *pdev)
ivideo->modeprechange = 0x2e;
- if(ivideo->chip == XGI_40) {
+ if(ivideo->chip = XGI_40) {
- inSISIDXREG(SISCR, 0xca, reg);
- inSISIDXREG(SISCR, 0xcc, v1);
+ reg = SiS_GetReg(SISCR, 0xca);
diff --git a/a/content_digest b/N1/content_digest
index 8f1d90f..fb14692 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 07/13] sisfb: replace inSISIDXREG with SiS_GetReg\0"
]
[
- "Date\0Mon, 20 Dec 2010 23:50:16 +0200\0"
+ "Date\0Mon, 20 Dec 2010 21:50:16 +0000\0"
]
[
"To\0linux-fbdev\@vger.kernel.org",
@@ -43,8 +43,8 @@
" \n",
"-\tinSISIDXREG(SISPART1,0x00,P1_00);\n",
"+\tP1_00 = SiS_GetReg(SISPART1, 0x00);\n",
- " \tif( ((ivideo->sisvga_engine == SIS_300_VGA) && (P1_00 & 0xa0) == 0x20) ||\n",
- " \t ((ivideo->sisvga_engine == SIS_315_VGA) && (P1_00 & 0x50) == 0x10) ) {\n",
+ " \tif( ((ivideo->sisvga_engine = SIS_300_VGA) && (P1_00 & 0xa0) = 0x20) ||\n",
+ " \t ((ivideo->sisvga_engine = SIS_315_VGA) && (P1_00 & 0x50) = 0x10) ) {\n",
" \t\treturn true;\n",
"\@\@ -751,11 +751,11 \@\@ sisfballowretracecrt1(struct sis_video_info *ivideo)\n",
" {\n",
@@ -153,7 +153,7 @@
"+\t\treg = SiS_GetReg(SISCR, 0x78);\n",
" \t\treg &= 0x30;\n",
" \t\tif(reg) {\n",
- " \t\t\tif(reg == 0x10) {\n",
+ " \t\t\tif(reg = 0x10) {\n",
"\@\@ -2027,7 +2027,7 \@\@ sisfb_get_dram_size(struct sis_video_info *ivideo)\n",
" \tcase SIS_340:\n",
" \tcase XGI_20:\n",
@@ -166,7 +166,7 @@
"\@\@ -2061,11 +2061,11 \@\@ sisfb_detect_VB_connect(struct sis_video_info *ivideo)\n",
" \n",
" #ifdef CONFIG_FB_SIS_300\n",
- " \tif(ivideo->sisvga_engine == SIS_300_VGA) {\n",
+ " \tif(ivideo->sisvga_engine = SIS_300_VGA) {\n",
"-\t\tinSISIDXREG(SISSR, 0x17, temp);\n",
"+\t\ttemp = SiS_GetReg(SISSR, 0x17);\n",
" \t\tif((temp & 0x0F) && (ivideo->chip != SIS_300)) {\n",
@@ -189,7 +189,7 @@
"\@\@ -2151,15 +2151,15 \@\@ sisfb_detect_VB_connect(struct sis_video_info *ivideo)\n",
" \t }\n",
" \t if(!(ivideo->vbflags & (TV_PAL | TV_NTSC | TV_PALM | TV_PALN | TV_NTSCJ))) {\n",
- " \t\tif(ivideo->sisvga_engine == SIS_300_VGA) {\n",
+ " \t\tif(ivideo->sisvga_engine = SIS_300_VGA) {\n",
"-\t\t\tinSISIDXREG(SISSR, 0x38, temp);\n",
"+\t\t\ttemp = SiS_GetReg(SISSR, 0x38);\n",
" \t\t\tif(temp & 0x01) ivideo->vbflags |= TV_PAL;\n",
@@ -216,7 +216,7 @@
" if(sr1F & 0xc0) mustwait = true;\n",
" \n",
" #ifdef CONFIG_FB_SIS_315\n",
- " if(ivideo->sisvga_engine == SIS_315_VGA) {\n",
+ " if(ivideo->sisvga_engine = SIS_315_VGA) {\n",
"- inSISIDXREG(SISCR,ivideo->SiS_Pr.SiS_MyCR63,cr63);\n",
"+ cr63 = SiS_GetReg(SISCR, ivideo->SiS_Pr.SiS_MyCR63);\n",
" cr63 &= 0x40;\n",
@@ -246,7 +246,7 @@
"+\t temp = SiS_GetReg(SISPART4, 0x03);\n",
" temp ^= 0x0e;\n",
" temp &= mytest;\n",
- " if(temp == mytest) result++;\n",
+ " if(temp = mytest) result++;\n",
"\@\@ -2400,7 +2400,7 \@\@ SiS_Sense30x(struct sis_video_info *ivideo)\n",
" \n",
" if(ivideo->vbflags2 & VB2_301) {\n",
@@ -259,7 +259,7 @@
"\@\@ -2430,7 +2430,7 \@\@ SiS_Sense30x(struct sis_video_info *ivideo)\n",
" }\n",
" \n",
- " if(ivideo->chip == SIS_300) {\n",
+ " if(ivideo->chip = SIS_300) {\n",
"- inSISIDXREG(SISSR,0x3b,myflag);\n",
"+ myflag = SiS_GetReg(SISSR, 0x3b);\n",
" if(!(myflag & 0x01)) vga2 = vga2_c = 0;\n",
@@ -301,7 +301,7 @@
" for(myflag = 2; myflag > 0; myflag--) {\n",
" \t biosflag ^= 0x20;\n",
"\@\@ -2665,10 +2665,10 \@\@ sisfb_get_VB_type(struct sis_video_info *ivideo)\n",
- " \tif(ivideo->chip == XGI_20)\n",
+ " \tif(ivideo->chip = XGI_20)\n",
" \t\treturn;\n",
" \n",
"-\tinSISIDXREG(SISPART4, 0x00, vb_chipid);\n",
@@ -328,7 +328,7 @@
" \t\t} else if(reg <= 0xe1) {\n",
"-\t\t\tinSISIDXREG(SISPART4,0x39,reg);\n",
"+\t\t\treg = SiS_GetReg(SISPART4, 0x39);\n",
- " \t\t\tif(reg == 0xff) {\n",
+ " \t\t\tif(reg = 0xff) {\n",
" \t\t\t ivideo->vbflags |= VB_302LV;\t/* Deprecated */\n",
" \t\t\t ivideo->vbflags2 |= VB2_302LV;\n",
"\@\@ -2718,7 +2718,7 \@\@ sisfb_get_VB_type(struct sis_video_info *ivideo)\n",
@@ -339,7 +339,7 @@
"+\t\treg = SiS_GetReg(SISCR, 0x37);\n",
" \t\treg &= SIS_EXTERNAL_CHIP_MASK;\n",
" \t\treg >>= 1;\n",
- " \t\tif(ivideo->sisvga_engine == SIS_300_VGA) {\n",
+ " \t\tif(ivideo->sisvga_engine = SIS_300_VGA) {\n",
"\@\@ -2759,7 +2759,7 \@\@ sisfb_get_VB_type(struct sis_video_info *ivideo)\n",
" #endif\n",
" \t\t} else if(ivideo->chip >= SIS_661) {\n",
@@ -365,10 +365,10 @@
"-\tinSISIDXREG(SISCR, 0x36, reg);\n",
"+\treg = SiS_GetReg(SISCR, 0x36);\n",
" \treg &= 0x0f;\n",
- " \tif(ivideo->sisvga_engine == SIS_300_VGA) {\n",
+ " \tif(ivideo->sisvga_engine = SIS_300_VGA) {\n",
" \t\tivideo->CRT2LCDType = sis300paneltype[reg];\n",
"\@\@ -2980,10 +2980,10 \@\@ sisfb_save_pdc_emi(struct sis_video_info *ivideo)\n",
- " \tif(ivideo->sisvga_engine == SIS_300_VGA) {\n",
+ " \tif(ivideo->sisvga_engine = SIS_300_VGA) {\n",
" \t\tif(ivideo->vbflags2 & (VB2_LVDS | VB2_30xBDH)) {\n",
" \t\t\tint tmp;\n",
"-\t\t\tinSISIDXREG(SISCR,0x30,tmp);\n",
@@ -378,7 +378,7 @@
"-\t\t\t\tinSISIDXREG(SISPART1,0x13,ivideo->detectedpdc);\n",
"+\t\t\t\tivideo->detectedpdc = SiS_GetReg(SISPART1, 0x13);\n",
" \t\t\t\tivideo->detectedpdc &= 0x3c;\n",
- " \t\t\t\tif(ivideo->SiS_Pr.PDC == -1) {\n",
+ " \t\t\t\tif(ivideo->SiS_Pr.PDC = -1) {\n",
" \t\t\t\t\t/* Let option override detection */\n",
"\@\@ -3007,7 +3007,7 \@\@ sisfb_save_pdc_emi(struct sis_video_info *ivideo)\n",
" \t\t/* Try to find about LCDA */\n",
@@ -456,7 +456,7 @@
" \n",
"\@\@ -3535,11 +3535,11 \@\@ sisfb_pre_setmode(struct sis_video_info *ivideo)\n",
" #ifdef CONFIG_FB_SIS_315\n",
- " \tif(ivideo->sisvga_engine == SIS_315_VGA) {\n",
+ " \tif(ivideo->sisvga_engine = SIS_315_VGA) {\n",
" \t if(ivideo->chip >= SIS_661) {\n",
"-\t inSISIDXREG(SISCR, 0x38, cr38);\n",
"+\t cr38 = SiS_GetReg(SISCR, 0x38);\n",
@@ -470,7 +470,7 @@
" \t}\n",
"\@\@ -3547,7 +3547,7 \@\@ sisfb_pre_setmode(struct sis_video_info *ivideo)\n",
" #ifdef CONFIG_FB_SIS_300\n",
- " \tif(ivideo->sisvga_engine == SIS_300_VGA) {\n",
+ " \tif(ivideo->sisvga_engine = SIS_300_VGA) {\n",
" \t tvregnum = 0x35;\n",
"-\t inSISIDXREG(SISCR, tvregnum, cr38);\n",
"+\t cr38 = SiS_GetReg(SISCR, tvregnum);\n",
@@ -512,10 +512,10 @@
"+\t\t\tivideo->p2_01 = SiS_GetReg(SISPART2, 0x01);\n",
"+\t\t\tivideo->p2_02 = SiS_GetReg(SISPART2, 0x02);\n",
" \t\t} else if(ivideo->vbflags2 & VB2_CHRONTEL) {\n",
- " \t\t\tif(ivideo->chronteltype == 1) {\n",
+ " \t\t\tif(ivideo->chronteltype = 1) {\n",
" \t\t\t\tivideo->tvx = SiS_GetCH700x(&ivideo->SiS_Pr, 0x0a);\n",
"\@\@ -4206,11 +4206,11 \@\@ sisfb_post_300_buswidth(struct sis_video_info *ivideo)\n",
- " \t\t\tif(readw(FBAddress) == temp)\n",
+ " \t\t\tif(readw(FBAddress) = temp)\n",
" \t\t\t\tbreak;\n",
" \t\t\torSISIDXREG(SISSR, 0x3c, 0x01);\n",
"-\t\t\tinSISIDXREG(SISSR, 0x05, reg);\n",
@@ -537,7 +537,7 @@
"-\tinSISIDXREG(SISSR, 0x3b, reg);\n",
"+\treg = SiS_GetReg(SISSR, 0x3b);\n",
" \tif(reg & 0x01) {\n",
- " \t\tif(readl((FBAddress + 12)) == 0xCDEF0123L)\n",
+ " \t\tif(readl((FBAddress + 12)) = 0xCDEF0123L)\n",
" \t\t\treturn 4;\t/* Channel A 128bit */\n",
"\@\@ -4362,7 +4362,7 \@\@ sisfb_post_sis300(struct pci_dev *pdev)\n",
" \t\tif(bios[0x52] & 0x80) {\n",
@@ -554,7 +554,7 @@
" \n",
"-\tinSISIDXREG(SISPART4, 0x00, reg);\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",
"\@\@ -4473,9 +4473,9 \@\@ sisfb_post_sis300(struct pci_dev *pdev)\n",
@@ -584,7 +584,7 @@
" \t} else {\n",
"-\t\tinSISIDXREG(SISSR, 0x3a, reg);\n",
"+\t\treg = SiS_GetReg(SISSR, 0x3a);\n",
- " \t\tif((reg & 0x30) == 0x30) {\n",
+ " \t\tif((reg & 0x30) = 0x30) {\n",
" \t\t\tv1 = 0x04; /* PCI */\n",
" \t\t\tv2 = 0x92;\n",
"\@\@ -4570,7 +4570,7 \@\@ sisfb_post_xgi_delay(struct sis_video_info *ivideo, int delay)\n",
@@ -597,7 +597,7 @@
" \t}\n",
" }\n",
"\@\@ -4684,7 +4684,7 \@\@ sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)\n",
- " \tif(ivideo->chip == XGI_20) {\n",
+ " \tif(ivideo->chip = XGI_20) {\n",
" \n",
" \t\tchannelab = 1;\n",
"-\t\tinSISIDXREG(SISCR, 0x97, reg);\n",
@@ -618,14 +618,14 @@
" \t\t}\n",
" \n",
"\@\@ -4846,7 +4846,7 \@\@ bail_out:\n",
- " \t\tranksize = (ivideo->chip == XGI_20) ?\n",
+ " \t\tranksize = (ivideo->chip = XGI_20) ?\n",
" \t\t\t\tdramsr13[(i * 5) + 3] : dramsr13_4[(i * 5) + 3];\n",
" \n",
"-\t\tinSISIDXREG(SISSR, 0x13, reg);\n",
"+\t\treg = SiS_GetReg(SISSR, 0x13);\n",
" \t\tif(reg & 0x80) ranksize <<= 1;\n",
" \n",
- " \t\tif(ivideo->chip == XGI_20) {\n",
+ " \t\tif(ivideo->chip = XGI_20) {\n",
"\@\@ -5007,7 +5007,7 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
" \n",
" \t/* Unlock SR */\n",
@@ -637,7 +637,7 @@
" \n",
"\@\@ -5068,7 +5068,7 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\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",
"-\t\tinSISIDXREG(SISCR, 0xcb, reg);\n",
"+\t\treg = SiS_GetReg(SISCR, 0xcb);\n",
@@ -650,7 +650,7 @@
" \n",
"-\t\tinSISIDXREG(SISPART4, 0x00, reg);\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",
"\@\@ -5103,9 +5103,9 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
@@ -684,7 +684,7 @@
"\@\@ -5158,8 +5158,8 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
" \t\toutSISIDXREG(SISSR, 0x22, v1);\n",
" \n",
- " \t\tif(ivideo->revision_id == 2) {\n",
+ " \t\tif(ivideo->revision_id = 2) {\n",
"-\t\t\tinSISIDXREG(SISSR, 0x3b, v1);\n",
"-\t\t\tinSISIDXREG(SISSR, 0x3a, v2);\n",
"+\t\t\tv1 = SiS_GetReg(SISSR, 0x3b);\n",
@@ -738,7 +738,7 @@
" \n",
"\@\@ -5383,15 +5383,15 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\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\tinSISIDXREG(SISCR, 0x97, reg);\n",
"+\t\t\treg = SiS_GetReg(SISCR, 0x97);\n",
@@ -831,18 +831,18 @@
" \t}\n",
" \tprintk(KERN_DEBUG \"-----------------\\n\");\n",
"\@\@ -5684,7 +5684,7 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
- " \tif(ivideo->chip == XGI_20) {\n",
+ " \tif(ivideo->chip = XGI_20) {\n",
" \t\torSISIDXREG(SISCR, 0x32, 0x20);\n",
" \t} else {\n",
"-\t\tinSISIDXREG(SISPART4, 0x00, reg);\n",
"+\t\treg = SiS_GetReg(SISPART4, 0x00);\n",
- " \t\tif((reg == 1) || (reg == 2)) {\n",
+ " \t\tif((reg = 1) || (reg = 2)) {\n",
" \t\t\tsisfb_sense_crt1(ivideo);\n",
" \t\t} else {\n",
"\@\@ -5711,8 +5711,8 \@\@ sisfb_post_xgi(struct pci_dev *pdev)\n",
" \tivideo->modeprechange = 0x2e;\n",
" \n",
- " \tif(ivideo->chip == XGI_40) {\n",
+ " \tif(ivideo->chip = XGI_40) {\n",
"-\t\tinSISIDXREG(SISCR, 0xca, reg);\n",
"-\t\tinSISIDXREG(SISCR, 0xcc, v1);\n",
"+\t\treg = SiS_GetReg(SISCR, 0xca);\n",
@@ -863,4 +863,4 @@
"1.5.6.5"
]
-41f50959f764b09b1b288de72542d4d9c3268f4abb6472b16ea1700d4460fe72
+4f7761957e5d9d317f703f49095cf765761bc3290115d49fb2fba0e3783b8cc9
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.