xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xfree86/parser/Device.c     |    4 +--
 hw/xfree86/parser/xf86tokens.h |   44 -----------------------------------------
 2 files changed, 3 insertions(+), 45 deletions(-)

New commits:
commit 584bbe99884d9028741387879c1a8bba211ea4f0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Apr 29 13:03:21 2024 +0200

    xfree86: parser: rename IOBASE for fixing name conflict
    
    Resolve conflicts with OS headers definining IOBASE by renaming the
    IOBASE enum value to XF86_TOKEN_IOBASE.
    
    This way, don't need the special #undef hack anymore.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1405>

diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c
index d0d057adc..ebc7178fb 100644
--- a/hw/xfree86/parser/Device.c
+++ b/hw/xfree86/parser/Device.c
@@ -75,7 +75,7 @@ static const xf86ConfigSymTabRec DeviceTab[] = {
     {VIDEORAM, "videoram"},
     {BIOSBASE, "biosbase"},
     {MEMBASE, "membase"},
-    {IOBASE, "iobase"},
+    {XF86_TOKEN_IOBASE, "iobase"},
     {CLOCKCHIP, "clockchip"},
     {CHIPID, "chipid"},
     {CHIPREV, "chiprev"},
@@ -181,7 +181,7 @@ xf86parseDeviceSection(void)
                 Error(NUMBER_MSG, "MemBase");
             ptr->dev_mem_base = xf86_lex_val.num;
             break;
-        case IOBASE:
+        case XF86_TOKEN_IOBASE:
             if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
                 Error(NUMBER_MSG, "IOBase");
             ptr->dev_io_base = xf86_lex_val.num;
diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index 23c65eb12..75b9e1f8f 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/hw/xfree86/parser/xf86tokens.h
@@ -59,9 +59,6 @@
 #ifndef _xf86_tokens_h
 #define _xf86_tokens_h
 
-/* Undefine symbols that some OSs might define */
-#undef IOBASE
-
 /*
  * Each token should have a unique value regardless of the section
  * it is used in.
@@ -169,7 +166,7 @@ typedef enum {
     CLOCKS,
     VIDEORAM,
     BOARD,
-    IOBASE,
+    XF86_TOKEN_IOBASE,
     RAMDAC,
     DACSPEED,
     BIOSBASE,
commit a1fa019012d3d5cc2178ac74cc0760d084f2ef9c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 13 20:12:29 2024 +0100

    xfree86: parser: drop obsolete token enum values
    
    These have been forgotten on some major cleanup back almost two decades ago.
    (Daniel dropped a lot of dead code, which already had been removed earlier
    but merged back accidentially).
    
    Didn't look further back on where exactly they had become obsolete - being
    unused for decades should be enough justification for dropping.
    
    Fixes: 81913a12910e39d7ea6af8657c1c66cc6791cd65
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1405>

diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index 4abff0d79..23c65eb12 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/hw/xfree86/parser/xf86tokens.h
@@ -91,11 +91,6 @@ typedef enum {
     OPTION,
     COMMENT,
 
-    /* Frequency units */
-    HRZ,
-    KHZ,
-    MHZ,
-
     /* File tokens */
     FONTPATH,
     MODULEPATH,
@@ -126,9 +121,6 @@ typedef enum {
     GAMMA,
     USEMODES,
 
-    /* Modes tokens */
-    /* no new ones */
-
     /* Mode tokens */
     DOTCLOCK,
     HTIMINGS,
@@ -189,37 +181,6 @@ typedef enum {
     BUSID,
     IRQ,
 
-    /* Keyboard tokens */
-    AUTOREPEAT,
-    XLEDS,
-    KPROTOCOL,
-    XKBKEYMAP,
-    XKBCOMPAT,
-    XKBTYPES,
-    XKBKEYCODES,
-    XKBGEOMETRY,
-    XKBSYMBOLS,
-    XKBDISABLE,
-    PANIX106,
-    XKBRULES,
-    XKBMODEL,
-    XKBLAYOUT,
-    XKBVARIANT,
-    XKBOPTIONS,
-    /* Obsolete keyboard tokens */
-    SERVERNUM,
-    LEFTALT,
-    RIGHTALT,
-    SCROLLLOCK_TOK,
-    RIGHTCTL,
-    /* arguments for the above obsolete tokens */
-    CONF_KM_META,
-    CONF_KM_COMPOSE,
-    CONF_KM_MODESHIFT,
-    CONF_KM_MODELOCK,
-    CONF_KM_SCROLLLOCK,
-    CONF_KM_CONTROL,
-
     /* Pointer tokens */
     EMULATE3,
     BAUDRATE,