From 71fb02e03d9d3b5010f539698aea39d647177470 Mon Sep 17 00:00:00 2001 From: Zack Buhman Date: Thu, 24 Oct 2024 04:54:12 -0500 Subject: [PATCH] video_output: remove redundant header includes --- holly/video_output.cpp | 1 - holly/video_output.hpp | 2 ++ holly/video_output_mode.inc | 5 ----- regs/gen/video_output.py | 8 -------- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/holly/video_output.cpp b/holly/video_output.cpp index 4483d70..4abaa72 100644 --- a/holly/video_output.cpp +++ b/holly/video_output.cpp @@ -9,7 +9,6 @@ #include "video_output.hpp" #include "video_output_mode.inc" -#include "video_output.hpp" namespace video_output { diff --git a/holly/video_output.hpp b/holly/video_output.hpp index f8f8c21..8e8b3cb 100644 --- a/holly/video_output.hpp +++ b/holly/video_output.hpp @@ -2,6 +2,8 @@ #include +#include "core_bits.hpp" + namespace video_output { struct mode { diff --git a/holly/video_output_mode.inc b/holly/video_output_mode.inc index 2a7e570..ad49868 100644 --- a/holly/video_output_mode.inc +++ b/holly/video_output_mode.inc @@ -1,8 +1,3 @@ -#include - -#include "core_bits.hpp" -#include "video_output.hpp" - namespace video_output { const struct mode vga = { .fb_r_ctrl = fb_r_ctrl::vclk_div::pclk_vclk_1 diff --git a/regs/gen/video_output.py b/regs/gen/video_output.py index 9099970..8b44bff 100644 --- a/regs/gen/video_output.py +++ b/regs/gen/video_output.py @@ -119,13 +119,6 @@ def render_namespace(modes, max_len): yield from render_modes(modes, max_len) yield "}" -def render_header(): - yield "#include " - yield "" - yield '#include "core_bits.hpp"' - yield '#include "video_output.hpp"' - yield "" - def max_length(regs): max_length = 0 for register, *_ in regs: @@ -142,6 +135,5 @@ if __name__ == "__main__": modes = transpose_by_name(format_names, regs) max_length = max_length(regs) render, out = renderer() - render(render_header()) render(render_namespace(modes, max_length)) sys.stdout.write(out.getvalue())