From c826294a965768725e54b5c5aacdfebb8abf1826 Mon Sep 17 00:00:00 2001
From: starfrost013 <mario64crashed@gmail.com>
Date: Tue, 17 Jun 2025 01:07:26 +0100
Subject: [PATCH] Move components of video cards (external ramdacs and clock
 generators that could be paired with many cards) to their own folders.
 Reorganise video cmakelists

---
 src/video/CMakeLists.txt                      | 110 +++++++++++++-----
 .../vid_clockgen_av9194.c}                    |   0
 .../vid_clockgen_icd2061.c}                   |   0
 .../vid_clockgen_ics2494.c}                   |   0
 .../vid_clockgen_ics2595.c}                   |   0
 .../vid_ramdac_ati68860.c}                    |   0
 .../vid_ramdac_ati68875.c}                    |   0
 .../vid_ramdac_att20c49x.c}                   |   0
 .../vid_ramdac_att2xc498.c}                   |   0
 .../vid_ramdac_bt481.c}                       |   0
 .../vid_ramdac_bt48x.c}                       |   0
 .../vid_ramdac_ibm_rgb528.c}                  |   0
 .../vid_ramdac_sc1148x.c}                     |   0
 .../vid_ramdac_sc1502x.c}                     |   0
 .../vid_ramdac_sdac.c}                        |   0
 .../vid_ramdac_stg1702.c}                     |   0
 .../vid_ramdac_tkd8001.c}                     |   0
 .../vid_ramdac_tvp3026.c}                     |   0
 18 files changed, 80 insertions(+), 30 deletions(-)
 rename src/video/{vid_av9194.c => clockgen/vid_clockgen_av9194.c} (100%)
 rename src/video/{vid_icd2061.c => clockgen/vid_clockgen_icd2061.c} (100%)
 rename src/video/{vid_ics2494.c => clockgen/vid_clockgen_ics2494.c} (100%)
 rename src/video/{vid_ics2595.c => clockgen/vid_clockgen_ics2595.c} (100%)
 rename src/video/{vid_ati68860_ramdac.c => ramdac/vid_ramdac_ati68860.c} (100%)
 rename src/video/{vid_ati68875_ramdac.c => ramdac/vid_ramdac_ati68875.c} (100%)
 rename src/video/{vid_att20c49x_ramdac.c => ramdac/vid_ramdac_att20c49x.c} (100%)
 rename src/video/{vid_att2xc498_ramdac.c => ramdac/vid_ramdac_att2xc498.c} (100%)
 rename src/video/{vid_bt481_ramdac.c => ramdac/vid_ramdac_bt481.c} (100%)
 rename src/video/{vid_bt48x_ramdac.c => ramdac/vid_ramdac_bt48x.c} (100%)
 rename src/video/{vid_ibm_rgb528_ramdac.c => ramdac/vid_ramdac_ibm_rgb528.c} (100%)
 rename src/video/{vid_sc1148x_ramdac.c => ramdac/vid_ramdac_sc1148x.c} (100%)
 rename src/video/{vid_sc1502x_ramdac.c => ramdac/vid_ramdac_sc1502x.c} (100%)
 rename src/video/{vid_sdac_ramdac.c => ramdac/vid_ramdac_sdac.c} (100%)
 rename src/video/{vid_stg_ramdac.c => ramdac/vid_ramdac_stg1702.c} (100%)
 rename src/video/{vid_tkd8001_ramdac.c => ramdac/vid_ramdac_tkd8001.c} (100%)
 rename src/video/{vid_tvp3026_ramdac.c => ramdac/vid_ramdac_tvp3026.c} (100%)

diff --git a/src/video/CMakeLists.txt b/src/video/CMakeLists.txt
index 09c49dabe..4cac8b76d 100644
--- a/src/video/CMakeLists.txt
+++ b/src/video/CMakeLists.txt
@@ -15,10 +15,39 @@
 #
 
 add_library(vid OBJECT
+
+    # Video Core
     agpgart.c
     video.c
     vid_table.c
-    # CGA 
+
+    # RAMDAC (Should this be its own library?)
+    ramdac/vid_ramdac_ati68860.c
+    ramdac/vid_ramdac_ati68875.c 
+    ramdac/vid_ramdac_att20c49x.c
+    ramdac/vid_ramdac_att2xc498.c
+    ramdac/vid_ramdac_bt48x.c 
+    ramdac/vid_ramdac_bt481.c 
+    ramdac/vid_ramdac_ibm_rgb528.c
+    ramdac/vid_ramdac_sc1148x.c 
+    ramdac/vid_ramdac_sc1502x.c 
+    ramdac/vid_ramdac_sdac.c 
+    ramdac/vid_ramdac_stg1702.c 
+    ramdac/vid_ramdac_tkd8001.c 
+    ramdac/vid_ramdac_tvp3026.c 
+
+    # Clock generator chips 
+    clockgen/vid_clockgen_av9194.c 
+    clockgen/vid_clockgen_icd2061.c
+    clockgen/vid_clockgen_ics2494.c 
+    clockgen/vid_clockgen_ics2595.c
+
+    # DDC / monitor identification stuff
+    vid_ddc.c
+
+    # CARDS start here
+
+    # CGA / Super CGA
     vid_cga.c
     vid_cga_comp.c
     vid_cga_compaq.c 
@@ -32,64 +61,84 @@ add_library(vid OBJECT
     # PCJr/Tandy
     vid_pcjr.c
     vid_tandy.c
-
     vid_mda.c
+
+    # Hercules
     vid_hercules.c
     vid_hercules_plus.c
     vid_hercules_incolor.c
+
+    # Other early CGA-era cards
     vid_genius.c
+    vid_sigma.c
+
+    # PGC / IM1024 / WY700 high-resolution
     vid_pgc.c
     vid_im1024.c
-    vid_sigma.c
     vid_wy700.c
+
+    # EGA
     vid_ega.c
     vid_ega_render.c
-    vid_svga.c
-    vid_8514a.c
-    vid_svga_render.c
-    vid_ddc.c
+    vid_jega.c
+
+    # (Real IBM) VGA 
     vid_vga.c
+
+    # Super VGA core
+    vid_svga.c
+    vid_svga_render.c
+
+    # 8514/A, XGA and derivatives
+    vid_8514a.c
+    vid_xga.c
+    vid_ps55da2.c
+
+    # ATI Technologies
     vid_ati_eeprom.c
     vid_ati18800.c
     vid_ati28800.c
     vid_ati_mach8.c
     vid_ati_mach64.c
-    vid_ati68875_ramdac.c
-    vid_ati68860_ramdac.c
-    vid_bt481_ramdac.c
-    vid_bt48x_ramdac.c
+
+    # Chips & Technologies
     vid_chips_69000.c
-    vid_av9194.c
-    vid_icd2061.c
-    vid_ics2494.c
-    vid_ics2595.c
+
+    # Cirrus Logic
     vid_cl54xx.c
+
+    # Tseng Labs
     vid_et3000.c
     vid_et4000.c
-    vid_sc1148x_ramdac.c
-    vid_sc1502x_ramdac.c
     vid_et4000w32.c
-    vid_stg_ramdac.c
+
+    # Headland
     vid_ht216.c
     vid_oak_oti.c
+
+    # Paradise
     vid_paradise.c
     vid_rtg310x.c
     vid_f82c425.c
     vid_ti_cf62011.c
-    vid_tvga.c vid_tgui9440.c
-    vid_tkd8001_ramdac.c
-    vid_att20c49x_ramdac.c
-    vid_s3.c vid_s3_virge.c
-    vid_ibm_rgb528_ramdac.c
-    vid_sdac_ramdac.c
+
+    # Trident
+    vid_tvga.c 
+    vid_tgui9440.c
+
+    # S3 Graphics
+    vid_s3.c 
+    vid_s3_virge.c
+
+    # Matrox
     vid_mga.c
-    vid_tvp3026_ramdac.c
-    vid_att2xc498_ramdac.c
-    vid_xga.c
-    vid_bochs_vbe.c
-    vid_ps55da2.c
-    vid_jega.c
+
+    # NVidia (pending)
     nv/nv_rivatimer.c
+
+    # Generic
+    vid_bochs_vbe.c
+
 )
 
 if(G100)
@@ -100,6 +149,7 @@ if(XL24)
     target_compile_definitions(vid PRIVATE USE_XL24)
 endif()
 
+# 3Dfx Voodoo
 add_library(voodoo OBJECT
     vid_voodoo.c
     vid_voodoo_banshee.c
diff --git a/src/video/vid_av9194.c b/src/video/clockgen/vid_clockgen_av9194.c
similarity index 100%
rename from src/video/vid_av9194.c
rename to src/video/clockgen/vid_clockgen_av9194.c
diff --git a/src/video/vid_icd2061.c b/src/video/clockgen/vid_clockgen_icd2061.c
similarity index 100%
rename from src/video/vid_icd2061.c
rename to src/video/clockgen/vid_clockgen_icd2061.c
diff --git a/src/video/vid_ics2494.c b/src/video/clockgen/vid_clockgen_ics2494.c
similarity index 100%
rename from src/video/vid_ics2494.c
rename to src/video/clockgen/vid_clockgen_ics2494.c
diff --git a/src/video/vid_ics2595.c b/src/video/clockgen/vid_clockgen_ics2595.c
similarity index 100%
rename from src/video/vid_ics2595.c
rename to src/video/clockgen/vid_clockgen_ics2595.c
diff --git a/src/video/vid_ati68860_ramdac.c b/src/video/ramdac/vid_ramdac_ati68860.c
similarity index 100%
rename from src/video/vid_ati68860_ramdac.c
rename to src/video/ramdac/vid_ramdac_ati68860.c
diff --git a/src/video/vid_ati68875_ramdac.c b/src/video/ramdac/vid_ramdac_ati68875.c
similarity index 100%
rename from src/video/vid_ati68875_ramdac.c
rename to src/video/ramdac/vid_ramdac_ati68875.c
diff --git a/src/video/vid_att20c49x_ramdac.c b/src/video/ramdac/vid_ramdac_att20c49x.c
similarity index 100%
rename from src/video/vid_att20c49x_ramdac.c
rename to src/video/ramdac/vid_ramdac_att20c49x.c
diff --git a/src/video/vid_att2xc498_ramdac.c b/src/video/ramdac/vid_ramdac_att2xc498.c
similarity index 100%
rename from src/video/vid_att2xc498_ramdac.c
rename to src/video/ramdac/vid_ramdac_att2xc498.c
diff --git a/src/video/vid_bt481_ramdac.c b/src/video/ramdac/vid_ramdac_bt481.c
similarity index 100%
rename from src/video/vid_bt481_ramdac.c
rename to src/video/ramdac/vid_ramdac_bt481.c
diff --git a/src/video/vid_bt48x_ramdac.c b/src/video/ramdac/vid_ramdac_bt48x.c
similarity index 100%
rename from src/video/vid_bt48x_ramdac.c
rename to src/video/ramdac/vid_ramdac_bt48x.c
diff --git a/src/video/vid_ibm_rgb528_ramdac.c b/src/video/ramdac/vid_ramdac_ibm_rgb528.c
similarity index 100%
rename from src/video/vid_ibm_rgb528_ramdac.c
rename to src/video/ramdac/vid_ramdac_ibm_rgb528.c
diff --git a/src/video/vid_sc1148x_ramdac.c b/src/video/ramdac/vid_ramdac_sc1148x.c
similarity index 100%
rename from src/video/vid_sc1148x_ramdac.c
rename to src/video/ramdac/vid_ramdac_sc1148x.c
diff --git a/src/video/vid_sc1502x_ramdac.c b/src/video/ramdac/vid_ramdac_sc1502x.c
similarity index 100%
rename from src/video/vid_sc1502x_ramdac.c
rename to src/video/ramdac/vid_ramdac_sc1502x.c
diff --git a/src/video/vid_sdac_ramdac.c b/src/video/ramdac/vid_ramdac_sdac.c
similarity index 100%
rename from src/video/vid_sdac_ramdac.c
rename to src/video/ramdac/vid_ramdac_sdac.c
diff --git a/src/video/vid_stg_ramdac.c b/src/video/ramdac/vid_ramdac_stg1702.c
similarity index 100%
rename from src/video/vid_stg_ramdac.c
rename to src/video/ramdac/vid_ramdac_stg1702.c
diff --git a/src/video/vid_tkd8001_ramdac.c b/src/video/ramdac/vid_ramdac_tkd8001.c
similarity index 100%
rename from src/video/vid_tkd8001_ramdac.c
rename to src/video/ramdac/vid_ramdac_tkd8001.c
diff --git a/src/video/vid_tvp3026_ramdac.c b/src/video/ramdac/vid_ramdac_tvp3026.c
similarity index 100%
rename from src/video/vid_tvp3026_ramdac.c
rename to src/video/ramdac/vid_ramdac_tvp3026.c