[Scummvm-cvs-logs] SF.net SVN: scummvm:[53982] scummvm/trunk/backends/platform/gp2x
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Oct 31 18:24:27 CET 2010
Revision: 53982
http://scummvm.svn.sourceforge.net/scummvm/?rev=53982&view=rev
Author: fingolfin
Date: 2010-10-31 17:24:27 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
GP2X: Fix warnings about unused decls
Modified Paths:
--------------
scummvm/trunk/backends/platform/gp2x/gp2x-hw.cpp
scummvm/trunk/backends/platform/gp2x/gp2x-mem.cpp
scummvm/trunk/backends/platform/gp2x/gp2x-mem.h
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-hw.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-hw.cpp 2010-10-31 17:23:53 UTC (rev 53981)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-hw.cpp 2010-10-31 17:24:27 UTC (rev 53982)
@@ -51,6 +51,10 @@
#include <sys/time.h>
#include <unistd.h>
+extern "C" {
+static unsigned long gp2x_dev[8]={0,0,0,0,0,0,0,0};//, gp2x_ticks_per_second;
+}
+
namespace GP2X_HW {
enum {
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-mem.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-mem.cpp 2010-10-31 17:23:53 UTC (rev 53981)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-mem.cpp 2010-10-31 17:24:27 UTC (rev 53982)
@@ -42,8 +42,11 @@
#include "backends/platform/gp2x/gp2x-mem.h"
-void SetClock (unsigned c)
-{
+extern "C" {
+static volatile unsigned short *gp2x_memregs;
+}
+
+void SetClock (unsigned c) {
unsigned v;
unsigned mdiv,pdiv=3,scale=0;
@@ -57,8 +60,7 @@
gp2x_memregs[0x910>>1] = v;
}
-void patchMMU (void)
-{
+void patchMMU (void) {
//volatile unsigned int *secbuf = (unsigned int *)malloc (204800);
printf ("Reconfiguring cached memory regions...\n");
@@ -71,19 +73,15 @@
int mmufd = open("/dev/mmuhack", O_RDWR);
- if(mmufd < 0)
- {
+ if(mmufd < 0) {
printf ("Upper memory uncached (attempt failed, access to upper memory will be slower)...\n");
- }
- else
- {
+ } else {
printf ("Upper memory cached...\n");
close(mmufd);
}
}
-void unpatchMMU (void)
-{
+void unpatchMMU (void) {
printf ("Restoreing cached memory regions...\n");
system("/sbin/rmmod mmuhack");
}
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-mem.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-mem.h 2010-10-31 17:23:53 UTC (rev 53981)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-mem.h 2010-10-31 17:24:27 UTC (rev 53982)
@@ -47,9 +47,6 @@
#define SYS_CLK_FREQ 7372800
-static unsigned long gp2x_dev[8]={0,0,0,0,0,0,0,0};//, gp2x_ticks_per_second;
-static volatile unsigned short *gp2x_ram, *gp2x_memregs;
-
#ifdef __cplusplus
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list