libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Apply xerpi diff

Browse Source
This commit is contained in:
twinaphex 2017-01-17 18:12:23 +01:00
parent 15853842f0
commit 7931436f5b
10 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
audio/drivers/psp_audio.c
View File

@ -18,6 +18,7 @@
#include <stdint.h>
#include <malloc.h>
#include <stdio.h>
#include <string.h>
#ifdef VITA
#include <psp2/kernel/processmgr.h>

3
bootstrap/vita/sbrk.c
View File

@ -1,6 +1,9 @@
#include <errno.h>
#include <reent.h>
#include "../../defines/psp_defines.h"
#include <psp2/kernel/sysmem.h>
#include <psp2/kernel/threadmgr.h>
static int _newlib_heap_memblock;
static unsigned _newlib_heap_size;
static char *_newlib_heap_base, *_newlib_heap_end, *_newlib_heap_cur;

8
frontend/drivers/platform_psp.c
View File

@ -18,10 +18,17 @@
#include <stddef.h>
#include <string.h>
#include "retroarch.h"
#include "paths.h"
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#ifdef HAVE_MENU
#include "../../menu/menu_driver.h"
#endif
#ifdef VITA
#include <psp2/power.h>
#include <psp2/sysmodule.h>
@ -38,6 +45,7 @@
#include <pspsdk.h>
#endif
#include <string/stdstring.h>
#include <boolean.h>
#include <file/file_path.h>
#ifndef IS_SALAMANDER

2
gfx/common/vita2d_common.h
View File

@ -21,9 +21,11 @@
#include <retro_inline.h>
#include <string/stdstring.h>
#include <gfx/math/matrix_4x4.h>
#include "../../defines/psp_defines.h"
#include "../../driver.h"
#include "../video_driver.h"
#include "../video_coord_array.h"
typedef struct vita_menu_frame

8
gfx/drivers/vita2d_gfx.c
View File

@ -16,8 +16,12 @@
#include <vita2d.h>
#include <verbosity.h>
#include <configuration.h>
#include <retro_inline.h>
#include <string/stdstring.h>
#include <formats/image.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
@ -27,11 +31,13 @@
#include "../../menu/menu_driver.h"
#endif
#include "../../defines/psp_defines.h"
#include "../common/vita2d_common.h"
#include "../../driver.h"
#include "../../runloop.h"
#include "../video_coord_array.h"
#include "../video_context_driver.h"
#include "../../defines/psp_defines.h"
extern void *memcpy_neon(void *dst, const void *src, size_t n);

3
gfx/drivers_font/vita2d_font.c
View File

@ -17,6 +17,9 @@
#include <vita2d.h>
#include <encodings/utf.h>
#include <verbosity.h>
#include "../common/vita2d_common.h"
#include "../font_driver.h"

1
input/drivers/psp_input.c
View File

@ -33,6 +33,7 @@
#include <boolean.h>
#include <libretro.h>
#include <retro_miscellaneous.h>
#ifdef HAVE_KERNEL_PRX
#include "../../bootstrap/psp1/kernel_functions.h"

10
input/drivers_joypad/psp_joypad.c
View File

@ -15,13 +15,23 @@
*/
#include <stdint.h>
#include <string.h>
#include <input/input_config.h>
#include "../../tasks/tasks_internal.h"
#include "../../configuration.h"
#include "../../defines/psp_defines.h"
#ifdef HAVE_MENU
#include "../../menu/menu_driver.h"
#endif
#if defined(VITA)
#include <psp2/kernel/sysmem.h>
#include <psp2/ctrl.h>
#include <psp2/touch.h>
#define PSP_MAX_PADS 4
static int psp2_model;

2
libretro-common/include/net/net_compat.h
View File

@ -101,6 +101,8 @@ struct hostent
char *h_addr;
};
struct SceNetInAddr inet_aton(const char *ip_addr);
#else
#include <sys/select.h>
#include <sys/types.h>

1
libretro-common/net/net_socket.c
View File

@ -142,6 +142,7 @@ int socket_select(int nfds, fd_set *readfs, fd_set *writefds,
#if defined(__CELLOS_LV2__)
return socketselect(nfds, readfs, writefds, errorfds, timeout);
#elif defined(VITA)
extern int retro_epoll_fd;
SceNetEpollEvent ev = {0};
ev.events = SCE_NET_EPOLLIN | SCE_NET_EPOLLHUP;