Update

2024-11-22 23:39:50 +00:00 · 2020-12-20 00:33:04 +01:00 · 2020-12-20 00:33:04 +01:00 · dc94407ece
commit dc94407ece
parent 3fd6466728
7 changed files with 10 additions and 68 deletions
--- a/deps/flac-1.3.3/include/share/compat.h
+++ b/deps/flac-1.3.3/include/share/compat.h
@ -46,7 +46,7 @@
 # include <unistd.h>
 #endif

-#if defined(__CELLOS_LV2__)
+#if defined(__PSL1GHT__)
 #define fseek_wrap fseek
 #define ftell_wrap ftell
 #elif defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@ -80,15 +80,11 @@
 #include <pspkernel.h>
 #endif

-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <cell/cell_fs.h>
-#endif
-
 #if defined(VITA)
 #define FIO_S_ISDIR SCE_S_ISDIR
 #endif

-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
+#if defined(__QNX__) || defined(PSP)
 #include <unistd.h> /* stat() is defined here */
 #endif

--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@ -69,7 +69,7 @@ extern "C" {
 #      endif
 #    endif
 #  else
-#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
+#      if defined(__GNUC__) && __GNUC__ >= 4
 #        define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
 #      else
 #        define RETRO_API RETRO_CALLCONV
--- a/libretro-common/include/memmap.h
+++ b/libretro-common/include/memmap.h
@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdint.h>

-#if defined(__CELLOS_LV2__) || defined(PSP) || defined(PS2) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH) || defined(HAVE_LIBNX)
+#if defined(PSP) || defined(PS2) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH) || defined(HAVE_LIBNX)
 /* No mman available */
 #elif defined(_WIN32) && !defined(_XBOX)
 #include <windows.h>
--- a/libretro-common/include/retro_miscellaneous.h
+++ b/libretro-common/include/retro_miscellaneous.h
@ -43,10 +43,6 @@

 #endif

-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <sys/fs_external.h>
-#endif
-
 #include <limits.h>

 #ifdef _MSC_VER
@ -79,9 +75,7 @@ static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
 }

 #ifndef PATH_MAX_LENGTH
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#define PATH_MAX_LENGTH CELL_FS_MAX_FS_PATH_LENGTH
-#elif defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(ORBIS)
+#if defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(ORBIS)
 #define PATH_MAX_LENGTH 512
 #else
 #define PATH_MAX_LENGTH 4096
--- a/libretro-common/include/retro_timers.h
+++ b/libretro-common/include/retro_timers.h
@ -25,9 +25,7 @@

 #include <stdint.h>

-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <sys/timer.h>
-#elif defined(XENON)
+#if defined(XENON)
 #include <time/time.h>
 #elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
 #include <unistd.h>
@ -83,9 +81,7 @@ static int nanosleepDOS(const struct timespec *rqtp, struct timespec *rmtp)
 *
 * Sleeps for a specified amount of milliseconds (@msec).
 **/
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#define retro_sleep(msec) (sys_timer_usleep(1000 * (msec)))
-#elif defined(PSP) || defined(VITA)
+#if defined(PSP) || defined(VITA)
 #define retro_sleep(msec) (sceKernelDelayThread(1000 * (msec)))
 #elif defined(_3DS)
 #define retro_sleep(msec) (svcSleepThread(1000000 * (s64)(msec)))
--- a/libretro-common/vfs/vfs_implementation.c
+++ b/libretro-common/vfs/vfs_implementation.c
@ -64,16 +64,7 @@
 #  endif
 #endif

-#if defined (__CELLOS_LV2__)  && !defined(__PSL1GHT__)
-#include <cell/cell_fs.h>
-#define O_RDONLY CELL_FS_O_RDONLY
-#define O_WRONLY CELL_FS_O_WRONLY
-#define O_CREAT CELL_FS_O_CREAT
-#define O_TRUNC CELL_FS_O_TRUNC
-#define O_RDWR CELL_FS_O_RDWR
-#else
 #include <fcntl.h>
-#endif

 /* TODO: Some things are duplicated but I'm really afraid of breaking other platforms by touching this */
 #if defined(VITA)
@ -95,7 +86,7 @@
 #  include <unistd.h>
 #endif

-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
+#if defined(__QNX__) || defined(PSP)
 #include <unistd.h> /* stat() is defined here */
 #endif

@ -139,15 +130,11 @@
 #include <pspkernel.h>
 #endif

-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <cell/cell_fs.h>
-#endif
-
 #if defined(VITA)
 #define FIO_S_ISDIR SCE_S_ISDIR
 #endif

-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
+#if defined(__QNX__) || defined(PSP)
 #include <unistd.h> /* stat() is defined here */
 #endif

@ -922,20 +909,6 @@ int retro_vfs_stat_impl(const char *path, int32_t *size)
   orbisDclose(dir_ret);

   is_character_special      = S_ISCHR(buf.st_mode);
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   /* CellOS Lv2 */
-   CellFsStat buf;
-
-   if (!path || !*path)
-      return 0;
-   if (cellFsStat(path, &buf) < 0)
-      return 0;
-
-   if (size)
-      *size                  = (int32_t)buf.st_size;
-
-   is_dir                    = ((buf.st_mode & S_IFMT) == S_IFDIR);
-
 #elif defined(_WIN32)
   /* Windows */
   DWORD file_info;
@ -1108,10 +1081,6 @@ struct libretro_vfs_implementation_dir
 #elif defined(VITA) || defined(PSP)
   SceUID directory;
   SceIoDirent entry;
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   CellFsErrno error;
-   int directory;
-   CellFsDirent entry;
 #elif defined(ORBIS)
   int directory;
   struct dirent entry;
@ -1127,8 +1096,6 @@ static bool dirent_check_error(libretro_vfs_implementation_dir *rdir)
   return (rdir->directory == INVALID_HANDLE_VALUE);
 #elif defined(VITA) || defined(PSP) || defined(ORBIS)
   return (rdir->directory < 0);
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   return (rdir->error != CELL_FS_SUCCEEDED);
 #else
   return !(rdir->directory);
 #endif
@ -1192,8 +1159,6 @@ libretro_vfs_implementation_dir *retro_vfs_opendir_impl(
 #elif defined(_3DS)
   rdir->directory       = !string_is_empty(name) ? opendir(name) : NULL;
   rdir->entry           = NULL;
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   rdir->error           = cellFsOpendir(name, &rdir->directory);
 #elif defined(ORBIS)
   rdir->directory       = orbisDopen(name);
 #else
@ -1229,10 +1194,6 @@ bool retro_vfs_readdir_impl(libretro_vfs_implementation_dir *rdir)
   return (rdir->directory != INVALID_HANDLE_VALUE);
 #elif defined(VITA) || defined(PSP)
   return (sceIoDread(rdir->directory, &rdir->entry) > 0);
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   uint64_t nread;
-   rdir->error = cellFsReaddir(rdir->directory, &rdir->entry, &nread);
-   return (nread != 0);
 #elif defined(ORBIS)
   return (orbisDread(rdir->directory, &rdir->entry) > 0);
 #else
@ -1253,7 +1214,7 @@ const char *retro_vfs_dirent_get_name_impl(libretro_vfs_implementation_dir *rdir
   if (name)
      free(name);
   return (char*)rdir->entry.cFileName;
-#elif defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) || defined(ORBIS)
+#elif defined(VITA) || defined(PSP) || defined(ORBIS)
   return rdir->entry.d_name;
 #else
   if (!rdir || !rdir->entry)
@ -1274,9 +1235,6 @@ bool retro_vfs_dirent_is_dir_impl(libretro_vfs_implementation_dir *rdir)
 #elif defined(VITA)
   return SCE_S_ISDIR(entry->d_stat.st_mode);
 #endif
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   CellFsDirent *entry          = (CellFsDirent*)&rdir->entry;
-   return (entry->d_type == CELL_FS_TYPE_DIRECTORY);
 #elif defined(ORBIS)
   const struct dirent *entry   = &rdir->entry;
   if (entry->d_type == DT_DIR)
@ -1313,8 +1271,6 @@ int retro_vfs_closedir_impl(libretro_vfs_implementation_dir *rdir)
      FindClose(rdir->directory);
 #elif defined(VITA) || defined(PSP)
   sceIoDclose(rdir->directory);
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   rdir->error = cellFsClosedir(rdir->directory);
 #elif defined(ORBIS)
   orbisDclose(rdir->directory);
 #else