funkey/picodrive-irixxxx
1
0
Fork 0
mirror of https://github.com/FunKey-Project/picodrive-irixxxx.git synced 2026-02-01 04:25:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #119 from fjtrujy/ps2-newlib

Browse Source 
Adapt PS2 port to the latest PS2SDK changes
This commit is contained in:
Autechre 2020-05-20 20:12:12 +02:00 committed by GitHub
commit e7be588d79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.libretro
View File

@ -289,10 +289,9 @@ else ifeq ($(platform), ps2)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = ee-gcc$(EXE_EXT)
AR = ee-ar$(EXE_EXT)
CFLAGS += -G0 -Wall -DPS2 -DUSE_BGR555 -DUTYPES_DEFINED -DFAMEC_NO_GOTOS -DRENDER_GSKIT_PS2 -fsingle-precision-constant
CFLAGS += -Wall -DPS2 -DUSE_BGR555 -DFAMEC_NO_GOTOS -DRENDER_GSKIT_PS2 -fsingle-precision-constant
CFLAGS += -Dmemcpy=mips_memcpy -Dmemset=mips_memset
# CFLAGS += -D_ASM_MISC_C_AMIPS -D_ASM_DRAW_C_AMIPS -D_ASM_MEMORY_C_AMIPS
CFLAGS += -I$(PS2SDK)/ports/include -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -Iplatform/ps2
CFLAGS += -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include
CFLAGS += -DHAVE_NO_LANGEXTRA
STATIC_LINKING = 1
NO_MMAP = 1
@ -311,7 +310,6 @@ else ifeq ($(platform), ps2)
use_cz80 = 1
OBJS += platform/ps2/asm.o platform/ps2/SMS_Utils.o
# OBJS += platform/ps2/Draw_mips_r5900.o platform/ps2/Memory_mips_r5900.o pico/misc_amips.o
# CTR (3DS)
else ifeq ($(platform), ctr)

6
pico/videoport.c
View File

@ -14,12 +14,6 @@
extern const unsigned char hcounts_32[];
extern const unsigned char hcounts_40[];
#ifndef UTYPES_DEFINED
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
#define UTYPES_DEFINED
#endif
int (*PicoDmaHook)(unsigned int source, int len, unsigned short **base, unsigned int *mask) = NULL;

2
platform/libretro/libretro-common/include/libretro_gskit_ps2.h
View File

@ -57,8 +57,6 @@ struct retro_hw_render_interface_gskit_ps2
* in this interface.
*/
GSTEXTURE *coreTexture;
bool clearTexture;
bool updatedPalette;
struct retro_hw_ps2_insets padding;
};
typedef struct retro_hw_render_interface_gskit_ps2 RETRO_HW_RENDER_INTEFACE_GSKIT_PS2;

5
platform/libretro/libretro.c
View File

@ -533,10 +533,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
memset(vout_buf, 0, vout_width * VOUT_MAX_HEIGHT);
memset(retro_palette, 0, gsKit_texture_size_ee(16, 16, GS_PSM_CT16));
PicoDrawSetOutBuf(vout_buf, vout_width);
if (ps2) {
ps2->clearTexture = true;
}
#else
vout_width = is_32cols ? VOUT_32BIT_WIDTH : VOUT_MAX_WIDTH;
memset(vout_buf, 0, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);
@ -1548,7 +1544,6 @@ void retro_run(void)
}
Pico.m.dirtyPal = 0;
ps2->updatedPalette = true;
}
if (PicoIn.AHW & PAHW_SMS) {

16
platform/ps2/stdint.h
View File

@ -1,16 +0,0 @@
#ifndef STDINT_H
#define STDINT_H
typedef unsigned long uintptr_t;
typedef signed long intptr_t;
typedef signed char int8_t;
typedef signed short int16_t;
typedef signed int int32_t;
typedef signed long int64_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef unsigned long uint64_t;
#endif //STDINT_H