diff --git a/Makefile.common b/Makefile.common index 997a9312fa..f1fe579964 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1018,7 +1018,8 @@ ifeq ($(HAVE_NETWORKING), 1) endif ifeq ($(HAVE_NETWORK_GAMEPAD), 1) - OBJ += input/input_remote.o + OBJ += input/input_remote.o \ + cores/libretro-net-retropad/net_retropad_core.o endif endif diff --git a/core_type.h b/core_type.h index a14f009489..08e9ea8d40 100644 --- a/core_type.h +++ b/core_type.h @@ -21,7 +21,8 @@ enum rarch_core_type CORE_TYPE_PLAIN = 0, CORE_TYPE_DUMMY, CORE_TYPE_FFMPEG, - CORE_TYPE_IMAGEVIEWER + CORE_TYPE_IMAGEVIEWER, + CORE_TYPE_NETRETROPAD }; #endif diff --git a/cores/internal_cores.h b/cores/internal_cores.h index 22d25e18aa..82f9aa59e5 100644 --- a/cores/internal_cores.h +++ b/cores/internal_cores.h @@ -184,4 +184,60 @@ size_t libretro_imageviewer_retro_get_memory_size(unsigned id); #endif +#if defined(HAVE_NETWORK_GAMEPAD) && defined(HAVE_NETPLAY) +/* Internal networked retropad core. */ + +void libretro_netretropad_retro_init(void); + +void libretro_netretropad_retro_deinit(void); + +unsigned libretro_netretropad_retro_api_version(void); + +void libretro_netretropad_retro_get_system_info(struct retro_system_info *info); + +void libretro_netretropad_retro_get_system_av_info(struct retro_system_av_info *info); + +void libretro_netretropad_retro_set_environment(retro_environment_t cb); + +void libretro_netretropad_retro_set_video_refresh(retro_video_refresh_t cb); + +void libretro_netretropad_retro_set_audio_sample(retro_audio_sample_t cb); + +void libretro_netretropad_retro_set_audio_sample_batch(retro_audio_sample_batch_t cb); + +void libretro_netretropad_retro_set_input_poll(retro_input_poll_t cb); + +void libretro_netretropad_retro_set_input_state(retro_input_state_t cb); + +void libretro_netretropad_retro_set_controller_port_device(unsigned port, unsigned device); + +void libretro_netretropad_retro_reset(void); + +void libretro_netretropad_retro_run(void); + +size_t libretro_netretropad_retro_serialize_size(void); + +bool libretro_netretropad_retro_serialize(void *data, size_t size); + +bool libretro_netretropad_retro_unserialize(const void *data, size_t size); + +void libretro_netretropad_retro_cheat_reset(void); + +void libretro_netretropad_retro_cheat_set(unsigned index, bool enabled, const char *code); + +bool libretro_netretropad_retro_load_game(const struct retro_game_info *game); + +bool libretro_netretropad_retro_load_game_special(unsigned game_type, + const struct retro_game_info *info, size_t num_info); + +void libretro_netretropad_retro_unload_game(void); + +unsigned libretro_netretropad_retro_get_region(void); + +void *libretro_netretropad_retro_get_memory_data(unsigned id); + +size_t libretro_netretropad_retro_get_memory_size(unsigned id); + +#endif + #endif diff --git a/cores/retropad/Makefile b/cores/libretro-net-retropad/Makefile similarity index 96% rename from cores/retropad/Makefile rename to cores/libretro-net-retropad/Makefile index 9c6b54a416..fc620c28be 100644 --- a/cores/retropad/Makefile +++ b/cores/libretro-net-retropad/Makefile @@ -116,7 +116,10 @@ else CFLAGS += -O3 endif -OBJECTS := ../../libretro-common/net/net_compat.o ../../libretro-common/net/net_socket.o retropad.o +OBJECTS := ../../libretro-common/net/net_compat.o \ + ../../libretro-common/net/net_socket.o \ + net_retropad_core.o + CFLAGS += -I../../libretro-common/include -Wall -pedantic $(fpic) ifneq (,$(findstring qnx,$(platform))) diff --git a/cores/libretro-net-retropad/internal_cores.h b/cores/libretro-net-retropad/internal_cores.h new file mode 100644 index 0000000000..7e1a2aab98 --- /dev/null +++ b/cores/libretro-net-retropad/internal_cores.h @@ -0,0 +1 @@ +#include "../internal_cores.h" diff --git a/cores/retropad/jni/Android.mk b/cores/libretro-net-retropad/jni/Android.mk similarity index 100% rename from cores/retropad/jni/Android.mk rename to cores/libretro-net-retropad/jni/Android.mk diff --git a/cores/retropad/jni/Application.mk b/cores/libretro-net-retropad/jni/Application.mk similarity index 100% rename from cores/retropad/jni/Application.mk rename to cores/libretro-net-retropad/jni/Application.mk diff --git a/cores/retropad/link.T b/cores/libretro-net-retropad/link.T similarity index 100% rename from cores/retropad/link.T rename to cores/libretro-net-retropad/link.T diff --git a/cores/retropad/retropad.c b/cores/retropad/retropad.c deleted file mode 100644 index 6edc342820..0000000000 --- a/cores/retropad/retropad.c +++ /dev/null @@ -1,325 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2015 - Daniel De Matteis - * Copyright (C) 2016 - Andrés Suárez - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -/* - * To-do: - * - Analog support - * - Some sort of connection control, it only sends packets - * but there is no acknoledgement of a connection o keepalives - * - Send player name - * - Render something on-screen maybe a gui to configure IP and port - instead of the ridiculously long strings we're using now - * - Allow changing IP address and port in runtime - * - Support other platforms - * - Input recording / Combos -*/ - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include - -#ifndef SOCKET_ERROR -#define SOCKET_ERROR -1 -#endif - -int s; -int port; -char message[64]; -char server[64]; -struct sockaddr_in si_other; - -struct retro_log_callback logger; -retro_log_printf_t log_cb; -static uint16_t *frame_buf; - -int input_state = 0; - -void retro_init(void) -{ - frame_buf = (uint16_t*)calloc(320 * 240, sizeof(uint16_t)); - - log_cb(RETRO_LOG_INFO, "Initialising sockets...\n"); - network_init(); -} - -void retro_deinit(void) -{ - if (frame_buf) - free(frame_buf); - frame_buf = NULL; -} - -unsigned retro_api_version(void) -{ - return RETRO_API_VERSION; -} - -void retro_set_controller_port_device( - unsigned port, unsigned device) -{ - (void)port; - (void)device; -} - -void retro_get_system_info( - struct retro_system_info *info) -{ - memset(info, 0, sizeof(*info)); - info->library_name = "RetroPad Remote"; - info->library_version = "0.01"; - info->need_fullpath = false; - info->valid_extensions = ""; /* Nothing. */ -} - -void retro_get_system_av_info( - struct retro_system_av_info *info) -{ - info->timing.fps = 60.0; - info->timing.sample_rate = 30000.0; - - info->geometry.base_width = 320; - info->geometry.base_height = 240; - info->geometry.max_width = 320; - info->geometry.max_height = 240; - info->geometry.aspect_ratio = 4.0 / 3.0; -} - -static retro_video_refresh_t video_cb; -static retro_audio_sample_t audio_cb; -static retro_audio_sample_batch_t audio_batch_cb; -static retro_environment_t environ_cb; -static retro_input_poll_t input_poll_cb; -static retro_input_state_t input_state_cb; - -void update_input() -{ - input_state = 0; - input_poll_cb(); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B)) - input_state += 1; - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A)) - input_state += 2; - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT)) - input_state += pow(2, 2); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START)) - input_state += pow(2, 3); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP)) - input_state += pow(2, 4); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN)) - input_state += pow(2, 5); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT)) - input_state += pow(2, 6); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT)) - input_state += pow(2, 7); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y)) - input_state += pow(2, 8); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X)) - input_state += pow(2, 9); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L)) - input_state += pow(2, 10); - if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R)) - input_state += pow(2, 11); -} - -void retro_set_environment(retro_environment_t cb) -{ - static const struct retro_variable vars[] = { - { "port", "Port; 55400|55401|55402|55403|55404|55405|55406|55407|55408|55409|55410|55411|55412|55413|55414|55415|55416|55417|55418|55419|55420" }, - { "ip_octet1", "IP address part 1; 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|35|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|135|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200|201|202|203|204|205|206|207|208|209|210|211|212|213|214|215|216|217|218|219|220|221|222|223|224|225|226|227|228|229|230|231|232|233|235|235|236|237|238|239|240|241|242|243|244|245|246|247|248|249|250|251|252|253|254|255" }, - { "ip_octet2", "IP address part 2; 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|35|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|135|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200|201|202|203|204|205|206|207|208|209|210|211|212|213|214|215|216|217|218|219|220|221|222|223|224|225|226|227|228|229|230|231|232|233|235|235|236|237|238|239|240|241|242|243|244|245|246|247|248|249|250|251|252|253|254|255" }, - { "ip_octet3", "IP address part 3; 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|35|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|135|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200|201|202|203|204|205|206|207|208|209|210|211|212|213|214|215|216|217|218|219|220|221|222|223|224|225|226|227|228|229|230|231|232|233|235|235|236|237|238|239|240|241|242|243|244|245|246|247|248|249|250|251|252|253|254|255" }, - { "ip_octet4", "IP address part 4; 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|35|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116|117|118|119|120|121|122|123|124|125|126|127|128|129|130|131|132|133|135|135|136|137|138|139|140|141|142|143|144|145|146|147|148|149|150|151|152|153|154|155|156|157|158|159|160|161|162|163|164|165|166|167|168|169|170|171|172|173|174|175|176|177|178|179|180|181|182|183|184|185|186|187|188|189|190|191|192|193|194|195|196|197|198|199|200|201|202|203|204|205|206|207|208|209|210|211|212|213|214|215|216|217|218|219|220|221|222|223|224|225|226|227|228|229|230|231|232|233|235|235|236|237|238|239|240|241|242|243|244|245|246|247|248|249|250|251|252|253|254|255" }, - - { NULL, NULL }, - }; - cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars); - - enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565; - - environ_cb = cb; - bool no_content = true; - cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_content); - - environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt); - - if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logger)) - log_cb = logger.log; -} - -static void check_variables(void) -{ - struct retro_variable var, var2, var3, var4, port_var; - var.key = "ip_octet1"; - var2.key = "ip_octet2"; - var3.key = "ip_octet3"; - var4.key = "ip_octet4"; - port_var.key = "port"; - - environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var); - environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var2); - environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var3); - environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var4); - environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &port_var); - - snprintf(server, sizeof(server), "%s.%s.%s.%s", var.value, var2.value, var3.value, var4.value); - port = atoi(port_var.value); -} - -void retro_set_audio_sample(retro_audio_sample_t cb) -{ - audio_cb = cb; -} - -void retro_set_audio_sample_batch( - retro_audio_sample_batch_t cb) -{ - audio_batch_cb = cb; -} - -void retro_set_input_poll(retro_input_poll_t cb) -{ - input_poll_cb = cb; -} - -void retro_set_input_state(retro_input_state_t cb) -{ - input_state_cb = cb; -} - -void retro_set_video_refresh(retro_video_refresh_t cb) -{ - video_cb = cb; -} - -void retro_reset(void) -{} - -void retro_run(void) -{ - unsigned i; - update_input(); - snprintf(message, sizeof(message), "%d", input_state); - - /* send the message */ - if (sendto(s, message, strlen(message) , 0 , (struct sockaddr *) &si_other, sizeof(si_other))==-1) - log_cb(RETRO_LOG_INFO, "Error sending data\n"); - - for (i = 0; i < 320 * 240; i++) - frame_buf[i] = 4 << 5; - video_cb(frame_buf, 320, 240, 640); -} - -bool retro_load_game(const struct retro_game_info *info) -{ - socket_target_t in_target; - - check_variables(); - - s = socket_create( - "retropad", - SOCKET_DOMAIN_INET, - SOCKET_TYPE_DATAGRAM, - SOCKET_PROTOCOL_UDP); - - if (s == SOCKET_ERROR) - log_cb(RETRO_LOG_INFO, "socket failed"); - - /* setup address structure */ - memset((char *) &si_other, 0, sizeof(si_other)); - - in_target.port = port; - in_target.server = server; - in_target.domain = SOCKET_DOMAIN_INET; - - socket_set_target(&si_other, &in_target); - - log_cb(RETRO_LOG_INFO, "Server IP Address: %s\n" , server); - - return true; -} - -void retro_unload_game(void) -{} - -unsigned retro_get_region(void) -{ - return RETRO_REGION_NTSC; -} - -bool retro_load_game_special(unsigned type, - const struct retro_game_info *info, size_t num) -{ - (void)type; - (void)info; - (void)num; - return false; -} - -size_t retro_serialize_size(void) -{ - return 0; -} - -bool retro_serialize(void *data, size_t size) -{ - (void)data; - (void)size; - return false; -} - -bool retro_unserialize(const void *data, - size_t size) -{ - (void)data; - (void)size; - return false; -} - -void *retro_get_memory_data(unsigned id) -{ - (void)id; - return NULL; -} - -size_t retro_get_memory_size(unsigned id) -{ - (void)id; - return 0; -} - -void retro_cheat_reset(void) -{} - -void retro_cheat_set(unsigned idx, - bool enabled, const char *code) -{ - (void)idx; - (void)enabled; - (void)code; -} - - diff --git a/dynamic.c b/dynamic.c index bf1247fb54..022679388b 100644 --- a/dynamic.c +++ b/dynamic.c @@ -68,13 +68,19 @@ static dylib_t lib_handle; #endif #define SYMBOL_DUMMY(x) current_core->x = libretro_dummy_##x + #ifdef HAVE_FFMPEG #define SYMBOL_FFMPEG(x) current_core->x = libretro_ffmpeg_##x #endif + #ifdef HAVE_IMAGEVIEWER #define SYMBOL_IMAGEVIEWER(x) current_core->x = libretro_imageviewer_##x #endif +#if defined(HAVE_NETWORK_GAMEPAD) && defined(HAVE_NETPLAY) +#define SYMBOL_NETRETROPAD(x) current_core->x = libretro_netretropad_##x +#endif + static bool ignore_environment_cb; const struct retro_subsystem_info *libretro_find_subsystem_info( @@ -498,6 +504,43 @@ static void load_symbols(enum rarch_core_type type, struct retro_core_t *current SYMBOL_IMAGEVIEWER(retro_get_region); SYMBOL_IMAGEVIEWER(retro_get_memory_data); SYMBOL_IMAGEVIEWER(retro_get_memory_size); +#endif + break; + case CORE_TYPE_NETRETROPAD: +#if defined(HAVE_NETWORK_GAMEPAD) && defined(HAVE_NETPLAY) + SYMBOL_NETRETROPAD(retro_init); + SYMBOL_NETRETROPAD(retro_deinit); + + SYMBOL_NETRETROPAD(retro_api_version); + SYMBOL_NETRETROPAD(retro_get_system_info); + SYMBOL_NETRETROPAD(retro_get_system_av_info); + + SYMBOL_NETRETROPAD(retro_set_environment); + SYMBOL_NETRETROPAD(retro_set_video_refresh); + SYMBOL_NETRETROPAD(retro_set_audio_sample); + SYMBOL_NETRETROPAD(retro_set_audio_sample_batch); + SYMBOL_NETRETROPAD(retro_set_input_poll); + SYMBOL_NETRETROPAD(retro_set_input_state); + + SYMBOL_NETRETROPAD(retro_set_controller_port_device); + + SYMBOL_NETRETROPAD(retro_reset); + SYMBOL_NETRETROPAD(retro_run); + + SYMBOL_NETRETROPAD(retro_serialize_size); + SYMBOL_NETRETROPAD(retro_serialize); + SYMBOL_NETRETROPAD(retro_unserialize); + + SYMBOL_NETRETROPAD(retro_cheat_reset); + SYMBOL_NETRETROPAD(retro_cheat_set); + + SYMBOL_NETRETROPAD(retro_load_game); + SYMBOL_NETRETROPAD(retro_load_game_special); + + SYMBOL_NETRETROPAD(retro_unload_game); + SYMBOL_NETRETROPAD(retro_get_region); + SYMBOL_NETRETROPAD(retro_get_memory_data); + SYMBOL_NETRETROPAD(retro_get_memory_size); #endif break; } diff --git a/griffin/griffin.c b/griffin/griffin.c index 0d7da3977b..f2f01d51a3 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -932,6 +932,7 @@ MENU #ifdef HAVE_NETWORK_GAMEPAD #include "../input/input_remote.c" +#include "../cores/libretro-net-retropad/net_retropad_core.c" #endif #include "../command.c"