From 77de9e7796ba5b88d82c019765e0f787b13cb73a Mon Sep 17 00:00:00 2001 From: Lephe Date: Mon, 13 Jul 2020 17:47:21 +0200 Subject: [PATCH] move private headers to subfolders of src/ This keeps the include/ folder clean. --- TODO | 1 - src/gray/engine.c | 2 +- src/gray/grect.c | 2 +- src/gray/gsubimage.c | 2 +- src/gray/gtext.c | 2 +- src/render-cg/dupdate.c | 2 +- include/display/cg.h => src/render-cg/render-cg.h | 8 ++++---- src/render-cg/topti.c | 3 ++- src/render-fx/bopti.c | 2 +- src/render-fx/dclear.c | 2 +- src/render-fx/dpixel.c | 2 +- src/render-fx/drect.c | 2 +- src/render-fx/dsubimage.c | 2 +- src/render-fx/dupdate.c | 2 +- src/render-fx/gint_dline.c | 2 +- src/render-fx/masks.c | 2 +- include/display/fx.h => src/render-fx/render-fx.h | 8 ++++---- src/render-fx/topti.c | 5 +++-- src/render/dline.c | 4 ++-- include/display/common.h => src/render/render.h | 12 ++++++------ src/render/topti.c | 3 ++- 21 files changed, 36 insertions(+), 34 deletions(-) rename include/display/cg.h => src/render-cg/render-cg.h (51%) rename include/display/fx.h => src/render-fx/render-fx.h (96%) rename include/display/common.h => src/render/render.h (89%) diff --git a/TODO b/TODO index c1e08c0..aa2b81e 100644 --- a/TODO +++ b/TODO @@ -7,7 +7,6 @@ Issues: * #10 support fx-CG 20 Extensions on existing code: -* build: move the private headers to the src/ folder * tmu: make interrupt handlers more elegant * bopti: try to display fullscreen images with TLB access + DMA on fxcg50 * topti: support unicode fonts diff --git a/src/gray/engine.c b/src/gray/engine.c index e589684..ae28c3f 100644 --- a/src/gray/engine.c +++ b/src/gray/engine.c @@ -10,7 +10,7 @@ #include #include -#include +#include "../render-fx/render-fx.h" /* Three additional video RAMS, allocated statically if --static-gray was set at configure time, or with malloc() otherwise. */ diff --git a/src/gray/grect.c b/src/gray/grect.c index f9d4fe5..511253c 100644 --- a/src/gray/grect.c +++ b/src/gray/grect.c @@ -1,6 +1,6 @@ #include #include -#include +#include "../render-fx/render-fx.h" /* grect(): Fill a rectangle on the screen */ void grect(int x1, int y1, int x2, int y2, color_t color) diff --git a/src/gray/gsubimage.c b/src/gray/gsubimage.c index b5aee3d..27cc6ad 100644 --- a/src/gray/gsubimage.c +++ b/src/gray/gsubimage.c @@ -1,5 +1,5 @@ #include -#include +#include "../render-fx/render-fx.h" #include "../render-fx/bopti-asm.h" /* List of rendering functions */ diff --git a/src/gray/gtext.c b/src/gray/gtext.c index 0211bf2..67db862 100644 --- a/src/gray/gtext.c +++ b/src/gray/gtext.c @@ -1,5 +1,5 @@ #include -#include +#include "../render/render.h" #include "../render-fx/topti-asm.h" /* gtext_opt(): Display a string of text */ diff --git a/src/render-cg/dupdate.c b/src/render-cg/dupdate.c index 57aebdf..35c0192 100644 --- a/src/render-cg/dupdate.c +++ b/src/render-cg/dupdate.c @@ -1,6 +1,6 @@ #include -#include #include +#include "render-cg.h" /* dupdate() - Push the video RAM to the display driver */ void dupdate(void) diff --git a/include/display/cg.h b/src/render-cg/render-cg.h similarity index 51% rename from include/display/cg.h rename to src/render-cg/render-cg.h index 58b79b5..6d94519 100644 --- a/include/display/cg.h +++ b/src/render-cg/render-cg.h @@ -1,12 +1,12 @@ //--- -// display:cg - Internal definitions for the display module on fxcg50 +// render-cg - Internal definitions for the display module on fxcg50 //--- -#ifndef DISPLAY_CG -#define DISPLAY_CG +#ifndef RENDER_CG +#define RENDER_CG /* dvram_switch() - triple buffering switch Alternates VRAMs after a display update started. */ void dvram_switch(void); -#endif /* DISPLAY_CG */ +#endif /* RENDER_CG */ diff --git a/src/render-cg/topti.c b/src/render-cg/topti.c index ea7bda2..6c04039 100644 --- a/src/render-cg/topti.c +++ b/src/render-cg/topti.c @@ -2,7 +2,8 @@ #include #include #include -#include + +#include "../render/render.h" #include "topti-asm.h" /* Default font */ diff --git a/src/render-fx/bopti.c b/src/render-fx/bopti.c index 026af9d..afb8469 100644 --- a/src/render-fx/bopti.c +++ b/src/render-fx/bopti.c @@ -1,6 +1,6 @@ #include #include -#include +#include "render-fx.h" #include "bopti-asm.h" /* struct rbox: A rendering box (target coordinates and source rectangle) diff --git a/src/render-fx/dclear.c b/src/render-fx/dclear.c index 4411475..7d5fcc1 100644 --- a/src/render-fx/dclear.c +++ b/src/render-fx/dclear.c @@ -1,5 +1,5 @@ #include -#include +#include "render-fx.h" /* dclear() - fill the screen with a single color */ void dclear(color_t color) diff --git a/src/render-fx/dpixel.c b/src/render-fx/dpixel.c index 87ab44b..106709f 100644 --- a/src/render-fx/dpixel.c +++ b/src/render-fx/dpixel.c @@ -1,6 +1,6 @@ #include #include -#include +#include "render-fx.h" /* dpixel() - change a pixel's color */ void dpixel(int x, int y, int color) diff --git a/src/render-fx/drect.c b/src/render-fx/drect.c index dd37ffa..0eed920 100644 --- a/src/render-fx/drect.c +++ b/src/render-fx/drect.c @@ -1,6 +1,6 @@ #include #include -#include +#include "render-fx.h" /* drect() - fill a rectangle of the screen */ void drect(int x1, int y1, int x2, int y2, int color) diff --git a/src/render-fx/dsubimage.c b/src/render-fx/dsubimage.c index a338a15..230d18f 100644 --- a/src/render-fx/dsubimage.c +++ b/src/render-fx/dsubimage.c @@ -1,5 +1,5 @@ #include -#include +#include "render-fx.h" #include "bopti-asm.h" /* List of rendering functions */ diff --git a/src/render-fx/dupdate.c b/src/render-fx/dupdate.c index 53cbb32..1ec7d85 100644 --- a/src/render-fx/dupdate.c +++ b/src/render-fx/dupdate.c @@ -1,6 +1,6 @@ #include #include -#include +#include "render-fx.h" /* Standard video RAM for fx9860g is 1 bit per pixel */ GSECTION(".bss") static uint32_t fx_vram[256]; diff --git a/src/render-fx/gint_dline.c b/src/render-fx/gint_dline.c index 6eec4b9..8880bdd 100644 --- a/src/render-fx/gint_dline.c +++ b/src/render-fx/gint_dline.c @@ -1,6 +1,6 @@ #include #include -#include +#include "render-fx.h" /* gint_dhline(): Optimized horizontal line using a rectangle mask */ void gint_dhline(int x1, int x2, int y, int color) diff --git a/src/render-fx/masks.c b/src/render-fx/masks.c index 26a4fcf..ca87e64 100644 --- a/src/render-fx/masks.c +++ b/src/render-fx/masks.c @@ -1,4 +1,4 @@ -#include +#include "render-fx.h" /* masks() - compute the vram masks for a given rectangle */ void masks(int x1, int x2, uint32_t *masks) diff --git a/include/display/fx.h b/src/render-fx/render-fx.h similarity index 96% rename from include/display/fx.h rename to src/render-fx/render-fx.h index d4257e3..05ec92b 100644 --- a/include/display/fx.h +++ b/src/render-fx/render-fx.h @@ -1,9 +1,9 @@ //--- -// display:fx - Internal definitions for the display module on fx9860g +// render-fx - Internal definitions for the display module on fx9860g //--- -#ifndef DISPLAY_FX -#define DISPLAY_FX +#ifndef RENDER_FX +#define RENDER_FX #include #include @@ -102,4 +102,4 @@ void gsubimage return; \ } -#endif /* DISPLAY_FX */ +#endif /* RENDER_FX */ diff --git a/src/render-fx/topti.c b/src/render-fx/topti.c index ada2a88..e53c0b3 100644 --- a/src/render-fx/topti.c +++ b/src/render-fx/topti.c @@ -1,8 +1,9 @@ #include #include #include -#include -#include + +#include "../render/render.h" +#include "render-fx.h" #include "topti-asm.h" /* Default font */ diff --git a/src/render/dline.c b/src/render/dline.c index 06888ca..6e37afb 100644 --- a/src/render/dline.c +++ b/src/render/dline.c @@ -1,9 +1,9 @@ #include #include -#include +#include "../render/render.h" #ifdef FX9860G -#include +#include "../render-fx/render-fx.h" #endif /* dline(): Bresenham line drawing algorithm diff --git a/include/display/common.h b/src/render/render.h similarity index 89% rename from include/display/common.h rename to src/render/render.h index 0075e64..95522c0 100644 --- a/include/display/common.h +++ b/src/render/render.h @@ -1,9 +1,9 @@ //--- -// display:common - Internal definitions for common display functions +// render - Internal definitions for common display functions //--- -#ifndef DISPLAY_COMMON -#define DISPLAY_COMMON +#ifndef RENDER_COMMON +#define RENDER_COMMON #include @@ -22,9 +22,9 @@ void gint_dvline(int y1, int y2, int x, color_t color); //--- /* Current font */ -extern font_t const * topti_font; +extern font_t const *topti_font; /* Default font */ -extern font_t const * gint_default_font; +extern font_t const *gint_default_font; /* enum topti_charset: Available character set decoders Each charset is associated with a reduced character table. */ @@ -57,4 +57,4 @@ int charset_decode(enum topti_charset set, uint c); using a proportional font, the size array is not heeded for. */ int topti_offset(font_t const *f, uint glyph); -#endif /* DISPLAY_COMMON */ +#endif /* RENDER_COMMON */ diff --git a/src/render/topti.c b/src/render/topti.c index 6d7b869..0788beb 100644 --- a/src/render/topti.c +++ b/src/render/topti.c @@ -1,6 +1,7 @@ #include #include -#include + +#include "../render/render.h" /* TODO: These parameters will eventually be specified by the font */ #define CHAR_SPACING 1