From c74b1d68849897f5a27a84ab60c635731b48e5a0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 5 Jun 2024 15:43:03 +0200 Subject: fix rendundant declarations Fix a a lot warnings on duplicate forward declarations. Signed-off-by: Enrico Weigelt, metux IT consult --- src/cimarron.c | 15 ++++++++------- src/gfx/disp_gu1.c | 3 --- src/gfx/disp_gu2.c | 3 --- src/gfx/gfx_priv.h | 11 ----------- src/gfx/gfx_vid.c | 2 -- 5 files changed, 8 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/cimarron.c b/src/cimarron.c index e4376a9..4b54de8 100644 --- a/src/cimarron.c +++ b/src/cimarron.c @@ -145,6 +145,14 @@ /* #define CIMARRON_EXCLUDE_CUSTOM_MACROS */ + +/* ROUTINE DEFINITIONS */ +/* All routines have a prototype, even those that are not included */ +/* via #ifdefs. This prevents the user from having to include the */ +/* correct #defines anywhere he/she wants to call a Cimarron routine. */ + +#include "cim_rtns.h" + /*----------------------------------------------------------------------*/ /* MODULE VARIABLES */ /* The following #defines affect how global variables in each Cimarron */ @@ -190,13 +198,6 @@ void (*cim_wrmsr) (unsigned long, unsigned long, unsigned long); #include "cim_regs.h" -/* ROUTINE DEFINITIONS */ -/* All routines have a prototype, even those that are not included */ -/* via #ifdefs. This prevents the user from having to include the */ -/* correct #defines anywhere he/she wants to call a Cimarron routine. */ - -#include "cim_rtns.h" - /* HARDWARE ACCESS MACROS */ #include "cim_defs.h" diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c index a03c754..fa081eb 100644 --- a/src/gfx/disp_gu1.c +++ b/src/gfx/disp_gu1.c @@ -25,9 +25,6 @@ void gu1_enable_compression(void); /* private routine definition */ void gu1_disable_compression(void); /* private routine definition */ -void gfx_reset_video(void); /* private routine definition */ -int gfx_set_display_control(int sync_polarities); /* private routine - * definition */ int gu1_set_specified_mode(DISPLAYMODE * pMode, int bpp); /* VIDEO BUFFER SIZE */ diff --git a/src/gfx/disp_gu2.c b/src/gfx/disp_gu2.c index 1f0bbb6..381b4ef 100644 --- a/src/gfx/disp_gu2.c +++ b/src/gfx/disp_gu2.c @@ -29,9 +29,6 @@ void gu2_enable_compression(void); /* private routine definition */ void gu2_disable_compression(void); /* private routine definition */ -int gfx_set_display_control(int sync_polarities); /* private routine - * definition */ -void gfx_reset_video(void); int gu2_set_specified_mode(DISPLAYMODE * pMode, int bpp); /*--------------------------------------------------------------------------- diff --git a/src/gfx/gfx_priv.h b/src/gfx/gfx_priv.h index 4f63f62..7b255a5 100644 --- a/src/gfx/gfx_priv.h +++ b/src/gfx/gfx_priv.h @@ -77,12 +77,6 @@ unsigned long gu2_get_vip_register_base(void); #if GFX_MSR_REDCLOUD -/* PRIVATE ROUTINES */ - -void redcloud_build_mbus_tree(void); -int redcloud_init_msr_devices(MSR aDev[], unsigned int array_size); -DEV_STATUS redcloud_find_msr_device(MSR * pDev); - /* DYNAMIC ROUTINES */ #if GFX_MSR_DYNAMIC @@ -240,11 +234,6 @@ int gfx_get_display_video_downscale_enable(void); #if GFX_DISPLAY_GU2 -/* PRIVATE ROUTINES */ - -void gu2_enable_compression(void); -void gu2_disable_compression(void); - /* DYNAMIC ROUTINES */ #if GFX_DISPLAY_DYNAMIC diff --git a/src/gfx/gfx_vid.c b/src/gfx/gfx_vid.c index 0dd7847..c4215e8 100644 --- a/src/gfx/gfx_vid.c +++ b/src/gfx/gfx_vid.c @@ -145,8 +145,6 @@ unsigned short gfx_vid_height = 0; /* copy from last gfx_set_video_window int gfx_alpha_select = 0; /* currently selected alpha region */ -int gfx_set_screen_enable(int enable); /* forward declaration */ - /* INCLUDE SUPPORT FOR CS5530, IF SPECIFIED. */ #if GFX_VIDEO_CS5530 -- cgit v1.2.3