RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
kub 2020-10-21 20:29:58 +02:00
commit e7faa8e4e1
5 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -125,6 +125,7 @@ platform/libpicofe/linux/plat.o: CFLAGS += -DPANDORA
OBJS += platform/pandora/plat.o OBJS += platform/pandora/plat.o
OBJS += platform/pandora/asm_utils.o OBJS += platform/pandora/asm_utils.o
OBJS += platform/common/arm_utils.o OBJS += platform/common/arm_utils.o
OBJS += platform/libpicofe/linux/in_evdev.o
OBJS += platform/libpicofe/linux/fbdev.o OBJS += platform/libpicofe/linux/fbdev.o
OBJS += platform/libpicofe/linux/xenv.o OBJS += platform/libpicofe/linux/xenv.o
OBJS += platform/libpicofe/pandora/plat.o OBJS += platform/libpicofe/pandora/plat.o
@ -132,6 +133,7 @@ USE_FRONTEND = 1
endif endif
ifeq "$(PLATFORM)" "gp2x" ifeq "$(PLATFORM)" "gp2x"
OBJS += platform/common/arm_utils.o OBJS += platform/common/arm_utils.o
OBJS += platform/libpicofe/linux/in_evdev.o
OBJS += platform/libpicofe/gp2x/in_gp2x.o OBJS += platform/libpicofe/gp2x/in_gp2x.o
OBJS += platform/libpicofe/gp2x/soc.o OBJS += platform/libpicofe/gp2x/soc.o
OBJS += platform/libpicofe/gp2x/soc_mmsp2.o OBJS += platform/libpicofe/gp2x/soc_mmsp2.o
@ -162,8 +164,7 @@ OBJS += platform/common/main.o platform/common/emu.o \
# libpicofe # libpicofe
OBJS += platform/libpicofe/input.o platform/libpicofe/readpng.o \ OBJS += platform/libpicofe/input.o platform/libpicofe/readpng.o \
platform/libpicofe/fonts.o platform/libpicofe/linux/in_evdev.o \ platform/libpicofe/fonts.o platform/libpicofe/linux/plat.o
platform/libpicofe/linux/plat.o
# libpicofe - sound # libpicofe - sound
OBJS += platform/libpicofe/sndout.o OBJS += platform/libpicofe/sndout.o

4
pico/cd/cd_image.c
View file

@ -11,6 +11,10 @@
#include "cdd.h" #include "cdd.h"
#include "cue.h" #include "cue.h"
#if defined(__GNUC__) && __GNUC__ >= 7
#pragma GCC diagnostic ignored "-Wformat-truncation"
#endif
static int handle_mp3(const char *fname, int index) static int handle_mp3(const char *fname, int index)
{ {
track_t *track = &cdd.toc.tracks[index]; track_t *track = &cdd.toc.tracks[index];

7
pico/memory.c
View file

@ -272,7 +272,12 @@ static NOINLINE u32 port_read(int i)
u32 in, out; u32 in, out;
out = data_reg & ctrl_reg; out = data_reg & ctrl_reg;
out |= 0x7f & ~ctrl_reg; // pull-ups
// pull-ups: should be 0x7f, but Decap Attack has a bug where it temp.
// disables output before doing TH-low read, so don't emulate it for TH.
// Decap Attack reportedly doesn't work on Nomad but works on must
// other MD revisions (different pull-up strength?).
out |= 0x3f & ~ctrl_reg;
in = port_readers[i](i, out); in = port_readers[i](i, out);

4
platform/common/emu.c
View file

@ -28,6 +28,10 @@
#include <pico/pico_int.h> #include <pico/pico_int.h>
#include <pico/patch.h> #include <pico/patch.h>
#if defined(__GNUC__) && __GNUC__ >= 7
#pragma GCC diagnostic ignored "-Wformat-truncation"
#endif
#ifndef _WIN32 #ifndef _WIN32
#define PATH_SEP "/" #define PATH_SEP "/"
#define PATH_SEP_C '/' #define PATH_SEP_C '/'

5
platform/linux/in_evdev.h
View file

@ -1,5 +0,0 @@
struct in_default_bind;
extern int in_evdev_allow_abs_only;
void in_evdev_init(const struct in_default_bind *defbinds);