Remove _MASK fields from generated code

Author: tiagocoutinho

linuxpy/codegen/fb.py

@@ -42,15 +42,21 @@
 {iocs_body}
 """
 
+
+def no_mask(key, value):
+    return not key.endswith("_MASK")
+
+
 # macros from #define statements
 MACRO_ENUMS = [
     CEnum("Type", "FB_TYPE_"),
-    CEnum("Text", "FB_AUX_TEXT_"),
+    CEnum("Text", "FB_AUX_TEXT_", filter=no_mask),
     CEnum("VGAPlanes", "FB_AUX_VGA_PLANES_"),
     CEnum("Visual", "FB_VISUAL_"),
     CEnum("Acceleration", "FB_ACCEL_"),
+    CEnum("Activate", ["FB_ACTIVATE_", "FB_CHANGE_"], klass="IntFlag", filter=no_mask),
     CEnum("Sync", "FB_SYNC_", klass="IntFlag"),
-    CEnum("VarMode", "FB_VMODE_", klass="IntFlag"),
+    CEnum("VarMode", "FB_VMODE_", klass="IntFlag", filter=no_mask),
     CEnum("Rotation", "FB_ROTATE_"),
     CEnum("VESABlank", "VESA_"),
     CEnum("VarBlank", "FB_VBLANK_", klass="IntFlag"),

linuxpy/fb/device.py

@@ -56,7 +56,7 @@ def get_fix_screen_info(fd) -> FixScreenInfo:
     return _translate_fix_fix_screen_info(info)
 
 
-def get_raw_var_screen_info(fd):
+def get_raw_var_screen_info(fd) -> raw.fb_var_screeninfo:
     return ioctl(fd, raw.IOC.GET_VSCREENINFO, raw.fb_var_screeninfo())
 
 

linuxpy/fb/raw.py

@@ -5,7 +5,7 @@
 # Distributed under the GPLv3 license. See LICENSE for more info.
 
 # This file has been generated by __main__
-# Date: 2025-01-31 11:43:12.530033
+# Date: 2025-02-05 10:55:50.155347
 # System: Linux
 # Release: 6.8.0-51-generic
 # Version: #52-Ubuntu SMP PREEMPT_DYNAMIC Thu Dec  5 13:09:44 UTC 2024
@@ -32,7 +32,6 @@ class Text(enum.IntEnum):
     MGA_STEP16 = 3  # MGA Millenium I: text, attr, 14 reserved bytes
     MGA_STEP8 = 4  # other MGAs:      text, attr,  6 reserved bytes
     SVGA_GROUP = 8  # 8-15: SVGA tileblit compatible modes
-    SVGA_MASK = 7  # lower three bits says step
     SVGA_STEP2 = 8  # SVGA text mode:  text, attr
     SVGA_STEP4 = 9  # SVGA text mode:  text, attr,  2 reserved bytes
     SVGA_STEP8 = 10  # SVGA text mode:  text, attr,  6 reserved bytes
@@ -140,6 +139,18 @@ class Acceleration(enum.IntEnum):
     PUV3_UNIGFX = 0xA0  # PKUnity-v3 Unigfx
 
 
+class Activate(enum.IntFlag):
+    NOW = 0  # set values immediately (or vbl)
+    NXTOPEN = 1  # activate on next open
+    TEST = 2  # don't set, round up impossible
+    VBL = 16  # activate values on next vbl
+    CMAP_VBL = 32  # change colormap on vbl
+    ALL = 64  # change all VCs on this fb
+    FORCE = 128  # force apply even when no change
+    INV_MODE = 256  # invalidate videomode
+    KD_TEXT = 512  # for KDSET vt ioctl
+
+
 class Sync(enum.IntFlag):
     HOR_HIGH_ACT = 1  # horizontal sync high active
     VERT_HIGH_ACT = 2  # vertical sync high active
@@ -154,7 +165,6 @@ class VarMode(enum.IntFlag):
     INTERLACED = 1  # cinterlaced
     DOUBLE = 2  # double scan
     ODD_FLD_FIRST = 4  # cinterlaced: top line first
-    MASK = 0xFF
     YWRAP = 256  # ywrap instead of panning
     SMOOTH_XPAN = 512  # smooth xpan possible (internally used)
     CONUPDATE = 512  # don't update x/yoffset