summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Valentin <benjamin.valentin@ml-pa.com>2022-11-25 16:29:07 +0100
committerBenjamin Valentin <benjamin.valentin@ml-pa.com>2022-11-25 16:29:07 +0100
commit64e2dee483c8d2a87ad5076694f9996222580a04 (patch)
treed97336f176f1b8095af5a8adbbc3b1049e658bf3
parentba223c5dc8f367a20ff8a91ab6c7208218e18080 (diff)
fix some build warnings
Modern gcc complains about misleading indentation and multiple function definitions, so let's fix those. Signed-off-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
-rw-r--r--src/atii2c.c2
-rw-r--r--src/atii2c.h2
-rw-r--r--src/atimach64exa.c10
-rw-r--r--src/ativga.c8
-rw-r--r--src/atiwonderio.c2
5 files changed, 7 insertions, 17 deletions
diff --git a/src/atii2c.c b/src/atii2c.c
index 6e3a7ef..72b7eac 100644
--- a/src/atii2c.c
+++ b/src/atii2c.c
@@ -315,7 +315,7 @@ ATICreateI2CBusRec
(
int iScreen,
ATIPtr pATI,
- char *BusName
+ const char *BusName
)
{
I2CBusPtr pI2CBus;
diff --git a/src/atii2c.h b/src/atii2c.h
index ba3494e..7c95acf 100644
--- a/src/atii2c.h
+++ b/src/atii2c.h
@@ -42,7 +42,7 @@ struct _ATII2CRec
};
extern void ATII2CPreInit(ScrnInfoPtr, ATIPtr);
-extern I2CBusPtr ATICreateI2CBusRec(int, ATIPtr, char *);
+extern I2CBusPtr ATICreateI2CBusRec(int, ATIPtr, const char *);
extern void ATII2CFreeScreen(int);
#endif /* ___ATII2C_H___ */
diff --git a/src/atimach64exa.c b/src/atimach64exa.c
index ea4c98e..99a924c 100644
--- a/src/atimach64exa.c
+++ b/src/atimach64exa.c
@@ -74,16 +74,6 @@
#ifdef USE_EXA
extern CARD8 ATIMach64ALU[];
-extern void
-ATIMach64ValidateClip
-(
- ATIPtr pATI,
- int sc_left,
- int sc_right,
- int sc_top,
- int sc_bottom
-);
-
#if 0
#define MACH64_TRACE(x) \
do { \
diff --git a/src/ativga.c b/src/ativga.c
index 8f4b0da..168c5c1 100644
--- a/src/ativga.c
+++ b/src/ativga.c
@@ -49,8 +49,8 @@ ATIVGAPreInit
/* Initialise sequencer register values */
pATIHW->seq[0] = 0x03U;
- pATIHW->seq[2] = 0x0FU;
- pATIHW->seq[4] = 0x0AU;
+ pATIHW->seq[2] = 0x0FU;
+ pATIHW->seq[4] = 0x0AU;
/* Initialise CRTC register values */
if (((pATI->Chip >= ATI_CHIP_264CT)))
@@ -58,7 +58,7 @@ ATIVGAPreInit
else
pATIHW->crt[19] = pATI->displayWidth >> 4;
- pATIHW->crt[23] = 0xE3U;
+ pATIHW->crt[23] = 0xE3U;
pATIHW->crt[24] = 0xFFU;
/* Initialise attribute controller register values */
@@ -66,7 +66,7 @@ ATIVGAPreInit
for (Index = 0; Index < 16; Index++)
pATIHW->attr[Index] = Index;
- pATIHW->attr[16] = 0x01U;
+ pATIHW->attr[16] = 0x01U;
pATIHW->attr[17] = 0xFFU;
}
pATIHW->attr[18] = 0x0FU;
diff --git a/src/atiwonderio.c b/src/atiwonderio.c
index e6c0db7..825ca13 100644
--- a/src/atiwonderio.c
+++ b/src/atiwonderio.c
@@ -60,7 +60,7 @@ ATIModifyExtReg
if (CurrentValue == NewValue)
return;
- ATIPutExtReg(Index, NewValue);
+ ATIPutExtReg(Index, NewValue);
}
#endif /* AVOID_CPIO */