XLibre/xf86-video-s3virge
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-s3virge.git synced 2026-03-24 01:24:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning: declaration of ‘tmp’ shadows a previous local [-Wshadow]

Browse Source 
s3v_driver.c: In function ‘S3VModeInit’:
s3v_driver.c:3103:12: warning: declaration of ‘tmp’ shadows a previous local [-Wshadow]
 3103 |        int tmp = vganew->CRTC[4] + ((i&0x10)<<4) + ps3v->HorizScaleFactor;
      |            ^~~
s3v_driver.c:2577:17: note: shadowed declaration is here
 2577 |   unsigned char tmp = 0;
      |                 ^~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith
2024-01-10 16:57:44 -08:00
parent d9db1f6451
commit 058fbc23b3
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/s3v_driver.c
View File

@@ -2574,7 +2574,6 @@ S3VModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
S3VPtr ps3v = S3VPTR(pScrn);
int width, dclk;
int i, j;
unsigned char tmp = 0;
/* Store values to current mode register structs */
S3VRegPtr new = &ps3v->ModeReg;
@@ -2626,24 +2625,26 @@ S3VModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
/* Start with MMIO, linear addr. regs */
VGAOUT8(vgaCRIndex, 0x3a);
tmp = VGAIN8(vgaCRReg);
if( S3_ViRGE_GX2_SERIES(ps3v->Chipset)
/* MXTESTME */ || S3_ViRGE_MX_SERIES(ps3v->Chipset) )
{
if(ps3v->pci_burst)
/*new->CR3A = (tmp & 0x38) | 0x10; / ENH 256, PCI burst */
/* Don't clear reserved bits... */
new->CR3A = (tmp & 0x7f) | 0x10; /* ENH 256, PCI burst */
else
new->CR3A = tmp | 0x90; /* ENH 256, no PCI burst! */
}
else
{
if(ps3v->pci_burst)
new->CR3A = (tmp & 0x7f) | 0x15; /* ENH 256, PCI burst */
else
new->CR3A = tmp | 0x95; /* ENH 256, no PCI burst! */
}
{
unsigned char tmp = VGAIN8(vgaCRReg);
if (S3_ViRGE_GX2_SERIES(ps3v->Chipset)
/* MXTESTME */ || S3_ViRGE_MX_SERIES(ps3v->Chipset) )
{
if (ps3v->pci_burst)
/*new->CR3A = (tmp & 0x38) | 0x10; / ENH 256, PCI burst */
/* Don't clear reserved bits... */
new->CR3A = (tmp & 0x7f) | 0x10; /* ENH 256, PCI burst */
else
new->CR3A = tmp | 0x90; /* ENH 256, no PCI burst! */
}
else
{
if (ps3v->pci_burst)
new->CR3A = (tmp & 0x7f) | 0x15; /* ENH 256, PCI burst */
else
new->CR3A = tmp | 0x95; /* ENH 256, no PCI burst! */
}
}
VGAOUT8(vgaCRIndex, 0x55);