From bcfe151ba1f8dcf743f181f8673f8a5a9f90823d Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 14 May 2024 17:03:47 +0200 Subject: drop compat with ancient xserver versions We're relying on at least 1.18 now. Signed-off-by: Enrico Weigelt, metux IT consult --- src/geode_ddc.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/geode_ddc.c') diff --git a/src/geode_ddc.c b/src/geode_ddc.c index 7b8277d..a72844d 100644 --- a/src/geode_ddc.c +++ b/src/geode_ddc.c @@ -175,10 +175,8 @@ GeodeGetDDC(ScrnInfoPtr pScrni) mon = xf86DoEDID_DDC2(DDC_CALL(pScrni), bus); -#if (XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,4,99,0,0)) if (mon) xf86DDCApplyQuirks(pScrni->scrnIndex, mon); -#endif xf86DestroyI2CBusRec(bus, FALSE, FALSE); -- cgit v1.2.3 From e46b0b9a39ec00dd8006d9927aaa21440b30b7bc Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 28 May 2024 14:49:08 +0200 Subject: drop old compat macros There's used to have separate versions for older Xserver versions, but no anymore, so these aren't needed anymore. Signed-off-by: Enrico Weigelt, metux IT consult --- src/geode_ddc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/geode_ddc.c') diff --git a/src/geode_ddc.c b/src/geode_ddc.c index a72844d..8227207 100644 --- a/src/geode_ddc.c +++ b/src/geode_ddc.c @@ -173,7 +173,7 @@ GeodeGetDDC(ScrnInfoPtr pScrni) if (!GeodeI2CInit(pScrni, &bus, "CS5536 DDC BUS")) return NULL; - mon = xf86DoEDID_DDC2(DDC_CALL(pScrni), bus); + mon = xf86DoEDID_DDC2(pScrni, bus); if (mon) xf86DDCApplyQuirks(pScrni->scrnIndex, mon); -- cgit v1.2.3 From 224f565dec708eb0f85964e2b74c31b87c3e1808 Mon Sep 17 00:00:00 2001 From: Connor Behan Date: Sun, 23 Jun 2024 22:24:44 -0300 Subject: Suppress majority of compiler warnings This applies some obvious changes to stop gcc from complaining about dead code, shadow declarations, differing signedness and sections that mix declarations with code. The warning about discarding const qualifiers is more annoying because we pass string literals to some functions which accept non-const pointers. Currently, this takes the following approach. If the function *needs* to accept non-const pointers, cast the string literal as char *. Otherwise, change the function to only accept a const pointer. To anticipate future use cases though, I could also leave function definitions as they are and just always cast string literals. Alternatively, if this is more trouble that it is worth, we could just put up with the warnings. Signed-off-by: Connor Behan --- src/geode_ddc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/geode_ddc.c') diff --git a/src/geode_ddc.c b/src/geode_ddc.c index 8227207..0a873c4 100644 --- a/src/geode_ddc.c +++ b/src/geode_ddc.c @@ -117,7 +117,7 @@ geode_ddc_getbits(I2CBusPtr b, int *scl, int *sda) } Bool -GeodeI2CInit(ScrnInfoPtr pScrni, I2CBusPtr * ptr, char *name) +GeodeI2CInit(ScrnInfoPtr pScrni, I2CBusPtr * ptr, const char *name) { I2CBusPtr bus; unsigned int ddciobase; @@ -150,7 +150,7 @@ GeodeI2CInit(ScrnInfoPtr pScrni, I2CBusPtr * ptr, char *name) if (!bus) return FALSE; - bus->BusName = name; + bus->BusName = (char *)name; bus->scrnIndex = pScrni->scrnIndex; bus->I2CGetBits = geode_ddc_getbits; -- cgit v1.2.3