From 29212e8a14e54e83adb56209e60caaafc72cd1d4 Mon Sep 17 00:00:00 2001 From: sezero Date: Tue, 7 Aug 2018 12:04:40 +0300 Subject: [PATCH] fxremap.c: warning fixes. --- glide2x/cvg/init/fxremap.c | 6 ++++-- glide3x/cvg/init/fxremap.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/glide2x/cvg/init/fxremap.c b/glide2x/cvg/init/fxremap.c index 1524a5a..6d28eaf 100644 --- a/glide2x/cvg/init/fxremap.c +++ b/glide2x/cvg/init/fxremap.c @@ -75,7 +75,9 @@ static RangeStruct test_data[6]= #endif static RangeStruct map[80]; +#if 0 /* not used */ static RangeStruct hole[80]; +#endif static RangeStruct *first_entry; static RangeStruct *last_entry; static long entries=0; @@ -299,7 +301,7 @@ static RangeStruct *TestForConflicts(void) else { if (!silent) { printf("FxRemap: Possible PCI conflict not with Voodoo device\n"); - printf("%X (%X) <-> %X:%X (%X)\n",cur->id, cur->address, + printf("%X (%X) <-> %X (%X)\n",cur->id, cur->address, cur->next->id, cur->next->address); } } @@ -793,7 +795,7 @@ static FxBool IsCardVoodoo(long i) static FxBool IsCardS3(long i) { FxU32 vendor,dev_id; - + pciGetConfigData(PCI_VENDOR_ID,i,&vendor); pciGetConfigData(PCI_DEVICE_ID,i,&dev_id); if ((vendor==0x5333)&&((dev_id==0x88f0)||(dev_id==0x8880))) diff --git a/glide3x/cvg/init/fxremap.c b/glide3x/cvg/init/fxremap.c index e70c156..b4c3b46 100644 --- a/glide3x/cvg/init/fxremap.c +++ b/glide3x/cvg/init/fxremap.c @@ -75,7 +75,9 @@ static RangeStruct test_data[6]= #endif static RangeStruct map[80]; +#if 0 /* not used */ static RangeStruct hole[80]; +#endif static RangeStruct *first_entry; static RangeStruct *last_entry; static int entries=0; @@ -795,7 +797,7 @@ static FxBool IsCardVoodoo(int i) static FxBool IsCardS3(int i) { FxU32 vendor,dev_id; - + pciGetConfigData(PCI_VENDOR_ID,i,&vendor); pciGetConfigData(PCI_DEVICE_ID,i,&dev_id); if ((vendor==0x5333)&&((dev_id==0x88f0)||(dev_id==0x8880)))