From 3def4af6d34776ba09e57e50cb40181345d2f121 Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Fri, 4 Sep 2015 12:00:41 -0700 Subject: [PATCH] gfxboard static/extern declaration fixes (gcc is strict about this) --- gfxboard.cpp | 119 +++++++++++++++++++++++++-------------------- include/gfxboard.h | 7 +-- 2 files changed, 70 insertions(+), 56 deletions(-) diff --git a/gfxboard.cpp b/gfxboard.cpp index cdd0bbd7..af118202 100644 --- a/gfxboard.cpp +++ b/gfxboard.cpp @@ -16,8 +16,10 @@ #define MEMDEBUGTEST 0x1ff000 #define PICASSOIV_DEBUG_IO 0 +#if MEMLOGR static bool memlogr = false; static bool memlogw = false; +#endif #define BYTESWAP_WORD -1 #define BYTESWAP_LONG 1 @@ -36,6 +38,7 @@ static bool memlogw = false; #include "rommgr.h" #include "zfile.h" #include "gfxboard.h" +#include "rommgr.h" #include "qemuvga/qemuuaeglue.h" #include "qemuvga/vga.h" @@ -77,15 +80,9 @@ static bool memlogw = false; #define BOARD_MODEL_MEMORY_SPECTRUM 1 #define BOARD_MODEL_REGISTERS_SPECTRUM 2 -extern addrbank gfxboard_bank_memory, gfxboard_bank_memory_nojit; -extern addrbank gfxboard_bank_special; -extern addrbank gfxboard_bank_wbsmemory; -extern addrbank gfxboard_bank_lbsmemory; -extern addrbank gfxboard_bank_nbsmemory; - struct gfxboard { - TCHAR *name; + const TCHAR *name; TCHAR *manufacturername; TCHAR *configname; int manufacturer; @@ -206,11 +203,10 @@ static bool monswitch_reset; static int monswitch_delay; static int fullrefresh; static bool modechanged; -static uae_u8 *gfxboard_surface, *vram_address, *fakesurface_surface; +static uae_u8 *gfxboard_surface, *fakesurface_surface; static bool gfxboard_vblank; static bool gfxboard_intena; static bool vram_enabled, vram_offset_enabled; -static bool vram_byteswap; static hwaddr vram_offset[2]; static uae_u8 cirrus_pci[0x44]; static uae_u8 p4_pci[0x44]; @@ -223,6 +219,65 @@ static uae_u32 vgaioregionptr, vgavramregionptr, vgabank0regionptr, vgabank1regi static const MemoryRegionOps *vgaio, *vgaram, *vgalowram, *vgammio; static MemoryRegion vgaioregion, vgavramregion; +DECLARE_MEMORY_FUNCTIONS(gfxboard); +DECLARE_MEMORY_FUNCTIONS_WITH_SUFFIX(gfxboard, mem); +DECLARE_MEMORY_FUNCTIONS_WITH_SUFFIX(gfxboard, mem_nojit); +DECLARE_MEMORY_FUNCTIONS_WITH_SUFFIX(gfxboard, bsmem); +DECLARE_MEMORY_FUNCTIONS_WITH_SUFFIX(gfxboard, wbsmem); +DECLARE_MEMORY_FUNCTIONS_WITH_SUFFIX(gfxboard, lbsmem); +DECLARE_MEMORY_FUNCTIONS_WITH_SUFFIX(gfxboard, nbsmem); +DECLARE_MEMORY_FUNCTIONS_WITH_SUFFIX(gfxboard, regs); +DECLARE_MEMORY_FUNCTIONS_WITH_SUFFIX(gfxboards, regs); + +static addrbank gfxboard_bank_memory = { + gfxboard_lget_mem, gfxboard_wget_mem, gfxboard_bget_mem, + gfxboard_lput_mem, gfxboard_wput_mem, gfxboard_bput_mem, + gfxboard_xlate, gfxboard_check, NULL, NULL, NULL, + gfxboard_lget_mem, gfxboard_wget_mem, ABFLAG_RAM | ABFLAG_THREADSAFE +}; + +static addrbank gfxboard_bank_memory_nojit = { + gfxboard_lget_mem_nojit, gfxboard_wget_mem_nojit, gfxboard_bget_mem_nojit, + gfxboard_lput_mem_nojit, gfxboard_wput_mem_nojit, gfxboard_bput_mem_nojit, + gfxboard_xlate, gfxboard_check, NULL, NULL, NULL, + gfxboard_lget_mem_nojit, gfxboard_wget_mem_nojit, ABFLAG_RAM | ABFLAG_THREADSAFE +}; + +static addrbank gfxboard_bank_wbsmemory = { + gfxboard_lget_wbsmem, gfxboard_wget_wbsmem, gfxboard_bget_wbsmem, + gfxboard_lput_wbsmem, gfxboard_wput_wbsmem, gfxboard_bput_wbsmem, + gfxboard_xlate, gfxboard_check, NULL, NULL, NULL, + gfxboard_lget_wbsmem, gfxboard_wget_wbsmem, ABFLAG_RAM | ABFLAG_THREADSAFE +}; + +static addrbank gfxboard_bank_lbsmemory = { + gfxboard_lget_lbsmem, gfxboard_wget_lbsmem, gfxboard_bget_lbsmem, + gfxboard_lput_lbsmem, gfxboard_wput_lbsmem, gfxboard_bput_lbsmem, + gfxboard_xlate, gfxboard_check, NULL, NULL, NULL, + gfxboard_lget_lbsmem, gfxboard_wget_lbsmem, ABFLAG_RAM | ABFLAG_THREADSAFE +}; + +static addrbank gfxboard_bank_nbsmemory = { + gfxboard_lget_nbsmem, gfxboard_wget_nbsmem, gfxboard_bget_bsmem, + gfxboard_lput_nbsmem, gfxboard_wput_nbsmem, gfxboard_bput_bsmem, + gfxboard_xlate, gfxboard_check, NULL, NULL, _T("Picasso IV banked VRAM"), + gfxboard_lget_nbsmem, gfxboard_wget_nbsmem, ABFLAG_RAM | ABFLAG_THREADSAFE +}; + +static addrbank gfxboard_bank_registers = { + gfxboard_lget_regs, gfxboard_wget_regs, gfxboard_bget_regs, + gfxboard_lput_regs, gfxboard_wput_regs, gfxboard_bput_regs, + default_xlate, default_check, NULL, NULL, NULL, + dummy_lgeti, dummy_wgeti, ABFLAG_IO | ABFLAG_SAFE +}; + +static addrbank gfxboard_bank_special = { + gfxboards_lget_regs, gfxboards_wget_regs, gfxboards_bget_regs, + gfxboards_lput_regs, gfxboards_wput_regs, gfxboards_bput_regs, + default_xlate, default_check, NULL, NULL, _T("Picasso IV MISC"), + dummy_lgeti, dummy_wgeti, ABFLAG_IO | ABFLAG_SAFE +}; + static void init_board (void) { int vramsize = board->vrammax; @@ -344,11 +399,13 @@ void qemu_console_resize(QemuConsole *con, int width, int height) vga_height = height; } +#if 0 static uae_u8 pal64 (uae_u8 v) { v = (v << 2) | ((v >> 2) & 3); return v; } +#endif DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp, int linesize, uint8_t *data, @@ -1729,44 +1786,6 @@ void gfxboard_reset (void) } } -static addrbank gfxboard_bank_memory = { - gfxboard_lget_mem, gfxboard_wget_mem, gfxboard_bget_mem, - gfxboard_lput_mem, gfxboard_wput_mem, gfxboard_bput_mem, - gfxboard_xlate, gfxboard_check, NULL, NULL, NULL, - gfxboard_lget_mem, gfxboard_wget_mem, ABFLAG_RAM | ABFLAG_THREADSAFE -}; -static addrbank gfxboard_bank_memory_nojit = { - gfxboard_lget_mem_nojit, gfxboard_wget_mem_nojit, gfxboard_bget_mem_nojit, - gfxboard_lput_mem_nojit, gfxboard_wput_mem_nojit, gfxboard_bput_mem_nojit, - gfxboard_xlate, gfxboard_check, NULL, NULL, NULL, - gfxboard_lget_mem_nojit, gfxboard_wget_mem_nojit, ABFLAG_RAM | ABFLAG_THREADSAFE -}; - -static addrbank gfxboard_bank_wbsmemory = { - gfxboard_lget_wbsmem, gfxboard_wget_wbsmem, gfxboard_bget_wbsmem, - gfxboard_lput_wbsmem, gfxboard_wput_wbsmem, gfxboard_bput_wbsmem, - gfxboard_xlate, gfxboard_check, NULL, NULL, NULL, - gfxboard_lget_wbsmem, gfxboard_wget_wbsmem, ABFLAG_RAM | ABFLAG_THREADSAFE -}; -static addrbank gfxboard_bank_lbsmemory = { - gfxboard_lget_lbsmem, gfxboard_wget_lbsmem, gfxboard_bget_lbsmem, - gfxboard_lput_lbsmem, gfxboard_wput_lbsmem, gfxboard_bput_lbsmem, - gfxboard_xlate, gfxboard_check, NULL, NULL, NULL, - gfxboard_lget_lbsmem, gfxboard_wget_lbsmem, ABFLAG_RAM | ABFLAG_THREADSAFE -}; -static addrbank gfxboard_bank_nbsmemory = { - gfxboard_lget_nbsmem, gfxboard_wget_nbsmem, gfxboard_bget_bsmem, - gfxboard_lput_nbsmem, gfxboard_wput_nbsmem, gfxboard_bput_bsmem, - gfxboard_xlate, gfxboard_check, NULL, NULL, _T("Picasso IV banked VRAM"), - gfxboard_lget_nbsmem, gfxboard_wget_nbsmem, ABFLAG_RAM | ABFLAG_THREADSAFE -}; -static addrbank gfxboard_bank_registers = { - gfxboard_lget_regs, gfxboard_wget_regs, gfxboard_bget_regs, - gfxboard_lput_regs, gfxboard_wput_regs, gfxboard_bput_regs, - default_xlate, default_check, NULL, NULL, NULL, - dummy_lgeti, dummy_wgeti, ABFLAG_IO | ABFLAG_SAFE -}; - static uae_u32 REGPARAM2 gfxboards_lget_regs (uaecptr addr) { uae_u32 v = 0; @@ -2112,12 +2131,6 @@ static void REGPARAM2 gfxboards_bput_regs (uaecptr addr, uae_u32 v) picassoiv_bank = b; } } -addrbank gfxboard_bank_special = { - gfxboards_lget_regs, gfxboards_wget_regs, gfxboards_bget_regs, - gfxboards_lput_regs, gfxboards_wput_regs, gfxboards_bput_regs, - default_xlate, default_check, NULL, NULL, _T("Picasso IV MISC"), - dummy_lgeti, dummy_wgeti, ABFLAG_IO | ABFLAG_SAFE -}; const TCHAR *gfxboard_get_name(int type) { diff --git a/include/gfxboard.h b/include/gfxboard.h index 879f339c..d621143d 100644 --- a/include/gfxboard.h +++ b/include/gfxboard.h @@ -1,6 +1,5 @@ - -extern addrbank gfxboard_bank_memory; -extern addrbank gfxboard_bank_registers; +#ifndef UAE_GFXBOARD_H +#define UAE_GFXBOARD_H extern addrbank *gfxboard_init_memory (int devnum); extern addrbank *gfxboard_init_memory_p4_z2(int devnum); @@ -52,3 +51,5 @@ extern uae_u8 vga_ram_get(int offset); #define GFXBOARD_PICASSO4_Z3 11 #define GFXBOARD_A2410 12 #define GFXBOARD_VGA 13 + +#endif /* UAE_GFXBOARD_H */ -- 2.47.3