From: notaz Date: Wed, 7 Dec 2011 16:34:25 +0000 (+0200) Subject: gpu_neon: fix linkage for c++ code (una-i) X-Git-Tag: r12~31 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;h=096ec49b4bae537b45c4b7178af6ad97c6bfabb2;p=pcsx_rearmed.git gpu_neon: fix linkage for c++ code (una-i) --- diff --git a/plugins/gpu_neon/gpu.c b/plugins/gpu_neon/gpu.c index 978f4d1e..990fc520 100644 --- a/plugins/gpu_neon/gpu.c +++ b/plugins/gpu_neon/gpu.c @@ -472,15 +472,15 @@ uint32_t GPUreadStatus(void) return ret; } -typedef struct GPUFREEZETAG +struct GPUFreeze { uint32_t ulFreezeVersion; // should be always 1 for now (set by main emu) uint32_t ulStatus; // current gpu status uint32_t ulControl[256]; // latest control register values unsigned char psxVRam[1024*1024*2]; // current VRam image (full 2 MB for ZN) -} GPUFreeze_t; +}; -long GPUfreeze(uint32_t type, GPUFreeze_t *freeze) +long GPUfreeze(uint32_t type, struct GPUFreeze *freeze) { int i; diff --git a/plugins/gpu_neon/gpu.h b/plugins/gpu_neon/gpu.h index 20194649..f5cc6328 100644 --- a/plugins/gpu_neon/gpu.h +++ b/plugins/gpu_neon/gpu.h @@ -97,6 +97,25 @@ void renderer_flush_queues(void); int vout_init(void); int vout_finish(void); +/* listing these here for correct linkage if rasterizer uses c++ */ +struct GPUFreeze; +struct rearmed_cbs; + +long GPUinit(void); +long GPUshutdown(void); +void GPUwriteDataMem(uint32_t *mem, int count); +long GPUdmaChain(uint32_t *rambase, uint32_t addr); +void GPUwriteData(uint32_t data); +void GPUreadDataMem(uint32_t *mem, int count); +uint32_t GPUreadData(void); +uint32_t GPUreadStatus(void); +void GPUwriteStatus(uint32_t data); +long GPUfreeze(uint32_t type, struct GPUFreeze *freeze); +void GPUupdateLace(void); +long GPUopen(void **dpy); +long GPUclose(void); +void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_); + #ifdef __cplusplus } #endif diff --git a/plugins/gpu_neon/vout_fb.c b/plugins/gpu_neon/vout_fb.c index 65fbc038..4d03859a 100644 --- a/plugins/gpu_neon/vout_fb.c +++ b/plugins/gpu_neon/vout_fb.c @@ -101,7 +101,7 @@ void GPUupdateLace(void) gpu.state.fb_dirty = 0; } -long GPUopen(void) +long GPUopen(void **unused) { gpu.frameskip.active = 0; gpu.frameskip.frame_ready = 1; diff --git a/plugins/gpu_neon/vout_sdl.c b/plugins/gpu_neon/vout_sdl.c index ad3931fa..98397266 100644 --- a/plugins/gpu_neon/vout_sdl.c +++ b/plugins/gpu_neon/vout_sdl.c @@ -97,7 +97,7 @@ long GPUclose(void) return 0; } -void GPUrearmedCallbacks(const void *cbs_) +void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_) { }