mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GX) Compile in HAVE_RSOUND for both Wii and NGC

Browse Source
This commit is contained in:
twinaphex 2013-11-11 11:14:55 +01:00
parent 72b32f2c41
commit d417669d48
4 changed files with 83 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.ngc
View File

@ -62,7 +62,7 @@ CFLAGS += -DHAVE_FILE_LOGGER
CFLAGS += -Iconsole/logger CFLAGS += -Iconsole/logger
endif endif
CFLAGS += -std=gnu99 -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -Wno-char-subscripts CFLAGS += -std=gnu99 -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DHAVE_RSOUND -Wno-char-subscripts
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -O0 -g CFLAGS += -O0 -g

2
Makefile.wii
View File

@ -63,7 +63,7 @@ CFLAGS += -Iconsole/logger
endif endif
CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DHAVE_THREADS -Wno-char-subscripts CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DHAVE_THREADS -DHAVE_RSOUND -Wno-char-subscripts
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -O0 -g -DDEBUG CFLAGS += -O0 -g -DDEBUG

126
audio/librsound.c
View File

@ -31,14 +31,29 @@
#include "rsound.h" #include "rsound.h"
#ifdef __CELLOS_LV2__ #if defined(__CELLOS_LV2__)
#include <cell/sysmodule.h>
#include <sys/timer.h>
#include <sys/sys_time.h>
// network headers
#include <netex/net.h> #include <netex/net.h>
#include <netex/errno.h> #include <netex/errno.h>
#define NETWORK_COMPAT_HEADERS 1
#elif defined(GEKKO)
#include <network.h>
#else
#define NETWORK_COMPAT_HEADERS 1
#endif #endif
#ifdef NETWORK_COMPAT_HEADERS
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <arpa/inet.h>
#include <sys/poll.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#ifdef _WIN32 #ifdef _WIN32
#include <direct.h> #include <direct.h>
@ -51,16 +66,8 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#include <sys/poll.h>
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <arpa/inet.h>
#ifdef __CELLOS_LV2__
#include <cell/sysmodule.h>
#include <sys/timer.h>
#include <sys/sys_time.h>
#endif
/* /*
**************************************************************************** ****************************************************************************
@ -91,6 +98,41 @@ enum rsd_conn_type
#define RSD_ERR(fmt, args...) #define RSD_ERR(fmt, args...)
#define RSD_DEBUG(fmt, args...) #define RSD_DEBUG(fmt, args...)
#if defined(__CELLOS_LV2__)
static int init_count = 0;
#define pollfd_fd(x) x.fd
#define net_send(a,b,c,d) send(a,b,c,d)
#define net_socket(a,b,c) socket(a,b,c)
#define net_connect(a,b,c) connect(a,b,c)
#define net_shutdown(a,b) shutdown(a,b)
#define net_socketclose(x) socketclose(x)
#define net_recv(a,b,c,d) recv(a,b,c,d)
#elif defined(GEKKO)
#define SHUT_RD 0
#define socketpoll(x, y, z) net_poll(x, y, z)
#define pollfd pollsd
#define pollfd_fd(x) x.socket
#define gethostbyname net_gethostbyname
#define getsockopt net_getsockopt
#define setsockopt net_setsockopt
#define net_send(a,b,c,d) net_send(a,b,c,d)
#define net_socket(a,b,c) net_socket(a,b,c)
#define net_connect(a,b,c) net_connect(a,b,c)
#define net_shutdown(a,b) net_shutdown(a,b)
#define net_socketclose(x) net_close(x)
#define net_recv(a,b,c,d) net_recv(a,b,c,d)
#else
#define pollfd_fd(x) x.fd
#define net_socket(a,b,c) socket(a,b,c)
#define socketpoll(x, y, z) poll(x, y, z)
#define net_send(a,b,c,d) send(a,b,c,d)
#define net_connect(a,b,c) connect(a,b,c)
#define net_shutdown(a,b) shutdown(a,b)
#define net_socketclose(x) close(x)
#define net_recv(a,b,c,d) recv(a,b,c,d)
#endif
static ssize_t rsnd_send_chunk(int socket, const void *buf, size_t size, int blocking); static ssize_t rsnd_send_chunk(int socket, const void *buf, size_t size, int blocking);
static ssize_t rsnd_recv_chunk(int socket, void *buf, size_t size, int blocking); static ssize_t rsnd_recv_chunk(int socket, void *buf, size_t size, int blocking);
static int rsnd_start_thread(rsound_t *rd); static int rsnd_start_thread(rsound_t *rd);
@ -111,12 +153,6 @@ static void rsnd_sleep(int msec);
static void rsnd_cb_thread(void *thread_data); static void rsnd_cb_thread(void *thread_data);
static void rsnd_thread(void *thread_data); static void rsnd_thread(void *thread_data);
#ifdef __CELLOS_LV2__
static int init_count = 0;
#else
#define socketclose(x) close(x)
#define socketpoll(x, y, z) poll(x, y, z)
#endif
/* Determine whether we're running big- or little endian */ /* Determine whether we're running big- or little endian */
static inline int rsnd_is_little_endian(void) static inline int rsnd_is_little_endian(void)
@ -202,11 +238,11 @@ static int rsnd_connect_server( rsound_t *rd )
rd->conn_type = RSD_CONN_TCP; rd->conn_type = RSD_CONN_TCP;
rd->conn.socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); rd->conn.socket = net_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if ( rd->conn.socket < 0 ) if ( rd->conn.socket < 0 )
goto error; goto error;
rd->conn.ctl_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); rd->conn.ctl_socket = net_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if ( rd->conn.ctl_socket < 0 ) if ( rd->conn.ctl_socket < 0 )
goto error; goto error;
@ -221,18 +257,18 @@ static int rsnd_connect_server( rsound_t *rd )
#endif #endif
/* Nonblocking connect with 3 second timeout */ /* Nonblocking connect with 3 second timeout */
connect(rd->conn.socket, (struct sockaddr*)&addr, sizeof(addr)); net_connect(rd->conn.socket, (struct sockaddr*)&addr, sizeof(addr));
fd.fd = rd->conn.socket; pollfd_fd(fd) = rd->conn.socket;
fd.events = POLLOUT; fd.events = POLLOUT;
rsnd_poll(&fd, 1, 3000); rsnd_poll(&fd, 1, 3000);
if (!(fd.revents & POLLOUT)) if (!(fd.revents & POLLOUT))
goto error; goto error;
connect(rd->conn.ctl_socket, (struct sockaddr*)&addr, sizeof(addr)); net_connect(rd->conn.ctl_socket, (struct sockaddr*)&addr, sizeof(addr));
fd.fd = rd->conn.ctl_socket; pollfd_fd(fd) = rd->conn.ctl_socket;
rsnd_poll(&fd, 1, 3000); rsnd_poll(&fd, 1, 3000);
if (!(fd.revents & POLLOUT)) if (!(fd.revents & POLLOUT))
goto error; goto error;
@ -466,9 +502,9 @@ static int rsnd_get_backend_info ( rsound_t *rd )
// We no longer want to read from this socket. // We no longer want to read from this socket.
#ifdef _WIN32 #ifdef _WIN32
shutdown(rd->conn.socket, SD_RECEIVE); net_shutdown(rd->conn.socket, SD_RECEIVE);
#elif !defined(__APPLE__) // OSX doesn't seem to like shutdown() #elif !defined(__APPLE__) // OSX doesn't seem to like shutdown()
shutdown(rd->conn.socket, SHUT_RD); net_shutdown(rd->conn.socket, SHUT_RD);
#endif #endif
return 0; return 0;
@ -492,10 +528,9 @@ static int rsnd_create_connection(rsound_t *rd)
} }
/* After connecting, makes really sure that we have a working connection. */ /* After connecting, makes really sure that we have a working connection. */
struct pollfd fd = { struct pollfd fd;
.fd = rd->conn.socket, pollfd_fd(fd) = rd->conn.socket;
.events = POLLOUT fd.events = POLLOUT;
};
if ( rsnd_poll(&fd, 1, 2000) < 0 ) if ( rsnd_poll(&fd, 1, 2000) < 0 )
{ {
@ -561,10 +596,9 @@ static ssize_t rsnd_send_chunk(int socket, const void* buf, size_t size, int blo
ssize_t rc = 0; ssize_t rc = 0;
size_t wrote = 0; size_t wrote = 0;
ssize_t send_size = 0; ssize_t send_size = 0;
struct pollfd fd = { struct pollfd fd;
.fd = socket, pollfd_fd(fd) = socket;
.events = POLLOUT fd.events = POLLOUT;
};
int sleep_time = (blocking) ? 10000 : 0; int sleep_time = (blocking) ? 10000 : 0;
@ -585,7 +619,7 @@ static ssize_t rsnd_send_chunk(int socket, const void* buf, size_t size, int blo
{ {
/* We try to limit ourselves to 1KiB packet sizes. */ /* We try to limit ourselves to 1KiB packet sizes. */
send_size = (size - wrote) > MAX_PACKET_SIZE ? MAX_PACKET_SIZE : size - wrote; send_size = (size - wrote) > MAX_PACKET_SIZE ? MAX_PACKET_SIZE : size - wrote;
rc = send(socket, (const char*)buf + wrote, send_size, 0); rc = net_send(socket, (const char*)buf + wrote, send_size, 0);
if ( rc < 0 ) if ( rc < 0 )
{ {
RSD_ERR("[RSound] Error sending chunk, %s.\n", strerror(errno)); RSD_ERR("[RSound] Error sending chunk, %s.\n", strerror(errno));
@ -613,10 +647,9 @@ static ssize_t rsnd_recv_chunk(int socket, void *buf, size_t size, int blocking)
ssize_t rc = 0; ssize_t rc = 0;
size_t has_read = 0; size_t has_read = 0;
ssize_t read_size = 0; ssize_t read_size = 0;
struct pollfd fd = { struct pollfd fd;
.fd = socket, pollfd_fd(fd) = socket;
.events = POLLIN fd.events = POLLIN;
};
int sleep_time = (blocking) ? 5000 : 0; int sleep_time = (blocking) ? 5000 : 0;
@ -637,7 +670,7 @@ static ssize_t rsnd_recv_chunk(int socket, void *buf, size_t size, int blocking)
if ( fd.revents & POLLIN ) if ( fd.revents & POLLIN )
{ {
read_size = (size - has_read) > MAX_PACKET_SIZE ? MAX_PACKET_SIZE : size - has_read; read_size = (size - has_read) > MAX_PACKET_SIZE ? MAX_PACKET_SIZE : size - has_read;
rc = recv(socket, (char*)buf + has_read, read_size, 0); rc = net_recv(socket, (char*)buf + has_read, read_size, 0);
if ( rc <= 0 ) if ( rc <= 0 )
{ {
RSD_ERR("[RSound] Error receiving chunk, %s.\n", strerror(errno)); RSD_ERR("[RSound] Error receiving chunk, %s.\n", strerror(errno));
@ -899,10 +932,9 @@ static int rsnd_close_ctl(rsound_t *rd)
if ( !(rd->conn_type & RSD_CONN_PROTO) ) if ( !(rd->conn_type & RSD_CONN_PROTO) )
return -1; return -1;
struct pollfd fd = { struct pollfd fd;
.fd = rd->conn.ctl_socket, pollfd_fd(fd) = rd->conn.ctl_socket;
.events = POLLOUT fd.events = POLLOUT;
};
if ( rsnd_poll(&fd, 1, 0) < 0 ) if ( rsnd_poll(&fd, 1, 0) < 0 )
return -1; return -1;
@ -910,7 +942,7 @@ static int rsnd_close_ctl(rsound_t *rd)
if ( fd.revents & POLLOUT ) if ( fd.revents & POLLOUT )
{ {
const char *sendbuf = "RSD 9 CLOSECTL"; const char *sendbuf = "RSD 9 CLOSECTL";
if ( send(rd->conn.ctl_socket, sendbuf, strlen(sendbuf), 0) < 0 ) if (net_send(rd->conn.ctl_socket, sendbuf, strlen(sendbuf), 0) < 0 )
return -1; return -1;
} }
else if ( fd.revents & POLLHUP ) else if ( fd.revents & POLLHUP )
@ -935,7 +967,7 @@ static int rsnd_close_ctl(rsound_t *rd)
const char *subchar; const char *subchar;
// We just read everything in large chunks until we find what we're looking for // We just read everything in large chunks until we find what we're looking for
int rc = recv(rd->conn.ctl_socket, buf + index, RSD_PROTO_MAXSIZE*2 - 1 - index, 0); int rc = net_recv(rd->conn.ctl_socket, buf + index, RSD_PROTO_MAXSIZE*2 - 1 - index, 0);
if (rc <= 0 ) if (rc <= 0 )
return -1; return -1;
@ -960,7 +992,7 @@ static int rsnd_close_ctl(rsound_t *rd)
return -1; return -1;
} }
socketclose(rd->conn.ctl_socket); net_socketclose(rd->conn.ctl_socket);
return 0; return 0;
} }
@ -1261,10 +1293,10 @@ static void rsnd_cb_thread(void *thread_data)
static int rsnd_reset(rsound_t *rd) static int rsnd_reset(rsound_t *rd)
{ {
if ( rd->conn.socket != -1 ) if ( rd->conn.socket != -1 )
socketclose(rd->conn.socket); net_socketclose(rd->conn.socket);
if ( rd->conn.socket != 1 ) if ( rd->conn.socket != 1 )
socketclose(rd->conn.ctl_socket); net_socketclose(rd->conn.ctl_socket);
/* Pristine stuff, baby! */ /* Pristine stuff, baby! */
slock_lock(rd->thread.mutex); slock_lock(rd->thread.mutex);
@ -1385,7 +1417,7 @@ int rsd_exec(rsound_t *rsound)
if ( rsnd_send_chunk(fd, buffer, sizeof(buffer), 1) != (ssize_t)sizeof(buffer) ) if ( rsnd_send_chunk(fd, buffer, sizeof(buffer), 1) != (ssize_t)sizeof(buffer) )
{ {
RSD_DEBUG("[RSound] Failed flushing buffer.\n"); RSD_DEBUG("[RSound] Failed flushing buffer.\n");
socketclose(fd); net_socketclose(fd);
return -1; return -1;
} }
} }

6
console/logger/logger.c
View File

@ -14,7 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef __CELLOS_LV2__ #if defined(__CELLOS_LV2__)
#include "../../ps3/sdk_defines.h" #include "../../ps3/sdk_defines.h"
#ifndef __PSL1GHT__ #ifndef __PSL1GHT__
#include <netex/net.h> #include <netex/net.h>
@ -25,9 +25,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #elif defined(GEKKO)
#ifdef GEKKO
#include <network.h> #include <network.h>
#endif #endif