lifning/gpsp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix some warnings

Browse source
This commit is contained in:
notaz 2011-09-03 01:26:33 +03:00
parent eac6971733
commit 8b6232a675
8 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common.h
View file

@ -29,6 +29,7 @@
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#include <windows.h> #include <windows.h>
#else #else
#define _BSD_SOURCE // sync
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

1
cpu.c
View file

@ -21,7 +21,6 @@
// - stm reglist writeback when base is in the list needs adjustment // - stm reglist writeback when base is in the list needs adjustment
// - block memory needs psr swapping and user mode reg swapping // - block memory needs psr swapping and user mode reg swapping
#include <stdio.h>
#include "common.h" #include "common.h"
u32 memory_region_access_read_u8[16]; u32 memory_region_access_read_u8[16];

1
cpu.h
View file

@ -112,6 +112,7 @@ extern u32 last_instruction;
u32 function_cc step_debug(u32 pc, u32 cycles); u32 function_cc step_debug(u32 pc, u32 cycles);
u32 execute_arm(u32 cycles); u32 execute_arm(u32 cycles);
void raise_interrupt(irq_type irq_raised); 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_u8(u32 address);
u32 function_cc execute_load_u16(u32 address); u32 function_cc execute_load_u16(u32 address);

1
cpu_threaded.c
View file

@ -21,7 +21,6 @@
// - stm reglist writeback when base is in the list needs adjustment // - stm reglist writeback when base is in the list needs adjustment
// - block memory needs psr swapping and user mode reg swapping // - block memory needs psr swapping and user mode reg swapping
#include <stdio.h>
#include "common.h" #include "common.h"
u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE]; u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE];

4
gp2x/Makefile
View file

@ -4,7 +4,7 @@
# Global definitions # 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 CC = $(PREFIX)/bin/arm-open2x-linux-gcc
STRIP = $(PREFIX)/bin/arm-open2x-linux-strip STRIP = $(PREFIX)/bin/arm-open2x-linux-strip
@ -18,6 +18,8 @@ else
BIN = gpsp_gp2x BIN = gpsp_gp2x
endif endif
-include Makefile.local
# Platform specific definitions # Platform specific definitions
VPATH += .. ../arm VPATH += .. ../arm

15
gp2x/gp2x.c
View file

@ -1,6 +1,6 @@
/* Parts used from cpuctrl */ /*
/* cpuctrl for GP2X Parts used from cpuctrl, Copyright (C) 2005 Hermes/PS2Reality
Copyright (C) 2005 Hermes/PS2Reality Portions Copyright (C) 2009 notaz
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -19,14 +19,14 @@
*/ */
#define _BSD_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#include "../common.h"
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "../common.h" #include <ctype.h>
#include "gp2x.h" #include "gp2x.h"
#include "warm.h" #include "warm.h"
#include "pollux_dpc_set.h" #include "pollux_dpc_set.h"
@ -230,10 +230,9 @@ void gp2x_init()
gpsp_gp2x_dev = open("/dev/mem", O_RDWR); gpsp_gp2x_dev = open("/dev/mem", O_RDWR);
gpsp_gp2x_dev_audio = open("/dev/mixer", O_RDWR); gpsp_gp2x_dev_audio = open("/dev/mixer", O_RDWR);
gpsp_gp2x_memregl = gpsp_gp2x_memregl = (u32 *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED,
(unsigned long *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED,
gpsp_gp2x_dev, 0xc0000000); gpsp_gp2x_dev, 0xc0000000);
gpsp_gp2x_memregs = (unsigned short *)gpsp_gp2x_memregl; gpsp_gp2x_memregs = (u16 *)gpsp_gp2x_memregl;
warm_init(); warm_init();
#ifdef WIZ_BUILD #ifdef WIZ_BUILD
gpsp_gp2x_gpiodev = open("/dev/GPIO", O_RDONLY); gpsp_gp2x_gpiodev = open("/dev/GPIO", O_RDONLY);

6
gui.c
View file

@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "common.h"
#include "font.h"
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
#include <sys/stat.h> #include <sys/stat.h>
@ -25,9 +28,6 @@
#endif #endif
#include "common.h"
#include "font.h"
#define MAX_PATH 1024 #define MAX_PATH 1024
// Blatantly stolen and trimmed from MZX (megazeux.sourceforge.net) // Blatantly stolen and trimmed from MZX (megazeux.sourceforge.net)

2
zip.c
View file

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <zlib.h>
#include "common.h" #include "common.h"
#include <zlib.h>
#define ZIP_BUFFER_SIZE (128 * 1024) #define ZIP_BUFFER_SIZE (128 * 1024)