From: notaz Date: Fri, 2 Sep 2011 22:26:33 +0000 (+0300) Subject: fix some warnings X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b6232a675c7b49bd9651805fc92917cc7a92198;p=gpsp.git fix some warnings --- diff --git a/common.h b/common.h index c3c03ba..8d55af9 100644 --- a/common.h +++ b/common.h @@ -29,6 +29,7 @@ #ifdef _WIN32_WCE #include #else + #define _BSD_SOURCE // sync #include #include #include diff --git a/cpu.c b/cpu.c index 63a9c6c..2bb8997 100644 --- a/cpu.c +++ b/cpu.c @@ -21,7 +21,6 @@ // - stm reglist writeback when base is in the list needs adjustment // - block memory needs psr swapping and user mode reg swapping -#include #include "common.h" u32 memory_region_access_read_u8[16]; diff --git a/cpu.h b/cpu.h index 22ed2d3..7ce72db 100644 --- a/cpu.h +++ b/cpu.h @@ -112,6 +112,7 @@ extern u32 last_instruction; u32 function_cc step_debug(u32 pc, u32 cycles); u32 execute_arm(u32 cycles); void raise_interrupt(irq_type irq_raised); +void set_cpu_mode(cpu_mode_type new_mode); u32 function_cc execute_load_u8(u32 address); u32 function_cc execute_load_u16(u32 address); diff --git a/cpu_threaded.c b/cpu_threaded.c index c1d85a8..547b3c0 100644 --- a/cpu_threaded.c +++ b/cpu_threaded.c @@ -21,7 +21,6 @@ // - stm reglist writeback when base is in the list needs adjustment // - block memory needs psr swapping and user mode reg swapping -#include #include "common.h" u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE]; diff --git a/gp2x/Makefile b/gp2x/Makefile index 2096419..529fa37 100644 --- a/gp2x/Makefile +++ b/gp2x/Makefile @@ -4,7 +4,7 @@ # Global definitions -PREFIX = /opt/open2x/gcc-4.1.1-glibc-2.3.6 +PREFIX ?= /opt/open2x/gcc-4.1.1-glibc-2.3.6 CC = $(PREFIX)/bin/arm-open2x-linux-gcc STRIP = $(PREFIX)/bin/arm-open2x-linux-strip @@ -18,6 +18,8 @@ else BIN = gpsp_gp2x endif +-include Makefile.local + # Platform specific definitions VPATH += .. ../arm diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c index 41e3f8b..d36dd08 100644 --- a/gp2x/gp2x.c +++ b/gp2x/gp2x.c @@ -1,6 +1,6 @@ -/* Parts used from cpuctrl */ -/* cpuctrl for GP2X - Copyright (C) 2005 Hermes/PS2Reality +/* + Parts used from cpuctrl, Copyright (C) 2005 Hermes/PS2Reality + Portions Copyright (C) 2009 notaz This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,14 +19,14 @@ */ -#define _BSD_SOURCE #define _GNU_SOURCE +#include "../common.h" #include #include #include #include #include -#include "../common.h" +#include #include "gp2x.h" #include "warm.h" #include "pollux_dpc_set.h" @@ -230,10 +230,9 @@ void gp2x_init() gpsp_gp2x_dev = open("/dev/mem", O_RDWR); gpsp_gp2x_dev_audio = open("/dev/mixer", O_RDWR); - gpsp_gp2x_memregl = - (unsigned long *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, + gpsp_gp2x_memregl = (u32 *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, gpsp_gp2x_dev, 0xc0000000); - gpsp_gp2x_memregs = (unsigned short *)gpsp_gp2x_memregl; + gpsp_gp2x_memregs = (u16 *)gpsp_gp2x_memregl; warm_init(); #ifdef WIZ_BUILD gpsp_gp2x_gpiodev = open("/dev/GPIO", O_RDONLY); diff --git a/gui.c b/gui.c index a08bb63..9381d6b 100644 --- a/gui.c +++ b/gui.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "common.h" +#include "font.h" + #ifndef _WIN32_WCE #include @@ -25,9 +28,6 @@ #endif -#include "common.h" -#include "font.h" - #define MAX_PATH 1024 // Blatantly stolen and trimmed from MZX (megazeux.sourceforge.net) diff --git a/zip.c b/zip.c index dd1d52c..a264603 100644 --- a/zip.c +++ b/zip.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include "common.h" +#include #define ZIP_BUFFER_SIZE (128 * 1024)