Update

Author: LibretroAdmin

dynamic/dylib.c

@@ -25,14 +25,20 @@
 #include <dynamic/dylib.h>
 #include <encodings/utf.h>
 
+#if defined(ORBIS)
+#include <orbis/libkernel.h>
+#endif
+
 #ifdef NEED_DYNAMIC
 
 #ifdef _WIN32
 #include <compat/posix_string.h>
 #include <windows.h>
 #else
+#if !defined(ORBIS)
 #include <dlfcn.h>
 #endif
+#endif
 
 /* Assume W-functions do not work below Win2K and Xbox platforms */
 #if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
@@ -118,6 +124,9 @@ dylib_t dylib_load(const char *path)
       return NULL;
    }
    last_dyn_error[0] = 0;
+#elif defined(ORBIS)
+   int res;
+   dylib_t lib = (dylib_t)sceKernelLoadStartModule(path, 0, NULL, 0, NULL, &res);
 #else
    dylib_t lib = dlopen(path, RTLD_LAZY | RTLD_LOCAL);
 #endif
@@ -161,6 +170,14 @@ function_t dylib_proc(dylib_t lib, const char *proc)
       return NULL;
    }
    last_dyn_error[0] = 0;
+#elif defined(ORBIS)
+   void *ptr_sym = NULL;
+   sym = NULL;
+
+   if (lib) {
+     sceKernelDlsym((SceKernelModule)lib, proc, &ptr_sym);
+     memcpy(&sym, &ptr_sym, sizeof(void*));
+   }
 #else
    void *ptr_sym = NULL;
 
@@ -196,6 +213,9 @@ void dylib_close(dylib_t lib)
    if (!FreeLibrary((HMODULE)lib))
       set_dl_error();
    last_dyn_error[0] = 0;
+#elif defined(ORBIS)
+   int res;
+   sceKernelStopUnloadModule((SceKernelModule)lib, 0, NULL, 0, NULL, &res);
 #else
 #ifndef NO_DLCLOSE
    dlclose(lib);

features/features_cpu.c

@@ -75,6 +75,10 @@
 #include <psp2/rtc.h>
 #endif
 
+#if defined(ORBIS)
+#include <orbis/libkernel.h>
+#endif
+
 #if defined(PS2)
 #include <ps2sdkapi.h>
 #endif
@@ -195,6 +199,8 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
    __asm__ volatile( "mrs %0, cntvct_el0" : "=r"(time_ticks) );
 #elif defined(PSP) || defined(VITA)
    time_ticks = sceKernelGetSystemTimeWide();
+#elif defined(ORBIS)
+   sceRtcGetCurrentTick((SceRtcTick*)&time_ticks);
 #elif defined(PS2)
    time_ticks = ps2_clock();
 #elif defined(_3DS)
@@ -255,6 +261,8 @@ retro_time_t cpu_features_get_time_usec(void)
    return sceKernelGetSystemTimeWide();
 #elif defined(DJGPP)
    return uclock() * 1000000LL / UCLOCKS_PER_SEC;
+#elif defined(ORBIS)
+   return sceKernelGetProcessTime();
 #else
 #error "Your platform does not have a timer function implemented in cpu_features_get_time_usec(). Cannot continue."
 #endif

file/config_file.c

@@ -26,10 +26,6 @@
 #include <ctype.h>
 #include <errno.h>
 
-#ifdef ORBIS
-#include <sys/fcntl.h>
-#include <orbisFile.h>
-#endif
 #include <retro_miscellaneous.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
@@ -1338,13 +1334,6 @@ bool config_file_write(config_file_t *conf, const char *path, bool sort)
 
    if (!string_is_empty(path))
    {
-#ifdef ORBIS
-      int fd     = orbisOpen(path,O_RDWR|O_CREAT,0644);
-      if (fd < 0)
-         return false;
-      config_file_dump_orbis(conf,fd);
-      orbisClose(fd);
-#else
       void* buf  = NULL;
       FILE *file = (FILE*)fopen_utf8(path, "wb");
       if (!file)
@@ -1359,7 +1348,6 @@ bool config_file_write(config_file_t *conf, const char *path, bool sort)
          fclose(file);
       if (buf)
          free(buf);
-#endif
 
       /* Only update modified flag if config file
        * is actually written to disk */
@@ -1371,53 +1359,6 @@ bool config_file_write(config_file_t *conf, const char *path, bool sort)
    return true;
 }
 
-#ifdef ORBIS
-void config_file_dump_orbis(config_file_t *conf, int fd)
-{
-   struct config_entry_list       *list = NULL;
-   struct config_include_list *includes = conf->includes;
-  
-   if (conf->reference)
-   {
-      pathname_make_slashes_portable(conf->reference);
-      fprintf(file, "#reference \"%s\"\n", conf->reference);
-   }
-
-
-   list          = config_file_merge_sort_linked_list(
-         (struct config_entry_list*)conf->entries,
-         config_file_sort_compare_func);
-   conf->entries = list;
-
-   while (list)
-   {
-      if (!list->readonly && list->key)
-      {
-         char newlist[256];
-         snprintf(newlist, sizeof(newlist),
-               "%s = %s\n", list->key, list->value);
-         orbisWrite(fd, newlist, strlen(newlist));
-      }
-      list = list->next;
-   }
-
-   /* Config files are read from the top down - if
-    * duplicate entries are found then the topmost
-    * one in the list takes precedence. This means
-    * '#include' directives must go *after* individual
-    * config entries, otherwise they will override
-    * any custom-set values */
-   while (includes)
-   {
-      char cad[256];
-      snprintf(cad, sizeof(cad),
-            "#include %s\n", includes->path);
-      orbisWrite(fd, cad, strlen(cad));
-      includes = includes->next;
-   }
-}
-#endif
-
 void config_file_dump(config_file_t *conf, FILE *file, bool sort)
 {
    struct config_entry_list       *list = NULL;

file/nbio/nbio_intf.c

@@ -32,9 +32,6 @@
 extern nbio_intf_t nbio_linux;
 extern nbio_intf_t nbio_mmap_unix;
 extern nbio_intf_t nbio_mmap_win32;
-#if defined(ORBIS)
-extern nbio_intf_t nbio_orbis;
-#endif
 extern nbio_intf_t nbio_stdio;
 
 #ifndef _XBOX
@@ -61,8 +58,6 @@ static nbio_intf_t *internal_nbio = &nbio_linux;
 static nbio_intf_t *internal_nbio = &nbio_mmap_unix;
 #elif defined(HAVE_MMAP_WIN32)
 static nbio_intf_t *internal_nbio = &nbio_mmap_win32;
-#elif defined(ORBIS)
-static nbio_intf_t *internal_nbio = &nbio_orbis;
 #else
 static nbio_intf_t *internal_nbio = &nbio_stdio;
 #endif

include/file/config_file.h

@@ -214,10 +214,6 @@ bool config_file_write(config_file_t *conf, const char *path, bool val);
  * Does not close the file. */
 void config_file_dump(config_file_t *conf, FILE *file, bool val);
 
-#ifdef ORBIS
-void config_file_dump_orbis(config_file_t *conf, int fd);
-#endif
-
 bool config_file_exists(const char *path);
 
 RETRO_END_DECLS

include/net/net_compat.h

@@ -56,6 +56,8 @@
 
 #include <network.h>
 
+#define setsockopt net_setsockopt
+
 #elif defined(VITA)
 
 #include <psp2/net/net.h>

include/retro_miscellaneous.h

@@ -75,7 +75,7 @@ static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
 }
 
 #ifndef PATH_MAX_LENGTH
-#if defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(ORBIS) || defined(__PSL1GHT__) || defined(__PS3__)
+#if defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(__PSL1GHT__) || defined(__PS3__)
 #define PATH_MAX_LENGTH 512
 #else
 #define PATH_MAX_LENGTH 4096

net/net_compat.c

@@ -422,7 +422,7 @@ void network_deinit(void)
 
 uint16_t inet_htons(uint16_t hostshort)
 {
-#if defined(VITA) || defined(__ORBIS__)
+#if defined(VITA)
    return sceNetHtons(hostshort);
 #else
    return htons(hostshort);
@@ -432,7 +432,7 @@ uint16_t inet_htons(uint16_t hostshort)
 
 int inet_ptrton(int af, const char *src, void *dst)
 {
-#if defined(VITA) || defined(__ORBIS__)
+#if defined(VITA)
    return sceNetInetPton(af, src, dst);
 #elif defined(GEKKO) || defined(_WIN32)
    /* TODO/FIXME - should use InetPton on Vista and later */
@@ -597,7 +597,7 @@ static const char *isockaddr_ntop(int af,
 
 const char *inet_ntop_compat(int af, const void *src, char *dst, socklen_t cnt)
 {
-#if defined(VITA) || defined(__ORBIS__)
+#if defined(VITA)
    return sceNetInetNtop(af,src,dst,cnt);
 #elif defined(WIIU)
    return inet_ntop(af, src, dst, cnt);

test/string/test_stdstring.c

@@ -184,9 +184,9 @@ START_TEST (test_word_wrap)
       "adipiscing elit. Nam nec enim quis orci\n"
       "euismod efficitur at nec arcu. Vivamus\n"
       "imperdiet est feugiat massa rhoncus\n"
-      "porttitor at vitae ante. Nunc a orci vel\n"
-      "ipsum tempor posuere sed a lacus. Ut\n"
-      "erat odio, ultrices vitae iaculis\n"
+      "porttitor at vitae ante. Nunc a orci\n"
+      "vel ipsum tempor posuere sed a lacus.\n"
+      "Ut erat odio, ultrices vitae iaculis\n"
       "fringilla, iaculis ut eros.\n"
       "Sed facilisis viverra lectus et\n"
       "ullamcorper. "