Bump up to version 1.9.0

Improve Crowdin scripts and fetch translations

.editorconfig

@@ -15,6 +15,11 @@ charset = utf-8
 indent_style = space
 indent_size = 3
 
+# 2 space indentation
+[*.{json,xml,yaml,yml}]
+indent_style = space
+indent_size = 2
+
 # Tab indentation
 [Makefile*]
 indent_style = tab

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: [twinaphex]
+github: [libretro]
 patreon: libretro
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.github/workflows/crowdin.yml

@@ -0,0 +1,28 @@
+# Upload sources to Crowdin for translation
+
+name: Crowdin Workflow
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'intl/*_us.h'
+      - 'intl/*_us.json'
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Java JDK
+        uses: actions/[email protected]
+        with:
+          java-version: 1.8
+      - name: Setup Python
+        uses: actions/setup-python@v2
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Crowdin Sync
+        run: |
+          cd intl
+          python3 crowdin_sync.py

.gitignore

@@ -8,6 +8,7 @@
 *.dol
 *.map
 *.swp
+*.cache
 .tmp
 .tmp.c
 .tmp.cxx
@@ -76,7 +77,9 @@ convert_rumble.awk
 *~
 assets
 info
+content_history.lpl
 content_image_history.lpl
+content_music_history.lpl
 saves
 screenshots
 
@@ -174,7 +177,7 @@ retroarch_switch.nso
 
 # PS2
 ps2/irx/*.c
-ps2/libcdvd/lib/
+*.irx
 
 # Wayland
 gfx/common/wayland/idle-inhibit-unstable-v1.c

.travis.yml

@@ -32,18 +32,24 @@ matrix:
       env: CXX_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: gcc
       env: CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: CC="gcc-8 --sysroot=/" CXX="g++-8 --sysroot=/"
     - compiler: gcc
       env: C89_BUILD=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: DISABLE_NETWORKING=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: DISABLE_OVERLAY=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: DISABLE_CDROM=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: DISABLE_VIDEO_LAYOUT=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: DISABLE_THREADS=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: DISABLE_AUDIOMIXER=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
@@ -103,9 +109,13 @@ matrix:
         - cd pkg/android/phoenix
         - ./gradlew assembleNormalRelease
 
+jobs:
+  allow_failure:
+    - os: osx
+
 before_install:
   - |
-     if [ "$CC" = gcc-8 ]; then
+     if [[ "$CC" =~ ^gcc-8.* ]]; then
        # Install a more recent gcc than the default
        sudo apt-get install -y g++-8
      elif [ "$CC" = clang-6.0 ]; then
@@ -130,6 +140,10 @@ before_script:
      if [ -n "$DISABLE_OVERLAY" ]; then
        ARGS="$ARGS --disable-overlay"
      fi
+  - |
+     if [ -n "$DISABLE_NETWORKING" ]; then
+       ARGS="$ARGS --disable-networking"
+     fi
   - |
      if [ -n "$DISABLE_CDROM" ]; then
        ARGS="$ARGS --disable-cdrom"
@@ -138,6 +152,10 @@ before_script:
      if [ -n "$DISABLE_VIDEO_LAYOUT" ]; then
        ARGS="$ARGS --disable-video_layout"
      fi
+  - |
+     if [ -n "$DISABLE_THREADS" ]; then
+       ARGS="$ARGS --disable-threads --disable-glslang"
+     fi
   - |
      if [ -n "$DISABLE_AUDIOMIXER" ]; then
        ARGS="$ARGS --disable-audiomixer"

.vscode/launch.json

@@ -40,6 +40,31 @@
              }
          ]
       },
-
+      {
+         "name": "PSP-GDB Debugger",
+          "type": "cppdbg",
+          "request": "launch",
+          "program": "${workspaceFolder}/retroarchpsp.elf",
+          "stopAtEntry": false,
+          "cwd": "${workspaceFolder}",
+          "environment": [],
+          "setupCommands": [
+             {
+                 "text": "symbol-file ${workspaceFolder}/retroarchpsp.elf",
+                 "description": "read symbols for elf file",
+                 "ignoreFailures": true
+             },
+             {
+               "description": "Enable all-exceptions",
+               "text": "-exec \"catch throw\"",
+               "ignoreFailures": true
+           }
+         ],
+         "showDisplayString": true,
+          "targetArchitecture": "mips",
+          "MIMode": "gdb",
+          "miDebuggerPath": "/usr/local/pspdev/bin/psp-gdb",
+          "miDebuggerServerAddress": "127.0.0.1:10001",
+     }
    ]
 }

.vscode/settings.json

@@ -1,15 +1,15 @@
 {
-   "terminal.integrated.shell.windows":    "C:\\msys64\\usr\\bin\\bash.exe",
+   "terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
    "terminal.integrated.env.windows": {
       "PATH": "/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH",
       "MSYSTEM": "MINGW64",
    },
    "terminal.integrated.cursorBlinking": true,
-
    "editor.tabSize": 3,
    "editor.detectIndentation": false,
    "editor.renderWhitespace": "all",
    "editor.insertSpaces": true,
+   "editor.formatOnSave": false,
    "files.associations": {
       "frontend_driver.h": "c",
       "*.in": "c",
@@ -42,7 +42,7 @@
       "core_info.h": "c",
       "thread": "c",
       "xlocale": "c",
-      "menu_widgets.h": "c",
+      "gfx_widgets.h": "c",
       "message_queue.h": "c",
       "task_queue.h": "c",
       "fifo_queue.h": "c",
@@ -52,7 +52,7 @@
       "ozone_display.h": "c",
       "verbosity.h": "c",
       "retroarch.h": "c",
-      "menu_animation.h": "c",
+      "gfx_animation.h": "c",
       "netplay.h": "c",
       "scaler.h": "c",
       "deque": "c",
@@ -63,7 +63,6 @@
       "xtree": "c",
       "xutility": "c",
       "menu_input_dialog.h": "c",
-      "menu_filebrowser.h": "c",
       "ozone_sidebar.h": "c",
       "menu_thumbnail_path.h": "c",
       "badges.h": "c"

CHANGES.md

@@ -1,5 +1,375 @@
 # Future
 
+# 1.9.0
+- 3DS: Fix sound crackling when paused
+- ANDROID/VIBRATION: Fixes "Vibrate on Key Press" having no effect on Android devices, which occurred because only the off time/strength was defined in what should have been a pair of off/on values
+- AUTOCONFIG: Ensure correct directory is used when saving autoconfig profiles
+- BLUETOOTH: Add a Bluetooth driver (Lakka-only for now)
+- CHEATS: Fix for wrong number of remaining cheat search matches on some machines
+- CHEEVOS: Option to play sound on achievement unlock.
+- CHEEVOS: Upgrade to rcheevos 9.1
+- CHEEVOS: Restore display of unlocked achievements across hardcore modes
+- CHEEVOS: Hash buffered data when available
+- CHEEVOS: Fix 'Auto Save State freezes RetroArch while Cheevos is enabled'
+- CORE OPTIONS: Pressing OK (or clicking/tapping) on a 'boolean toggle' core option no longer opens a drop-down list. The value now toggles directly, just like boolean options everywhere else in the menu
+- CORE OPTIONS: Toggling an option that changes the number of core options being displayed (i.e. things like `Show Advanced Audio/Video Settings) no longer resets the navigation pointer to the start of the list
+- CORE OPTIONS: Before, RetroArch would identify core option values as being 'boolean' if they had labels matching the specific strings enabled or disabled. Most core devs would abide by this, but not always... As a result, we sometimes would end up with misidentified values, with all kinds of Enabled, Off, True, etc. strings littering the menu, in place of proper toggle switches. All boolean-type value labels are now detected, and replaced with standard ON/OFF strings.
+- CLI: A new command line option --load-menu-on-error has been added
+- CRT: On the fly CRT porch adjuments - these changes allow a user to adjust how the porch algorithm generates the 15khz/31khz output. Giving the ability to change over/under scan.
+- CONFIG FILE: Optimise parsing of configuration files
+- D3D9/D3D11: Fix core-initiated D3D9/D3D11 driver switches
+- DRIVERS: Implemented protection to avoid setting critical drivers to nothing thus preventing the user from locking him/herself out of the program
+- EMSCRIPTEN: Fix input code to ignore unknown keys
+- FFMPEG CORE: Prevent seeking past the end of files (hang fix)
+- FILE I/O: VFS and NBIO interfaces will now use 64-bit fseek/ftell where possible, should allow for reading/writing to files bigger than 2GB
+- INPUT MAPPING/REMAPPING: Add input remap drop-down lists
+- IOS: Fixed iOS 6 version
+- IOS: Hide the home indicator as it obscures the content too frequently
+- IOS/METAL: Metal video driver now works on RetroArch iOS
+- IOS/METAL: Support getting video metrics to support proper touchscreen interactions
+- LOCALIZATION: Updates for several languages (synchronized from Crowdin)
+- MEMORY/LINUX/ANDROID: Fix reporting of free memory
+- MEMORY/WINDOWS: Fix reporting of free memory
+- MENU: Enlarged INT/UINT selection limit from 999 to 9999
+- MENU: Fix cursor forced to first entry after displaying lists
+- MENU: Make Notification Font option visible when Graphics Widgets are enabled
+- MENU/RGUI: Add optional 'toggle switch' icons
+- MENU/WIDGETS: Add optional widget-based 'load content' launch feedback animation
+- MENU/WIDGETS: Make notification font size option visible when graphics widgets are enabled
+- ODROID GO ADVANCE: Video driver - fix race condition with RGUI callback
+- PLAYLISTS: Change playlists to use dynamic arrays. Instead of a fixed initial 12MB memory allocation (99999 * 128 byte (on 64bit arch)), use a dynamically growing array
+- PLAYLISTS: Playlist base content directory paths - portable playlists
+- PLAYLISTS/SEARCH: Enhanced playlist search functionality
+- PLAYLISTS/DATABASE: Add 'Explore' view
+- PLAYLISTS/DATABASE/EXPLORE: Show system icons in explore view
+- PS2: Improve FPS Limiter
+- RUNAHEAD: Prevent runahead from being disabled *permanently* when an error occurs
+- SHADERS/SLANG: Increased Slang max Parameters, Textures & Passes
+- VIDEO FILTERS/BLARGG: Make Blargg_snes filter customizable
+- WINDOWS/RAWINPUT: Fix invalid calls to dinput_handle_message when input driver is not set to dinput
+- X11: Add lightgun support
+
+# 1.8.9
+- AUTO SAVESTATES: Ensure save states are correctly flushed to disk when quitting RetroArch (fixes broken save states when exiting RetroArch - without first closing content - with 'Auto Save State' enabled)
+- BUILTIN CORES: Builtin cores like ffmpeg and imageviewer would previously try  to erroneously load a dynamic core named 'builtin' - this would fail and would just be a wasteful operation - this now skips dylib loading in libretro_get_system_info for builtin cores
+- CHEEVOS: Report API errors when unlocking achievements or submitting leaderboards
+- CHEEVOS: Support less common file extensions
+- CHEEVOS: Disable hardcore mode when playing BSV file
+- CHEEVOS: Correctly report unlocked non-hardcore achievements when hardcore is paused
+- CHEEVOS/M3U: Bugfix - did not handle absolute/relative paths in M3U files correctly before
+- CHEEVOS/M3U: Bugfix - it didn't handle comments/directives
+- CHEEVOS/M3U: Bugfix - it doesn't handle trailing whitespace
+- CHEEVOS/M3U: Bugfix - failed when loading M3U files with certain line endings
+- CORE MANAGEMENT: Add 'core management' menu (Settings -> Core)
+- CORE MANAGEMENT: Add option to backup/restore installed cores
+- CORE MANAGEMENT: Improved core selection logic
+- CORE INFO: Search search optimisations
+- CORE DOWNLOADER: Rename 'Core Updater' to 'Core Downloader'
+- CORE DOWNLOADER: Add 'Show Experimental Cores' setting under Settings > Network > Updater
+- CORE DOWNLOADER: Core licenses are now shown for all entries in the Core Updater menu
+- CORE DOWNLOADER: Pressing RetroPad select on a Core Updater entry will now display any text in the description field of its info file
+- CORE DOWNLOADER: Installed cores are now highlighted via a [#] symbol
+- CORE DOWNLOADER: Pressing RetroPad start on a selected, installed entry opens the Core Information menu (when using Material UI, swiping left or right triggers the same action). This means we can now view bios info etc. - and more importantly delete cores - without jumping through all the hoops of loading a core first and navigating all over the place
+- CORE DOWNLOADER/UPDATER: Add option to automatically backup cores when updating
+- DISK CONTROL: Enable 'Load New Disc' while disk tray is open
+- INPUT: Added a hotkey delay option to allow hotkey input to work properly when it is assigned to another action
+- INPUT: Remove 'All Users Control Menu' setting, was buggy and will be properly reintroduced after input overhaul
+- LINUX: Set default saves/save states/system paths
+- LOCALIZATION: Add Persian language
+- LOCALIZATION: Add Hebrew language
+- LOCALIZATION: Add Asturian language
+- MENU: Proper line wrapping for message dialog boxes
+- MENU/HOTKEYS: Add sublabels to all hotkey bind entries
+- MENU/QUICK MENU: Suppress the display of 'empty' quick menu listings when closing content
+- MENU/OZONE: Performance improvements
+- MENU/SDL: Add mouse controls
+- OPENGL1/VITA: Initial changes for HW context without FBO
+- OVERLAYS: Add options for moving the on-screen overlay
+- PLAYLISTS/WINDOWS: Fix core path entries in image/video/music history playlists
+- PS2: Add back CDFS support
+- SDL/GL: Advertise GLSL support
+- VIDEO/WIDGETS: Fix heap-use-after-free errors, leading to memory corruption
+- VITA: Added custom bubbles support
+- VITA: VitaGL update
+- VULKAN/WSI: Better frame pacing
+- VULKAN/WSI: Fix Intel Mesa being broken when using Fences, we have to use Semaphores to acquire the swapchain or the entire GPU stalls
+- VULKAN/WSI: Add support for either using fences or semaphores when syncing
+- VULKAN/WSI: Prefer using semaphores for integrated GPUs as it promotes better throughput over fences
+- VULKAN/WSI/ANDROID: Do not use mailbox emulation on Android
+- UWP/XBOX: Potentially improve performance by enabling 'Game Mode'
+
+# 1.8.8
+- AUDIO/JACK: Fix regression introduced after 1.8.4 - would hang at startup
+- CHEEVOS: Disable hardcore when cheats are enabled
+- CHD: Return false when special track cannot be found
+- DISCORD/MATCHMAKING: Fix Discord 'Ask To Join' functionality
+- FILE PATH: Various file path handling optimisations
+- FONT: Fix Arabic, Chinese and Korean font rendering
+- INPUT MAPPING/REMAPPING: Restore broken 'reset to default' functionality with RetroPad 'start' button
+- INPUT MAPPING/REMAPPING: Fix 'reset to default' action for analog sticks and undefined core inputs 
+- LOCALIZATION: Update Arabic translation
+- LOCALIZATION: Update Chinese (Simplified) translation
+- LOCALIZATION: Update Chinese (Traditional) translation
+- LOCALIZATION: Update German translation
+- LOCALIZATION: Update Greek translation
+- LOCALIZATION: Update Spanish translation
+- LOCALIZATION: Update French translation
+- LOCALIZATION: Update Italian translation
+- LOCALIZATION: Update Japanese translation
+- LOCALIZATION: Update Korean translation
+- LOCALIZATION: Update Dutch translation
+- LOCALIZATION: Update Polish translation
+- LOCALIZATION: Update Portuguese Brazilian translation
+- LOCALIZATION: Update Russian translation
+- LOCALIZATION: Update Turkish translation
+- LOCALIZATION: Update Vietnamese translation
+- LOCALIZATION: Add Slovak translation
+- MENU: Small buffer optimizations
+- MENU/THUMBNAILS/BUGFIX: Fix heap-use-after-free error
+- MENU/OZONE: Add option to sort playlists after name truncation
+- MENU/OZONE/ANDROIDTV: Default to Ozone menu driver
+- MENU/OZONE/ANDROID: Gamepad-like devices default to Ozone now (Shield Portable)
+- NETPLAY: Lower announcement rate
+- OVERLAYS: Fix memory leak when loading overlays
+- SHADER PRESETS: Improved shader preset dirs
+- TIME/DATE: Enable configuration of date seperator in clock and runtime 'last played' displays
+- VITA: Fix upside-down vertical games
+- UWP: Enable playlist and savefile compression by default (because of slow file I/O)
+- WIIU: Gamepad hotplugging support
+- WIIU: Theoretical multi-gamepad support
+- VIDEO/WIDGETS: Fix overlapping text when simultaneous pop-up notifications and core/shader messages are being displayed
+- X11: Fix crash in x11_display_server_get_screen_orientation
+- X11/XSHM: Allow X11/XHSM video driver to operate without SHM extension
+- X11/XSHM: Fix compatibility with X11 input driver
+- XVIDEO: Fix keyboard input initialization
+- XVIDEO/XWAYLAND: Fix XVideo support on xwayland (by supporting I420 and YZ12)
+
+# 1.8.7
+- 3DS: Add IDs for Frodo
+- 3DS: Enable basic networking / cheevos
+- CHEEVOS/BUGFIX: Opening achievements list would crash RetroArch with badges enabled (on new games)
+- CHEEVOS: Option to start a session with all achievements active
+- CHEEVOS: Don't perform unnecessary cheevos initialisation when cheevos are disabled. Should reduce startup times when loading content.
+- CORE OPTIONS: Disable 'Use Global Core Options File' by default
+- DOS/DJGPP: Add 32bit color support for cores
+- GLCORE: Switch to glcore video driver when requested by a core
+- LINUX/XDG: Use GenericName correctly in desktop entry
+- MAC/COCOA: Fix mouse cursor tracking
+- MENU/MATERIALUI: Add desktop-style playlist view mode
+- MENU/MATERIALUI/DESKTOPVIEW: When scrolling playlists, show last selected thumbnails while waiting for next entry to load
+- MENU/MATERIALUI: Limit tab switch rate when input repeat is active
+- MENU/OZONE: Fix sidebar playlist sort order when 'Truncate Playlist Names' is enabled
+- MENU/RGUI: Adjusted menu defaults, adjusted default scrolling speed
+- MENU/RGUI: Enable custom wallpaper when menu size is reduced at low resolutions
+- MENU/XMB: Limit tab switch rate when input repeat is active
+- NETPLAY: Fix regressions introduced in 1.8.5
+- RGUI: Add option to always stretch menu to fill the screen
+- WIIU: Enable graphics widgets
+
+# 1.8.6
+- 3DS: Add IDs for UZEM, TGB Dual, and NeoCD
+- 3DS: Fix font driver horizontal text alignment
+- 3DS: Allow button presses up to INPUT_MAX_USERS - this enables the 3DS to bind and use buttons and axis for users up to the maximum set by 'Max Users' in the input settings menu.
+- 3DS: Disable video filter if upscaled resolution exceeds hardware limits. The 3DS has a maximum video buffer size of 2048x2048. This is sufficient for every core that it supports, but when using software video filters the core output resolution is doubled. This is made worse by the fact that the video filter upscaling buffer size is dependent upon the maximum output resolution of the core - which in some cases is very large indeed (e.g. pcsx-rearmed sets a maximum width of 1024, for enhanced resolution support). The 3DS has very limited 'linear memory' for graphics buffer purposes, and a large base core buffer + video filter buffer can easily exceed this - which may also disable video output, or cause a crash. This PR very simply adds a 3DS-specific check to the video filter initialisation: if the resultant upscaling buffer exceeds the hardware limitation, then the filter is automatically disabled.
+- 3DS/FONT/BUGFIX: Text colour was wrong: the RGBA channels were muddled, and R was always set to 255
+- 3DS/FONT/BUGFIX: When drawing multiline strings, the line spacing was completely incorrect
+- 3DS/FONT: Improves the appearance of the drop shadow effect on notification text.
+- 3DS/ARCHIVE/7Z: Re-enable 7zip support.
+- ARCHIVE/ZIP: Expand functionality of 'rzip_stream' interface. This PR expands the functionality of the new rzip_stream archived stream interface such that it now has almost complete feature parity with the standard file_stream interface, and can therefore be used as a drop-in replacement in most situations
+- AI SERVICE: Hide redundant entries when service is disabled
+- AI SERVICE: Added in auto-translate support
+- AI SERVICE: support for NVDA and SAPI narration
+- AUTOCONFIG: Use correct port index in input device configured/disconnected notifications
+- BUGFIX: Fix race condition where task could momentarily not be in the queue when reordering
+- CHEEVOS/BUGFIX: Prevent null reference rendering achievement list while closing application
+- CHEEVOS/BUGFIX: Report non-memorymap GBA cores as unsupported
+- COMMANDLINE: Advise against using -s and -S variables on the command line. …
+- CONFIG FILE: Only write config files to disk when parameters change
+- CONFIG FILE/BUGFIX: RetroArch no longer crashes when attempting to save a config file after 'unsetting' a parameter (currently, this can be triggered quite easily by manipulating input remaps)
+- CONFIG FILE/BUGFIX: When using Material UI, RetroArch no longer modifies the wrong setting (or segfaults...) when tapping entries in the Quick Menu > Controls input remapping submenu
+- CONFIG FILE/BUGFIX: Quite a few real and potential memory leaks have been fixed.
+- CHD: Fixes a crash caused by ignoring the return value from one of the CHD library functions
+- FASTFORWARDING: A new Mute When Fast-Forwarding option has been added under Settings > Audio. When enabled, users can fast forward without having to listen to distorted audio.
+- GLCORE/SLANG: Set filter and wrap mode correctly when intialising shader textures. Before, the glcore shader driver did not correctly initialise loaded textures. The texture filtering and wrap mode were forced on texture creation, but these settings were not recorded - subsequent updates would set garbage values, that would resolve to linear filtering OFF and wrap mode = CLAMP_TO_EDGE.
+- LOCALIZATION: Update Japanese translation
+- LOCALIZATION: Update Spanish translation
+- LOCALIZATION: Update Portuguese Brazilian translation
+- IOS: Set audio session category to ambient so sound does not get cut off on interruption (phone call/playing back audio)
+- MAC/IOHIDMANAGER/BUGFIX: Fix for Mayflash N64 adapter. In case last hatswitch does not match cookie. For the mayflash N64 adapter, I was getting a BAD EXC ADDRESS (in mac OS 10.13) for this line (tmp was NULL). Retroarch would crash in the gui if I pressed a button from the DPAD on controller 2. With this change, it no longer crashes in the gui and still registers the button push.
+- MAC/COCOA: Fix mouse input - this brings back two lines of code that have been removed over time but
+appear to be required in order for mouse input to work on macOS
+- METAL/BUGFIX: GPU capture on Metal/OSX/NVidia could crash
+- METAL/BUGFIX: Taking screenshots could capture black frames. Resulting PNG screenshots were black.
+- METAL/BUGFIX: Corrupted image due to incorrect viewport copy when taking screenshot
+- MENU: Prevent font-related segfaults when using extremely small scales/window sizes
+- MENU: Fix 'gfx_display_draw_texture_slice()'
+- MENU/FONT: Enable correct vertical alignment of text (+ font rendering fixes)
+- MENU/RGUI: Enable automatic menu size reduction when running at low resolutions (down to 256x192)
+- MENU/OZONE: Update timedate style options for Last Played sublabel metadata
+- MENU/OZONE: Hide 'Menu Color Theme' setting when 'Use preferred system color theme' is enabled
+- MENU/OZONE: Fix thumbnail switching via 'scan' button functionality
+- MENU/OZONE: Prevent glitches when rendering Ozone's selection cursor
+- MENU/OZONE: Enable proper vertical text alignment + thumbnail display improvements
+- MENU/OZONE: Enable second thumbnail/content metadata toggle using RetroPad 'select'
+- MENU/OZONE: Refactor footer display
+- MENU/OZONE: Hide thumbnail button hints when viewing file browser lists
+- MENU/OZONE/INPUT/BUGFIX: Fix undefined behaviour when using touch screen to change input remaps
+- MENU/OZONE/INPUT/BUGFIX: It turns out that Windows reports negative pointer coordinates when the mouse cursor goes beyond the left hand edge of the RetroArch window (this doesn't happen on Linux, so I never encountered this issue before!). As a result, if Ozone is currently not showing the sidebar (menu depth > 1), moving the cursor off the left edge of the window generates a false positive 'cursor in sidebar' event - which breaks menu navigation, as described in #10419. With this PR, we now handle 'cursor in sidebar' status correctly in all cases
+- MENU/OZONE/INPUT/BUGFIX: Pointer input is now correctly disabled when message boxes are displayed
+- MENU/XMB: Fix thumbnail switching via 'scan' button functionality
+- ODROID GO ADVANCE: Add DRM HW context driver
+- PSL1GHT: Initial port
+- PSL1GHT/KEYBOARD: Implement PSL1GHT keyboard
+- PLAYLIST/BUGFIX: Improve handling of 'broken' playlists - RetroArch will no longer segfault when attempting to run content via a playlist entry with missing path or core path fields.
+- PLAYLIST/BUGFIX: Improve handling of 'broken' playlists - when a playlist entry has either core path and/or core name set to NULL, DETECT or an empty string, attempting to load content will fallback to the normal 'core selection' code (currently this happens only if both core path and core name are DETECT - this is wholly inadequate!)
+- PLAYLIST/BUGFIX: RetroArch will no longer segfault when attempting to fetch content runtime information when core path is NULL
+- PLAYLIST/BUGFIX: Core name + runtime info will only be displayed on playlists and in the Information submenu if both the core path and core name fields are 'valid' (i.e. not NULL or DETECT)
+- PLAYLIST/BUGFIX: When handling entries with missing path fields, the menu sorting order now matches that of the playlist sorting order (at present, everything goes out of sync when paths are empty). Moreover, entries with missing path fields can now be 'selected', so users can remove them (currently, hitting A on such an entry immediately tries - and fails - to load the content, so the only way to remove the broken entry is via the Playlist Management > Clean Playlist feature)
+- PLAYLIST: Add optional per-playlist alphabetical sorting
+- PLAYLIST: Omit whitespace when writing compressed JSON format playlists
+- PLAYLIST: Add optional playlist compression
+- QNX: Support analog sticks
+- SAVESTATES: Add optional save state compression (enabled by default now)
+- SRAM: Add optional save (SRAM) file compression
+- SCANNER: Prevent redundant playlist entries when handling M3U content
+- SCANNER/ANDROID: Fix content scanner being unable to identify certain games from CHD images (raw data sector/subcode)
+- TASKS/BUGFIX: Fix task deadlocks
+- TASKS/SCREENSHOT/BUGFIX: Fix heap-use-after-free error when widgets are disabled
+- TVOS: Disable overlays for tvOS, fix app icon
+- VIDEO/WIDGETS/BUGFIX: The font ascender/descender metrics added in #10375 are now used to achieve 'pixel perfect' vertical text alignment
+- VIDEO/WIDGETS/BUGFIX: Message queue text now uses its own dedicated font. Previously, a single (larger) font was used for all active widgets, and this was scaled down for message queue items. This 'squished' the text a little; more importantly, when using the stb font renderers (on Android. etc.) it caused ugly artefacts around the edges of glyphs due to pixel interpolation errors. Now that a correctly sized font is used, the message queue is always rendered cleanly.
+- VIDEO/WIDGETS/BUGFIX: Previously, each widget font was 'flushed' (font_driver_flush()) at least once a frame. This is quite a slow operation. Now we only flush fonts if they have actually been used.
+- VULKAN/BUGFIX: Fix display of statistics text
+- UNIX/BUGFIX: Fix overflow when computing total memory on i386
+- WIIU/BUGFIX: Fix font driver horizontal text alignment
+- WIIU/BUGFIX: Fix non-vertex coordinates in draws using tex shader
+- WIIU/BUGFIX: Update and fix meta.xml file for the WiiU release. This change makes it so the information from the meta.xml file parsed for the WiiU's Homebrew Launcher is displayed properly.
+
+# 1.8.5
+- 3DS: Keep the bottom screen hidden on sleep/wakeup. When the 3DS wakes back up after being closed, the bottom screen needs to be reinitialized. Adding the condition here will cause the screen to be turned on or off based on the state of ctr_bottom_screen_enabled, as you'd expect
+- ANDROID/CHROMEBOOK/CRASH: Fix Chromebook crashes (on x86 x64) when touching the screen
+- BUGFIX: Prevent double input when using 'return' key (hardware) to close on-screen keyboard
+- BUGFIX: Fix mouse capture hotkey not working
+- BUGFIX: Avoid overflow when calculating multiplying performance counter
+- BUGFIX: Retroarch overlay displaying "Game remap file loaded." on the overlay instead of "Core remap file loaded." when only a core remap file is present
+- CHEEVOS/BUGFIX: Achievement triggers could cause Retroarch to Crash
+- CHEEVOS: Don't block Sameboy core because it only exposes some memory
+- CHEEVOS: Support for extended Sega CD memory
+- CHEEVOS: Show RetroAchievements Hash in content information list
+- CHEEVOS: If the core says it's exposing SYSTEM_RAM, give it the benefit of the doubt
+- CHEEVOS: RetroAchievements rich presence for RA.org website/Discord
+- CHEEVOS: Reset token when username or password changes
+- CHEEVOS: Display measured progress on locked achievements
+- CHEEVOS: Queue multiple popups
+- CHEEVOS: Add delay retries to leaderboard submits
+- CHEEVOS: Prevent buffer overflow when encountering an unknown macro
+- CORE UPDATER: Prevent hang when fetching core list if HTTP transfer fails
+- DISK CONTROL: Add disk labels to 'disk inserted' notifications
+- EMSCRIPTEN: Recreate input event listeners properly
+- FFMPEG CORE: Fix crash on seeking when using HW decoding in some cases
+- LIBRETRO: Add disk control interface API extension
+- LINUX: Avoid possible crash when running retroarch at startup
+- LINUX/GLX: Fix threaded video crashes/instability because of GLX OML sync callbacks
+- LOCALIZATION: Update French translation
+- LOCALIZATION: Update Korean translation
+- LOCALIZATION: Update Polish translation
+- LOCALIZATION: Update Spanish translation
+- LOCALIZATION: Update Portuguese Brazilian translation
+- MENU: Add Menu Scroll Acceleration option
+- MENU: Automatically select currently checked item when opening drop-down lists
+- MENU: Fix smooth (vertical) line ticker scroll speed
+- MENU: Don't flush on override/remap messages
+- MENU/DATETIME: Adds some new timedate styles that follow the DD/MM/YYYY format, found in several European countries
+- MENU/DATETIME: Modifies the existing translation files in order to accommodate the new options that are now available
+- MENU/DATETIME: Reorders the timedate view options based on a decreasing order of the quantity of information displayed, so that they are more convenient to switch around and easily categorized
+- MENU/BUGFIX: Fix bug - if you were in XMB and you would set menu driver to RGUI, you could no longer go to the left or right tab
+- MENU/MATERIALUI: Add option to remove navigation bar
+- MENU/OZONE: Add DPI-based scaling
+- MENU/OZONE: Add rudimentary pointer support
+- MENU/OZONE: Add 'Nord' and 'Gruvbox Dark' themes
+- MENU/OZONE/POINTER: Pointer can be used to switch between sidebar and entries list
+- MENU/OZONE/POINTER: Pointer can be used to select sidebar and entries list items
+- MENU/OZONE/POINTER: Both sidebar and entries list can be scrolled by dragging
+- MENU/OZONE/POINTER: Clicking/pressing the header or footer produces a 'cancel' action
+- MENU/OZONE/POINTER: Cursor focus follows mouse pointer from sidebar to entries list (and vice versa)
+- MENU/OZONE/POINTER: In entries list, item under cursor is automatically selected (with some fudging to ensure this doesn't break mouse wheel scrolling)
+- MENU/OZONE/POINTER: In sidebar, item under cursor is not automatically selected (this is too jarring)
+- MENU/RGUI: Add 'Flux' theme
+- MENU/XMB: New color themes 'Cube Purple', 'Family Red', etc
+- NETPLAY/MENU/BUGFIX: Fix Netplay Stateless Mode doesn't save. Affects other netplay settings which can be overridden by commandline option
+- ODROID GO ADVANCE: Rotation support
+- NETPLAY/ROOMS/BUGFIX: Prevent out-of-bounds array indexing when displaying/selecting netplay rooms in menus
+- SCANNER: Add 'Arcade DAT Filter' Option
+- SCANNER: Add scanning Korea and Asia PS1 discs
+- SCANNER: Add support for scanning PSP Korean
+- VIDEO: Set hardware 'Bilinear filtering' off by default
+- VIDEO/WIDGETS: Widgets are now menu-independent
+- VIDEO/WIDGETS: Allow notifications to use full screen width when not displaying menu
+- VIDEO/WIDGETS: DPI-based scaling
+- VIDEO/WIDGETS: Fix volume widget scaling
+- VIDEO/WIDGETS: Add independent widget scale override settings for fullscreen/windowed modes
+- VIDEO/WIDGETS/BUGFIX: Prevent improper display of (old style) OSD text when widgets are enabled
+- VIDEO/WIDGETS/THREADED/BUGFIX: Fix issue - corruption of menu widgets when running some cores (e.g. VICE) with threaded video enabled
+- WIFI/CONNMANCTL: Display more characters from SSID
+
+# 1.8.4
+- ANDROID/BUGFIX: Prevent crash when Android device is minimized and you go back to the app
+- CAMERA/BUGFIX: Fix crash when a core requires the camera driver and the platform only has a null driver. This would crash mgba on Wii for example
+- DISK CONTROL: Cycle Disk Tray now becomes Eject Disk or Insert Disk depending upon current drive state
+- DISK CONTROL: Current Disk Index is only shown when the current disk has been ejected
+- DISK CONTROL: The old Insert Disk entry has been changed to Load New Disk, and is only shown when a disk is currently inserted (this is because loading a new disk from the filesystem - i.e. bypassing the m3u playlist disk index interface - automatically ejects and inserts disks, and so cannot be done while the virtual drive is empty)
+- DISK CONTROL: The Current Disk Index may now be set more easily via a drop-down list.
+- DISK CONTROL: Selecting Eject Disk automatically moves the menu selection to the Current Disk Index entry
+- DISK CONTROL: Selecting an index via the Current Disk Index drop-down list automatically moves the menu selection back to Insert Disk
+- DISK CONTROL: The Disk Control entry sublabels have been changed for greater clarity
+- DISK CONTROL: All of the horrendous notification spam has been removed. Notifications are now only shown in the event of an error, or when the menu itself does not provide sufficient visual feedback (note that using hotkeys to swap disks still produces the old style notifications, since this is typically only done while content is running - i.e. no menu). The duration of disk-related info notifications has also been reduced to a more sane level.
+- DISK CONTROL: A new Resume content after changing disks option has been added under Settings > User Interface. When enabled (default setting), content is resumed automatically after selecting either Insert Disk or Load New Disk (when disabled, the menu remains open, obviously...)
+- DISK CONTROL/BUGFIX: The Disk Control menu now has the correct title
+- DISK CONTROL/BUGFIX: Selecting a disk via the Load New Disk file browser no longer flushes the user back to the top level menu (it now correctly returns to the Disk Control menu)
+- LIBNX/SWITCH: Updated libnx integration to v3.0.0. This also cherry-picks libnx commit 583d6bb92dcbb33b6bb4a0fa1a9df6e3725d6ef6, which should fix the requirement having to turn rumble off and on in the system settings once per reboot
+- PLAYLISTS: Add 'Clean Playlist' option
+
+# 1.8.3
+- ANDROID/BUGFIX: Fix 'Install or Restore Core' regression
+- BUGFIX: Ensure core info is always initialised when calling 'drivers_init()'. This bug could prevent cores from doing content runtime logging
+- BUGFIX/MENU: History size can only be set to 1 at a minimum
+- BUGFIX/MENU: (XMB/OZONE) Fix 'quick menu' detection. XMB would not display savestate thumbnails in the quick menu if it was accessed via the main menu
+- BUGFIX/CRASH/CORE UPDATER: Fix potential double free error
+- BUGFIX/CRASH/OPENGL/WINDOWS: Fix regression in 1.8.2 that would cause GL-based cores to fail because it would try to erroneously load libGLESv2.dll instead of OpenGL32.dll (cores affected: VitaQuake 2/3/Dhewm3, possibly more)
+- BUGFIX/MENU/DESKTOP UI: Show desktop menu on startup does not launch Qt UI on Linux
+- BUGFIX: Entries in the Playlist Thumbnails Updater list were displaying improper sublabels. I have no idea when this broke... The issue is now fixed
+- CHEEVOS: Don't disable achievement when AddAddress generates an out-of-range address
+- CHEEVOS: Don't reset triggers/leaderboards that failed to load
+- CHEEVOS: Don't count unsupported achievements as unlocked
+- CORE UPDATER: Display number of cores updated when updating installed cores
+- DINGUX: Initial port
+- D3D11: Block FL9_3 devices from D3D11 driver because they don't work anyway (current D3D11 driver uses SM4.0 which requires FL10_0 and up)
+- D3D11: Fallback to GL driver when D3D11 fails
+- EMSCRIPTEN: Fix assets
+- HISTORY/FAVORITES: Bump up default to 200 entries from 100
+- FFMPEG CORE: Implement packet buffer, fixes MP4 video playback for many files
+- LOCALIZATION: Update Italian translation
+- LOCALIZATION: Update Polish translation
+- LOCALIZATION: Update Russian translation
+- LOCALIZATION: Update Spanish translation
+- MENU: Added 'Hosting' menu under Netplay menu
+- MENU: Added 'Subsystems' menu
+- MENU/FILEBROWSER: Fix file selection issues when starting from (or navigating to) the top level directory
+- MENU/WIDGETS: Prevent looping of task title text
+- RASPBERRY PI: Fix BGRA8888 color inversion issues in the menu and elsewhere with VideoCore GL drivers
+- NETPLAY/RELAY: Add Sao Paulo (Brazil) relay server
+- NETPLAY/RELAY: Fix the “spectator” bug when using the relay server – When a player switches into the spectator mode (pressing “i”) while using the relay server, all players will disconnect.
+- NETPLAY/RELAY: Overall stability has improved. Fixed a memory leak that would cause the relay server to become unresponsive after some time.
+- NETPLAY/RELAY: Fixed critical bug that would cause all players to be disconnected from the relay server if one player was leaving the game. That bug had been open for one year and we were finally able to fix it.
+- SWITCH/LIBNX/BUGFIX: Fix onscreen keyboard input regression
+- THUMBNAIL UPDATER: When waiting for individual thumbnail file http transfers to complete, the task status checking is more accurate. This uses the same method as the new core updater - we now wait until the task is 'really' complete, instead of relying on the (slightly nebulous) 'task finished' state
+- UWP: Add ANGLE support
+- UWP: Wire up get_metrics to the fake context of D3D9/10/11/12 driver, enabling proper scaling and mouse/touch gestures
+- VITA: Re-add Online Updater
+- VULKAN: Fix font driver 'vulkan_get_message_width()' function
+- VIDEO FILTERS: Only use threads when the number exceeds 1. Fixes race conditions with some CPU filters on Vita
+- WINDOWS: Add ANGLE support for x64, separate binary (for now?)  
+
 # 1.8.2
 - BUG/CRASH/GLSLANG: Fix glslang crashing error - managed to reproduce an issue which has been plaguing
 users for a while, where glslang throws an assert after closing a game (and starting a new one). This would affect all video drivers that use Slang for shaders, such as D3D10/11/12/Vulkan/Metal

Makefile

@@ -14,7 +14,11 @@ include config.mk
 # (It'd be better to put this comment in that file, but .gitignore doesn't work on files that exist in the repo.)
 -include Makefile.local
 
+ifeq ($(HAVE_ANGLE), 1)
+TARGET = retroarch_angle
+else
 TARGET = retroarch
+endif
 
 OBJ :=
 LIBS :=
@@ -41,6 +45,8 @@ else
    DEF_FLAGS += -ffast-math
 endif
 
+DEF_FLAGS += -Wall
+
 ifneq ($(findstring BSD,$(OS)),)
    DEF_FLAGS += -DBSD
    LDFLAGS += -L/usr/local/lib
@@ -64,7 +70,7 @@ endif
 include Makefile.common
 
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
-   DEFINES +=  -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
+   DEF_FLAGS += -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
 endif
 
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc"),1)
@@ -76,7 +82,7 @@ endif
 HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
 
 ifeq ($(MISSING_DECLS), 1)
-   DEFINES += -Werror=missing-declarations
+   DEF_FLAGS += -Werror=missing-declarations
 endif
 
 ifeq ($(HAVE_DYLIB), 1)
@@ -102,10 +108,20 @@ ifneq ($(findstring Win32,$(OS)),)
    LDFLAGS += -mwindows
 endif
 
-DEF_FLAGS += -Wall $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
+ifneq ($(CXX_BUILD), 1)
+   ifneq ($(C89_BUILD),)
+      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long
+   else ifeq ($(HAVE_C99), 1)
+      CFLAGS += $(C99_CFLAGS)
+   endif
+
+   CFLAGS += -D_GNU_SOURCE
+endif
+
+DEF_FLAGS += $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
 
 CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
+CXXFLAGS += $(DEF_FLAGS) -D__STDC_CONSTANT_MACROS
 OBJCFLAGS :=  $(CFLAGS) -D__STDC_CONSTANT_MACROS
 
 ifeq ($(HAVE_CXX), 1)
@@ -123,29 +139,6 @@ else
    LINK = $(CC)
 endif
 
-ifneq ($(CXX_BUILD), 1)
-   ifneq ($(GNU90_BUILD), 1)
-      ifneq ($(findstring icc,$(CC)),)
-         CFLAGS += -std=c99 -D_GNU_SOURCE
-      else
-         CFLAGS += -std=gnu99 -D_GNU_SOURCE
-      endif
-   endif
-
-   ifneq ($(C89_BUILD),)
-      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long
-   endif
-endif
-
-ifeq ($(NOUNUSED), yes)
-   CFLAGS += -Wno-unused-result
-   CXXFLAGS += -Wno-unused-result
-endif
-ifeq ($(NOUNUSED_VARIABLE), yes)
-   CFLAGS += -Wno-unused-variable
-   CXXFLAGS += -Wno-unused-variable
-endif
-
 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
 
 ifneq ($(X86),)
@@ -203,7 +196,7 @@ endif
 
 SYMBOL_MAP := -Wl,-Map=output.map
 
-retroarch: $(RARCH_OBJ)
+$(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
 	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
 
@@ -222,13 +215,6 @@ $(OBJDIR)/%.o: %.m
 	@$(if $(Q), $(shell echo echo OBJC $<),)
 	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
 
-.FORCE:
-
-$(OBJDIR)/git_version.o: git_version.c .FORCE
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
 $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)
@@ -240,16 +226,17 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
 	$(Q)$(WINDRES) -o $@ $<
 
 install: $(TARGET)
-	rm -f $(OBJDIR)/git_version.o
 	mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DATA_DIR)/applications 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(DATA_DIR)/metainfo 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DOC_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DATA_DIR)/pixmaps 2>/dev/null || /bin/true
 	cp $(TARGET) $(DESTDIR)$(BIN_DIR)
 	cp tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	cp retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
+	cp com.libretro.RetroArch.appdata.xml $(DESTDIR)$(DATA_DIR)/metainfo
 	cp retroarch.desktop $(DESTDIR)$(DATA_DIR)/applications
 	cp docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
 	cp docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
@@ -260,6 +247,7 @@ install: $(TARGET)
 	chmod 755 $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	chmod 644 $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	chmod 644 $(DESTDIR)$(DATA_DIR)/applications/retroarch.desktop
+	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
 	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
@@ -280,10 +268,11 @@ install: $(TARGET)
 	fi
 
 uninstall:
-	rm -f $(DESTDIR)$(BIN_DIR)/retroarch
+	rm -f $(DESTDIR)$(BIN_DIR)/$(TARGET)
 	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	rm -f $(DESTDIR)$(DATA_DIR)/applications/retroarch.desktop
+	rm -f $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
 	rm -f $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
 	rm -f $(DESTDIR)$(DOC_DIR)/COPYING
 	rm -f $(DESTDIR)$(DOC_DIR)/COPYING.assets

Makefile.ctr

@@ -50,9 +50,13 @@ endif
 DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
-	#DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
+	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
+	DEFINES += -DHAVE_ZLIB -DHAVE_7ZIP -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
+	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA
+	DEFINES += -DHAVE_PATCH -DHAVE_RWAV
+	DEFINES += -DHAVE_SCREENSHOTS
+	DEFINES += -DHAVE_REWIND
+	#DEFINES += -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
 	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
 	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
 else
@@ -72,6 +76,11 @@ else
 	HAVE_XMB = 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
+	HAVE_PATCH = 1
+	HAVE_SCREENSHOTS = 1
+	HAVE_REWIND = 1
+	HAVE_AUDIOMIXER = 1
+	HAVE_RWAV = 1
 	#HAVE_NETWORKING = 1
 	#HAVE_CHEEVOS = 1
 	#HAVE_SOCKET_LEGACY = 1
@@ -135,11 +144,15 @@ CFLAGS += -I. \
 			 -Ideps \
 			 -Ideps/7zip \
 			 -Ideps/stb \
+			 -Ideps/rcheevos/include \
 			 -Ilibretro-common/include \
 			 -Ilibretro-common/include/compat/zlib
 
 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
+CFLAGS += -DHAVE_DSP_FILTER
+CFLAGS += -DHAVE_VIDEO_FILTER
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
+CFLAGS += -DHAVE_CHEATS
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 

Makefile.ctr.salamander

@@ -24,11 +24,11 @@ OBJ := ctr/ctr_system.o \
 		 frontend/frontend_salamander.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_ctr.o \
-		 frontend/drivers/platform_null.o \
 		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/file/file_path.o \
+		 libretro-common/file/file_path_io.o \
 		 libretro-common/string/stdstring.o \
 		 libretro-common/lists/string_list.o \
 		 libretro-common/lists/dir_list.o \
@@ -38,6 +38,7 @@ OBJ := ctr/ctr_system.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
 		 libretro-common/hash/rhash.o \
+		 libretro-common/time/rtime.o \
 		 file_path_str.o \
 		 verbosity.o
 

Makefile.dingux

@@ -0,0 +1,188 @@
+CC = /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-gcc
+CXX = /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-g++
+PACKAGE_NAME = retroarch
+
+DEBUG ?= 0
+
+HAVE_SCREENSHOTS = 1
+HAVE_REWIND = 1
+HAVE_7ZIP = 1
+HAVE_AL = 1
+# this freezes when switching back from menu
+HAVE_ALSA = 0
+HAVE_DSP_FILTER = 1
+HAVE_VIDEO_FILTER = 1
+HAVE_BUILTINMBEDTLS = 1
+HAVE_BUILTINZLIB = 1
+HAVE_C99 = 1
+HAVE_CC = 1
+HAVE_CC_RESAMPLER = 1
+HAVE_CHD = 1
+HAVE_CHEEVOS = 1
+HAVE_COMMAND = 1
+HAVE_CXX = 1
+HAVE_DR_MP3 = 1
+HAVE_DYNAMIC = 1
+HAVE_EGL = 1
+HAVE_FREETYPE = 1
+HAVE_GDI = 1
+HAVE_GETADDRINFO = 1
+HAVE_GETOPT_LONG = 1
+HAVE_GLSL = 1
+HAVE_HID = 1
+HAVE_IBXM = 1
+HAVE_IMAGEVIEWER = 1
+HAVE_LANGEXTRA = 1
+HAVE_LIBRETRODB = 1
+HAVE_MENU = 1
+HAVE_MENU_COMMON = 1
+HAVE_GFX_WIDGETS = 1
+HAVE_MMAP = 1
+HAVE_NETWORKING = 1
+HAVE_OPENDINGUX_FBDEV = 1
+HAVE_OPENGL = 1
+HAVE_OPENGL1 = 0
+HAVE_OPENGLES = 1
+HAVE_OPENGLES3 = 0
+HAVE_OPENGL_CORE = 0
+HAVE_OPENSSL = 1
+HAVE_OVERLAY = 1
+HAVE_RBMP = 1
+HAVE_RJPEG = 1
+HAVE_RPILED = 1
+HAVE_RPNG = 1
+HAVE_RUNAHEAD = 1
+HAVE_SDL_DINGUX = 1
+HAVE_SHADERPIPELINE = 1
+HAVE_STB_FONT = 1
+HAVE_STB_IMAGE = 1
+HAVE_STB_VORBIS = 1
+HAVE_STDIN_CMD = 1
+HAVE_STRCASESTR = 1
+HAVE_THREADS = 1
+HAVE_TRANSLATE = 1
+HAVE_UDEV = 1
+HAVE_VIDEO_LAYOUT = 1
+HAVE_XMB = 1
+HAVE_ZLIB = 1
+HAVE_CONFIGFILE = 1
+HAVE_PATCH = 1
+HAVE_CHEATS = 1
+
+OS = Linux
+TARGET = retroarch
+OPK_NAME = retroarch.opk
+
+OBJ :=
+LINK := $(CXX)
+DEF_FLAGS := -march=mips32 -mtune=mips32r2 -mhard-float -ffast-math -fomit-frame-pointer -fdata-sections
+DEF_FLAGS += -I. -Ideps -Ideps/stb -DDINGUX=1 -MMD
+DEF_FLAGS += -Wall -Wno-unused-variable
+DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
+LIBS := -ldl -lz -lrt -lcrypto -lssl -ludev -pthread
+CFLAGS :=
+CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
+ASFLAGS :=
+LDFLAGS := -flto
+INCLUDE_DIRS = -I/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include
+LIBRARY_DIRS = -L/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/lib
+DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
+DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1 -DHAVE_OPENDINGUX_FBDEV=1
+DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
+DEFINES += -DHAVE_AL=1
+DEFINES += -DHAVE_ONLINE_UPDATER=1
+DEFINES += -DHAVE_UPDATE_ASSETS=1
+DEFINES += -DHAVE_UDEV=1
+
+SDL_DINGUX_CFLAGS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config --cflags)
+SDL_DINGUX_LIBS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config --libs)
+FREETYPE_CFLAGS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config --cflags)
+FREETYPE_LIBS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config --libs)
+AL_LIBS := -lopenal
+OPENGLES_CFLAGS := -DMESA_EGL_NO_X11_HEADERS
+OPENGLES_LIBS := -lGLESv2 -lEGL
+MMAP_LIBS = -lc
+
+OBJDIR_BASE := obj-unix
+
+ifeq ($(DEBUG), 1)
+   OBJDIR := $(OBJDIR_BASE)/debug
+   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
+else
+   OBJDIR := $(OBJDIR_BASE)/release
+   DEF_FLAGS += -O2 -DNDEBUG
+endif
+
+include Makefile.common
+
+DEF_FLAGS += $(INCLUDE_DIRS)
+CFLAGS += $(DEF_FLAGS)
+CXXFLAGS += $(DEF_FLAGS)
+
+HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
+
+Q := @
+
+RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
+
+define DESKTOP_ENTRY
+[Desktop Entry]
+Name=retroarch
+Comment=Retroarch
+Exec=retroarch
+Terminal=false
+Type=Application
+StartupNotify=true
+Icon=retroarch
+Categories=emulators;
+X-OD-NeedsDownscaling=true
+endef
+export DESKTOP_ENTRY
+
+all: $(TARGET) opk
+
+-include $(RARCH_OBJ:.o=.d)
+
+SYMBOL_MAP := -Wl,-Map=output.map
+
+$(TARGET): $(RARCH_OBJ)
+	@$(if $(Q), $(shell echo echo LD $@),)
+	$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+
+$(OBJDIR)/%.o: %.c
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
+
+$(OBJDIR)/%.o: %.cpp
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CXX $<),)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
+$(OBJDIR)/%.o: %.m
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo OBJC $<),)
+	$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
+$(OBJDIR)/%.o: %.S $(HEADERS)
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo AS $<),)
+	$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
+
+clean:
+	rm -rf $(OBJDIR_BASE)
+	rm -f $(TARGET)
+	rm -f *.d
+	rm -rf $(OPK_NAME)
+
+opk: $(TARGET)
+	echo "$$DESKTOP_ENTRY" > default.gcw0.desktop
+	rm -f $(OPK_NAME)
+	cp media/ico_src/icon32.png retroarch.png
+	mksquashfs retroarch default.gcw0.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
+	rm -f default.gcw0.desktop retroarch.png
+
+.PHONY: all clean opk
+
+print-%:
+	@echo '$*=$($*)'

Makefile.emscripten

@@ -9,17 +9,22 @@ OBJ :=
 DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
 DEFINES += -DHAVE_FILTERS_BUILTIN
 
+HAVE_DSP_FILTER = 1
+HAVE_VIDEO_FILTER = 1
 HAVE_OVERLAY = 1
 HAVE_GLSL = 1
+HAVE_SCREENSHOTS = 1
+HAVE_REWIND = 1
 HAVE_AUDIOMIXER = 1
 HAVE_VIDEO_LAYOUT = 0
 HAVE_CC_RESAMPLER = 1
 HAVE_EGL    = 1
 HAVE_OPENGLES = 1
 HAVE_RJPEG  = 0
+HAVE_RPNG   = 1
 HAVE_EMSCRIPTEN = 1
 HAVE_MENU = 1
-HAVE_MENU_WIDGETS = 1
+HAVE_GFX_WIDGETS = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
 HAVE_SDL2 = 0
@@ -28,6 +33,8 @@ HAVE_SHADERPIPELINE = 1
 HAVE_STATIC_VIDEO_FILTERS = 1
 HAVE_STATIC_AUDIO_FILTERS = 1
 HAVE_STB_FONT = 1
+HAVE_CONFIGFILE = 1
+HAVE_CHEATS = 1
 
 MEMORY = 134217728
 
@@ -37,7 +44,7 @@ OBJDIR := obj-emscripten
 
 #if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS:
 
-LIBS    := -s USE_ZLIB=1 -s USE_LIBPNG=1
+LIBS    := -s USE_ZLIB=1
 LDFLAGS := -L. --no-heap-copy -s $(LIBS) -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 -s "EXTRA_EXPORTED_RUNTIME_METHODS=['callMain']" \
            -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
            --js-library emscripten/library_rwebaudio.js \

Makefile.griffin

@@ -75,15 +75,22 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END       := -Wl,--no-whole-archive
 endif
 
+STATIC_BUILD = 1
 ifneq (,$(findstring msvc,$(platform)))
-   LIBS               := $(WHOLE_START) $(WHOLE_END)
-else
+   STATIC_BUILD = 0
+endif
 ifneq (,$(findstring unix,$(platform)))
+   STATIC_BUILD = 0
+endif
+ifeq (qnx, $(platform))
+   STATIC_BUILD = 0
+endif
+
+ifeq ($(STATIC_BUILD), 0)
    LIBS               := $(WHOLE_START) $(WHOLE_END)
 else
    LIBS               := $(WHOLE_START) -lretro_$(platform) $(WHOLE_END)
 endif
-endif
 
 libogc_platform    :=
 
@@ -93,7 +100,7 @@ else ifeq ($(platform), wii)
    libogc_platform    := 1
 endif
 
-HAVE_MENU_WIDGETS := 1
+HAVE_GFX_WIDGETS := 1
 
 # PS3
 ifeq ($(platform), ps3)
@@ -148,7 +155,7 @@ else ifeq ($(libogc_platform), 1)
    endif
 
    LIBDIRS += -L.
-   MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float -DMSB_FIRST
+   MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float
 
    ifeq ($(platform), ngc)
       LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
@@ -184,8 +191,9 @@ else ifeq ($(libogc_platform), 1)
 
    CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
 
-	HAVE_AUDIOMIXER			 := 1
    HAVE_RUNAHEAD            := 1
+   HAVE_DSP_FILTER          := 1
+   HAVE_VIDEO_FILTER        := 1
    HAVE_FILTERS_BUILTIN     := 1
    HAVE_THREADS             := 1
    HAVE_RPNG                := 1
@@ -197,10 +205,16 @@ else ifeq ($(libogc_platform), 1)
    HAVE_VIDEO_LAYOUT        := 0
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
+   HAVE_SCREENSHOTS         := 1
+   HAVE_REWIND              := 1
+   HAVE_AUDIOMIXER          := 1
+   HAVE_RWAV                := 1
    RARCH_CONSOLE             = 1
 
    ifeq ($(platform), wii)
-		HAVE_AUDIOMIXER			 := 1
       #HAVE_LANGEXTRA          := 1
       HAVE_WIIUSB_HID          := 1
       HAVE_RARCH_EXEC          := 1
@@ -236,6 +250,9 @@ else ifeq ($(platform), xenon360)
    HAVE_THREADS             := 1
    HAVE_GETOPT_LONG         := 1
    RARCH_CONSOLE             = 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
 # PSP
 else ifeq ($(platform), psp1)
@@ -260,6 +277,9 @@ else ifeq ($(platform), psp1)
    HAVE_KERNEL_PRX          := 1
    #HAVE_LANGEXTRA          := 1
    RARCH_CONSOLE             = 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
    ifeq ($(BUILD_PRX), 1)
       LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS)
@@ -299,6 +319,8 @@ else ifeq ($(platform), vita)
    LIBDIRS += -L.
    LDFLAGS +=  -Wl,-q
 
+   HAVE_DSP_FILTER          := 1
+   HAVE_VIDEO_FILTER        := 1
    HAVE_FILTERS_BUILTIN     := 1
    HAVE_LANGEXTRA           := 1
    HAVE_RPNG                := 1
@@ -317,6 +339,9 @@ else ifeq ($(platform), vita)
    HAVE_THREADS             := 1
    HAVE_LIBRETRODB          := 1
    RARCH_CONSOLE             = 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 else ifeq ($(platform), windows_msvc6_x86)
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
@@ -340,6 +365,9 @@ else ifeq ($(platform), windows_msvc6_x86)
    HAVE_DYLIB               := 1
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -383,6 +411,9 @@ else ifeq ($(platform), windows_msvc2003_x86)
    HAVE_DYLIB               := 1
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -432,6 +463,9 @@ else ifeq ($(platform), windows_msvc2005_x86)
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 1
    HAVE_DIRECTX             ?= 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -458,7 +492,10 @@ else ifeq ($(platform), windows_msvc2005_x86)
    endif
 else ifneq (,$(findstring windows_msvc2010,$(platform)))
    HAVE_GDI                 := 1
+   HAVE_SCREENSHOTS         := 1
+   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
+   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -483,6 +520,9 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -532,7 +572,10 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    endif
 else ifneq (,$(findstring windows_msvc2012,$(platform)))
    HAVE_GDI                 := 1
+   HAVE_SCREENSHOTS         := 1
+   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
+   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -557,6 +600,9 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -610,7 +656,10 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
    endif
 else ifneq (,$(findstring windows_msvc2013,$(platform)))
    HAVE_GDI                 := 1
+   HAVE_SCREENSHOTS         := 1
+   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
+   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -635,6 +684,9 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -688,7 +740,10 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
    endif
 else ifneq (,$(findstring windows_msvc2015,$(platform)))
    HAVE_GDI                 := 1
+   HAVE_SCREENSHOTS         := 1
+   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
+   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -713,6 +768,9 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -780,8 +838,55 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
       export INCLUDE := $(INCLUDE);libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
       export LIB := $(LIB)
    endif
-else ifneq (,$(findstring unix,$(platform)))
+else ifeq (qnx,$(platform))
+   HAVE_SCREENSHOTS         := 1
+   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
+   HAVE_RWAV                := 1
+   HAVE_RPNG                := 1
+   HAVE_RJPEG               := 1
+   HAVE_RBMP                := 1
+   HAVE_RTGA                := 1
+   HAVE_ZLIB                := 1
+   HAVE_7ZIP                := 1
+   HAVE_NETWORKING          := 1
+   HAVE_NETWORK_CMD         := 1
+   HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
+   HAVE_MATERIALUI          := 1
+   HAVE_XMB                 := 1
+   HAVE_STB_FONT            := 1
+   HAVE_THREADS             := 1
+   HAVE_LIBRETRODB          := 1
+   HAVE_COMMAND             := 1
+   HAVE_STDIN_CMD           := 1
+   HAVE_CMD                 := 1
+   HAVE_DYLIB               := 1
+   HAVE_DYNAMIC             := 1
+   HAVE_GRIFFIN_CPP         := 0
+   WANT_GLSLANG             := 0
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
+
+   CC=qcc -Vgcc_ntoarmv7le
+   CXX=QCC -Vgcc_ntoarmv7le
+
+   ifeq ($(DEBUG), 1)
+      LDFLAGS += -g
+   endif
+
+   PLATCFLAGS += -DHAVE_SHADERPIPELINE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_XCB -DHAVE_EGL -DHAVE_BB10 -DHAVE_GLSL -DHAVE_AL -DHAVE_BSV_MOVIE -DRARCH_MOBILE
+   EXT_TARGET := $(TARGET_NAME)
+   EXT_INTER_TARGET := $(TARGET_NAME)
+   INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/rcheevos/include -Ideps/SPIRV-Cross -Ideps/glslang -I.
+   LIBS += -lEGL -lbps -lscreen -lsocket -lm -lGLESv2 -lOpenAL
+else ifneq (,$(findstring unix,$(platform)))
+   HAVE_SCREENSHOTS         := 1
+   HAVE_REWIND              := 1
+   HAVE_AUDIOMIXER          := 1
+   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -804,13 +909,57 @@ else ifneq (,$(findstring unix,$(platform)))
    HAVE_DYLIB               := 1
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 1
-   WANT_GLSLANG							:= 1
+   WANT_GLSLANG             := 1
+   HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 1
+   HAVE_CHEATS              := 1
 
-   PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_MENU_WIDGETS -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_PULSE
+   PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_BSV_MOVIE -DHAVE_PULSE
    EXT_TARGET := $(TARGET_NAME)
    EXT_INTER_TARGET := $(TARGET_NAME)
    INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/rcheevos/include -Ideps/SPIRV-Cross -Ideps/glslang -I.
    LIBS += -ldl -lm -lpthread -lGL -ludev -lpulse -lX11 -lX11-xcb -lXxf86vm
+else ifeq (dos,$(platform))
+   HAVE_RPNG                := 1
+   HAVE_RJPEG               := 1
+   HAVE_RBMP                := 1
+   HAVE_RTGA                := 1
+   HAVE_ZLIB                := 1
+   HAVE_7ZIP                := 1
+   HAVE_NETWORKING          := 0
+   HAVE_NETWORK_CMD         := 0
+   HAVE_NETPLAYDISCOVERY    := 0
+   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
+   HAVE_MATERIALUI          := 0
+   HAVE_XMB                 := 0
+   HAVE_STB_FONT            := 1
+   HAVE_THREADS             := 0
+   HAVE_LIBRETRODB          := 1
+   HAVE_COMMAND             := 1
+   HAVE_STDIN_CMD           := 1
+   HAVE_CMD                 := 1
+   HAVE_DYLIB               := 0
+   HAVE_DYNAMIC             := 0
+   HAVE_GRIFFIN_CPP         := 0
+   WANT_GLSLANG             := 0
+	HAVE_CONFIGFILE          := 1
+   HAVE_PATCH               := 0
+   HAVE_CHEATS              := 0
+   CC=i586-pc-msdosdjgpp-gcc
+   CXX=i586-pc-msdosdjgpp-g++
+
+   ifeq ($(DEBUG), 1)
+      LDFLAGS += -g
+   endif
+
+   PLATCFLAGS += -DHAVE_SHADERPIPELINE -DHAVE_CC_RESAMPLER -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DRARCH_INTERNAL  -DHAVE_XCB
+   TARGET_NAME := retrodos
+   EXT_TARGET := $(TARGET_NAME).exe
+   EXT_INTER_TARGET := $(TARGET_NAME).exe
+   INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/SPIRV-Cross -Ideps/glslang -I.
+   LIBS += -lm
+   LIBDIRS += -L.
 endif
 
 ifneq (,$(findstring msvc,$(platform)))
@@ -898,6 +1047,10 @@ ifeq ($(HAVE_IMAGEVIEWER), 1)
    CFLAGS      += -DHAVE_IMAGEVIEWER
 endif
 
+ifeq ($(HAVE_BSV_MOVIE), 1)
+   CFLAGS      += -DHAVE_BSV_MOVIE
+endif
+
 ifeq ($(HAVE_RUNAHEAD), 1)
    CFLAGS      += -DHAVE_RUNAHEAD
 endif
@@ -906,10 +1059,22 @@ ifeq ($(HAVE_7ZIP), 1)
    CFLAGS      += -DHAVE_7ZIP
 endif
 
+ifeq ($(HAVE_SCREENSHOTS), 1)
+	CFLAGS      += -DHAVE_SCREENSHOTS
+endif
+
+ifeq ($(HAVE_REWIND), 1)
+	CFLAGS      += -DHAVE_REWIND
+endif
+
 ifeq ($(HAVE_AUDIOMIXER), 1)
    CFLAGS      += -DHAVE_AUDIOMIXER
 endif
 
+ifeq ($(HAVE_RWAV), 1)
+   CFLAGS      += -DHAVE_RWAV
+endif
+
 ifeq ($(HAVE_OVERLAY), 1)
    CFLAGS      += -DHAVE_OVERLAY
 endif
@@ -956,6 +1121,14 @@ ifeq ($(HAVE_LANGEXTRA), 1)
    CFLAGS += -DHAVE_LANGEXTRA
 endif
 
+ifeq ($(HAVE_DSP_FILTER), 1)
+   CFLAGS += -DHAVE_DSP_FILTER
+endif
+
+ifeq ($(HAVE_VIDEO_FILTER), 1)
+   CFLAGS += -DHAVE_VIDEO_FILTER
+endif
+
 ifeq ($(HAVE_FILTERS_BUILTIN), 1)
    CFLAGS += -DHAVE_FILTERS_BUILTIN
 endif
@@ -972,6 +1145,18 @@ ifeq ($(HAVE_THREADS), 1)
    endif
 endif
 
+ifeq ($(HAVE_CONFIGFILE), 1)
+   CFLAGS += -DHAVE_CONFIGFILE
+endif
+
+ifeq ($(HAVE_PATCH), 1)
+   CFLAGS += -DHAVE_PATCH
+endif
+
+ifeq ($(HAVE_CHEATS), 1)
+	CFLAGS += -DHAVE_CHEATS
+endif
+
 ifeq ($(HAVE_RSOUND), 1)
    CFLAGS += -DHAVE_RSOUND
 endif
@@ -1080,7 +1265,12 @@ $(APP_BOOTER_DIR)/app_booter.bin:
 	$(MAKE) -C $(APP_BOOTER_DIR)
 
 pkg: all
-ifeq ($(platform), wii)
+ifeq ($(platform), qnx)
+	mkdir -p pkg/qnx/pkg
+	cp -r $(EXT_TARGET) pkg/qnx/pkg/RetroArch
+	cp -r media/canvas.png pkg/qnx/pkg/canvas.png
+	cp -r media/retroarch-96x96.png pkg/qnx/pkg/retroarch-96x96.png
+else ifeq ($(platform), wii)
 	cp -r $(EXT_TARGET) pkg/wii/CORE.dol
 else ifeq ($(platform), ngc)
 	cp -r $(EXT_TARGET) pkg/ngc/CORE.dol
@@ -1088,6 +1278,18 @@ else ifeq ($(platform), psp1)
 	psp-fixup-imports$(EXT) $(EXT_TARGET)
 endif
 
+ifeq ($(platform), qnx)
+retroarch-dev.bar: pkg
+ifeq ($(QNX_DEBUGTOKEN),)
+	blackberry-nativepackager -package $@ -devMode pkg/qnx/bar-descriptor.xml -C  pkg/qnx/pkg pkg/qnx/pkg/*
+else
+	blackberry-nativepackager -package $@ -devMode -debugToken $(QNX_DEBUGTOKEN) pkg/qnx/bar-descriptor.xml -C  pkg/qnx/pkg pkg/qnx/pkg/*
+endif
+
+retroarch-release.bar: pkg
+	blackberry-nativepackager -package $@ pkg/qnx/bar-descriptor.xml -C  pkg/qnx/pkg pkg/qnx/pkg/*
+endif
+
 shaders-checkout:
 	@if test -d $(SHADER_CG_DIR); then \
       echo "[SHADER CHECKOUT::] Git pulling common-shaders..."; \

Makefile.libnx

@@ -23,6 +23,8 @@ DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSO
 
 HAVE_DR_MP3 = 1
 HAVE_TRANSLATE = 1
+HAVE_SCREENSHOTS = 1
+HAVE_REWIND = 1
 HAVE_AUDIOMIXER = 1
 HAVE_CC_RESAMPLER = 1
 HAVE_MENU_COMMON = 1
@@ -33,9 +35,14 @@ HAVE_RBMP = 1
 HAVE_ZLIB = 1
 HAVE_BUILTINZLIB = 1
 HAVE_LIBRETRODB = 1
+HAVE_DSP_FILTER = 1
+HAVE_VIDEO_FILTER = 1
 HAVE_STATIC_VIDEO_FILTERS = 1
 HAVE_STATIC_AUDIO_FILTERS = 1
 HAVE_MENU = 1
+HAVE_CONFIGFILE = 1
+HAVE_PATCH = 1
+HAVE_CHEATS = 1
 HAVE_RUNAHEAD = 1
 HAVE_NETWORKING = 1
 HAVE_NETPLAYDISCOVERY = 1
@@ -52,7 +59,7 @@ HAVE_SWITCH = 1
 HAVE_LIBNX = 1
 HAVE_OPENGL = 1
 HAVE_LANGEXTRA = 1
-HAVE_MENU_WIDGETS = 1
+HAVE_GFX_WIDGETS = 1
 
 ifeq ($(HAVE_OPENGL), 1)
   HAVE_EGL = 1
@@ -132,7 +139,7 @@ LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs $(ARCH) -Wl,--allow-multiple-de
 # add things from Makefile.common
 CFLAGS += $(DEF_FLAGS)
 
-LIBS	:= -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lm
+LIBS	:= -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lvpx -lopus -llzma -lm
 
 ifeq ($(HAVE_OPENGL), 1)
   LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)

Makefile.msvc

@@ -11,6 +11,10 @@ WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\$(NOTHING)
 WindowsSDKVersion := 10.0.14393.0\$(NOTHING)
 VCINSTALLDIR := C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\$(NOTHING)
 
+HAVE_DSP_FILTER          := 1
+HAVE_VIDEO_FILTER        := 1
+HAVE_SCREENSHOTS         := 1
+HAVE_REWIND              := 1
 HAVE_AUDIOMIXER          := 1
 HAVE_D3DX                := 1
 HAVE_D3D8                := 0
@@ -21,7 +25,7 @@ HAVE_D3D12               := 1
 HAVE_CG                  := 1
 HAVE_OPENGL              := 1
 HAVE_OPENGL1             := 1
-HAVE_MENU_WIDGETS			 := 1
+HAVE_GFX_WIDGETS			 := 1
 HAVE_VULKAN              := 1
 HAVE_XAUDIO              := 1
 HAVE_XINPUT              := 1
@@ -31,6 +35,8 @@ HAVE_WINMM               := 1
 
 HAVE_RPNG                := 1
 HAVE_ZLIB                := 1
+HAVE_CONFIGFILE          := 1
+HAVE_PATCH               := 1
 HAVE_MENU                := 1
 HAVE_RGUI                := 1
 HAVE_XMB                 := 1
@@ -59,6 +65,8 @@ HAVE_LANGEXTRA           := 1
 HAVE_CHEEVOS             := 1
 HAVE_SHADERPIPELINE      := 1
 HAVE_IMAGEVIEWER         := 1
+HAVE_BSV_MOVIE           := 1
+HAVE_CHEATS              := 1
 
 ifeq ($(HAVE_D3D8), 1)
    D3D8_LIBS := -ld3d8
@@ -191,11 +199,9 @@ else
    OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 endif
 
-DEFINES += -DRARCH_INTERNAL -DHAVE_DYNAMIC -DJSON_STATIC
+DEFINES += -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_DYNAMIC -DJSON_STATIC
 INCLUDE_DIRS += -I. -Igfx/include
 
-#OBJ := version_git.o
-
 OBJ := $(patsubst %rarch.o,%rarch.res,$(OBJ))
 OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
 OBJ := $(OBJ:.o=.obj)

Makefile.openpandora

@@ -15,7 +15,9 @@ LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib
 
 LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
 DEFINES = -std=gnu99 -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
-DEFINES += -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_OVERLAY -DHAVE_VIDEO_LAYOUT -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
+DEFINES += -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SCREENSHOTS -DHAVE_REWIND -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_OVERLAY -DHAVE_VIDEO_LAYOUT -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
+DEFINES += -DHAVE_DSP_FILTER
+DEFINES += -DHAVE_VIDEO_FILTER
 DEFINES += $(INCDIRS)
 DEFINES += -D__OPENPANDORA__ -DPANDORA
 DEFINES += -marm -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize

Makefile.orbis

@@ -16,13 +16,16 @@ DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_MENU -DHAVE_LIBRETRODB
+	DEFINES += -DHAVE_MENU -DHAVE_LIBRETRODB -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SCREENSHOTS -DHAVE_CHEATS
+	DEFINES += -DHAVE_REWIND
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
 else
 
+   HAVE_DSP_FILTER := 1
+   HAVE_VIDEO_FILTER := 1
 	HAVE_FILTERS_BUILTIN	:= 1
 	HAVE_LANGEXTRA		:= 0
 	HAVE_RPNG		:= 1
@@ -34,13 +37,18 @@ else
 	HAVE_VIDEO_LAYOUT := 0
 	HAVE_7ZIP		:= 1
 	HAVE_EGL 		:= 1
-	HAVE_MENU_WIDGETS := 1
+	HAVE_GFX_WIDGETS := 1
 	HAVE_GLSL      := 1
 	HAVE_OPENGLES  		:= 1
 	HAVE_NETWORKING		:= 0
 	HAVE_SOCKET_LEGACY	:= 0
 	HAVE_MENU		:= 1
 	HAVE_MENU_COMMON	:= 1
+	HAVE_CONFIGFILE := 1
+   HAVE_SCREENSHOTS := 1
+   HAVE_REWIND      := 1
+	HAVE_PATCH      := 1
+   HAVE_CHEATS       := 1
 	HAVE_RGUI		:= 0
 	HAVE_MATERIALUI 	:= 0
 	HAVE_XMB		:= 1

Makefile.ps2

@@ -1,28 +1,22 @@
 BUILD_FOR_PCSX2    = 0
 DEBUG              = 0
-HAVE_KERNEL_PRX    = 0
 HAVE_LOGGER        = 0
 HAVE_FILE_LOGGER   = 0
 HAVE_THREADS       = 0
-BIG_STACK          = 0
 MUTE_WARNINGS      = 1
 PS2_IP = 192.168.1.150
 
-TARGET = retroarchps2.elf
-TARGET_RELEASE = retroarchps2-release.elf
-
-# Lib CDVD
-CDVD_DIR = ps2/libcdvd
+TARGET = retroarchps2-debug.elf
+TARGET_RELEASE = retroarchps2.elf
 
 # Compile the IRXs first
 IRX_DIR = ps2/irx
-IRX_FILES = $(wildcard ps2/irx/*.c)
 
 ifeq ($(DEBUG), 1)
    OPTIMIZE_LV	:= -O0 -g
 	RARCH_DEFINES += -DDEBUG
 else
-   OPTIMIZE_LV	:= -O2
+   OPTIMIZE_LV	:= -O3
 	LDFLAGS :=  -s
 endif
 
@@ -30,20 +24,20 @@ ifeq ($(MUTE_WARNINGS), 1)
    DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
 endif
 
-INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include -I$(CDVD_DIR)/ee
-INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include -Ideps -Ideps/stb -Ideps/7zip
+INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
+INCDIR += -Ips2/include -Ilibretro-common/include -Ideps -Ideps/stb -Ideps/7zip
 INCDIR += -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
-GPVAL = -G0
 CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)
 
-RARCH_DEFINES += -DPS2 -DUSE_IOP_CTYPE_MACRO -D_MIPS_ARCH_R5900 -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG
-RARCH_DEFINES += -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+RARCH_DEFINES += -DPS2 -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_RGUI
+RARCH_DEFINES += -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+RARCH_DEFINES += -DHAVE_DSP_FILTER
+RARCH_DEFINES += -DHAVE_VIDEO_FILTER
 
-LIBDIR =
-LDFLAGS += -L$(PS2SDK)/ports/lib -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ee/lib -L$(CDVD_DIR)/lib -L.
-LIBS += -lretro_ps2 -lgskit -ldmakit -lgskit_toolkit -laudsrv -lmf -lpadx -lmtap -lmc -lhdd -lsdl -lfileXio -lz
-LIBS += -lcdvdfs -lpatches -lpoweroff
+LDFLAGS += -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -L.
+# Lib cdvd is needed to get proper time
+LIBS += -lretro_ps2 -lpatches -lpoweroff -lgskit -ldmakit -laudsrv -lpadx -lmtap -lz -lcdvd -lelf-loader
 
 ifeq ($(BUILD_FOR_PCSX2), 1)
 RARCH_DEFINES += -DBUILD_FOR_PCSX2
@@ -57,27 +51,17 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS += -DHAVE_FILE_LOGGER
 endif
 
-ifeq ($(HAVE_KERNEL_PRX), 1)
-CFLAGS += -DHAVE_KERNEL_PRX
-endif
-
-ifeq ($(BIG_STACK), 1)
-CFLAGS += -DBIG_STACK
-endif
-
 CFLAGS += $(RARCH_DEFINES)
 
 # All the IRX objects
 EE_OBJS += $(IRX_DIR)/freemtap_irx.o $(IRX_DIR)/freepad_irx.o $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o
 EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o
 EE_OBJS += $(IRX_DIR)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o
-EE_OBJS += $(IRX_DIR)/cdvd_irx.o
+EE_OBJS += $(IRX_DIR)/cdfs_irx.o
 
 # Missing objecst on the PS2SDK
-EE_OBJS += ps2/compat_files/compat_ctype.o ps2/compat_files/time.o ps2/compat_files/ps2_devices.o 
-EE_OBJS += ps2/compat_files/fileXio_cdvd.o ps2/compat_files/ps2_descriptor.o
+EE_OBJS += ps2/compat_files/ps2_devices.o 
 
-#EE_OBJS = griffin/griffin.o bootstrap/ps2/kernel_functions.o
 EE_OBJS += griffin/griffin.o
 
 EE_CFLAGS = $(CFLAGS)
@@ -106,7 +90,10 @@ prepare:
 run:
 	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
 
-debug: clean prepare all run
+sim:
+	PCSX2 --elf=$(PWD)/$(EE_BIN) --nogui
+
+debug: clean all run
 
 package:
 	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
@@ -115,9 +102,4 @@ release: clean all package
 
 #Include preferences
 include $(PS2SDK)/samples/Makefile.pref
-include $(PS2SDK)/samples/Makefile.eeglobal
-
-#Linking with C++
-$(EE_BIN): $(EE_OBJS) $(PS2SDK)/ee/startup/crt0.o
-	$(EE_CXX) $(EE_NO_CRT) -T$(PS2SDK)/ee/startup/linkfile $(EE_CXXFLAGS) \
-		-o $(EE_BIN) $(PS2SDK)/ee/startup/crt0.o $(CRTI_OBJ) $(CRTBEGIN_OBJ) $(EE_OBJS) $(CRTEND_OBJ) $(CRTN_OBJ) $(EE_LDFLAGS) $(EE_LIBS)
+include $(PS2SDK)/samples/Makefile.eeglobal_cpp

Makefile.ps2.salamander

@@ -0,0 +1,103 @@
+BUILD_FOR_PCSX2   = 0
+DEBUG             = 0
+HAVE_FILE_LOGGER  = 0
+MUTE_WARNINGS     = 1
+PS2_IP = 192.168.1.150
+
+TARGET = raboot-debug.elf
+TARGET_RELEASE = raboot.elf
+
+# Compile the IRXs first
+IRX_DIR = ps2/irx
+
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_LV	:= -O0 -g
+	RARCH_DEFINES += -DDEBUG
+else
+   OPTIMIZE_LV	:= -O3
+	LDFLAGS :=  -s
+endif
+
+ifeq ($(MUTE_WARNINGS), 1)
+   DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
+endif
+
+INCDIR = -Ilibretro-common/include
+INCDIR += -Ips2/include
+CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
+ASFLAGS = $(CFLAGS)
+
+RARCH_DEFINES += -DPS2 -DIS_SALAMANDER -DRARCH_CONSOLE
+
+LIBDIR =
+LDFLAGS =
+LIBS = -lm -lelf-loader -lpatches -lpoweroff
+
+ifeq ($(BUILD_FOR_PCSX2), 1)
+RARCH_DEFINES += -DBUILD_FOR_PCSX2
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+endif
+
+CFLAGS += $(RARCH_DEFINES)
+
+EE_OBJS = frontend/frontend_salamander.o \
+		 frontend/frontend_driver.o \
+		 frontend/drivers/platform_ps2.o \
+		 libretro-common/file/file_path.o \
+		 libretro-common/file/file_path_io.o \
+		 libretro-common/string/stdstring.o \
+		 libretro-common/lists/string_list.o \
+		 libretro-common/lists/dir_list.o \
+		 libretro-common/file/retro_dirent.o \
+		 libretro-common/encodings/encoding_utf.o \
+		 libretro-common/compat/fopen_utf8.o \
+		 libretro-common/compat/compat_strl.o \
+		 libretro-common/compat/compat_strcasestr.o \
+		 libretro-common/file/config_file.o \
+		 libretro-common/streams/file_stream.o \
+		 libretro-common/vfs/vfs_implementation.o \
+		 libretro-common/hash/rhash.o \
+		 libretro-common/time/rtime.o \
+		 file_path_str.o \
+		 verbosity.o \
+		 ps2/compat_files/ps2_devices.o 
+
+# Needed IRX objects
+EE_OBJS += $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o $(IRX_DIR)/cdfs_irx.o
+EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o
+EE_OBJS += $(IRX_DIR)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/poweroff_irx.o
+
+EE_CFLAGS = $(CFLAGS)
+EE_CXXFLAGS = $(CFLAGS)
+EE_LDFLAGS = $(LDFLAGS)
+EE_LIBS = $(LIBS)
+EE_ASFLAGS = $(ASFLAGS)
+EE_INCS = $(INCDIR)
+EE_BIN = $(TARGET)
+EE_GPVAL = $(GPVAL)
+
+all: irxdir $(EE_BIN)
+
+irxdir:
+	$(MAKE) -C $(IRX_DIR)
+
+clean:
+	rm -f $(EE_BIN) $(EE_OBJS)
+	$(MAKE) -C $(IRX_DIR) clean
+
+debug: clean all run
+
+run:
+	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
+
+package:
+	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
+
+release: clean all package
+
+#Include preferences
+include $(PS2SDK)/samples/Makefile.pref
+include $(PS2SDK)/samples/Makefile.eeglobal_cpp

Makefile.ps3

@@ -69,8 +69,9 @@ endif
 
 PPU_SRCS		= griffin/griffin.c
 
-#DEFINES += -DHAVE_VIDEO_LAYOUT
-DEFINES += -DHAVE_MENU -DHAVE_MENU_WIDGETS -DHAVE_RGUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC
+DEFINES += -DHAVE_VIDEO_LAYOUT
+DEFINES += -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_GFX_WIDGETS -DHAVE_RGUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC
+DEFINES += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
 
 ifeq ($(DEX_BUILD), 1)
 DEFINES += -DDEX_BUILD
@@ -116,7 +117,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l
 
 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
 
-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS -DRC_DISABLE_LUA
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER
 
 #DEFINES += -DHAVE_IMAGEVIEWER
 

Makefile.ps3.cobra

@@ -108,7 +108,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l
 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
 
 #DEFINES += -DHAVE_VIDEO_LAYOUT
-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS
+DEFINES += -DHAVE_THREADS -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_PATCH -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS
 
 ifeq ($(DEBUG), 1)
    PPU_OPTIMIZE_LV	:= -O0 -g

Makefile.ps3.salamander

@@ -45,8 +45,8 @@ PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
 PPU_SRCS		= frontend/frontend_salamander.c \
 				  frontend/frontend_driver.c \
 				  frontend/drivers/platform_ps3.c \
-				  frontend/drivers/platform_null.c \
 				  libretro-common/file/file_path.c \
+				  libretro-common/file/file_path_io.c \
 				  libretro-common/lists/dir_list.c \
 				  libretro-common/lists/string_list.c \
 				  libretro-common/file/retro_dirent.c \
@@ -59,6 +59,7 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/streams/file_stream.c \
 				  libretro-common/vfs/vfs_implementation.c \
 				  libretro-common/file/config_file.c \
+				  libretro-common/time/rtime.c \
 				  file_path_str.c \
 				  verbosity.c
 

Makefile.psl1ght

@@ -1,29 +1,39 @@
+#-------------------------------------------------------------------------------
+# Clear the implicit built in rules
+#-------------------------------------------------------------------------------
+.SUFFIXES:
+#-------------------------------------------------------------------------------
+ifeq ($(strip $(PSL1GHT)),)
+$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+endif
+ 
+include $(PSL1GHT)/ppu_rules
+
 include version.all
 
 DEBUG			= 0
 HAVE_LOGGER		= 0
-HAVE_FILE_LOGGER	= 0
+HAVE_FILE_LOGGER	= 1
 
 PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
 PC_DEVELOPMENT_UDP_PORT		= 3490
 
-CC = $(PS3DEV)/ppu/bin/ppu-gcc
-CXX = $(PS3DEV)/ppu/bin/ppu-g++
-LD = $(PS3DEV)/ppu/bin/ppu-ld
-
-CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
+CONTENTID		= UP0001-SSNE10001_00-0000000000000001
+APPID                   = SSNE10001
+TITLE                   = Retroarch PSL1GHT
+PACKAGE_BASENAME := retroarch_psl1ght
 
 ELF_TARGET := retroarch_psl1ght.elf
-EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
-CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
+SELF_TARGET := $(ELF_TARGET:.elf=.self)
+CORE_PATH		= pkg/psl1ght/pkg/USRDIR/cores/CORE.SELF
 
-INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib
-LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
+INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude
+LIBDIRS += -L.
 
-MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
+MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell
 CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
-LIBS := -lrgl_ps3 -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule  -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl
+LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule  -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl
 
 # system platform
 system_platform = unix
@@ -38,46 +48,10 @@ endif
 
 PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
-PKG_FINALIZE         	= package_finalize
-MAKE_SELF_WC		= make_self_wc
-MAKE_SELF		= make_self_npdrm
-PYTHON2			= python2
 GIT			= git
 else
-PKG_FINALIZE         	= package_finalize.exe
-MAKE_SELF_WC		= make_self_wc.exe
-MAKE_SELF		= make_self_npdrm.exe
-PYTHON2			= python2.exe
 GIT			= git.exe
 endif
-# system platform
-system_platform = unix
-ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
-endif
-
-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
-ifeq ($(shell uname), Linux)
-PKG_FINALIZE         	= package_finalize
-MAKE_SELF_WC		= make_self_wc
-MAKE_SELF		= make_self_npdrm
-PYTHON2			= python2
-GIT			= git
-else
-PKG_FINALIZE         	= package_finalize.exe
-MAKE_SELF_WC		= make_self_wc.exe
-MAKE_SELF		= make_self_npdrm.exe
-PYTHON2			= python2.exe
-GIT			= git.exe
-endif
-
-MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
-MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
 
 OBJ = griffin/griffin.o
 
@@ -91,8 +65,8 @@ endif
 
 SHARED_FLAGS :=
 
-#SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
-SHARED_FLAGS += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER
+SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
+SHARED_FLAGS += -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DRARCH_CONSOLE -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_MULTIMAN -DHAVE_RGUI
 CFLAGS += -std=gnu99 $(SHARED_FLAGS)
 CXXFLAGS += $(SHARED_FLAGS)
 
@@ -103,28 +77,18 @@ else
    CXXFLAGS += -03 -g
 endif
 
-all: $(ELF_TARGET)
+all: $(SELF_TARGET)
 
 $(ELF_TARGET): $(OBJ)
 	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
 
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+create-core: $(SELF_TARGET)
+	cp $(SELF_TARGET) $(CORE_PATH) 
 
-%.o: %.cpp
-	$(CXX) $(CFLAGS) -c -o $@ $<
-
-create-npdrm-core:
-	$(MAKE_FSELF_NPDRM) $(ELF_TARGET) $(CORE_PATH)
-
-create-core:
-	$(MAKE_SELF_WC) $(ELF_TARGET) $(CORE_PATH)
-
-pkg: $(ELF_TARGET) create-npdrm-core
-	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf ps3/pkg
-
-pkg-signed: $(ELF_TARGET) create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
+pkg: create-core
+	$(PKG) --contentid $(CONTENTID) pkg/psl1ght/pkg/ $(PACKAGE_BASENAME).pkg
+#	cp $(PACKAGE_BASENAME).pkg $(PACKAGE_BASENAME).gnpdrm.pkg
+#	$(PACKAGE_FINALIZE) $(PACKAGE_BASENAME).gnpdrm.pkg
 
 clean:
 	rm -f $(ELF_TARGET)

Makefile.psl1ght.salamander

@@ -0,0 +1,120 @@
+#-------------------------------------------------------------------------------
+# Clear the implicit built in rules
+#-------------------------------------------------------------------------------
+.SUFFIXES:
+#-------------------------------------------------------------------------------
+ifeq ($(strip $(PSL1GHT)),)
+$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+endif
+ 
+include $(PSL1GHT)/ppu_rules
+
+include version.all
+
+DEBUG			= 0
+HAVE_LOGGER		= 0
+HAVE_FILE_LOGGER	= 1
+
+PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+CONTENTID		= UP0001-SSNE10001_00-0000000000000001
+APPID                   = SSNE10001
+TITLE                   = Retroarch PSL1GHT
+PACKAGE_BASENAME := retroarch_psl1ght
+
+ELF_TARGET := retroarch_psl1ght_salamander.elf
+ELF_TARGET_NONSTRIPPED := retroarch_psl1ght_salamander_nonstripped.elf
+EBOOT_PATH		= pkg/psl1ght/pkg/USRDIR/EBOOT.BIN
+
+INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude
+LIBDIRS += -L.
+
+MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell -mhard-float -fmodulo-sched -ffunction-sections -fdata-sections
+CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
+LDFLAGS := $(MACHDEP)
+LIBS :=  -lgcm_sys -lrsx -lsysutil -lio -lnet -lsysmodule -lrt -llv2 -lm
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+ifeq ($(shell uname), Linux)
+GIT			= git
+else
+GIT			= git.exe
+endif
+
+OBJ		= frontend/frontend_salamander.o \
+				  frontend/frontend_driver.o \
+				  frontend/drivers/platform_ps3.o \
+				  libretro-common/file/file_path.o \
+				  libretro-common/file/file_path_io.o \
+				  libretro-common/lists/dir_list.o \
+				  libretro-common/lists/string_list.o \
+				  libretro-common/file/retro_dirent.o \
+				  libretro-common/hash/rhash.o \
+				  libretro-common/string/stdstring.o \
+				  libretro-common/encodings/encoding_utf.o \
+				  libretro-common/compat/compat_strl.o \
+				  libretro-common/compat/compat_strcasestr.o \
+				  libretro-common/compat/fopen_utf8.o \
+				  libretro-common/streams/file_stream.o \
+				  libretro-common/vfs/vfs_implementation.o \
+				  libretro-common/file/config_file.o \
+				  libretro-common/time/rtime.c \
+				  file_path_str.o \
+				   verbosity.o
+
+ifeq ($(HAVE_LOGGER), 1)
+CFLAGS		+= -DHAVE_LOGGER
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+endif
+
+SHARED_FLAGS :=
+
+SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
+SHARED_FLAGS += -DHAVE_MENU -DHAVE_CONFIGFILE -DRARCH_CONSOLE -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER -DHAVE_MULTIMAN -DHAVE_RGUI -DIS_SALAMANDER
+CFLAGS += -std=gnu99 $(SHARED_FLAGS)
+CXXFLAGS += $(SHARED_FLAGS)
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3 -g
+   CXXFLAGS += -03 -g
+endif
+
+all: create-salamander
+
+$(ELF_TARGET_NONSTRIPPED): $(OBJ)
+	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
+
+$(ELF_TARGET): $(ELF_TARGET_NONSTRIPPED)
+	$(STRIP) $< -o $@
+	$(SPRX) $@
+
+create-salamander: $(ELF_TARGET)
+	$(SELF_NPDRM) $(ELF_TARGET) $(EBOOT_PATH) $(CONTENTID)
+
+pkg: create-salamander
+	$(PKG) --contentid $(CONTENTID) pkg/psl1ght/pkg/ $(PACKAGE_BASENAME).pkg
+#	cp $(PACKAGE_BASENAME).pkg $(PACKAGE_BASENAME).gnpdrm.pkg
+#	$(PACKAGE_FINALIZE) $(PACKAGE_BASENAME).gnpdrm.pkg
+
+clean:
+	rm -f $(ELF_TARGET)
+	rm -f $(OBJ)
+
+.PHONY: clean

Makefile.psp1

@@ -25,7 +25,7 @@ INCDIR = deps deps/stb deps/7zip deps/pthreads deps/pthreads/platform/psp deps/p
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)
 
-RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_AUDIOMIXER -DHAVE_RWAV -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
 
 LIBDIR =
 LDFLAGS =
@@ -58,3 +58,18 @@ OBJS = $(PSP_OBJECTS)
 
 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
+
+pspsh-debug:
+	pspsh -e reset
+	read -p "Start debugger in VSCode and press any key to continue... \n" -n1 -s
+	pspsh -e debug ./retroarchpsp.prx
+	pspsh
+
+pspsh-run:
+	pspsh -e reset
+	pspsh -e ./retroarchpsp.prx
+	pspsh
+
+debug: clean all pspsh-debug
+
+run: clean all pspsh-run

Makefile.psp1.salamander

@@ -35,8 +35,8 @@ PSP_EBOOT_PIC1  = pkg/psp1/PIC1.PNG
 OBJS = frontend/frontend_salamander.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_psp.o \
-		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
+		 libretro-common/file/file_path_io.o \
 		 libretro-common/string/stdstring.o \
 		 libretro-common/lists/string_list.o \
 		 libretro-common/lists/dir_list.o \
@@ -49,6 +49,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
 		 libretro-common/hash/rhash.o \
+		 libretro-common/time/rtime.o \
 		 file_path_str.o \
 		 verbosity.o \
 		 bootstrap/psp1/kernel_functions.o

Makefile.switch

@@ -6,15 +6,18 @@ WHOLE_ARCHIVE_LINK      = 0
 
 OBJ :=
 
-DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_DYNAMIC
+DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_DYNAMIC -DHAVE_REWIND
 
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_NEON -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
 	DEFINES += -DHAVE_RUNAHEAD -DHAVE_DYNAMIC
+	DEFINES += -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS
 else
+   HAVE_REWIND = 1
 	HAVE_AUDIOMIXER = 1
+	HAVE_RWAV       = 1
 	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
 	HAVE_RTGA = 1
@@ -23,6 +26,8 @@ else
 	HAVE_RBMP = 1
 	HAVE_RGUI = 1
 	HAVE_ZLIB = 1
+   HAVE_DSP_FILTER = 1
+   HAVE_VIDEO_FILTER = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
 	HAVE_MATERIALUI = 0 # enable later?
@@ -30,8 +35,11 @@ else
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
 	HAVE_MENU = 1
+	HAVE_CONFIGFILE = 1
 	HAVE_RUNAHEAD = 1
 	HAVE_DYNAMIC = 1
+	HAVE_PATCH   = 1
+	HAVE_CHEATS  = 1
 
 	include Makefile.common
 	CFLAGS += $(DEF_FLAGS)

Makefile.vita

@@ -1,5 +1,6 @@
 TARGET		    := retroarch_vita
 DEBUG               ?= 0
+HAVE_FILE_LOGGER	= 1
 GRIFFIN_BUILD        = 0
 WHOLE_ARCHIVE_LINK   = 0
 
@@ -11,22 +12,28 @@ PC_DEVELOPMENT_UDP_PORT	   =
 
 OBJ :=
 
-DEFINES :=
+DEFINES := -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS
 INCDIRS :=
 
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
+	DEFINES += -DHAVE_REWIND
+	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
 	INCDIRS += -I. -Ideps/7zip -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb
 else
-
+   HAVE_REWIND := 1
+   HAVE_UPDATE_ASSETS      := 1
+   HAVE_ONLINE_UPDATER     := 1
 	HAVE_NEON		:= 1
    HAVE_MATH_NEON := 1
+   HAVE_DSP_FILTER := 1
+   HAVE_VIDEO_FILTER := 1
+   HAVE_SCREENSHOTS := 1
 	HAVE_FILTERS_BUILTIN	:= 1
 	HAVE_LANGEXTRA		:= 1
 	HAVE_RPNG		:= 1
@@ -41,7 +48,10 @@ else
 	HAVE_SOCKET_LEGACY	:= 1
 	HAVE_MENU		:= 1
 	HAVE_MENU_COMMON	:= 1
-   HAVE_MENU_WIDGETS = 1
+	HAVE_GFX_WIDGETS := 1
+	HAVE_CONFIGFILE := 1
+	HAVE_PATCH      := 1
+	HAVE_CHEATS     := 1
 	HAVE_OVERLAY		:= 1
 	HAVE_VIDEO_LAYOUT := 0
 	HAVE_MATERIALUI		:= 1
@@ -56,6 +66,8 @@ else
 	RARCH_CONSOLE		:= 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
+	HAVE_AUDIOMIXER 	:= 1
+	HAVE_RWAV       	:= 1
 
 	ifeq ($(DEBUG), 1)
 		HAVE_NETLOGGER = 1
@@ -83,7 +95,7 @@ AR      := $(PREFIX)ar
 OBJCOPY := $(PREFIX)objcopy
 STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
-LD      := $(CXX)
+LD      := $(CC)
 
 LIBDIRS := -L.
 
@@ -98,7 +110,9 @@ ASFLAGS := $(CFLAGS)
 LDFLAGS := -Wl,-q
 
 CFLAGS += -Wall -ffast-math -g
-CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
+CFLAGS += -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DRARCH_CONSOLE
+CFLAGS += -DHAVE_DSP_FILTER
+CFLAGS += -DHAVE_VIDEO_FILTER
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
 
 ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
@@ -118,7 +132,7 @@ CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
 VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub -lSceAppUtil_stub \
 	-lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub \
 	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub -lSceMotion_stub \
-	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz
+	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lstdc++ -lpthread -lpng -lz -lSceShaccCg_stub
 
 LIBS	:= $(WHOLE_START) -lretro_vita $(WHOLE_END) $(VITA_LIBS) -lm -lc
 
@@ -151,7 +165,13 @@ all: $(TARGETS)
 
 %.depend: ;
 
-$(TARGET).elf: $(OBJ) libretro_vita.a
+libSceShaccCg_stub.a: 
+	mkdir -p deps/vitaShaRK/SceShaccCg
+	vita-libs-gen deps/vitaShaRK/SceShaccCg.yml deps/vitaShaRK/SceShaccCg
+	make -C deps/vitaShaRK/SceShaccCg ARCH=arm-vita-eabi 
+	cp deps/vitaShaRK/SceShaccCg/libSceShaccCg_stub.a .
+
+$(TARGET).elf: $(OBJ) libretro_vita.a libSceShaccCg_stub.a
 	$(LD) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
 
 %.velf: %.elf
@@ -167,7 +187,8 @@ $(TARGET).elf: $(OBJ) libretro_vita.a
 	vita-pack-vpk -s param.sfo -b $< $@
 
 clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).elf.unstripped.elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk
+	rm -f $(OBJ) $(TARGET).elf $(TARGET).elf.unstripped.elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk libSceShaccCg_stub.a
+	rm -rf  deps/vitaShaRK/SceShaccCg
 	rm -f $(OBJ:.o=.depend)
 
 # Useful for developers
@@ -177,6 +198,10 @@ vpksend: $(TARGET).vpk
 send: $(TARGET).self
 	curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin
 
+launch: $(TARGET).self
+	curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin
+	echo "launch $(VITA_TITLE_ID)" | nc ${PSVITAIP} 1338
+
 .PHONY: clean all send vpksend
 .PRECIOUS: %.depend
 

Makefile.vita.salamander

@@ -35,8 +35,8 @@ CFLAGS += $(RARCH_DEFINES)
 OBJS = frontend/frontend_salamander.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_psp.o \
-		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
+		 libretro-common/file/file_path_io.o \
 		 libretro-common/string/stdstring.o \
 		 libretro-common/lists/string_list.o \
 		 libretro-common/lists/dir_list.o \
@@ -49,6 +49,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
 		 libretro-common/hash/rhash.o \
+		 libretro-common/time/rtime.o \
 		 file_path_str.o \
 		 verbosity.o
 

Makefile.wii.salamander

@@ -55,8 +55,8 @@ OBJ = frontend/frontend_salamander.o \
 		frontend/frontend_driver.o \
 		frontend/drivers/platform_gx.o \
 		frontend/drivers/platform_wii.o \
-		frontend/drivers/platform_null.o \
 		libretro-common/file/file_path.o \
+		libretro-common/file/file_path_io.o \
 		libretro-common/hash/rhash.o \
 		libretro-common/string/stdstring.o \
 		libretro-common/lists/string_list.o \
@@ -69,6 +69,7 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/compat/compat_strcasestr.o \
 		libretro-common/compat/fopen_utf8.o \
 		libretro-common/file/config_file.o \
+		libretro-common/time/rtime.o \
 		file_path_str.o \
 		verbosity.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj

Makefile.wiiu

@@ -53,11 +53,11 @@ ifeq ($(SALAMANDER_BUILD),1)
    OBJ += frontend/frontend_salamander.o
    OBJ += frontend/frontend_driver.o
    OBJ += frontend/drivers/platform_wiiu.o
-   OBJ += frontend/drivers/platform_null.o
    OBJ += libretro-common/encodings/encoding_utf.o
    OBJ += libretro-common/compat/compat_strcasestr.o
    OBJ += libretro-common/compat/fopen_utf8.o
    OBJ += libretro-common/file/file_path.o
+   OBJ += libretro-common/file/file_path_io.o
    OBJ += libretro-common/string/stdstring.o
    OBJ += libretro-common/lists/string_list.o
    OBJ += libretro-common/lists/dir_list.o
@@ -67,12 +67,14 @@ ifeq ($(SALAMANDER_BUILD),1)
    OBJ += libretro-common/streams/file_stream.o
    OBJ += libretro-common/vfs/vfs_implementation.o
    OBJ += libretro-common/hash/rhash.o
+   OBJ += libretro-common/time/rtime.o
    OBJ += file_path_str.o
    OBJ += verbosity.o
 
 # $(SALAMANDER_BUILD),0
 else
    DEFINES += -DRARCH_INTERNAL
+   DEFINES += -DHAVE_SCREENSHOTS
    DEFINES += -DHAVE_KEYMAPPER
    DEFINES += -DHAVE_ONLINE_UPDATER
    DEFINES += -DHAVE_UPDATE_ASSETS
@@ -97,7 +99,7 @@ endif
    OBJ += gfx/drivers/gx2_shaders/snowflake.o
 
    ifeq ($(GRIFFIN_BUILD), 1)
-      OBJ += griffin/griffin.o
+      OBJ += griffin/griffin.o griffin/griffin_cpp.o
 
       INCDIRS += -Ilibretro-common/include/compat/zlib
       # for stb, libfat, iosuhax
@@ -107,7 +109,9 @@ endif
       INCDIRS += -Ideps/SPIRV-Cross
 
       DEFINES += -DHAVE_AUDIOMIXER
-      DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
+      DEFINES += -DHAVE_RWAV
+      DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_RGUI -DHAVE_LIBRETRODB
+		DEFINES += -DHAVE_REWIND
       DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
       DEFINES += -DHAVE_SPIRV_CROSS -DHAVE_SLANG
       DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY
@@ -120,12 +124,19 @@ endif
 
    # $(GRIFFIN_BUILD),0
    else
+      HAVE_SCREENSHOTS = 1
       HAVE_AUDIOMIXER = 1
+      HAVE_RWAV = 1
       HAVE_MENU_COMMON = 1
+      HAVE_GFX_WIDGETS = 1
       HAVE_RTGA = 1
       HAVE_RPNG = 1
       HAVE_RJPEG = 1
       HAVE_RBMP = 1
+      HAVE_CONFIGFILE = 1
+      HAVE_PATCH      = 1
+      HAVE_REWIND     = 1
+      HAVE_CHEATS     = 1
       HAVE_MENU = 1
       HAVE_RGUI = 1
       HAVE_7ZIP = 1
@@ -146,6 +157,8 @@ endif
       HAVE_SPIRV_CROSS = 1
       HAVE_SLANG = 1
       HAVE_VIDEO_LAYOUT = 0
+      HAVE_DSP_FILTER = 1
+      HAVE_VIDEO_FILTER = 1
       HAVE_STATIC_VIDEO_FILTERS = 1
       HAVE_STATIC_AUDIO_FILTERS = 1
       WANT_LIBFAT = 1
@@ -162,7 +175,7 @@ OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
 #-----------------------------
 # Compile flags
 
-DEFINES += -DWIIU -DMSB_FIRST -D__WUT__ -DHW_WUP -D__wiiu__
+DEFINES += -DWIIU -D__WUT__ -DHW_WUP -D__wiiu__
 DEFINES += -DHAVE_MAIN
 DEFINES += -DRARCH_CONSOLE
 
@@ -183,7 +196,7 @@ CFLAGS  := -mcpu=750 -meabi -mhard-float
 CFLAGS  += -ffast-math -Werror=implicit-function-declaration
 CFLAGS  += -ffunction-sections -fdata-sections
 #CFLAGS += -fomit-frame-pointer -mword-relocations
-#CFLAGS += -Wall
+CFLAGS += -Wall
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g

Makefile.win

@@ -1,6 +1,8 @@
 TARGET = retroarch.exe
 
+HAVE_SCREENSHOTS = 1
 HAVE_AUDIOMIXER = 1
+HAVE_RWAV = 1
 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
 HAVE_DSOUND = 1
@@ -14,8 +16,14 @@ HAVE_STDIN_CMD = 1
 HAVE_COMMAND = 1
 HAVE_THREADS = 1
 HAVE_MENU = 1
+HAVE_CONFIGFILE = 1
+HAVE_PATCH      = 1
+HAVE_REWIND     = 1
+HAVE_CHEATS     = 1
 HAVE_RGUI = 1
 HAVE_MATERIALUI = 1
+HAVE_DSP_FILTER = 1
+HAVE_VIDEO_FILTER = 1
 HAVE_7ZIP = 1
 HAVE_PYTHON = 0
 DYNAMIC = 1
@@ -95,7 +103,7 @@ OS               := Win32
 OBJ              :=
 LIBS             := -lm
 DEFINES			  :=
-DEFINES          += -I. -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -DRARCH_INTERNAL -DHAVE_OVERLAY
+DEFINES          += -I. -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_OVERLAY
 #DEFINES			  += -DHAVE_VIDEO_LAYOUT
 LDFLAGS          := -L. -static-libgcc
 
@@ -159,13 +167,6 @@ $(OBJDIR)/%.o: %.c
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
 
-.FORCE:
-
-$(OBJDIR)/git_version.o: git_version.c .FORCE
-	@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
 $(OBJDIR)/%.o: %.cpp | $(dir $@)
 	@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
 	@$(if $(Q), $(shell echo echo CXX $<),)

README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/libretro/RetroArch.svg?branch=master)](https://travis-ci.org/libretro/RetroArch)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/8936/badge.svg)](https://scan.coverity.com/projects/retroarch)
+[![Crowdin](https://badges.crowdin.net/retroarch/localized.svg)](https://crowdin.com/project/retroarch)
 
 # RetroArch
 
@@ -8,15 +9,17 @@ Popular examples of implementations for this API includes video game system emul
 more generalized 3D programs.
 These programs are instantiated as dynamic libraries. We refer to these as "libretro cores".
 
-![XMB menu driver](http://i.imgur.com/BMR1xxr.png "XMB menu driver")
+![XMB menu driver](docs/XMB-main-menu.jpg "XMB menu driver")
 
-![rgui menu driver](http://i.imgur.com/X3CbBKa.png "rgui menu driver")
+![rgui menu driver](docs/rgui-main-menu.jpg "rgui menu driver")
 
-![glui menu driver](http://i.imgur.com/ooqv8rw.png "glui menu driver")
+![glui menu driver](docs/glui-main-menu.jpg "glui menu driver")
+
+![ozone menu driver](docs/ozone-main-menu.jpg "ozone menu driver")
 
 ## libretro
 
-[libretro](http://libretro.com) is an API that exposes generic audio/video/input callbacks.
+[libretro](https://www.libretro.com) is an API that exposes generic audio/video/input callbacks.
 A frontend for libretro (such as RetroArch) handles video output, audio output, input and application lifecycle.
 A libretro core written in portable C or C++ can run seamlessly on many platforms with very little to no porting effort.
 
@@ -31,12 +34,12 @@ Latest binaries are currently hosted on the [buildbot](http://buildbot.libretro.
 
 ## Support
 
-To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org.
+To reach developers, either make an issue here on GitHub, make a thread on the [forum](https://www.libretro.com/forums/), chat on [discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org. You could create a post in [Reddit](https://www.reddit.com/r/RetroArch/) with *Technical Support* flair.
 
 ## Documentation
 
 See our [Documentation Center](https://docs.libretro.com/). On Unix, man-pages are provided.
-More developer-centric stuff is found [here](https://github.com/libretro/libretro.github.com/wiki/Documentation-devs).
+More developer-centric stuff is found [here](https://docs.libretro.com/development/libretro-overview/).
 
 ## Related projects
 
@@ -72,6 +75,7 @@ RetroArch has been ported to the following platforms:
    - Haiku
    - Solaris
    - macOS (PPC, x86-32 and x86-64)
+   - PlayStation 2
    - PlayStation 3
    - PlayStation Portable
    - PlayStation Vita
@@ -80,7 +84,7 @@ RetroArch has been ported to the following platforms:
    - Nintendo GameCube
    - Nintendo Wii
    - Nintendo Wii U
-   - Nintendo 3DS
+   - Nintendo 3DS/2DS
    - Nintendo Switch
    - Nintendo NES/SNES Classic Edition
    - Raspberry Pi
@@ -256,3 +260,23 @@ These modelines are more accurate giving exact hz. However, some games may have
 Some arcade resolutions can be very different from consumer CRTs. There is resolution detection to ensure MAME games will be displayed in the closest available resolution but drawn at their native resolution within this resolution. Meaning that the MAME game will look just like the original hardware.
 
 MAME ROMs that run in a vertical aspect like DoDonPachi need to be rotated within MAME before resolution switching and aspect correction will work. Do this before enabling CRT SwitchRes so that RetroArch will run in your desktop resolution. Once you have rotated any games that may need it turn CRT SwitchRes on.
+
+## Socials
+
+The links below belong to our official channels. Links other than this may have been created by fans, independent members or followers. We seriously recommend using our original resources.
+
+- [Website](https://www.retroarch.com/)
+- [Blog](https://libretro.com/)
+- [Facebook](https://www.facebook.com/libretro)
+- [Twitter](https://twitter.com/libretro)
+- [Reddit](https://www.reddit.com/r/RetroArch/)
+- [YouTube](https://www.youtube.com/Libretro)
+- [Google Post](https://posts.google.com/share/55Nhs2jG)
+- [Steam](https://store.steampowered.com/app/1118310/RetroArch/)
+- [YouTube Topic](https://www.youtube.com/channel/UC5q007PYyQPgin0HHbzF0zQ)
+- [Patreon](https://www.patreon.com/libretro)
+- [BOUNTYSOURCE](https://www.bountysource.com/teams/libretro/issues)
+- [Discord](https://discord.gg/27Xxm2h)
+- [Teespring](https://teespring.com/stores/retroarch)
+- [Documentation](https://docs.libretro.com/)
+- [Forum](https://forums.libretro.com/)

accessibility.h

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
  *
  *  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-
@@ -13,27 +14,20 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __MENU_CONTENT_H__
-#define __MENU_CONTENT_H__
+#ifndef __RETROARCH_ACCESSIBILITY_H
+#define __RETROARCH_ACCESSIBILITY_H
 
 #include <stdint.h>
+#include <stddef.h>
+#include <sys/types.h>
 #include <stdlib.h>
 
 #include <boolean.h>
+#include <retro_inline.h>
 #include <retro_common_api.h>
 
-RETRO_BEGIN_DECLS
-
-typedef struct menu_content_ctx_defer_info
-{
-   void *data;
-   const char *dir;
-   const char *path;
-   const char *menu_label;
-   char *s;
-   size_t len;
-} menu_content_ctx_defer_info_t;
-
-RETRO_END_DECLS
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #endif

audio/audio_defines.h

@@ -30,7 +30,7 @@ RETRO_BEGIN_DECLS
 
 #define AUDIO_MIXER_MAX_STREAMS        16
 
-#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 4)
+#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 5)
 
 /* do not define more than (MAX_SYSTEM_STREAMS - MAX_STREAMS) */
 enum audio_mixer_system_slot
@@ -38,7 +38,8 @@ enum audio_mixer_system_slot
    AUDIO_MIXER_SYSTEM_SLOT_OK = AUDIO_MIXER_MAX_STREAMS,
    AUDIO_MIXER_SYSTEM_SLOT_CANCEL,
    AUDIO_MIXER_SYSTEM_SLOT_NOTICE,
-   AUDIO_MIXER_SYSTEM_SLOT_BGM
+   AUDIO_MIXER_SYSTEM_SLOT_BGM,
+   AUDIO_MIXER_SYSTEM_SLOT_ACHIEVEMENT_UNLOCK
 };
 
 enum audio_action

audio/drivers/alsa.c

@@ -372,7 +372,7 @@ static void *alsa_device_list_new(void *data)
 
    n      = hints;
 
-   while (*n != NULL)
+   while (*n)
    {
       char *name = snd_device_name_get_hint(*n, "NAME");
       char *io   = snd_device_name_get_hint(*n, "IOID");

audio/drivers/alsathread.c

@@ -66,7 +66,7 @@ static void alsa_worker_thread(void *data)
       size_t fifo_size;
       snd_pcm_sframes_t frames;
       slock_lock(alsa->fifo_lock);
-      avail = fifo_read_avail(alsa->buffer);
+      avail     = FIFO_READ_AVAIL(alsa->buffer);
       fifo_size = MIN(alsa->period_size, avail);
       fifo_read(alsa->buffer, buf, fifo_size);
       scond_signal(alsa->cond);
@@ -256,7 +256,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
       size_t write_amt;
 
       slock_lock(alsa->fifo_lock);
-      avail           = fifo_write_avail(alsa->buffer);
+      avail           = FIFO_WRITE_AVAIL(alsa->buffer);
       write_amt       = MIN(avail, size);
 
       fifo_write(alsa->buffer, buf, write_amt);
@@ -271,7 +271,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
       {
          size_t avail;
          slock_lock(alsa->fifo_lock);
-         avail = fifo_write_avail(alsa->buffer);
+         avail = FIFO_WRITE_AVAIL(alsa->buffer);
 
          if (avail == 0)
          {
@@ -334,7 +334,7 @@ static size_t alsa_thread_write_avail(void *data)
    if (alsa->thread_dead)
       return 0;
    slock_lock(alsa->fifo_lock);
-   val = fifo_write_avail(alsa->buffer);
+   val = FIFO_WRITE_AVAIL(alsa->buffer);
    slock_unlock(alsa->fifo_lock);
    return val;
 }
@@ -361,7 +361,7 @@ static void *alsa_thread_device_list_new(void *data)
 
    n      = hints;
 
-   while (*n != NULL)
+   while (*n)
    {
       char *name = snd_device_name_get_hint(*n, "NAME");
       char *io   = snd_device_name_get_hint(*n, "IOID");

audio/drivers/coreaudio.c

@@ -52,7 +52,9 @@ typedef struct coreaudio
    size_t buffer_size;
 } coreaudio_t;
 
+#if TARGET_OS_IOS
 static bool g_interrupted;
+#endif
 
 static void coreaudio_free(void *data)
 {
@@ -101,7 +103,7 @@ static OSStatus audio_write_cb(void *userdata,
 
    slock_lock(dev->lock);
 
-   if (fifo_read_avail(dev->buffer) < write_avail)
+   if (FIFO_READ_AVAIL(dev->buffer) < write_avail)
    {
       *action_flags = kAudioUnitRenderAction_OutputIsSilence;
 
@@ -243,7 +245,7 @@ static void *coreaudio_init(const char *device,
 #else
    comp = AudioComponentFindNext(NULL, &desc);
 #endif
-   if (comp == NULL)
+   if (!comp)
       goto error;
 
 #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
@@ -344,20 +346,24 @@ static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
    const uint8_t *buf = (const uint8_t*)buf_;
    size_t written     = 0;
 
+#if TARGET_OS_IOS
    while (!g_interrupted && size > 0)
+#else
+   while (size > 0)
+#endif
    {
       size_t write_avail;
 
       slock_lock(dev->lock);
 
-      write_avail = fifo_write_avail(dev->buffer);
+      write_avail = FIFO_WRITE_AVAIL(dev->buffer);
       if (write_avail > size)
          write_avail = size;
 
       fifo_write(dev->buffer, buf, write_avail);
-      buf += write_avail;
+      buf     += write_avail;
       written += write_avail;
-      size -= write_avail;
+      size    -= write_avail;
 
       if (dev->nonblock)
       {
@@ -365,7 +371,7 @@ static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
          break;
       }
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
       if (write_avail == 0 && !scond_wait_timeout(
                dev->cond, dev->lock, 3000000))
          g_interrupted = true;
@@ -424,7 +430,7 @@ static size_t coreaudio_write_avail(void *data)
    coreaudio_t *dev = (coreaudio_t*)data;
 
    slock_lock(dev->lock);
-   avail = fifo_write_avail(dev->buffer);
+   avail = FIFO_WRITE_AVAIL(dev->buffer);
    slock_unlock(dev->lock);
 
    return avail;

audio/drivers/coreaudio3.m

@@ -31,8 +31,8 @@ typedef struct ringbuffer
    float *buffer;
    size_t cap;
    atomic_int len;
-   size_t writePtr;
-   size_t readPtr;
+   size_t write_ptr;
+   size_t read_ptr;
 } ringbuffer_t;
 
 typedef ringbuffer_t * ringbuffer_h;
@@ -44,7 +44,7 @@ static inline size_t rb_len(ringbuffer_h r)
 
 static inline size_t rb_cap(ringbuffer_h r)
 {
-   return (r->readPtr + r->cap - r->writePtr) % r->cap;
+   return (r->read_ptr + r->cap - r->write_ptr) % r->cap;
 }
 
 static inline size_t rb_avail(ringbuffer_h r)
@@ -54,17 +54,17 @@ static inline size_t rb_avail(ringbuffer_h r)
 
 static inline void rb_advance_write(ringbuffer_h r)
 {
-   r->writePtr = (r->writePtr + 1) % r->cap;
+   r->write_ptr = (r->write_ptr + 1) % r->cap;
 }
 
 static inline void rb_advance_write_n(ringbuffer_h r, size_t n)
 {
-   r->writePtr = (r->writePtr + n) % r->cap;
+   r->write_ptr = (r->write_ptr + n) % r->cap;
 }
 
 static inline void rb_advance_read(ringbuffer_h r)
 {
-   r->readPtr = (r->readPtr + 1) % r->cap;
+   r->read_ptr = (r->read_ptr + 1) % r->cap;
 }
 
 static inline void rb_len_add(ringbuffer_h r, int n)
@@ -79,11 +79,11 @@ static inline void rb_len_sub(ringbuffer_h r, int n)
 
 static void rb_init(ringbuffer_h r, size_t cap)
 {
-   r->buffer   = malloc(cap * sizeof(float));
-   r->cap      = cap;
+   r->buffer     = malloc(cap * sizeof(float));
+   r->cap        = cap;
    atomic_init(&r->len, 0);
-   r->writePtr = 0;
-   r->readPtr  = 0;
+   r->write_ptr  = 0;
+   r->read_ptr   = 0;
 }
 
 static void rb_free(ringbuffer_h r)
@@ -102,13 +102,13 @@ static void rb_write_data(ringbuffer_h r, const float *data, size_t len)
    size_t first_write = n;
    size_t rest_write  = 0;
 
-   if (r->writePtr + n > r->cap)
+   if (r->write_ptr + n > r->cap)
    {
-      first_write = r->cap - r->writePtr;
-      rest_write  = n - first_write;
+      first_write     = r->cap - r->write_ptr;
+      rest_write      = n - first_write;
    }
 
-   memcpy(r->buffer + r->writePtr, data, first_write*sizeof(float));
+   memcpy(r->buffer + r->write_ptr, data, first_write*sizeof(float));
    memcpy(r->buffer, data + first_write, rest_write*sizeof(float));
 
    rb_advance_write_n(r, n);
@@ -126,9 +126,9 @@ static void rb_read_data(ringbuffer_h r,
       int i       = 0;
       for (; i < n/2; i++)
       {
-         d0[i] = r->buffer[r->readPtr];
+         d0[i] = r->buffer[r->read_ptr];
          rb_advance_read(r);
-         d1[i] = r->buffer[r->readPtr];
+         d1[i] = r->buffer[r->read_ptr];
          rb_advance_read(r);
       }
 

audio/drivers/ctr_csnd_audio.c

@@ -23,7 +23,7 @@
 
 typedef struct
 {
-   bool nonblocking;
+   bool nonblock;
    bool playing;
    int16_t* l;
    int16_t* r;
@@ -180,7 +180,7 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
       (((ctr->pos - ctr->playpos ) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 4)) ||
       (((ctr->playpos  - ctr->pos) & CTR_CSND_AUDIO_COUNT_MASK) < (size >> 2)))
    {
-      if (ctr->nonblocking)
+      if (ctr->nonblock)
          ctr->pos = (ctr->playpos + (CTR_CSND_AUDIO_COUNT >> 1)) & CTR_CSND_AUDIO_COUNT_MASK;
       else
       {
@@ -189,7 +189,7 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
             retro_sleep(1);
             ctr_csnd_audio_update_playpos(ctr);
          }while (((ctr->playpos - ctr->pos) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 1)
-                 || (((ctr->pos - ctr->playpos) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 4)));
+               || (((ctr->pos - ctr->playpos) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 4)));
       }
    }
 
@@ -265,7 +265,7 @@ static void ctr_csnd_audio_set_nonblock_state(void *data, bool state)
 {
    ctr_csnd_audio_t* ctr = (ctr_csnd_audio_t*)data;
    if (ctr)
-      ctr->nonblocking = state;
+      ctr->nonblock = state;
 }
 
 static bool ctr_csnd_audio_use_float(void *data)

audio/drivers/ctr_dsp_audio.c

@@ -22,7 +22,7 @@
 
 typedef struct
 {
-   bool nonblocking;
+   bool nonblock;
    bool playing;
    int channel;
    ndspWaveBuf dsp_buf;
@@ -102,7 +102,7 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
       (((ctr->pos - sample_pos ) & CTR_DSP_AUDIO_COUNT_MASK) < (CTR_DSP_AUDIO_COUNT >> 4)) ||
       (((sample_pos  - ctr->pos) & CTR_DSP_AUDIO_COUNT_MASK) < (size >> 2)))
    {
-      if (ctr->nonblocking)
+      if (ctr->nonblock)
          ctr->pos = (sample_pos + (CTR_DSP_AUDIO_COUNT >> 1)) & CTR_DSP_AUDIO_COUNT_MASK;
       else
       {
@@ -173,7 +173,7 @@ static void ctr_dsp_audio_set_nonblock_state(void *data, bool state)
 {
    ctr_dsp_audio_t* ctr = (ctr_dsp_audio_t*)data;
    if (ctr)
-      ctr->nonblocking = state;
+      ctr->nonblock = state;
 }
 
 static bool ctr_dsp_audio_use_float(void *data)

audio/drivers/dsound.c

@@ -94,30 +94,25 @@ struct audio_lock
    DWORD size2;
 };
 
-static INLINE bool grab_region(dsound_t *ds, uint32_t write_ptr,
-      struct audio_lock *region)
+static bool grab_region(dsound_t *ds, uint32_t write_ptr,
+      struct audio_lock *region, HRESULT res)
 {
-   HRESULT     res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
-         &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0);
-
    if (res == DSERR_BUFFERLOST)
    {
+#ifdef DEBUG
+      RARCH_WARN("[DirectSound error]: %s\n", "DSERR_BUFFERLOST");
+#endif
       if ((res = IDirectSoundBuffer_Restore(ds->dsb)) != DS_OK)
          return false;
       if ((res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
                   &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0)) != DS_OK)
          return false;
-   }
-
-   if (res == DS_OK)
       return true;
+   }
 
 #ifdef DEBUG
    switch (res)
    {
-      case DSERR_BUFFERLOST:
-         RARCH_WARN("[DirectSound error]: %s\n", "DSERR_BUFFERLOST");
-         break;
       case DSERR_INVALIDCALL:
          RARCH_WARN("[DirectSound error]: %s\n", "DSERR_INVALIDCALL");
          break;
@@ -151,6 +146,7 @@ static DWORD CALLBACK dsound_thread(PVOID data)
 
    while (ds->thread_alive)
    {
+      HRESULT res;
       bool is_pull = false;
       struct audio_lock region;
       DWORD read_ptr, avail, fifo_avail;
@@ -159,7 +155,7 @@ static DWORD CALLBACK dsound_thread(PVOID data)
       avail = write_avail(read_ptr, write_ptr, ds->buffer_size);
 
       EnterCriticalSection(&ds->crit);
-      fifo_avail = fifo_read_avail(ds->buffer);
+      fifo_avail = FIFO_READ_AVAIL(ds->buffer);
       LeaveCriticalSection(&ds->crit);
 
       if (avail < CHUNK_SIZE || ((fifo_avail < CHUNK_SIZE) && (avail < ds->buffer_size / 2)))
@@ -175,11 +171,15 @@ static DWORD CALLBACK dsound_thread(PVOID data)
          continue;
       }
 
-      if (!grab_region(ds, write_ptr, &region))
+      if ((res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
+                  &region.chunk1, &region.size1, &region.chunk2, &region.size2, 0)) != DS_OK)
       {
-         ds->thread_alive = false;
-         SetEvent(ds->event);
-         break;
+         if (!grab_region(ds, write_ptr, &region, res))
+         {
+            ds->thread_alive = false;
+            SetEvent(ds->event);
+            break;
+         }
       }
 
       if (fifo_avail < CHUNK_SIZE)
@@ -303,7 +303,8 @@ static void dsound_free(void *data)
    free(ds);
 }
 
-static BOOL CALLBACK enumerate_cb(LPGUID guid, LPCSTR desc, LPCSTR module, LPVOID context)
+static BOOL CALLBACK enumerate_cb(LPGUID guid,
+      LPCSTR desc, LPCSTR module, LPVOID context)
 {
    union string_list_elem_attr attr;
    struct string_list *list = (struct string_list*)context;
@@ -328,6 +329,19 @@ static BOOL CALLBACK enumerate_cb(LPGUID guid, LPCSTR desc, LPCSTR module, LPVOI
    return TRUE;
 }
 
+static void dsound_set_wavefmt(WAVEFORMATEX *wfx,
+      unsigned channels, unsigned samplerate)
+{
+   wfx->wFormatTag        = WAVE_FORMAT_PCM;
+   wfx->nBlockAlign       = channels * sizeof(int16_t);
+   wfx->wBitsPerSample    = 16;
+
+   wfx->nChannels         = channels;
+   wfx->nSamplesPerSec    = samplerate;
+   wfx->nAvgBytesPerSec   = wfx->nSamplesPerSec * wfx->nBlockAlign;
+   wfx->cbSize            = 0;
+}
+
 static void *dsound_init(const char *dev, unsigned rate, unsigned latency,
       unsigned block_frames,
       unsigned *new_rate)
@@ -390,12 +404,7 @@ static void *dsound_init(const char *dev, unsigned rate, unsigned latency,
       goto error;
 #endif
 
-   wfx.wFormatTag        = WAVE_FORMAT_PCM;
-   wfx.nChannels         = 2;
-   wfx.nSamplesPerSec    = rate;
-   wfx.wBitsPerSample    = 16;
-   wfx.nBlockAlign       = 2 * sizeof(int16_t);
-   wfx.nAvgBytesPerSec   = rate * 2 * sizeof(int16_t);
+   dsound_set_wavefmt(&wfx, 2, rate);
 
    ds->buffer_size       = (latency * wfx.nAvgBytesPerSec) / 1000;
    ds->buffer_size      /= CHUNK_SIZE;
@@ -496,27 +505,49 @@ static ssize_t dsound_write(void *data, const void *buf_, size_t size)
    if (!ds->thread_alive)
       return -1;
 
-   while (size > 0)
+   if (ds->nonblock)
    {
-      size_t avail;
+      if (size > 0)
+      {
+         size_t avail;
 
-      EnterCriticalSection(&ds->crit);
-      avail = fifo_write_avail(ds->buffer);
-      if (avail > size)
-         avail = size;
+         EnterCriticalSection(&ds->crit);
+         avail = FIFO_WRITE_AVAIL(ds->buffer);
+         if (avail > size)
+            avail = size;
 
-      fifo_write(ds->buffer, buf, avail);
-      LeaveCriticalSection(&ds->crit);
+         fifo_write(ds->buffer, buf, avail);
+         LeaveCriticalSection(&ds->crit);
 
-      buf     += avail;
-      size    -= avail;
-      written += avail;
+         buf     += avail;
+         size    -= avail;
+         written += avail;
+      }
+   }
+   else
+   {
+      while (size > 0)
+      {
+         size_t avail;
 
-      if (ds->nonblock || !ds->thread_alive)
-         break;
+         EnterCriticalSection(&ds->crit);
+         avail = FIFO_WRITE_AVAIL(ds->buffer);
+         if (avail > size)
+            avail = size;
 
-      if (avail == 0)
-         WaitForSingleObject(ds->event, INFINITE);
+         fifo_write(ds->buffer, buf, avail);
+         LeaveCriticalSection(&ds->crit);
+
+         buf     += avail;
+         size    -= avail;
+         written += avail;
+
+         if (!ds->thread_alive)
+            break;
+
+         if (avail == 0)
+            WaitForSingleObject(ds->event, INFINITE);
+      }
    }
 
    return written;
@@ -528,21 +559,13 @@ static size_t dsound_write_avail(void *data)
    dsound_t *ds = (dsound_t*)data;
 
    EnterCriticalSection(&ds->crit);
-   avail = fifo_write_avail(ds->buffer);
+   avail = FIFO_WRITE_AVAIL(ds->buffer);
    LeaveCriticalSection(&ds->crit);
    return avail;
 }
 
-static size_t dsound_buffer_size(void *data)
-{
-   return 4 * 1024;
-}
-
-static bool dsound_use_float(void *data)
-{
-   (void)data;
-   return false;
-}
+static size_t dsound_buffer_size(void *data) { return 4 * 1024; }
+static bool dsound_use_float(void *data) { return false; }
 
 static void *dsound_list_new(void *u)
 {

audio/drivers/gx_audio.c

@@ -109,7 +109,7 @@ static INLINE void copy_swapped(uint32_t * restrict dst,
    {
       uint32_t s = *src++;
       *dst++ = (s >> 16) | (s << 16);
-   }while(--size);
+   } while (--size);
 }
 
 static ssize_t gx_audio_write(void *data, const void *buf_, size_t size)

audio/drivers/jack.c

@@ -25,8 +25,8 @@
 #include <boolean.h>
 #include <rthreads/rthreads.h>
 
-#include "../../retroarch.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #define FRAMES(x) (x / (sizeof(float) * 2))
@@ -146,7 +146,8 @@ static size_t find_buffersize(jack_t *jd, int latency, unsigned out_rate)
    return buffer_frames * sizeof(jack_default_audio_sample_t);
 }
 
-static void *ja_init(const char *device, unsigned rate, unsigned latency,
+static void *ja_init(const char *device,
+      unsigned rate, unsigned latency,
       unsigned block_frames,
       unsigned *new_rate)
 {
@@ -166,7 +167,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency,
 #endif
 
    jd->client = jack_client_open("RetroArch", JackNullOption, NULL);
-   if (jd->client == NULL)
+   if (!jd->client)
       goto error;
 
    *new_rate = jack_get_sample_rate(jd->client);
@@ -176,14 +177,14 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency,
 
    jd->ports[0] = jack_port_register(jd->client, "left", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
    jd->ports[1] = jack_port_register(jd->client, "right", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-   if (jd->ports[0] == NULL || jd->ports[1] == NULL)
+   if (!jd->ports[0] || !jd->ports[1])
    {
       RARCH_ERR("[JACK]: Failed to register ports.\n");
       goto error;
    }
 
    jports = jack_get_ports(jd->client, NULL, NULL, JackPortIsPhysical | JackPortIsInput);
-   if (jports == NULL)
+   if (!jports)
    {
       RARCH_ERR("[JACK]: Failed to get ports.\n");
       goto error;
@@ -196,7 +197,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency,
    for (i = 0; i < 2; i++)
    {
       jd->buffer[i] = jack_ringbuffer_create(bufsize);
-      if (jd->buffer[i] == NULL)
+      if (!jd->buffer[i])
       {
          RARCH_ERR("[JACK]: Failed to create buffers.\n");
          goto error;
@@ -229,7 +230,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency,
 error:
    for (i = 0; i < parsed; i++)
       free(dest_ports[i]);
-   if (jports != NULL)
+   if (jports)
       jack_free(jports);
    free(jd);
    return NULL;
@@ -334,14 +335,14 @@ static void ja_free(void *data)
 
    jd->shutdown = true;
 
-   if (jd->client != NULL)
+   if (jd->client)
    {
       jack_deactivate(jd->client);
       jack_client_close(jd->client);
    }
 
    for (i = 0; i < 2; i++)
-      if (jd->buffer[i] != NULL)
+      if (jd->buffer[i])
          jack_ringbuffer_free(jd->buffer[i]);
 
 #ifdef HAVE_THREADS

audio/drivers/nullaudio.c

@@ -1,96 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#include "../../retroarch.h"
-#include "../../verbosity.h"
-
-static void *null_audio_init(const char *device, unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_rate)
-{
-   RARCH_ERR("Using the null audio driver. RetroArch will be silent.\n");
-
-   (void)device;
-   (void)rate;
-   (void)latency;
-   (void)new_rate;
-   return (void*)-1;
-}
-
-static void null_audio_free(void *data)
-{
-   (void)data;
-}
-
-static ssize_t null_audio_write(void *data, const void *buf, size_t size)
-{
-   (void)data;
-   (void)buf;
-
-   return size;
-}
-
-static bool null_audio_stop(void *data)
-{
-   (void)data;
-   return true;
-}
-
-static bool null_audio_alive(void *data)
-{
-   (void)data;
-   return true;
-}
-
-static bool null_audio_start(void *data, bool is_shutdown)
-{
-   (void)data;
-   return true;
-}
-
-static void null_audio_set_nonblock_state(void *data, bool state)
-{
-   (void)data;
-   (void)state;
-}
-
-static bool null_audio_use_float(void *data)
-{
-   (void)data;
-   return true;
-}
-
-static size_t null_audio_write_avail(void *data)
-{
-   (void)data;
-   return 0;
-}
-
-audio_driver_t audio_null = {
-   null_audio_init,
-   null_audio_write,
-   null_audio_stop,
-   null_audio_start,
-   null_audio_alive,
-   null_audio_set_nonblock_state,
-   null_audio_free,
-   null_audio_use_float,
-   "null",
-   NULL,
-   NULL,
-   null_audio_write_avail,
-   NULL
-};

audio/drivers/openal.c

@@ -115,7 +115,7 @@ static void *al_init(const char *device, unsigned rate, unsigned latency,
 
    al->buffers = (ALuint*)calloc(al->num_buffers, sizeof(ALuint));
    al->res_buf = (ALuint*)calloc(al->num_buffers, sizeof(ALuint));
-   if (al->buffers == NULL || al->res_buf == NULL)
+   if (!al->buffers || !al->res_buf)
       goto error;
 
    alGenSources(1, &al->source);

audio/drivers/opensl.c

@@ -67,7 +67,7 @@ static void opensl_callback(SLAndroidSimpleBufferQueueItf bq, void *ctx)
 #define GOTO_IF_FAIL(x) do { \
    if ((res = (x)) != SL_RESULT_SUCCESS) \
       goto error; \
-} while(0)
+} while (0)
 
 static void sl_free(void *data)
 {

audio/drivers/ps2_audio.c

@@ -29,7 +29,8 @@
 
 typedef struct ps2_audio
 {
-   bool nonblocking;
+   /* TODO/FIXME - nonblock is not implemented */
+   bool nonblock;
    bool running;
 
 } ps2_audio_t;
@@ -39,11 +40,11 @@ static void audioConfigure(ps2_audio_t *ps2, unsigned rate)
    int err;
    struct audsrv_fmt_t format;
 
-   format.bits = AUDIO_BITS;
-   format.freq = rate;
+   format.bits     = AUDIO_BITS;
+   format.freq     = rate;
    format.channels = AUDIO_CHANNELS;
 
-   err = audsrv_set_format(&format);
+   err             = audsrv_set_format(&format);
 
    if (err)
    {
@@ -82,15 +83,12 @@ static void ps2_audio_free(void *data)
 
 static ssize_t ps2_audio_write(void *data, const void *buf, size_t size)
 {
-   int bytes_sent;
    ps2_audio_t* ps2 = (ps2_audio_t*)data;
 
    if (!ps2->running)
       return -1;
 
-   bytes_sent = audsrv_play_audio(buf, size);
-
-   return bytes_sent;
+   return audsrv_play_audio(buf, size);
 }
 
 static bool ps2_audio_alive(void *data)
@@ -134,7 +132,7 @@ static void ps2_audio_set_nonblock_state(void *data, bool toggle)
    ps2_audio_t* ps2 = (ps2_audio_t*)data;
 
    if (ps2)
-      ps2->nonblocking = toggle;
+      ps2->nonblock = toggle;
 }
 
 static bool ps2_audio_use_float(void *data)

audio/drivers/ps3_audio.c

@@ -29,7 +29,7 @@
 typedef struct
 {
    uint32_t audio_port;
-   bool nonblocking;
+   bool nonblock;
    bool started;
    volatile bool quit_thread;
    fifo_buffer_t *buffer;
@@ -61,7 +61,7 @@ static void event_loop(uint64_t data)
       sys_event_queue_receive(id, &event, SYS_NO_TIMEOUT);
 
       sys_lwmutex_lock(&aud->lock, SYS_NO_TIMEOUT);
-      if (fifo_read_avail(aud->buffer) >= sizeof(out_tmp))
+      if (FIFO_READ_AVAIL(aud->buffer) >= sizeof(out_tmp))
          fifo_read(aud->buffer, out_tmp, sizeof(out_tmp));
       else
          memset(out_tmp, 0, sizeof(out_tmp));
@@ -150,13 +150,13 @@ static ssize_t ps3_audio_write(void *data, const void *buf, size_t size)
 {
    ps3_audio_t *aud = data;
 
-   if (aud->nonblocking)
+   if (aud->nonblock)
    {
-      if (fifo_write_avail(aud->buffer) < size)
+      if (FIFO_WRITE_AVAIL(aud->buffer) < size)
          return 0;
    }
 
-   while (fifo_write_avail(aud->buffer) < size)
+   while (FIFO_WRITE_AVAIL(aud->buffer) < size)
       sys_lwcond_wait(&aud->cond, 0);
 
    sys_lwmutex_lock(&aud->lock, SYS_NO_TIMEOUT);
@@ -200,7 +200,7 @@ static void ps3_audio_set_nonblock_state(void *data, bool toggle)
 {
    ps3_audio_t *aud = data;
    if (aud)
-      aud->nonblocking = toggle;
+      aud->nonblock = toggle;
 }
 
 static void ps3_audio_free(void *data)

audio/drivers/psp_audio.c

@@ -44,7 +44,7 @@
 
 typedef struct psp_audio
 {
-   bool nonblocking;
+   bool nonblock;
 
    uint32_t* buffer;
    uint32_t* zeroBuffer;
@@ -167,7 +167,7 @@ static void *psp_audio_init(const char *device,
    psp->cond_lock = slock_new();
    psp->cond = scond_new();
 
-   psp->nonblocking = false;
+   psp->nonblock    = false;
    psp->running     = true;
    psp->worker_thread = sthread_create(audioMainLoop, psp);
 
@@ -202,18 +202,18 @@ static void psp_audio_free(void *data)
 
 static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
 {
-   psp_audio_t* psp = (psp_audio_t*)data;
+   psp_audio_t* psp     = (psp_audio_t*)data;
    uint16_t write_pos   = psp->write_pos;
    uint16_t sampleCount = size / sizeof(uint32_t);
 
    if (!psp->running)
       return -1;
 
-   if (psp->nonblocking)
+   if (psp->nonblock)
    {
       if (AUDIO_BUFFER_SIZE - ((uint16_t)
-            (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK) < size)
-      return 0;
+               (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK) < size)
+         return 0;
    }
 
    slock_lock(psp->cond_lock);
@@ -287,7 +287,7 @@ static void psp_audio_set_nonblock_state(void *data, bool toggle)
 {
    psp_audio_t* psp = (psp_audio_t*)data;
    if (psp)
-      psp->nonblocking = toggle;
+      psp->nonblock = toggle;
 }
 
 static bool psp_audio_use_float(void *data)

audio/drivers/roar.c

@@ -45,7 +45,7 @@ static void *ra_init(const char *device, unsigned rate, unsigned latency,
 
    (void)latency;
 
-   if ((vss = roar_vs_new_simple(device, "RetroArch", rate, 2, ROAR_CODEC_PCM_S, 16, ROAR_DIR_PLAY, &err)) == NULL)
+   if (!(vss = roar_vs_new_simple(device, "RetroArch", rate, 2, ROAR_CODEC_PCM_S, 16, ROAR_DIR_PLAY, &err)))
    {
       RARCH_ERR("RoarAudio: \"%s\"\n", roar_vs_strerr(err));
       free(roar);
@@ -105,8 +105,11 @@ static bool ra_alive(void *data)
 static void ra_set_nonblock_state(void *data, bool state)
 {
    roar_t *roar = (roar_t*)data;
+
    if (roar_vs_blocking(roar->vss, (state) ? ROAR_VS_FALSE : ROAR_VS_TRUE, NULL) < 0)
-      fprintf(stderr, "RetroArch [ERROR]: Can't set nonblocking. Will not be able to fast-forward.\n");
+   {
+      RARCH_ERR("Can't set nonblocking. Will not be able to fast-forward.\n");
+   }
    roar->nonblocking = state;
 }
 

audio/drivers/rsound.c

@@ -39,9 +39,8 @@ typedef struct rsd
 
 static ssize_t rsound_audio_cb(void *data, size_t bytes, void *userdata)
 {
-   rsd_t *rsd = (rsd_t*)userdata;
-
-   size_t avail = fifo_read_avail(rsd->buffer);
+   rsd_t *rsd        = (rsd_t*)userdata;
+   size_t avail      = FIFO_READ_AVAIL(rsd->buffer);
    size_t write_size = bytes > avail ? avail : bytes;
    fifo_read(rsd->buffer, data, write_size);
    scond_signal(rsd->cond);
@@ -115,7 +114,7 @@ static ssize_t rs_write(void *data, const void *buf, size_t size)
 
       rsd_callback_lock(rsd->rd);
 
-      avail = fifo_write_avail(rsd->buffer);
+      avail     = FIFO_WRITE_AVAIL(rsd->buffer);
       write_amt = avail > size ? size : avail;
 
       fifo_write(rsd->buffer, buf, write_amt);
@@ -130,7 +129,7 @@ static ssize_t rs_write(void *data, const void *buf, size_t size)
          size_t avail;
          rsd_callback_lock(rsd->rd);
 
-         avail = fifo_write_avail(rsd->buffer);
+         avail = FIFO_WRITE_AVAIL(rsd->buffer);
 
          if (avail == 0)
          {
@@ -165,7 +164,7 @@ static bool rs_stop(void *data)
 
 static void rs_set_nonblock_state(void *data, bool state)
 {
-   rsd_t *rsd = (rsd_t*)data;
+   rsd_t *rsd    = (rsd_t*)data;
    rsd->nonblock = state;
 }
 
@@ -209,7 +208,7 @@ static size_t rs_write_avail(void *data)
    if (rsd->has_error)
       return 0;
    rsd_callback_lock(rsd->rd);
-   val = fifo_write_avail(rsd->buffer);
+   val = FIFO_WRITE_AVAIL(rsd->buffer);
    rsd_callback_unlock(rsd->rd);
    return val;
 }

audio/drivers/sdl_audio.c

@@ -46,7 +46,7 @@ typedef struct sdl_audio
 static void sdl_audio_cb(void *data, Uint8 *stream, int len)
 {
    sdl_audio_t  *sdl = (sdl_audio_t*)data;
-   size_t      avail = fifo_read_avail(sdl->buffer);
+   size_t      avail = FIFO_READ_AVAIL(sdl->buffer);
    size_t write_size = len > (int)avail ? avail : len;
 
    fifo_read(sdl->buffer, stream, write_size);
@@ -151,7 +151,7 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
       size_t avail, write_amt;
 
       SDL_LockAudio();
-      avail = fifo_write_avail(sdl->buffer);
+      avail = FIFO_WRITE_AVAIL(sdl->buffer);
       write_amt = avail > size ? size : avail;
       fifo_write(sdl->buffer, buf, write_amt);
       SDL_UnlockAudio();
@@ -166,7 +166,7 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
          size_t avail;
 
          SDL_LockAudio();
-         avail = fifo_write_avail(sdl->buffer);
+         avail = FIFO_WRITE_AVAIL(sdl->buffer);
 
          if (avail == 0)
          {

audio/drivers/switch_audio.c

@@ -29,10 +29,11 @@
 #define BUFFER_COUNT 3
 #endif
 
-static const int sample_rate           = 48000;
-static const int max_num_samples       = sample_rate;
-static const int num_channels          = 2;
-static const size_t sample_buffer_size = ((max_num_samples * num_channels * sizeof(uint16_t)) + 0xfff) & ~0xfff;
+
+#define SAMPLE_RATE 48000
+#define NUM_CHANNELS 2
+
+#define SAMPLE_BUFFER_SIZE (((SAMPLE_RATE * NUM_CHANNELS * sizeof(uint16_t)) + 0xfff) & ~0xfff)
 
 typedef struct
 {
@@ -49,24 +50,26 @@ typedef struct
 #endif
 } switch_audio_t;
 
+#ifdef HAVE_LIBNX
 static uint32_t switch_audio_data_size(void)
 {
-#ifdef HAVE_LIBNX
-   static const int framerate = 1000 / 30;
-   static const int samplecount = (sample_rate / framerate);
-   return (samplecount * num_channels * sizeof(uint16_t));
-#else
-   return sample_buffer_size;
-#endif
+   static const int framerate    = 1000 / 30;
+   static const int sample_count = (SAMPLE_RATE / framerate);
+   return (sample_count * NUM_CHANNELS * sizeof(uint16_t));
 }
+#else
+static uint32_t switch_audio_data_size(void)
+{
+   return SAMPLE_BUFFER_SIZE;
+}
+#endif
 
 static size_t switch_audio_buffer_size(void *data)
 {
-   (void) data;
 #ifdef HAVE_LIBNX
    return (switch_audio_data_size() + 0xfff) & ~0xfff;
 #else
-   return sample_buffer_size;
+   return SAMPLE_BUFFER_SIZE;
 #endif
 }
 
@@ -92,27 +95,27 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
 
       if (!swa->current_buffer)
       {
-         if (swa->blocking)
+         /* no buffer, nonblocking... */
+         if (!swa->blocking)
+            return 0;
+
+         while (!swa->current_buffer)
          {
-            while(swa->current_buffer == NULL)
-            {
-               uint32_t handle_idx = 0;
-               num                 = 0;
+#ifndef HAVE_LIBNX
+            uint32_t handle_idx = 0;
+#endif
+            num                 = 0;
 
 #ifdef HAVE_LIBNX
-               if (audoutWaitPlayFinish(&swa->current_buffer, &num, U64_MAX) != 0) { }
+            if (audoutWaitPlayFinish(&swa->current_buffer, &num, UINT64_MAX) != 0) { }
 #else
-               svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
-               svcResetSignal(swa->event);
+            svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
+            svcResetSignal(swa->event);
 
-               if (switch_audio_ipc_output_get_released_buffer(swa, num) != 0)
-                  return -1;
+            if (switch_audio_ipc_output_get_released_buffer(swa, num) != 0)
+               return -1;
 #endif
-            }
          }
-         else
-            /* no buffer, nonblocking... */
-            return 0;
       }
 
       swa->current_buffer->data_size = 0;
@@ -121,11 +124,11 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
 	if (to_write > switch_audio_buffer_size(NULL) - swa->current_buffer->data_size)
 		to_write = switch_audio_buffer_size(NULL) - swa->current_buffer->data_size;
 
-   #ifndef HAVE_LIBNX
-	memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
-   #else
-	memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, buf, to_write);
-   #endif
+#ifndef HAVE_LIBNX
+   memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
+#else
+   memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, buf, to_write);
+#endif
 	swa->current_buffer->data_size   += to_write;
 	swa->current_buffer->buffer_size  = switch_audio_buffer_size(NULL);
 
@@ -149,7 +152,6 @@ static bool switch_audio_stop(void *data)
 
    /* TODO/FIXME - fix libnx codepath */
 #ifndef HAVE_LIBNX
-
    if (!swa->is_paused)
 	   if (switch_audio_ipc_output_stop(swa) != 0)
 		   return false;
@@ -209,8 +211,7 @@ static void switch_audio_free(void *data)
 
 static bool switch_audio_use_float(void *data)
 {
-	(void) data;
-	return false; /* force INT16 */
+   return false; /* force INT16 */
 }
 
 static size_t switch_audio_write_avail(void *data)
@@ -237,8 +238,10 @@ static void *switch_audio_init(const char *device,
       unsigned *new_rate)
 {
    unsigned i;
+#ifndef HAVE_LIBNX
    char names[8][0x20];
    uint32_t num_names  = 0;
+#endif
    switch_audio_t *swa = (switch_audio_t*) calloc(1, sizeof(*swa));
 
    if (!swa)
@@ -263,16 +266,16 @@ static void *switch_audio_init(const char *device,
    if (audio_ipc_open_output(names[0], &swa->output) != 0)
       goto fail_audio_ipc;
 
-   if (swa->output.sample_rate != sample_rate)
+   if (swa->output.sample_rate != SAMPLE_RATE)
    {
       RARCH_ERR("expected sample rate of %d, got sample rate of %d\n",
-            sample_rate, swa->output.sample_rate);
+            SAMPLE_RATE, swa->output.sample_rate);
       goto fail_audio_output;
    }
 
-   if (swa->output.num_channels != num_channels)
+   if (swa->output.num_channels != NUM_CHANNELS)
    {
-      RARCH_ERR("expected %d channels, got %d\n", num_channels,
+      RARCH_ERR("expected %d channels, got %d\n", NUM_CHANNELS,
             swa->output.num_channels);
       goto fail_audio_output;
    }
@@ -297,16 +300,17 @@ static void *switch_audio_init(const char *device,
       swa->buffers[i].data_offset = 0;
       swa->buffers[i].buffer      = memalign(0x1000, switch_audio_buffer_size(NULL));
 
-      if (swa->buffers[i].buffer == NULL)
+      if (!swa->buffers[i].buffer)
          goto fail_audio_output;
 
       memset(swa->buffers[i].buffer, 0, switch_audio_buffer_size(NULL));
 #else
       swa->buffers[i].ptr         = &swa->buffers[i].sample_data;
       swa->buffers[i].unknown     = 0;
-      swa->buffers[i].sample_data = alloc_pages(sample_buffer_size, switch_audio_buffer_size(NULL), NULL);
+      swa->buffers[i].sample_data = alloc_pages(SAMPLE_BUFFER_SIZE,
+            switch_audio_buffer_size(NULL), NULL);
 
-      if (swa->buffers[i].sample_data == NULL)
+      if (!swa->buffers[i].sample_data)
 	      goto fail_audio_output;
 #endif
 
@@ -335,8 +339,9 @@ fail_audio_output:
 /* TODO/FIXME - fix libnx codepath */
 #ifndef HAVE_LIBNX
    audio_ipc_output_close(&swa->output);
-#endif
 fail_audio_ipc:
+#endif
+
 /* TODO/FIXME - fix libnx codepath */
 #ifndef HAVE_LIBNX
    audio_ipc_finalize();

audio/drivers/switch_audio_compat.h

@@ -17,7 +17,7 @@ typedef Thread compat_thread;
 typedef CondVar compat_condvar;
 
 #define compat_thread_create(thread, func, data, stack_size, prio, cpu) \
-   threadCreate(thread, func, data, stack_size, prio, cpu)
+   threadCreate(thread, func, data, NULL, stack_size, prio, cpu)
 #define compat_thread_start(thread) \
    threadStart(thread)
 #define compat_thread_join(thread) \
@@ -46,6 +46,10 @@ typedef AudioOutBuffer compat_audio_out_buffer;
 #define switch_audio_ipc_output_stop(a) audoutStopAudioOut()
 #define switch_audio_ipc_output_start(a) audoutStartAudioOut()
 
+#ifndef UINT64_MAX
+#define UINT64_MAX U64_MAX
+#endif
+
 #else
 
 /* libtransistor definitions */

audio/drivers/switch_libnx_audren_audio.c

@@ -42,7 +42,8 @@ static const AudioRendererConfig audio_renderer_config =
    .num_mix_buffers = 2,
 };
 
-typedef struct {
+typedef struct
+{
    AudioDriver drv;
    void* mempool;
    AudioDriverWaveBuf wavebufs[BUFFER_COUNT];
@@ -52,10 +53,11 @@ typedef struct {
    size_t buffer_size;
    size_t samples;
    Mutex update_lock;
-   bool nonblocking;
+   bool nonblock;
 } libnx_audren_t;
 
-static void *libnx_audren_audio_init(const char *device, unsigned rate, unsigned latency,
+static void *libnx_audren_audio_init(
+      const char *device, unsigned rate, unsigned latency,
       unsigned block_frames,
       unsigned *new_rate)
 {
@@ -79,14 +81,14 @@ static void *libnx_audren_audio_init(const char *device, unsigned rate, unsigned
    real_latency = MAX(5, latency);
    RARCH_LOG("[Audio]: real_latency is %u\n", real_latency);
 
-   aud->nonblocking = !block_frames;
-   aud->buffer_size = (real_latency * sample_rate / 1000);
-   aud->samples = (aud->buffer_size / num_channels / sizeof(int16_t));
+   aud->nonblock     = !block_frames;
+   aud->buffer_size  = (real_latency * sample_rate / 1000);
+   aud->samples      = (aud->buffer_size / num_channels / sizeof(int16_t));
    aud->current_size = 0;
-   *new_rate = sample_rate;
+   *new_rate         = sample_rate;
 
-   mempool_size = (aud->buffer_size * BUFFER_COUNT + (AUDREN_MEMPOOL_ALIGNMENT-1)) &~ (AUDREN_MEMPOOL_ALIGNMENT-1);
-   aud->mempool = memalign(AUDREN_MEMPOOL_ALIGNMENT, mempool_size);
+   mempool_size      = (aud->buffer_size * BUFFER_COUNT + (AUDREN_MEMPOOL_ALIGNMENT-1)) &~ (AUDREN_MEMPOOL_ALIGNMENT-1);
+   aud->mempool      = memalign(AUDREN_MEMPOOL_ALIGNMENT, mempool_size);
    if (!aud->mempool)
    {
       RARCH_ERR("[Audio]: mempool alloc failed\n");
@@ -94,14 +96,14 @@ static void *libnx_audren_audio_init(const char *device, unsigned rate, unsigned
    }
 
    rc = audrenInitialize(&audio_renderer_config);
-   if(R_FAILED(rc))
+   if (R_FAILED(rc))
    {
       RARCH_ERR("[Audio]: audrenInitialize: %x\n", rc);
       goto fail;
    }
 
    rc = audrvCreate(&aud->drv, &audio_renderer_config, num_channels);
-   if(R_FAILED(rc))
+   if (R_FAILED(rc))
    {
       RARCH_ERR("[Audio]: audrvCreate: %x\n", rc);
       goto fail_init;
@@ -123,7 +125,7 @@ static void *libnx_audren_audio_init(const char *device, unsigned rate, unsigned
    audrvDeviceSinkAdd(&aud->drv, AUDREN_DEFAULT_DEVICE_NAME, num_channels, sink_channels);
 
    rc = audrenStartAudioRenderer();
-   if(R_FAILED(rc))
+   if (R_FAILED(rc))
    {
       RARCH_ERR("[Audio]: audrenStartAudioRenderer: %x\n", rc);
    }
@@ -150,9 +152,7 @@ fail:
    if (aud)
    {
       if (aud->mempool)
-      {
          free(aud->mempool);
-      }
 
       free(aud);
    }
@@ -176,24 +176,25 @@ static ssize_t libnx_audren_audio_get_free_wavebuf_idx(libnx_audren_t* aud)
 
    for (i = 0; i < BUFFER_COUNT; i++)
    {
-      if (aud->wavebufs[i].state == AudioDriverWaveBufState_Free
+      if (
+            aud->wavebufs[i].state == AudioDriverWaveBufState_Free
          || aud->wavebufs[i].state == AudioDriverWaveBufState_Done)
-      {
          return i;
-      }
    }
 
    return -1;
 }
 
-static size_t libnx_audren_audio_append(libnx_audren_t* aud, const void *buf, size_t size)
+static size_t libnx_audren_audio_append(
+      libnx_audren_t* aud, const void *buf, size_t size)
 {
+   void *dstbuf     = NULL;
    ssize_t free_idx = -1;
 
-   if(!aud->current_wavebuf)
+   if (!aud->current_wavebuf)
    {
       free_idx = libnx_audren_audio_get_free_wavebuf_idx(aud);
-      if(free_idx == -1)
+      if (free_idx == -1)
          return 0;
 
       aud->current_wavebuf = &aud->wavebufs[free_idx];
@@ -201,18 +202,16 @@ static size_t libnx_audren_audio_append(libnx_audren_t* aud, const void *buf, si
       aud->current_size = 0;
    }
 
-   if(size > aud->buffer_size - aud->current_size)
-   {
+   if (size > aud->buffer_size - aud->current_size)
       size = aud->buffer_size - aud->current_size;
-   }
 
-   void *dstbuf = aud->current_pool_ptr + aud->current_size;
+   dstbuf = aud->current_pool_ptr + aud->current_size;
    memcpy(dstbuf, buf, size);
    armDCacheFlush(dstbuf, size);
 
    aud->current_size += size;
 
-   if(aud->current_size == aud->buffer_size)
+   if (aud->current_size == aud->buffer_size)
    {
       audrvVoiceAddWaveBuf(&aud->drv, 0, aud->current_wavebuf);
 
@@ -231,24 +230,32 @@ static size_t libnx_audren_audio_append(libnx_audren_t* aud, const void *buf, si
    return size;
 }
 
-static ssize_t libnx_audren_audio_write(void *data, const void *buf, size_t size)
+static ssize_t libnx_audren_audio_write(void *data,
+      const void *buf, size_t size)
 {
    libnx_audren_t *aud = (libnx_audren_t*)data;
-   size_t written = 0;
+   size_t written      = 0;
 
    if (!aud)
       return -1;
 
-   while(written < size)
+   if (aud->nonblock)
    {
-      written += libnx_audren_audio_append(aud, buf + written, size - written);
-      if(written != size)
+      while (written < size)
       {
-         if(aud->nonblocking)
-         {
+         written += libnx_audren_audio_append(
+               aud, buf + written, size - written);
+         if (written != size)
             break;
-         }
-         else
+      }
+   }
+   else
+   {
+      while (written < size)
+      {
+         written += libnx_audren_audio_append(
+               aud, buf + written, size - written);
+         if (written != size)
          {
             mutexLock(&aud->update_lock);
             audrvUpdate(&aud->drv);
@@ -341,7 +348,7 @@ static void libnx_audren_audio_set_nonblock_state(void *data, bool state)
    if (!aud)
       return;
 
-   aud->nonblocking = state;
+   aud->nonblock    = state;
 }
 
 audio_driver_t audio_switch_libnx_audren = {

audio/drivers/switch_libnx_audren_thread_audio.c

@@ -43,13 +43,14 @@ static const AudioRendererConfig audio_renderer_config =
    .num_mix_buffers = 2,
 };
 
-typedef struct {
+typedef struct
+{
    AudioDriver drv;
    void* mempool;
    AudioDriverWaveBuf wavebufs[BUFFER_COUNT];
    size_t buffer_size;
    size_t samples;
-   bool nonblocking;
+   bool nonblock;
 
    fifo_buffer_t* fifo;
    Mutex fifo_lock;
@@ -63,21 +64,21 @@ typedef struct {
 
 static void thread_job(void* data)
 {
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-   size_t available = 0;
-   size_t current_size = 0;
-   size_t written_tmp = 0;
-   AudioDriverWaveBuf* current_wavebuf = NULL;
-   void* current_pool_ptr = NULL;
-   void* dstbuf = NULL;
    unsigned i;
+   libnx_audren_thread_t *aud          = (libnx_audren_thread_t*)data;
+   size_t available                    = 0;
+   size_t current_size                 = 0;
+   size_t written_tmp                  = 0;
+   AudioDriverWaveBuf* current_wavebuf = NULL;
+   void* current_pool_ptr              = NULL;
+   void* dstbuf                        = NULL;
 
    if (!aud)
       return;
 
-   while(aud->running)
+   while (aud->running)
    {
-      if(!current_wavebuf)
+      if (!current_wavebuf)
       {
          for (i = 0; i < BUFFER_COUNT; i++)
          {
@@ -92,19 +93,17 @@ static void thread_job(void* data)
          }
       }
 
-      if(current_wavebuf)
+      if (current_wavebuf)
       {
          mutexLock(&aud->fifo_lock);
-         available = aud->paused ? 0 : fifo_read_avail(aud->fifo);
+         available = aud->paused ? 0 : FIFO_READ_AVAIL(aud->fifo);
          written_tmp = MIN(available, aud->buffer_size - current_size);
          dstbuf = current_pool_ptr + current_size;
-         if(written_tmp > 0)
-         {
+         if (written_tmp > 0)
             fifo_read(aud->fifo, dstbuf, written_tmp);
-         }
          mutexUnlock(&aud->fifo_lock);
 
-         if(written_tmp > 0)
+         if (written_tmp > 0)
          {
             condvarWakeAll(&aud->fifo_condvar);
 
@@ -112,7 +111,7 @@ static void thread_job(void* data)
             armDCacheFlush(dstbuf, written_tmp);
          }
 
-         if(current_size == aud->buffer_size)
+         if (current_size == aud->buffer_size)
          {
             audrvVoiceAddWaveBuf(&aud->drv, 0, current_wavebuf);
 
@@ -157,17 +156,19 @@ static void *libnx_audren_thread_audio_init(const char *device, unsigned rate, u
       goto fail;
    }
 
-   real_latency = MAX(latency, 5);
+   real_latency     = MAX(latency, 5);
    RARCH_LOG("[Audio]: real_latency is %u\n", real_latency);
 
-   aud->running = true;
-   aud->paused = false;
-   aud->nonblocking = !block_frames;
+   aud->running     = true;
+   aud->paused      = false;
+   aud->nonblock    = !block_frames;
    aud->buffer_size = (real_latency * sample_rate / 1000);
-   aud->samples = (aud->buffer_size / num_channels / sizeof(int16_t));
+   aud->samples     = (aud->buffer_size / num_channels / sizeof(int16_t));
+
+   mempool_size     = (aud->buffer_size * BUFFER_COUNT + 
+         (AUDREN_MEMPOOL_ALIGNMENT-1)) &~ (AUDREN_MEMPOOL_ALIGNMENT-1);
+   aud->mempool     = memalign(AUDREN_MEMPOOL_ALIGNMENT, mempool_size);
 
-   mempool_size = (aud->buffer_size * BUFFER_COUNT + (AUDREN_MEMPOOL_ALIGNMENT-1)) &~ (AUDREN_MEMPOOL_ALIGNMENT-1);
-   aud->mempool = memalign(AUDREN_MEMPOOL_ALIGNMENT, mempool_size);
    if (!aud->mempool)
    {
       RARCH_ERR("[Audio]: mempool alloc failed\n");
@@ -175,43 +176,44 @@ static void *libnx_audren_thread_audio_init(const char *device, unsigned rate, u
    }
 
    rc = audrenInitialize(&audio_renderer_config);
-   if(R_FAILED(rc))
+   if (R_FAILED(rc))
    {
       RARCH_ERR("[Audio]: audrenInitialize: %x\n", rc);
       goto fail;
    }
 
    rc = audrvCreate(&aud->drv, &audio_renderer_config, num_channels);
-   if(R_FAILED(rc))
+   if (R_FAILED(rc))
    {
       RARCH_ERR("[Audio]: audrvCreate: %x\n", rc);
       goto fail_init;
    }
 
-   for(i = 0; i < BUFFER_COUNT; i++)
+   for (i = 0; i < BUFFER_COUNT; i++)
    {
-      aud->wavebufs[i].data_raw = aud->mempool;
-      aud->wavebufs[i].size = mempool_size;
+      aud->wavebufs[i].data_raw            = aud->mempool;
+      aud->wavebufs[i].size                = mempool_size;
       aud->wavebufs[i].start_sample_offset = i * aud->samples;
-      aud->wavebufs[i].end_sample_offset = aud->wavebufs[i].start_sample_offset + aud->samples;
+      aud->wavebufs[i].end_sample_offset   = aud->wavebufs[i].start_sample_offset + aud->samples;
    }
 
    mpid = audrvMemPoolAdd(&aud->drv, aud->mempool, mempool_size);
    audrvMemPoolAttach(&aud->drv, mpid);
 
-   audrvDeviceSinkAdd(&aud->drv, AUDREN_DEFAULT_DEVICE_NAME, num_channels, sink_channels);
+   audrvDeviceSinkAdd(&aud->drv, AUDREN_DEFAULT_DEVICE_NAME,
+         num_channels, sink_channels);
 
    rc = audrenStartAudioRenderer();
-   if(R_FAILED(rc))
+   if (R_FAILED(rc))
    {
       RARCH_ERR("[Audio]: audrenStartAudioRenderer: %x\n", rc);
    }
 
    audrvVoiceInit(&aud->drv, 0, num_channels, PcmFormat_Int16, sample_rate);
    audrvVoiceSetDestinationMix(&aud->drv, 0, AUDREN_FINAL_MIX_ID);
-   for(i = 0; i < num_channels; i++)
+   for (i = 0; i < num_channels; i++)
    {
-      for(j = 0; j < num_channels; j++)
+      for (j = 0; j < num_channels; j++)
       {
          audrvVoiceSetMixFactor(&aud->drv, 0, i == j ? 1.0f : 0.0f, i, j);
       }
@@ -229,15 +231,17 @@ static void *libnx_audren_thread_audio_init(const char *device, unsigned rate, u
    mutexInit(&aud->fifo_condlock);
 
    svcGetThreadPriority(&thread_priority, CUR_THREAD_HANDLE);
-   rc = threadCreate(&aud->thread, &thread_job, (void*)aud, thread_stack_size, thread_priority - 1, thread_preferred_cpu);
-   if(R_FAILED(rc))
+   rc = threadCreate(&aud->thread, &thread_job,
+         (void*)aud, NULL, thread_stack_size,
+         thread_priority - 1, thread_preferred_cpu);
+   if (R_FAILED(rc))
    {
       RARCH_ERR("[Audio]: threadCreate: %x\n", rc);
       goto fail_drv;
    }
 
    rc = threadStart(&aud->thread);
-   if(R_FAILED(rc))
+   if (R_FAILED(rc))
    {
       RARCH_ERR("[Audio]: threadStart: %x\n", rc);
       threadClose(&aud->thread);
@@ -258,9 +262,7 @@ fail:
    if (aud)
    {
       if (aud->mempool)
-      {
          free(aud->mempool);
-      }
 
       free(aud);
    }
@@ -278,7 +280,8 @@ static size_t libnx_audren_thread_audio_buffer_size(void *data)
    return aud->buffer_size;
 }
 
-static ssize_t libnx_audren_thread_audio_write(void *data, const void *buf, size_t size)
+static ssize_t libnx_audren_thread_audio_write(void *data,
+      const void *buf, size_t size)
 {
    libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
    size_t available, written, written_tmp;
@@ -286,18 +289,16 @@ static ssize_t libnx_audren_thread_audio_write(void *data, const void *buf, size
    if (!aud || !aud->running)
       return -1;
 
-   if(aud->paused)
+   if (aud->paused)
       return 0;
 
-   if(aud->nonblocking)
+   if (aud->nonblock)
    {
       mutexLock(&aud->fifo_lock);
-      available = fifo_write_avail(aud->fifo);
+      available = FIFO_WRITE_AVAIL(aud->fifo);
       written = MIN(available, size);
-      if(written > 0)
-      {
+      if (written > 0)
          fifo_write(aud->fifo, buf, written);
-      }
       mutexUnlock(&aud->fifo_lock);
    }
    else
@@ -306,8 +307,8 @@ static ssize_t libnx_audren_thread_audio_write(void *data, const void *buf, size
       while (written < size && aud->running)
       {
          mutexLock(&aud->fifo_lock);
-         available = fifo_write_avail(aud->fifo);
-         if(available)
+         available = FIFO_WRITE_AVAIL(aud->fifo);
+         if (available)
          {
             written_tmp = MIN(size - written, available);
             fifo_write(aud->fifo, (const char*)buf + written, written_tmp);
@@ -406,7 +407,7 @@ static size_t libnx_audren_thread_audio_write_avail(void *data)
       return 0;
 
    mutexLock(&aud->fifo_lock);
-   available = fifo_write_avail(aud->fifo);
+   available = FIFO_WRITE_AVAIL(aud->fifo);
    mutexUnlock(&aud->fifo_lock);
 
    return available;
@@ -419,7 +420,7 @@ static void libnx_audren_thread_audio_set_nonblock_state(void *data, bool state)
    if (!aud)
       return;
 
-   aud->nonblocking = state;
+   aud->nonblock = state;
 }
 
 audio_driver_t audio_switch_libnx_audren_thread = {

audio/drivers/switch_thread_audio.c

@@ -35,11 +35,9 @@
 
 #include "switch_audio_compat.h"
 
-static const size_t thread_stack_size = 1024 * 8;
-static const int thread_preferred_cpu = 2;
-static const int channel_count = 2;
-static const size_t sample_size = sizeof(uint16_t);
-static const size_t frame_size = channel_count * sample_size;
+#define THREAD_STACK_SIZE (1024 * 8)
+#define THREAD_PREFERRED_CPU  2
+#define SAMPLE_SIZE sizeof(uint16_t)
 
 #define AUDIO_BUFFER_COUNT 2
 
@@ -53,7 +51,7 @@ typedef struct
    size_t fifoSize;
 
    volatile bool running;
-   bool nonblocking;
+   bool nonblock;
    bool is_paused;
 
    compat_audio_out_buffer buffers[AUDIO_BUFFER_COUNT];
@@ -87,7 +85,7 @@ static void mainLoop(void* data)
       if (!released_out_buffer)
       {
 #ifdef HAVE_LIBNX
-         rc = audoutWaitPlayFinish(&released_out_buffer, &released_out_count, U64_MAX);
+         rc = audoutWaitPlayFinish(&released_out_buffer, &released_out_count, UINT64_MAX);
 #else
          uint32_t handle_idx = 0;
          svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
@@ -108,7 +106,7 @@ static void mainLoop(void* data)
 
       compat_mutex_lock(&swa->fifoLock);
 
-      avail    = fifo_read_avail(swa->fifo);
+      avail    = FIFO_READ_AVAIL(swa->fifo);
       to_write = MIN(avail, buf_avail);
       if (to_write > 0)
       {
@@ -144,15 +142,17 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
    Result rc;
    unsigned i;
    uint32_t prio;
+#ifndef HAVE_LIBNX
    char names[8][0x20];
    uint32_t num_names  = 0;
+#endif
    switch_thread_audio_t *swa = (switch_thread_audio_t *)calloc(1, sizeof(*swa));
 
    if (!swa)
       return NULL;
 
    swa->running     = true;
-   swa->nonblocking = true;
+   swa->nonblock    = true;
    swa->is_paused   = true;
    swa->latency     = MAX(latency, 8);
 
@@ -206,7 +206,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
 #endif
 
    *new_rate     = swa->sampleRate;
-   swa->fifoSize = (swa->sampleRate * sample_size * swa->latency) / 1000;
+   swa->fifoSize = (swa->sampleRate * SAMPLE_SIZE * swa->latency) / 1000;
 
    for (i = 0; i < AUDIO_BUFFER_COUNT; i++)
    {
@@ -217,7 +217,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
       swa->buffers[i].data_size   = swa->buffers[i].buffer_size;
       swa->buffers[i].buffer      = memalign(0x1000, swa->buffers[i].buffer_size);
 
-      if (swa->buffers[i].buffer == NULL)
+      if (!swa->buffers[i].buffer)
          goto fail;
 
       memset(swa->buffers[i].buffer, 0, swa->buffers[i].buffer_size);
@@ -228,7 +228,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
       swa->buffers[i].data_size   = swa->buffers[i].buffer_size;
       swa->buffers[i].sample_data = alloc_pages(swa->buffers[i].buffer_size, swa->buffers[i].buffer_size, NULL);
 
-      if (swa->buffers[i].sample_data == NULL)
+      if (!swa->buffers[i].sample_data)
 	      goto fail_audio_output;
 
       memset(swa->buffers[i].sample_data, 0, swa->buffers[i].buffer_size);
@@ -247,7 +247,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
          device, rate, swa->sampleRate, swa->latency, block_frames, swa->fifoSize);
 
    svcGetThreadPriority(&prio, 0xffff8000);
-   rc = compat_thread_create(&swa->thread, &mainLoop, (void*)swa, thread_stack_size, prio - 1, thread_preferred_cpu);
+   rc = compat_thread_create(&swa->thread, &mainLoop, (void*)swa, THREAD_STACK_SIZE, prio - 1, THREAD_PREFERRED_CPU);
 
    if (R_FAILED(rc))
    {
@@ -345,10 +345,10 @@ static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t siz
    if (!swa || !swa->running)
          return 0;
 
-   if (swa->nonblocking)
+   if (swa->nonblock)
    {
       compat_mutex_lock(&swa->fifoLock);
-      avail = fifo_write_avail(swa->fifo);
+      avail = FIFO_WRITE_AVAIL(swa->fifo);
       written = MIN(avail, size);
       if (written > 0)
          fifo_write(swa->fifo, buf, written);
@@ -360,7 +360,7 @@ static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t siz
       while (written < size && swa->running)
       {
          compat_mutex_lock(&swa->fifoLock);
-         avail = fifo_write_avail(swa->fifo);
+         avail = FIFO_WRITE_AVAIL(swa->fifo);
          if (avail == 0)
          {
             compat_mutex_unlock(&swa->fifoLock);
@@ -397,7 +397,7 @@ static void switch_thread_audio_set_nonblock_state(void *data, bool state)
    switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
 
    if (swa)
-      swa->nonblocking = state;
+      swa->nonblock = state;
 }
 
 static bool switch_thread_audio_use_float(void *data)
@@ -412,7 +412,7 @@ static size_t switch_thread_audio_write_avail(void *data)
    switch_thread_audio_t* swa = (switch_thread_audio_t*)data;
 
    compat_mutex_lock(&swa->fifoLock);
-   val = fifo_write_avail(swa->fifo);
+   val = FIFO_WRITE_AVAIL(swa->fifo);
    compat_mutex_unlock(&swa->fifoLock);
 
    return val;

audio/drivers/tinyalsa.c

@@ -808,7 +808,7 @@ static unsigned int pcm_get_channels(const struct pcm *pcm)
  * */
 static const struct pcm_config * pcm_get_config(const struct pcm *pcm)
 {
-   if (pcm == NULL)
+   if (!pcm)
       return NULL;
    return &pcm->config;
 }
@@ -929,7 +929,7 @@ static int pcm_set_config(struct pcm *pcm, const struct pcm_config *config)
     struct snd_pcm_sw_params sparams;
     struct snd_pcm_hw_params params;
 
-    if (pcm == NULL)
+    if (!pcm)
         return -EFAULT;
 
     if (config)
@@ -1293,7 +1293,7 @@ static int pcm_get_htimestamp(struct pcm *pcm, unsigned int *avail,
  */
 static int pcm_is_ready(const struct pcm *pcm)
 {
-   if (pcm != NULL)
+   if (pcm)
       return pcm->fd >= 0;
    return 0;
 }
@@ -1525,7 +1525,7 @@ static struct pcm_params *pcm_params_get(unsigned int card, unsigned int device,
    fd = open(fn, O_RDWR|O_NONBLOCK);
    if (fd < 0)
    {
-      fprintf(stderr, "cannot open device '%s'\n", fn);
+      RARCH_ERR("[TINYALSA] Cannot open device '%s'\n", fn);
       goto err_open;
    }
 
@@ -1538,7 +1538,7 @@ static struct pcm_params *pcm_params_get(unsigned int card, unsigned int device,
    param_init(params);
    if (ioctl(fd, SNDRV_PCM_IOCTL_HW_REFINE, params))
    {
-      fprintf(stderr, "SNDRV_PCM_IOCTL_HW_REFINE error (%d)\n", errno);
+      RARCH_ERR("[TINYALSA] SNDRV_PCM_IOCTL_HW_REFINE error (%d)\n", errno);
       goto err_hw_refine;
    }
 
@@ -1582,7 +1582,7 @@ static const struct pcm_mask *pcm_params_get_mask(const struct pcm_params *pcm_p
 {
     int p;
     struct snd_pcm_hw_params *params = (struct snd_pcm_hw_params *)pcm_params;
-    if (params == NULL)
+    if (!params)
         return NULL;
 
     p = pcm_param_to_alsa(param);
@@ -2019,7 +2019,7 @@ static int pcm_mmap_transfer(struct pcm *pcm, const void *buffer, unsigned int b
       avail = pcm_avail_update(pcm);
       if (avail < 0)
       {
-         fprintf(stderr, "cannot determine available mmap frames");
+         RARCH_ERR("[TINYALSA] Cannot determine available mmap frames");
          return err;
       }
 
@@ -2029,7 +2029,7 @@ static int pcm_mmap_transfer(struct pcm *pcm, const void *buffer, unsigned int b
       {
          if (pcm_start(pcm) < 0)
          {
-            fprintf(stderr, "start error: hw 0x%x app 0x%x avail 0x%x\n",
+            RARCH_ERR("[TINYALSA] Start error: hw 0x%x app 0x%x avail 0x%x\n",
                   (unsigned int)pcm->mmap_status->hw_ptr,
                   (unsigned int)pcm->mmap_control->appl_ptr,
                   avail);
@@ -2052,7 +2052,7 @@ static int pcm_mmap_transfer(struct pcm *pcm, const void *buffer, unsigned int b
          {
             pcm->prepared = 0;
             pcm->running = 0;
-            fprintf(stderr, "wait error: hw 0x%x app 0x%x avail 0x%x\n",
+            RARCH_ERR("[TINYALSA] Wait error: hw 0x%x app 0x%x avail 0x%x\n",
                   (unsigned int)pcm->mmap_status->hw_ptr,
                   (unsigned int)pcm->mmap_control->appl_ptr,
                   avail);
@@ -2073,7 +2073,7 @@ static int pcm_mmap_transfer(struct pcm *pcm, const void *buffer, unsigned int b
       frames = pcm_mmap_transfer_areas(pcm, (void *)buffer, offset, frames);
       if (frames < 0)
       {
-         fprintf(stderr, "write error: hw 0x%x app 0x%x avail 0x%x\n",
+         RARCH_ERR("[TINYALSA] Write error: hw 0x%x app 0x%x avail 0x%x\n",
                (unsigned int)pcm->mmap_status->hw_ptr,
                (unsigned int)pcm->mmap_control->appl_ptr,
                avail);
@@ -2185,7 +2185,7 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,
    RARCH_LOG("[TINYALSA]: Using card: %u, device: %u.\n", card, device);
 
    tinyalsa->params = pcm_params_get(card, device, PCM_OUT);
-   if (tinyalsa->params == NULL)
+   if (!tinyalsa->params)
    {
       RARCH_ERR("[TINYALSA]: params: Cannot open audio device.\n");
       goto error;
@@ -2224,7 +2224,7 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,
 
    tinyalsa->pcm = pcm_open(card, device, PCM_OUT, &config);
 
-   if (tinyalsa->pcm == NULL)
+   if (!tinyalsa->pcm)
    {
       RARCH_ERR("[TINYALSA]: Failed to allocate memory for pcm.\n");
       goto error;

audio/drivers/wasapi.c

@@ -29,7 +29,7 @@
 typedef struct
 {
    bool exclusive;
-   bool blocking;
+   bool nonblock;
    bool running;
    size_t frame_size;     /* 4 or 8 only */
    size_t engine_buffer_size;
@@ -491,13 +491,14 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
    BYTE *dest                = NULL;
    settings_t *settings      = config_get_ptr();
    bool float_format         = settings->bools.audio_wasapi_float_format;
+   bool exclusive_mode       = settings->bools.audio_wasapi_exclusive_mode;
    int sh_buffer_length      = settings->ints.audio_wasapi_sh_buffer_length;
    wasapi_t *w               = (wasapi_t*)calloc(1, sizeof(wasapi_t));
 
    if (!w)
       return NULL;
 
-   w->exclusive              = settings->bools.audio_wasapi_exclusive_mode;
+   w->exclusive              = exclusive_mode;
    w->device                 = wasapi_init_device(dev_id);
    if (!w->device && dev_id)
       w->device = wasapi_init_device(NULL);
@@ -575,7 +576,7 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
    if (FAILED(hr))
       goto error;
    w->running  = true;
-   w->blocking = settings->bools.audio_sync;
+   w->nonblock = !settings->bools.audio_sync;
 
    return w;
 
@@ -596,16 +597,15 @@ static bool wasapi_flush(wasapi_t * w, const void * data, size_t size)
 {
    BYTE *dest         = NULL;
    UINT32 frame_count = size / w->frame_size;
-   HRESULT hr         = _IAudioRenderClient_GetBuffer(
-         w->renderer, frame_count, &dest);
-   if (FAILED(hr))
+
+   if (FAILED(_IAudioRenderClient_GetBuffer(
+               w->renderer, frame_count, &dest)))
       return false;
 
    memcpy(dest, data, size);
-   hr = _IAudioRenderClient_ReleaseBuffer(
-         w->renderer, frame_count,
-         0);
-   if (FAILED(hr))
+   if (FAILED(_IAudioRenderClient_ReleaseBuffer(
+               w->renderer, frame_count,
+               0)))
       return false;
 
    return true;
@@ -615,48 +615,90 @@ static bool wasapi_flush_buffer(wasapi_t * w, size_t size)
 {
    BYTE *dest         = NULL;
    UINT32 frame_count = size / w->frame_size;
-   HRESULT hr         = _IAudioRenderClient_GetBuffer(
-         w->renderer, frame_count, &dest);
-   if (FAILED(hr))
+   if (FAILED(_IAudioRenderClient_GetBuffer(
+         w->renderer, frame_count, &dest)))
       return false;
 
    fifo_read(w->buffer, dest, size);
-   hr = _IAudioRenderClient_ReleaseBuffer(
+   if (FAILED(_IAudioRenderClient_ReleaseBuffer(
          w->renderer, frame_count,
-         0);
-   if (FAILED(hr))
+         0)))
       return false;
 
    return true;
 }
 
+static ssize_t wasapi_write_sh_buffer(wasapi_t *w, const void * data, size_t size)
+{
+   ssize_t written    = -1;
+   UINT32 padding     = 0;
+   size_t write_avail = FIFO_WRITE_AVAIL(w->buffer);
+
+   if (!write_avail)
+   {
+      size_t read_avail  = 0;
+      if (!(WaitForSingleObject(w->write_event, INFINITE) == WAIT_OBJECT_0))
+         return -1;
+
+      if (FAILED(_IAudioClient_GetCurrentPadding(w->client, &padding)))
+         return -1;
+
+      read_avail  = FIFO_READ_AVAIL(w->buffer);
+      write_avail = w->engine_buffer_size - padding * w->frame_size;
+      written     = read_avail < write_avail ? read_avail : write_avail;
+      if (written)
+         if (!wasapi_flush_buffer(w, written))
+            return -1;
+   }
+
+   write_avail = FIFO_WRITE_AVAIL(w->buffer);
+   written     = size < write_avail ? size : write_avail;
+   if (written)
+      fifo_write(w->buffer, data, written);
+
+   return written;
+}
+
 static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
 {
-   DWORD ir;
-   HRESULT hr;
    size_t write_avail = 0;
    ssize_t written    = -1;
    UINT32 padding     = 0;
 
+   if (!(WaitForSingleObject(w->write_event, INFINITE) == WAIT_OBJECT_0))
+      return -1;
+
+   if (FAILED(_IAudioClient_GetCurrentPadding(w->client, &padding)))
+      return -1;
+
+   write_avail = w->engine_buffer_size - padding * w->frame_size;
+   if (!write_avail)
+      return 0;
+
+   written = size < write_avail ? size : write_avail;
+   if (written)
+      if (!wasapi_flush(w, data, written))
+         return -1;
+
+   return written;
+}
+
+static ssize_t wasapi_write_sh_nonblock(wasapi_t *w, const void * data, size_t size)
+{
+   size_t write_avail       = 0;
+   ssize_t written          = -1;
+   UINT32 padding           = 0;
+
    if (w->buffer)
    {
-      write_avail = fifo_write_avail(w->buffer);
+      write_avail           = FIFO_WRITE_AVAIL(w->buffer);
       if (!write_avail)
       {
          size_t read_avail  = 0;
-
-         if (w->blocking)
-         {
-            ir = WaitForSingleObject(w->write_event, INFINITE);
-            if (!(ir == WAIT_OBJECT_0))
-               return -1;
-         }
-
-         hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
-         if (FAILED(hr))
+         if (FAILED(_IAudioClient_GetCurrentPadding(w->client, &padding)))
             return -1;
 
-         read_avail  = fifo_read_avail(w->buffer);
+         read_avail  = FIFO_READ_AVAIL(w->buffer);
          write_avail = w->engine_buffer_size - padding * w->frame_size;
          written     = read_avail < write_avail ? read_avail : write_avail;
          if (written)
@@ -664,26 +706,17 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
                return -1;
       }
 
-      write_avail = fifo_write_avail(w->buffer);
+      write_avail = FIFO_WRITE_AVAIL(w->buffer);
       written     = size < write_avail ? size : write_avail;
       if (written)
          fifo_write(w->buffer, data, written);
    }
    else
    {
-      if (w->blocking)
-      {
-         ir = WaitForSingleObject(w->write_event, INFINITE);
-         if (!(ir == WAIT_OBJECT_0))
-            return -1;
-      }
-
-      hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
-      if (FAILED(hr))
+      if (FAILED(_IAudioClient_GetCurrentPadding(w->client, &padding)))
          return -1;
 
-      write_avail = w->engine_buffer_size - padding * w->frame_size;
-      if (!write_avail)
+      if (!(write_avail = w->engine_buffer_size - padding * w->frame_size))
          return 0;
 
       written = size < write_avail ? size : write_avail;
@@ -695,21 +728,15 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
    return written;
 }
 
-static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size)
+static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size, DWORD ms)
 {
    ssize_t written    = 0;
-   size_t write_avail = fifo_write_avail(w->buffer);
+   size_t write_avail = FIFO_WRITE_AVAIL(w->buffer);
 
    if (!write_avail)
    {
-      DWORD ir = WaitForSingleObject(
-            w->write_event, w->blocking ? INFINITE : 0);
-      if (ir != WAIT_OBJECT_0)
-      {
-         if (w->blocking)
-            return -1;
-         return 0;
-      }
+      if (WaitForSingleObject(w->write_event, ms) != WAIT_OBJECT_0)
+         return -1;
 
       if (!wasapi_flush_buffer(w, w->engine_buffer_size))
          return -1;
@@ -725,26 +752,48 @@ static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size)
 
 static ssize_t wasapi_write(void *wh, const void *data, size_t size)
 {
-   size_t written;
-   wasapi_t *w = (wasapi_t*)wh;
+   size_t written = 0;
+   wasapi_t *w    = (wasapi_t*)wh;
 
-   if (w->blocking)
+   if (w->nonblock)
+   {
+      if (w->exclusive)
+         return wasapi_write_ex(w, data, size, 0);
+      return wasapi_write_sh_nonblock(w, data, size);
+   }
+
+   if (w->exclusive)
    {
       ssize_t ir;
-      for (written = 0, ir = -1; written < size; written += ir)
+      for (ir = -1; written < size; written += ir)
       {
-         if (w->exclusive)
-            ir = wasapi_write_ex(w, (char*)data + written, size - written);
-         else
-            ir = wasapi_write_sh(w, (char*)data + written, size - written);
+         ir = wasapi_write_ex(w, (char*)data + written, size - written, INFINITE);
          if (ir == -1)
             return -1;
       }
    }
-   else if (w->exclusive)
-      written = wasapi_write_ex(w, data, size);
    else
-      written = wasapi_write_sh(w, data, size);
+   {
+      ssize_t ir;
+      if (w->buffer)
+      {
+         for (ir = -1; written < size; written += ir)
+         {
+            ir = wasapi_write_sh_buffer(w, (char*)data + written, size - written);
+            if (ir == -1)
+               return -1;
+         }
+      }
+      else
+      {
+         for (ir = -1; written < size; written += ir)
+         {
+            ir = wasapi_write_sh(w, (char*)data + written, size - written);
+            if (ir == -1)
+               return -1;
+         }
+      }
+   }
 
    return written;
 }
@@ -752,8 +801,7 @@ static ssize_t wasapi_write(void *wh, const void *data, size_t size)
 static bool wasapi_stop(void *wh)
 {
    wasapi_t *w = (wasapi_t*)wh;
-   HRESULT  hr = _IAudioClient_Stop(w->client);
-   if (FAILED(hr))
+   if (FAILED(_IAudioClient_Stop(w->client)))
       return !w->running;
 
    w->running = false;
@@ -790,7 +838,7 @@ static void wasapi_set_nonblock_state(void *wh, bool nonblock)
 
    RARCH_LOG("[WASAPI]: Sync %s.\n", nonblock ? "off" : "on");
 
-   w->blocking = !nonblock;
+   w->nonblock = nonblock;
 }
 
 static void wasapi_free(void *wh)
@@ -838,15 +886,13 @@ static void wasapi_device_list_free(void *u, void *slp)
 
 static size_t wasapi_write_avail(void *wh)
 {
-   HRESULT hr;
    wasapi_t *w    = (wasapi_t*)wh;
    UINT32 padding = 0;
 
    if (w->buffer)
-      return fifo_write_avail(w->buffer);
+      return FIFO_WRITE_AVAIL(w->buffer);
 
-   hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
-   if (FAILED(hr))
+   if (FAILED(_IAudioClient_GetCurrentPadding(w->client, &padding)))
       return 0;
 
    return w->engine_buffer_size - padding * w->frame_size;

audio/drivers/wiiu_audio.c

@@ -31,7 +31,7 @@ typedef struct
    AXMVoice* mvoice;
    uint16_t* buffer_l;
    uint16_t* buffer_r;
-   bool nonblocking;
+   bool nonblock;
 
    uint32_t pos;
    uint32_t written;
@@ -56,17 +56,19 @@ typedef struct
 static volatile ax_audio_t *wiiu_cb_ax = NULL;
 void wiiu_ax_callback(void)
 {
+   ax_audio_t *ax = NULL;
    /*possibly called before unregister */
-   if(wiiu_cb_ax == NULL)
+   if (!wiiu_cb_ax)
       return;
 
-   ax_audio_t *ax = (ax_audio_t*)wiiu_cb_ax;
-   if(AXIsMultiVoiceRunning(ax->mvoice))
+   ax = (ax_audio_t*)wiiu_cb_ax;
+
+   if (AXIsMultiVoiceRunning(ax->mvoice))
    {
-      if(OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
+      if (OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
       {
          /* Buffer underrun, stop playback to let it fill up */
-         if(ax->written < AX_AUDIO_SAMPLE_MIN)
+         if (ax->written < AX_AUDIO_SAMPLE_MIN)
             AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_STOPPED);
          ax->written -= AX_AUDIO_SAMPLE_COUNT;
          OSUninterruptibleSpinLock_Release(&ax->spinlock);
@@ -100,7 +102,7 @@ static void* ax_audio_init(const char* device, unsigned rate, unsigned latency,
       return NULL;
    }
 
-   ax->buffer_l               = MEM1_alloc(AX_AUDIO_SIZE, 0x100);
+   ax->buffer_l              = MEM1_alloc(AX_AUDIO_SIZE, 0x100);
    ax->buffer_r              = MEM1_alloc(AX_AUDIO_SIZE, 0x100);
    memset(ax->buffer_l,0,AX_AUDIO_SIZE);
    memset(ax->buffer_r,0,AX_AUDIO_SIZE);
@@ -166,9 +168,9 @@ static bool ax_audio_stop(void* data)
 
 static int ax_audio_limit(int in)
 {
-	if(in < 0)
+	if (in < 0)
 		in += AX_AUDIO_COUNT;
-	else if(in >= AX_AUDIO_COUNT)
+	else if (in >= AX_AUDIO_COUNT)
 		in -= AX_AUDIO_COUNT;
 	return in;
 }
@@ -183,57 +185,62 @@ static bool ax_audio_start(void* data, bool is_shutdown)
       return true;
 
    /* Set back to playing on enough buffered data */
-   if(ax->written > AX_AUDIO_SAMPLE_LOAD)
+   if (ax->written > AX_AUDIO_SAMPLE_LOAD)
    {
-      AXSetMultiVoiceCurrentOffset(ax->mvoice, ax_audio_limit(ax->pos - ax->written));
+      AXSetMultiVoiceCurrentOffset(ax->mvoice,
+            ax_audio_limit(ax->pos - ax->written));
       AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_PLAYING);
    }
+
    return true;
 }
 
 static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
 {
    uint32_t i;
-   size_t countAvail   = 0;
+   size_t count_avail  = 0;
    ax_audio_t* ax      = (ax_audio_t*)data;
    const uint16_t* src = buf;
    size_t count        = size >> 2;
 
-   if(!size || (size & 0x3))
+   if (!size || (size & 0x3))
       return 0;
 
-   if(count > AX_AUDIO_MAX_FREE)
-      count = AX_AUDIO_MAX_FREE;
+   if (count > AX_AUDIO_MAX_FREE)
+      count            = AX_AUDIO_MAX_FREE;
 
-   countAvail = ((ax->written > AX_AUDIO_MAX_FREE) ? 0 : (AX_AUDIO_MAX_FREE - ax->written));
+   count_avail         = (
+         (ax->written > AX_AUDIO_MAX_FREE) 
+         ? 0 
+         : (AX_AUDIO_MAX_FREE - ax->written));
 
-   if (ax->nonblocking)
+   if (ax->nonblock)
    {
       /* Not enough available for 3ms of data */
-      if(countAvail < AX_AUDIO_SAMPLE_COUNT)
+      if (count_avail < AX_AUDIO_SAMPLE_COUNT)
          count = 0;
    }
-   else if(countAvail < count)
+   else if (count_avail < count)
    {
       /* Sync, wait for free memory */
-      while(AXIsMultiVoiceRunning(ax->mvoice) && (countAvail < count))
+      while (AXIsMultiVoiceRunning(ax->mvoice) && (count_avail < count))
       {
          OSYieldThread(); /* Gives threads with same priority time to run */
-         countAvail = (ax->written > AX_AUDIO_MAX_FREE ? 0 : (AX_AUDIO_MAX_FREE - ax->written));
+         count_avail = (ax->written > AX_AUDIO_MAX_FREE ? 0 : (AX_AUDIO_MAX_FREE - ax->written));
       }
    }
 
    /* Over available space, do as much as possible */
-   if(count > countAvail)
-      count = countAvail;
+   if (count > count_avail)
+      count = count_avail;
 
    /* make sure we have input size */
-   if(count > 0)
+   if (count > 0)
    {
       /* write in new data */
-      size_t startPos   = ax->pos;
-      int flushP2needed = 0;
-      int flushP2       = 0;
+      size_t start_pos    = ax->pos;
+      int flush_p2_needed = 0;
+      int flush_p2       = 0;
 
       for (i = 0; i < (count << 1); i += 2)
       {
@@ -242,30 +249,31 @@ static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
          ax->pos               = ax_audio_limit(ax->pos + 1);
 
          /* wrapped around, make sure to store cache */
-         if(ax->pos == 0)
+         if (ax->pos == 0)
          {
-            flushP2needed = 1;
-            flushP2       = ((count << 1) - i);
-            DCStoreRangeNoSync(ax->buffer_l+startPos, (AX_AUDIO_COUNT-startPos) << 1);
-            DCStoreRangeNoSync(ax->buffer_r+startPos, (AX_AUDIO_COUNT-startPos) << 1);
+            flush_p2_needed = 1;
+            flush_p2       = ((count << 1) - i);
+            DCStoreRangeNoSync(ax->buffer_l + start_pos,
+                  (AX_AUDIO_COUNT - start_pos) << 1);
+            DCStoreRangeNoSync(ax->buffer_r + start_pos, (AX_AUDIO_COUNT - start_pos) << 1);
          }
       }
 
       /* standard cache store case */
-      if(!flushP2needed)
+      if (!flush_p2_needed)
       {
-         DCStoreRangeNoSync(ax->buffer_l+startPos, count << 1);
-         DCStoreRange(ax->buffer_r+startPos, count << 1);
+         DCStoreRangeNoSync(ax->buffer_l + start_pos, count << 1);
+         DCStoreRange(ax->buffer_r + start_pos, count << 1);
       }
       /* store the rest after wrap */
-      else if(flushP2 > 0)
+      else if (flush_p2 > 0)
       {
-         DCStoreRangeNoSync(ax->buffer_l, flushP2);
-         DCStoreRange(ax->buffer_r, flushP2);
+         DCStoreRangeNoSync(ax->buffer_l, flush_p2);
+         DCStoreRange(ax->buffer_r, flush_p2);
       }
 
       /* add in new audio data */
-      if(OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
+      if (OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
       {
          ax->written += count;
          OSUninterruptibleSpinLock_Release(&ax->spinlock);
@@ -276,7 +284,7 @@ static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
     *
     * checks if it can be started
     */
-   if(!AXIsMultiVoiceRunning(ax->mvoice))
+   if (!AXIsMultiVoiceRunning(ax->mvoice))
       ax_audio_start(ax, false);
 
    /* return what was actually copied */
@@ -294,27 +302,20 @@ static void ax_audio_set_nonblock_state(void* data, bool state)
    ax_audio_t* ax = (ax_audio_t*)data;
 
    if (ax)
-      ax->nonblocking = state;
+      ax->nonblock = state;
 }
 
-static bool ax_audio_use_float(void* data)
-{
-   (void)data;
-   return false;
-}
+static bool ax_audio_use_float(void* data) { return false; }
 
 static size_t ax_audio_write_avail(void* data)
 {
    ax_audio_t* ax = (ax_audio_t*)data;
-
    size_t ret = AX_AUDIO_COUNT - ax->written;
-
    return (ret < AX_AUDIO_SAMPLE_COUNT ? 0 : ret);
 }
 
 static size_t ax_audio_buffer_size(void* data)
 {
-   (void)data;
    return AX_AUDIO_COUNT;
 }
 
@@ -331,6 +332,6 @@ audio_driver_t audio_ax =
    "AX",
    NULL, /* device_list_new */
    NULL, /* device_list_free */
-   NULL, /* write_avail */
-   NULL, /* buffer_size */
+   ax_audio_write_avail,
+   ax_audio_buffer_size,
 };

audio/drivers/xaudio.c

@@ -20,7 +20,6 @@
 #endif
 #endif
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -411,16 +410,12 @@ static void xa_set_nonblock_state(void *data, bool state)
 
 static bool xa_start(void *data, bool is_shutdown)
 {
-   xa_t *xa = (xa_t*)data;
+   xa_t *xa      = (xa_t*)data;
    xa->is_paused = false;
    return true;
 }
 
-static bool xa_use_float(void *data)
-{
-   (void)data;
-   return true;
-}
+static bool xa_use_float(void *data) { return true; }
 
 static void xa_free(void *data)
 {

audio/drivers/xaudio29.h

@@ -869,26 +869,27 @@ static INLINE HRESULT XAudio2Create(_Outptr_ IXAudio2** ppXAudio2,
    typedef HRESULT(__stdcall *XAudio2CreateWithVersionInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR, DWORD);
    typedef HRESULT(__stdcall *XAudio2CreateInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR);
 
-   static HMODULE s_dllInstance = NULL;
-   static XAudio2CreateWithVersionInfoFunc s_pfnAudio2CreateWithVersion = NULL;
+   static XAudio2CreateWithVersionInfoFunc 
+      s_pfnAudio2CreateWithVersion                = NULL;
    static XAudio2CreateInfoFunc s_pfnAudio2Create = NULL;
+   static HMODULE s_dllInstance                   = NULL;
 
-   if (s_dllInstance == NULL)
+   if (!s_dllInstance)
    {
       s_dllInstance = LoadLibraryEx(XAUDIO2_DLL, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
-      if (s_dllInstance == NULL)
+      if (!s_dllInstance)
          return HRESULT_FROM_WIN32(GetLastError());
 
       s_pfnAudio2CreateWithVersion = (XAudio2CreateWithVersionInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2CreateWithVersionInfo");
-      if (s_pfnAudio2CreateWithVersion == NULL)
+      if (!s_pfnAudio2CreateWithVersion)
       {
          s_pfnAudio2Create = (XAudio2CreateInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2Create");
-         if (s_pfnAudio2Create == NULL)
+         if (!s_pfnAudio2Create)
             return HRESULT_FROM_WIN32(GetLastError());
       }
    }
 
-   if (s_pfnAudio2CreateWithVersion != NULL)
+   if (s_pfnAudio2CreateWithVersion)
       return (*s_pfnAudio2CreateWithVersion)(ppXAudio2, Flags, XAudio2Processor, NTDDI_VERSION);
    return (*s_pfnAudio2Create)(ppXAudio2, Flags, XAudio2Processor);
 }

audio/drivers/xenon360_audio.c

@@ -66,7 +66,15 @@ static ssize_t xenon360_audio_write(void *data, const void *buf, size_t size)
    for (i = 0; i < (size >> 2); i++)
       xa->buffer[i] = bswap_32(in_buf[i]);
 
-   if (!xa->nonblock)
+   if (xa->nonblock)
+   {
+      if (xenon_sound_get_unplayed() < MAX_BUFFER)
+      {
+         xenon_sound_submit(xa->buffer, size);
+         written = size;
+      }
+   }
+   else
    {
       while (xenon_sound_get_unplayed() >= MAX_BUFFER)
       {
@@ -78,14 +86,6 @@ static ssize_t xenon360_audio_write(void *data, const void *buf, size_t size)
       xenon_sound_submit(xa->buffer, size);
       written = size;
    }
-   else
-   {
-      if (xenon_sound_get_unplayed() < MAX_BUFFER)
-      {
-         xenon_sound_submit(xa->buffer, size);
-         written = size;
-      }
-   }
 
    return written;
 }

audio/librsound.c

@@ -234,7 +234,7 @@ static int rsnd_connect_server( rsound_t *rd )
    if (!isdigit(rd->host[0]))
    {
       struct hostent *host = gethostbyname(rd->host);
-      if (host == NULL)
+      if (!host)
          return -1;
 
       addr.sin_addr.s_addr = inet_addr(host->h_addr_list[0]);
@@ -295,7 +295,7 @@ static int rsnd_send_header_info(rsound_t *rd)
    /* Defines the size of a wave header */
 #define HEADER_SIZE 44
    char *header = calloc(1, HEADER_SIZE);
-   if (header == NULL)
+   if (!header)
    {
       RSD_ERR("[RSound] Could not allocate memory.");
       return -1;
@@ -472,7 +472,7 @@ static int rsnd_get_backend_info ( rsound_t *rd )
    if ( rd->fifo_buffer != NULL )
       fifo_free(rd->fifo_buffer);
    rd->fifo_buffer = fifo_new (rd->buffer_size);
-   if ( rd->fifo_buffer == NULL )
+   if (!rd->fifo_buffer)
    {
       RSD_ERR("[RSound] Failed to create FIFO buffer.\n");
       return -1;
@@ -765,13 +765,13 @@ static void rsnd_drain(rsound_t *rd)
       delta /= 1000000;
       /* Calculates the amount of data we have in our virtual buffer. Only used to calculate delay. */
       slock_lock(rd->thread.mutex);
-      rd->bytes_in_buffer = (int)((int64_t)rd->total_written + (int64_t)fifo_read_avail(rd->fifo_buffer) - delta);
+      rd->bytes_in_buffer = (int)((int64_t)rd->total_written + (int64_t)FIFO_READ_AVAIL(rd->fifo_buffer) - delta);
       slock_unlock(rd->thread.mutex);
    }
    else
    {
       slock_lock(rd->thread.mutex);
-      rd->bytes_in_buffer = fifo_read_avail(rd->fifo_buffer);
+      rd->bytes_in_buffer = FIFO_READ_AVAIL(rd->fifo_buffer);
       slock_unlock(rd->thread.mutex);
    }
 }
@@ -789,7 +789,7 @@ static size_t rsnd_fill_buffer(rsound_t *rd, const char *buf, size_t size)
          return 0;
 
       slock_lock(rd->thread.mutex);
-      if ( fifo_write_avail(rd->fifo_buffer) >= size )
+      if (FIFO_WRITE_AVAIL(rd->fifo_buffer) >= size)
       {
          slock_unlock(rd->thread.mutex);
          break;
@@ -886,7 +886,7 @@ static size_t rsnd_get_ptr(rsound_t *rd)
 {
    int ptr;
    slock_lock(rd->thread.mutex);
-   ptr = fifo_read_avail(rd->fifo_buffer);
+   ptr = FIFO_READ_AVAIL(rd->fifo_buffer);
    slock_unlock(rd->thread.mutex);
 
    return ptr;
@@ -963,7 +963,7 @@ static int rsnd_close_ctl(rsound_t *rd)
             return -1;
 
          subchar = strrchr(buf, 'R');
-         if ( subchar == NULL )
+         if (!subchar)
             index = 0;
          else
          {
@@ -1023,7 +1023,7 @@ static int rsnd_update_server_info(rsound_t *rd)
 
       temp[RSD_PROTO_CHUNKSIZE] = '\0';
 
-      if ( (substr = strstr(temp, "RSD")) == NULL )
+      if (!(substr = strstr(temp, "RSD")))
          return -1;
 
       // Jump over "RSD" in header
@@ -1038,7 +1038,7 @@ static int rsnd_update_server_info(rsound_t *rd)
 
       // We only bother if this is an INFO message.
       substr = strstr(temp, "INFO");
-      if ( substr == NULL )
+      if (!substr)
          continue;
 
       // Jump over "INFO" in header
@@ -1060,7 +1060,7 @@ static int rsnd_update_server_info(rsound_t *rd)
       int delay = rsd_delay(rd);
       int delta = (int)(client_ptr - serv_ptr);
       slock_lock(rd->thread.mutex);
-      delta += fifo_read_avail(rd->fifo_buffer);
+      delta += FIFO_READ_AVAIL(rd->fifo_buffer);
       slock_unlock(rd->thread.mutex);
 
       RSD_DEBUG("[RSound] Delay: %d, Delta: %d.\n", delay, delta);
@@ -1116,7 +1116,7 @@ static void rsnd_thread ( void * thread_data )
 
          /* If the buffer is empty or we've stopped the stream, jump out of this for loop */
          slock_lock(rd->thread.mutex);
-         if ( fifo_read_avail(rd->fifo_buffer) < rd->backend_info.chunk_size || !rd->thread_active )
+         if (FIFO_READ_AVAIL(rd->fifo_buffer) < rd->backend_info.chunk_size || !rd->thread_active)
          {
             slock_unlock(rd->thread.mutex);
             break;
@@ -1382,11 +1382,10 @@ int rsd_exec(rsound_t *rsound)
    fcntl(rsound->conn.socket, F_SETFL, O_NONBLOCK);
 #endif
 
-   // Flush the buffer
-
-   if ( fifo_read_avail(rsound->fifo_buffer) > 0 )
+   /* Flush the buffer */
+   if (FIFO_READ_AVAIL(rsound->fifo_buffer) > 0 )
    {
-      char buffer[fifo_read_avail(rsound->fifo_buffer)];
+      char buffer[FIFO_READ_AVAIL(rsound->fifo_buffer)];
       fifo_read(rsound->fifo_buffer, buffer, sizeof(buffer));
       if ( rsnd_send_chunk(fd, buffer, sizeof(buffer), 1) != (ssize_t)sizeof(buffer) )
       {
@@ -1548,7 +1547,7 @@ int rsd_pause(rsound_t* rsound, int enable)
 int rsd_init(rsound_t** rsound)
 {
    *rsound = calloc(1, sizeof(rsound_t));
-   if ( *rsound == NULL )
+   if (*rsound == NULL)
       return -1;
 
    retro_assert(rsound != NULL);

bluetooth/bluetooth_driver.h

@@ -0,0 +1,78 @@
+/*  RetroArch - A frontend for libretro.
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __BLUETOOTH_DRIVER__H
+#define __BLUETOOTH_DRIVER__H
+
+#include <stdint.h>
+
+#include <boolean.h>
+#include <retro_common_api.h>
+#include <lists/string_list.h>
+
+RETRO_BEGIN_DECLS
+
+enum rarch_bluetooth_ctl_state
+{
+   RARCH_BLUETOOTH_CTL_NONE = 0,
+   RARCH_BLUETOOTH_CTL_DESTROY,
+   RARCH_BLUETOOTH_CTL_DEINIT,
+   RARCH_BLUETOOTH_CTL_FIND_DRIVER,
+   RARCH_BLUETOOTH_CTL_INIT
+};
+
+typedef struct bluetooth_driver
+{
+   void *(*init)(void);
+
+   void (*free)(void *data);
+
+   void (*scan)(void *data);
+   void (*get_devices)(void *data, struct string_list *list);
+   bool (*device_is_connected)(void *data, unsigned i);
+   void (*device_get_sublabel)(void *data, char *s, unsigned i, size_t len);
+   bool (*connect_device)(void *data, unsigned i);
+
+   const char *ident;
+} bluetooth_driver_t;
+
+extern bluetooth_driver_t bluetooth_bluetoothctl;
+extern bluetooth_driver_t bluetooth_bluez;
+
+/**
+ * config_get_bluetooth_driver_options:
+ *
+ * Get an enumerated list of all bluetooth driver names,
+ * separated by '|'.
+ *
+ * Returns: string listing of all bluetooth driver names,
+ * separated by '|'.
+ **/
+const char* config_get_bluetooth_driver_options(void);
+
+void driver_bluetooth_scan(void);
+
+void driver_bluetooth_get_devices(struct string_list *list);
+
+bool driver_bluetooth_device_is_connected(unsigned i);
+
+void driver_bluetooth_device_get_sublabel(char *s, unsigned i, size_t len);
+
+bool driver_bluetooth_connect_device(unsigned i);
+
+bool bluetooth_driver_ctl(enum rarch_bluetooth_ctl_state state, void *data);
+
+RETRO_END_DECLS
+
+#endif

bluetooth/drivers/bluetoothctl.c

@@ -0,0 +1,215 @@
+/*  RetroArch - A frontend for libretro.
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <compat/strl.h>
+#include <configuration.h>
+
+#include "../bluetooth_driver.h"
+#include "../../retroarch.h"
+
+typedef struct
+{
+   bool bluetoothctl_cache[256];
+   unsigned bluetoothctl_counter[256];
+   struct string_list* lines;
+   char command[256];
+} bluetoothctl_t;
+
+static void *bluetoothctl_init(void)
+{
+   return calloc(1, sizeof(bluetoothctl_t));
+}
+
+static void bluetoothctl_free(void *data)
+{
+   if (data)
+      free(data);
+}
+
+static void bluetoothctl_scan(void *data)
+{
+   char line[512];
+   union string_list_elem_attr attr;
+   FILE *dev_file                   = NULL;
+   bluetoothctl_t *btctl            = (bluetoothctl_t*) data;
+
+   attr.i = 0;
+   if (btctl->lines)
+      free(btctl->lines);
+   btctl->lines = string_list_new();
+
+   pclose(popen("bluetoothctl -- power on", "r"));
+
+   pclose(popen("bluetoothctl --timeout 10 scan on", "r"));
+
+   runloop_msg_queue_push(msg_hash_to_str(MSG_BLUETOOTH_SCAN_COMPLETE),
+         1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT,
+         MESSAGE_QUEUE_CATEGORY_INFO);
+
+   dev_file = popen("bluetoothctl -- devices", "r");
+
+   while (fgets(line, 512, dev_file))
+   {
+      size_t len = strlen(line);
+      if (len > 0 && line[len-1] == '\n')
+         line[--len] = '\0';
+
+      string_list_append(btctl->lines, line, attr);
+   }
+
+   pclose(dev_file);
+}
+
+static void bluetoothctl_get_devices(void *data, struct string_list* devices)
+{
+   unsigned i;
+   union string_list_elem_attr attr;
+   bluetoothctl_t *btctl = (bluetoothctl_t*) data;
+
+   attr.i = 0;
+
+   if (!btctl->lines)
+      return;
+
+   for (i = 0; i < btctl->lines->size; i++)
+   {
+      char device[64];
+      const char *line = btctl->lines->elems[i].data;
+
+      /* bluetoothctl devices outputs lines of the format:
+       * $ bluetoothctl devices
+       *     'Device (mac address) (device name)'
+       */
+      strlcpy(device, line+24, sizeof(device));
+      string_list_append(devices, device, attr);
+   }
+}
+
+static bool bluetoothctl_device_is_connected(void *data, unsigned i)
+{
+   bluetoothctl_t *btctl = (bluetoothctl_t*) data;
+   char ln[512]          = {0};
+   char device[18]       = {0};
+   const char *line      = btctl->lines->elems[i].data;
+   FILE *command_file    = NULL;
+
+   if (btctl->bluetoothctl_counter[i] == 60)
+   {
+      static struct string_list* list = NULL;
+      btctl->bluetoothctl_counter[i]  = 0;
+      list                            = string_split(line, " ");
+      if (!list)
+         return false;
+
+      if (list->size == 0)
+      {
+         string_list_free(list);
+         return false;
+      }
+
+      strlcpy(device, list->elems[1].data, sizeof(device));
+      string_list_free(list);
+
+      snprintf(btctl->command, sizeof(btctl->command), "\
+            bluetoothctl -- info %s | grep 'Connected: yes'",
+            device);
+
+      command_file = popen(btctl->command, "r");
+
+      while (fgets(ln, 512, command_file))
+      {
+         btctl->bluetoothctl_cache[i] = true;
+         return true;
+      }
+      pclose(command_file);
+      btctl->bluetoothctl_cache[i] = false;
+   }
+   else
+   {
+      btctl->bluetoothctl_counter[i]++;
+      return btctl->bluetoothctl_cache[i];
+   }
+
+   return false;
+}
+
+static bool bluetoothctl_connect_device(void *data, unsigned idx)
+{
+   unsigned i;
+   bluetoothctl_t *btctl               = (bluetoothctl_t*) data;
+   char device[18]                     = {0};
+   const char *line                    = btctl->lines->elems[idx].data;
+   static struct string_list* list     = NULL;
+
+   /* bluetoothctl devices outputs lines of the format:
+    * $ bluetoothctl devices
+    *     'Device (mac address) (device name)'
+    */
+   list                                = string_split(line, " ");
+   if (!list)
+      return false;
+
+   if (list->size == 0)
+   {
+      string_list_free(list);
+      return false;
+   }
+
+   strlcpy(device, list->elems[1].data, sizeof(device));
+   string_list_free(list);
+
+   snprintf(btctl->command, sizeof(btctl->command), "\
+         bluetoothctl -- trust %s",
+         device);
+
+   pclose(popen(btctl->command, "r"));
+
+   snprintf(btctl->command, sizeof(btctl->command), "\
+         bluetoothctl -- pair %s",
+         device);
+
+   pclose(popen(btctl->command, "r"));
+
+   snprintf(btctl->command, sizeof(btctl->command), "\
+         bluetoothctl -- connect %s",
+         device);
+
+   pclose(popen(btctl->command, "r"));
+
+   btctl->bluetoothctl_counter[idx] = 0;
+   return true;
+}
+
+static void bluetoothctl_device_get_sublabel(
+      void *data, char *s, unsigned i, size_t len)
+{
+   bluetoothctl_t *btctl = (bluetoothctl_t*) data;
+   /* bluetoothctl devices outputs lines of the format:
+    * $ bluetoothctl devices
+    *     'Device (mac address) (device name)'
+    */
+   const char      *line = btctl->lines->elems[i].data;
+   strlcpy(s, line+7, 18);
+}
+
+bluetooth_driver_t bluetooth_bluetoothctl = {
+   bluetoothctl_init,
+   bluetoothctl_free,
+   bluetoothctl_scan,
+   bluetoothctl_get_devices,
+   bluetoothctl_device_is_connected,
+   bluetoothctl_device_get_sublabel,
+   bluetoothctl_connect_device,
+   "bluetoothctl",
+};

bluetooth/drivers/bluez.c

@@ -0,0 +1,616 @@
+/*  RetroArch - A frontend for libretro.
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <dbus/dbus.h>
+#include <compat/strl.h>
+#include <configuration.h>
+#include <retro_timers.h>
+#include <string/stdstring.h>
+
+#include "../bluetooth_driver.h"
+#include "../../retroarch.h"
+
+typedef struct
+{
+   /* object path. usually looks like /org/bluez/hci0/dev_AA_BB_CC_DD_EE_FF
+    * technically unlimited, but should be enough */
+   char path[128];
+
+   /* for display purposes 64 bytes should be enough */
+   char name[64];
+
+   /* MAC address, 17 bytes */
+   char address[18];
+
+   /* freedesktop.org icon name
+    * See bluez/src/dbus-common.c
+    * Can be NULL */
+   char icon[64];
+
+   int connected;
+   int paired;
+   int trusted;
+} device_info_t;
+
+#define VECTOR_LIST_TYPE device_info_t
+#define VECTOR_LIST_NAME device_info
+#include "../../libretro-common/lists/vector_list.c"
+#undef VECTOR_LIST_TYPE
+#undef VECTOR_LIST_NAME
+
+typedef struct
+{
+    struct device_info_vector_list *devices;
+    char adapter[256];
+    DBusConnection* dbus_connection;
+    bool bluez_cache[256];
+    int bluez_cache_counter[256];
+} bluez_t;
+
+static void *bluez_init (void)
+{
+   return calloc(1, sizeof(bluez_t));
+}
+
+static void bluez_free (void *data)
+{
+   if (data)
+      free(data);
+}
+
+static int
+set_bool_property (
+   bluez_t *bluez,
+   const char *path,
+   const char *arg_adapter,
+   const char *arg_property,
+   int value)
+{
+   DBusError err;
+   DBusMessage *message, *reply;
+   DBusMessageIter req_iter, req_subiter;
+
+   dbus_error_init(&err);
+
+   message = dbus_message_new_method_call(
+      "org.bluez",
+      path,
+      "org.freedesktop.DBus.Properties",
+      "Set"
+   );
+   if (!message)
+      return 1;
+
+   dbus_message_iter_init_append(message, &req_iter);
+   if (!dbus_message_iter_append_basic(
+            &req_iter, DBUS_TYPE_STRING, &arg_adapter))
+      goto fault;
+   if (!dbus_message_iter_append_basic(
+            &req_iter, DBUS_TYPE_STRING, &arg_property))
+      goto fault;
+   if (!dbus_message_iter_open_container(
+            &req_iter, DBUS_TYPE_VARIANT,
+            DBUS_TYPE_BOOLEAN_AS_STRING, &req_subiter))
+      goto fault;
+   if (!dbus_message_iter_append_basic(
+            &req_subiter, DBUS_TYPE_BOOLEAN, &value))
+      goto fault;
+   if (!dbus_message_iter_close_container(
+            &req_iter, &req_subiter))
+      goto fault;
+
+   reply = dbus_connection_send_with_reply_and_block(bluez->dbus_connection,
+      message, 1000, &err);
+   if (!reply)
+      goto fault;
+   dbus_message_unref(reply);
+   dbus_message_unref(message);
+   return 0;
+
+fault:
+   dbus_message_iter_abandon_container_if_open(&req_iter, &req_subiter);
+   dbus_message_unref(message);
+   return 1;
+}
+
+static int get_bool_property(
+   bluez_t *bluez,
+   const char *path,
+   const char *arg_adapter,
+   const char *arg_property,
+   int *value)
+{
+   DBusMessage *message, *reply;
+   DBusError err;
+   DBusMessageIter root_iter, variant_iter;
+
+   dbus_error_init(&err);
+
+   message = dbus_message_new_method_call( "org.bluez", path,
+      "org.freedesktop.DBus.Properties", "Get");
+   if (!message)
+      return 1;
+
+   if (!dbus_message_append_args(message,
+      DBUS_TYPE_STRING, &arg_adapter,
+      DBUS_TYPE_STRING, &arg_property,
+      DBUS_TYPE_INVALID))
+      return 1;
+
+   reply = dbus_connection_send_with_reply_and_block(bluez->dbus_connection,
+      message, 1000, &err);
+
+   dbus_message_unref(message);
+
+   if (!reply)
+      return 1;
+
+   if (!dbus_message_iter_init(reply, &root_iter))
+      return 1;
+
+   if (DBUS_TYPE_VARIANT != dbus_message_iter_get_arg_type(&root_iter))
+      return 1;
+
+   dbus_message_iter_recurse(&root_iter, &variant_iter);
+   dbus_message_iter_get_basic(&variant_iter, value);
+
+   dbus_message_unref(reply);
+   return 0;
+}
+
+static int adapter_discovery (bluez_t *bluez, const char *method)
+{
+   DBusMessage *message = dbus_message_new_method_call(
+         "org.bluez", bluez->adapter,
+         "org.bluez.Adapter1", method);
+   if (!message)
+      return 1;
+
+   if (!dbus_connection_send(bluez->dbus_connection, message, NULL))
+      return 1;
+
+   dbus_connection_flush(bluez->dbus_connection);
+   dbus_message_unref(message);
+
+   return 0;
+}
+
+static int get_managed_objects (bluez_t *bluez, DBusMessage **reply)
+{
+   DBusMessage *message;
+   DBusError err;
+
+   dbus_error_init(&err);
+
+   message = dbus_message_new_method_call("org.bluez", "/",
+         "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
+   if (!message)
+      return 1;
+
+   *reply = dbus_connection_send_with_reply_and_block(bluez->dbus_connection,
+         message, -1, &err);
+   /* if (!reply) is done by the caller in this one */
+
+   dbus_message_unref(message);
+   return 0;
+}
+
+static int device_method (bluez_t *bluez, const char *path, const char *method)
+{
+   DBusMessage *message, *reply;
+   DBusError err;
+
+   dbus_error_init(&err);
+
+   message = dbus_message_new_method_call( "org.bluez", path,
+         "org.bluez.Device1", method);
+   if (!message)
+      return 1;
+
+   reply = dbus_connection_send_with_reply_and_block(bluez->dbus_connection,
+         message, 10000, &err);
+   if (!reply)
+      return 1;
+
+   dbus_connection_flush(bluez->dbus_connection);
+   dbus_message_unref(message);
+
+   return 0;
+}
+
+static int get_default_adapter(bluez_t *bluez, DBusMessage *reply)
+{
+   /* "...an application would discover the available adapters by
+    * performing a ObjectManager.GetManagedObjects call and look for any
+    * returned objects with an “org.bluez.Adapter1″ interface.
+    * The concept of a default adapter was always a bit fuzzy and the
+    * value could’t be changed, so if applications need something like it
+    * they could e.g. just pick the first adapter they encounter in the
+    * GetManagedObjects reply."
+    * -- http://www.bluez.org/bluez-5-api-introduction-and-porting-guide/
+    */
+
+   DBusMessageIter root_iter;
+   DBusMessageIter dict_1_iter, dict_2_iter;
+   DBusMessageIter array_1_iter, array_2_iter;
+
+   char *obj_path, *interface_name;
+
+   /* a{oa{sa{sv}}} */
+   if (!dbus_message_iter_init(reply, &root_iter))
+      return 1;
+
+   /* a */
+   if (DBUS_TYPE_ARRAY != dbus_message_iter_get_arg_type(&root_iter))
+      return 1;
+   dbus_message_iter_recurse(&root_iter, &array_1_iter);
+   do
+   {
+      /* a{...} */
+      if (DBUS_TYPE_DICT_ENTRY != dbus_message_iter_get_arg_type(&array_1_iter))
+         return 1;
+      dbus_message_iter_recurse(&array_1_iter, &dict_1_iter);
+
+      /* a{o...} */
+      if (DBUS_TYPE_OBJECT_PATH != dbus_message_iter_get_arg_type(&dict_1_iter))
+         return 1;
+      dbus_message_iter_get_basic(&dict_1_iter, &obj_path);
+
+      if (!dbus_message_iter_next(&dict_1_iter))
+         return 1;
+      /* a{oa} */
+      if (DBUS_TYPE_ARRAY != dbus_message_iter_get_arg_type(&dict_1_iter))
+         return 1;
+      dbus_message_iter_recurse(&dict_1_iter, &array_2_iter);
+      do
+      {
+         /* empty array? */
+         if (DBUS_TYPE_INVALID == 
+               dbus_message_iter_get_arg_type(&array_2_iter))
+            continue;
+
+         /* a{oa{...}} */
+         if (DBUS_TYPE_DICT_ENTRY != 
+               dbus_message_iter_get_arg_type(&array_2_iter))
+            return 1;
+         dbus_message_iter_recurse(&array_2_iter, &dict_2_iter);
+
+         /* a{oa{s...}} */
+         if (DBUS_TYPE_STRING != 
+               dbus_message_iter_get_arg_type(&dict_2_iter))
+            return 1;
+         dbus_message_iter_get_basic(&dict_2_iter, &interface_name);
+
+         if (string_is_equal(interface_name, "org.bluez.Adapter1"))
+         {
+            strlcpy(bluez->adapter, obj_path, 256);
+            return 0;
+         }
+      } while (dbus_message_iter_next(&array_2_iter));
+   } while (dbus_message_iter_next(&array_1_iter));
+
+   /* Couldn't find an adapter */
+   return 1;
+}
+
+static int read_scanned_devices (bluez_t *bluez, DBusMessage *reply)
+{
+   device_info_t device;
+   DBusMessageIter root_iter;
+   DBusMessageIter dict_1_iter, dict_2_iter, dict_3_iter;
+   DBusMessageIter array_1_iter, array_2_iter, array_3_iter;
+   DBusMessageIter variant_iter;
+   char *obj_path, *interface_name, *interface_property_name;
+   char *found_device_address, *found_device_name, *found_device_icon;
+
+   /* a{oa{sa{sv}}} */
+   if (!dbus_message_iter_init(reply, &root_iter))
+      return 1;
+
+   /* a */
+   if (DBUS_TYPE_ARRAY != dbus_message_iter_get_arg_type(&root_iter))
+      return 1;
+
+   dbus_message_iter_recurse(&root_iter, &array_1_iter);
+
+   do
+   {
+      /* a{...} */
+      if (DBUS_TYPE_DICT_ENTRY != 
+            dbus_message_iter_get_arg_type(&array_1_iter))
+         return 1;
+
+      dbus_message_iter_recurse(&array_1_iter, &dict_1_iter);
+
+      /* a{o...} */
+      if (DBUS_TYPE_OBJECT_PATH != 
+            dbus_message_iter_get_arg_type(&dict_1_iter))
+         return 1;
+
+      dbus_message_iter_get_basic(&dict_1_iter, &obj_path);
+
+      if (!dbus_message_iter_next(&dict_1_iter))
+         return 1;
+
+      /* a{oa} */
+      if (DBUS_TYPE_ARRAY != 
+            dbus_message_iter_get_arg_type(&dict_1_iter))
+         return 1;
+
+      dbus_message_iter_recurse(&dict_1_iter, &array_2_iter);
+      do
+      {
+         /* empty array? */
+         if (DBUS_TYPE_INVALID == 
+               dbus_message_iter_get_arg_type(&array_2_iter))
+            continue;
+
+         /* a{oa{...}} */
+         if (DBUS_TYPE_DICT_ENTRY != 
+               dbus_message_iter_get_arg_type(&array_2_iter))
+            return 1;
+         dbus_message_iter_recurse(&array_2_iter, &dict_2_iter);
+
+         /* a{oa{s...}} */
+         if (DBUS_TYPE_STRING != 
+               dbus_message_iter_get_arg_type(&dict_2_iter))
+            return 1;
+         dbus_message_iter_get_basic(&dict_2_iter, &interface_name);
+
+         if (!string_is_equal(interface_name, "org.bluez.Device1"))
+            continue;
+
+         memset(&device, 0, sizeof(device));
+         strlcpy(device.path, obj_path, 128);
+
+         if (!dbus_message_iter_next(&dict_2_iter))
+            return 1;
+
+         /* a{oa{sa}} */
+         if (DBUS_TYPE_ARRAY != dbus_message_iter_get_arg_type(&dict_2_iter))
+            return 1;
+
+         dbus_message_iter_recurse(&dict_2_iter, &array_3_iter);
+
+         do {
+            /* empty array? */
+            if (DBUS_TYPE_INVALID ==
+                  dbus_message_iter_get_arg_type(&array_3_iter))
+               continue;
+
+            /* a{oa{sa{...}}} */
+            if (DBUS_TYPE_DICT_ENTRY != 
+                  dbus_message_iter_get_arg_type(&array_3_iter))
+               return 1;
+            dbus_message_iter_recurse(&array_3_iter, &dict_3_iter);
+
+            /* a{oa{sa{s...}}} */
+            if (DBUS_TYPE_STRING != 
+                  dbus_message_iter_get_arg_type(&dict_3_iter))
+               return 1;
+
+            dbus_message_iter_get_basic(&dict_3_iter,
+                  &interface_property_name);
+
+            if (!dbus_message_iter_next(&dict_3_iter))
+               return 1;
+            /* a{oa{sa{sv}}} */
+            if (DBUS_TYPE_VARIANT != 
+                  dbus_message_iter_get_arg_type(&dict_3_iter))
+               return 1;
+
+            /* Below, "Alias" property is used instead of "Name".
+             * "This value ("Name") is only present for
+             * completeness.  It is better to always use
+             * the Alias property when displaying the
+             * devices name."
+             * -- bluez/doc/device-api.txt
+             */
+
+            /* DBUS_TYPE_VARIANT is a container type */
+            dbus_message_iter_recurse(&dict_3_iter, &variant_iter);
+            if (string_is_equal(interface_property_name, "Address"))
+            {
+               dbus_message_iter_get_basic(&variant_iter,
+                     &found_device_address);
+               strlcpy(device.address, found_device_address, 18);
+            }
+            else if (string_is_equal(interface_property_name, "Alias"))
+            {
+               dbus_message_iter_get_basic(&variant_iter,
+                     &found_device_name);
+               strlcpy(device.name, found_device_name, 64);
+            }
+            else if (string_is_equal(interface_property_name, "Icon"))
+            {
+               dbus_message_iter_get_basic(&variant_iter,
+                     &found_device_icon);
+               strlcpy(device.icon, found_device_icon, 64);
+            }
+            else if (string_is_equal(interface_property_name, "Connected"))
+            {
+               dbus_message_iter_get_basic(&variant_iter,
+                     &device.connected);
+            }
+            else if (string_is_equal(interface_property_name, "Paired"))
+            {
+               dbus_message_iter_get_basic(&variant_iter,
+                     &device.paired);
+            }
+            else if (string_is_equal(interface_property_name, "Trusted"))
+            {
+               dbus_message_iter_get_basic(&variant_iter,
+                     &device.trusted);
+            }
+         } while (dbus_message_iter_next(&array_3_iter));
+
+         if (!device_info_vector_list_append(bluez->devices, device))
+            return 1;
+
+      } while (dbus_message_iter_next(&array_2_iter));
+   } while (dbus_message_iter_next(&array_1_iter));
+
+   return 0;
+}
+
+static void bluez_dbus_connect(bluez_t *bluez)
+{
+   DBusError err;
+   dbus_error_init(&err);
+   bluez->dbus_connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
+}
+
+static void bluez_dbus_disconnect(bluez_t *bluez)
+{
+   if (!bluez->dbus_connection)
+      return;
+
+   dbus_connection_close(bluez->dbus_connection);
+   dbus_connection_unref(bluez->dbus_connection);
+   bluez->dbus_connection = NULL;
+}
+
+static void bluez_scan(void *data)
+{
+   DBusError err;
+   DBusMessage *reply;
+   bluez_t *bluez = (bluez_t*)data;
+
+   bluez_dbus_connect(bluez);
+
+   if (get_managed_objects(bluez, &reply))
+      return;
+   if (!reply)
+      return;
+
+   /* Get default adapter */
+   if (get_default_adapter(bluez, reply))
+      return;
+   dbus_message_unref(reply);
+
+   /* Power device on */
+   if (set_bool_property(bluez, bluez->adapter,
+            "org.bluez.Adapter1", "Powered", 1))
+      return;
+
+   /* Start discovery */
+   if (adapter_discovery(bluez, "StartDiscovery"))
+      return;
+
+   retro_sleep(10000);
+
+   /* Stop discovery */
+   if (adapter_discovery(bluez, "StopDiscovery"))
+      return;
+
+   /* Get scanned devices */
+   if (get_managed_objects(bluez, &reply))
+      return;
+   if (!reply)
+      return;
+
+   if (bluez->devices)
+      device_info_vector_list_free(bluez->devices);
+   bluez->devices = device_info_vector_list_new();
+
+   read_scanned_devices(bluez, reply);
+   dbus_message_unref(reply);
+   bluez_dbus_disconnect(bluez);
+}
+
+static void bluez_get_devices(void *data,
+      struct string_list* devices_string_list)
+{
+   unsigned i;
+   union string_list_elem_attr attr;
+   bluez_t *bluez = (bluez_t*)data;
+
+   attr.i = 0;
+
+   if (!bluez->devices)
+      return;
+
+   for (i = 0; i < bluez->devices->count; i++)
+   {
+      char device[64];
+      strlcpy(device, bluez->devices->data[i].name, sizeof(device));
+      string_list_append(devices_string_list, device, attr);
+   }
+}
+
+static bool bluez_device_is_connected(void *data, unsigned i)
+{
+   int value;
+   bluez_t *bluez = (bluez_t*)data;
+
+   if (bluez->bluez_cache_counter[i] == 60)
+   {
+      bluez->bluez_cache_counter[i] = 0;
+      bluez_dbus_connect(bluez);
+
+      /* Device disappeared */
+      if (get_bool_property(bluez, bluez->devices->data[i].path,
+            "org.bluez.Device1", "Connected", &value))
+          value = false;
+
+      bluez_dbus_disconnect(bluez);
+
+      bluez->bluez_cache[i] = value;
+      return value;
+   }
+
+   bluez->bluez_cache_counter[i]++;
+   return bluez->bluez_cache[i];
+}
+
+static void bluez_device_get_sublabel(
+      void *data, char *s, unsigned i, size_t len)
+{
+   bluez_t *bluez = (bluez_t*)data;
+   strlcpy(s, bluez->devices->data[i].address, len);
+}
+
+static bool bluez_connect_device(void *data, unsigned i)
+{
+   bluez_t *bluez = (bluez_t*)data;
+   bluez_dbus_connect(bluez);
+
+   /* Trust the device */
+   if (set_bool_property(bluez, bluez->devices->data[i].path,
+            "org.bluez.Device1", "Trusted", 1))
+      return false;
+
+   /* Pair the device */
+   device_method(bluez, bluez->devices->data[i].path, "Pair");
+
+   /* Can be "Already Exists" */
+   /* Connect the device */
+   if (device_method(bluez, bluez->devices->data[i].path, "Connect"))
+      return false;
+
+   bluez_dbus_disconnect(bluez);
+   bluez->bluez_cache_counter[i] = 0;
+   return true;
+}
+
+bluetooth_driver_t bluetooth_bluez = {
+   bluez_init,
+   bluez_free,
+   bluez_scan,
+   bluez_get_devices,
+   bluez_device_is_connected,
+   bluez_device_get_sublabel,
+   bluez_connect_device,
+   "bluez",
+};

bootstrap/psp1/kernel_functions_prx/main.c

@@ -39,25 +39,28 @@ unsigned int read_system_buttons(void)
 
 void exitspawn_kernel(const char *fileName, SceSize args, void *argp)
 {
+   int k1;
    struct SceKernelLoadExecVSHParam game_param;
 
-   thread_active = 0;
+   thread_active                = 0;
 
    memset(&game_param,0,sizeof(game_param));
 
-   game_param.size = sizeof(game_param);
-   game_param.args = args;
-   game_param.argp = argp;
-   game_param.key  = "game";
+   game_param.size              = sizeof(game_param);
+   game_param.args              = args;
+   game_param.argp              = argp;
+   game_param.key               = "game";
    game_param.vshmain_args_size = 0;
-   game_param.vshmain_args = NULL;
-   game_param.configfile = 0;
-   game_param.unk4 = 0;
-   game_param.unk5 = 0x10000;
+   game_param.vshmain_args      = NULL;
+   game_param.configfile        = 0;
+   game_param.unk4              = 0;
+   game_param.unk5              = 0x10000;
 
-   int k1 = pspSdkSetK1(0);
-   //sceKernelSuspendAllUserThreads();
-   int ret = sceKernelLoadExecVSHMs2(fileName, &game_param);
+   k1                           = pspSdkSetK1(0);
+#if 0
+   sceKernelSuspendAllUserThreads();
+#endif
+   sceKernelLoadExecVSHMs2(fileName, &game_param);
    pspSdkSetK1(k1);
 }
 

camera/drivers/android.c

@@ -57,7 +57,7 @@ static void *android_camera_init(const char *device, uint64_t caps,
       goto dealloc;
 
    GET_OBJECT_CLASS(env, class, android_app->activity->clazz);
-   if (class == NULL)
+   if (!class)
       goto dealloc;
 
    GET_METHOD_ID(env, androidcamera->onCameraInit, class,

camera/drivers/nullcamera.c

@@ -1,60 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2012-2015 - Michael Lelli
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#include "../../retroarch.h"
-
-static void *nullcamera_init(const char *device, uint64_t caps,
-      unsigned width, unsigned height)
-{
-   (void)device;
-   return (void*)-1;
-}
-
-static void nullcamera_free(void *data)
-{
-   (void)data;
-}
-
-static bool nullcamera_start(void *data)
-{
-   (void)data;
-   return true;
-}
-
-static void nullcamera_stop(void *data)
-{
-   (void)data;
-}
-
-static bool nullcamera_poll(void *data,
-      retro_camera_frame_raw_framebuffer_t frame_raw_cb,
-      retro_camera_frame_opengl_texture_t frame_gl_cb)
-{
-   (void)data;
-   (void)frame_raw_cb;
-   (void)frame_gl_cb;
-
-   return true;
-}
-
-camera_driver_t camera_null = {
-   nullcamera_init,
-   nullcamera_free,
-   nullcamera_start,
-   nullcamera_stop,
-   nullcamera_poll,
-   "null",
-};

camera/drivers/video4linux2.c

@@ -402,7 +402,7 @@ static bool v4l_poll(void *data,
 
    if (preprocess_image(data))
    {
-      if (frame_raw_cb != NULL)
+      if (frame_raw_cb)
          frame_raw_cb(v4l->buffer_output, v4l->width,
                v4l->height, v4l->width * 4);
       return true;

cheevos-new/badges.c

@@ -1,73 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2016 - Andre Leiradella
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#include <file/file_path.h>
-#include <string/stdstring.h>
-
-#ifdef HAVE_MENU
-#include "../menu/menu_driver.h"
-#endif
-
-#include "../file_path_special.h"
-#include "../configuration.h"
-#include "../verbosity.h"
-#include "../network/net_http_special.h"
-
-#include "badges.h"
-
-badges_ctx_t badges_ctx;
-
-bool badge_exists(const char* filepath)
-{
-  return path_is_valid(filepath);
-}
-
-void set_badge_menu_texture(badges_ctx_t * badges, int i)
-{
-   char badge_file[16];
-   char fullpath[PATH_MAX_LENGTH];
-
-   snprintf(badge_file, sizeof(badge_file), "%s%s", badges->badge_id_list[i],
-         badges->badge_locked[i] ? "_lock.png" : ".png");
-
-   fill_pathname_application_special(fullpath,
-         PATH_MAX_LENGTH * sizeof(char),
-         APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);
-
-#ifdef HAVE_MENU
-   menu_display_reset_textures_list(badge_file, fullpath,
-         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL);
-#endif
-}
-
-void set_badge_info (badges_ctx_t *badge_struct, int id,
-      const char *badge_id, bool active)
-{
-   if (!badge_struct)
-      return;
-
-   badge_struct->badge_id_list[id] = badge_id;
-   badge_struct->badge_locked[id]  = active;
-   set_badge_menu_texture(badge_struct, id);
-}
-
-menu_texture_item get_badge_texture(int id)
-{
-   settings_t *settings = config_get_ptr();
-   if (!settings || !settings->bools.cheevos_badges_enable)
-      return (menu_texture_item)NULL;
-
-   return badges_ctx.menu_texture_list[id];
-}

cheevos-new/fixup.c

@@ -1,285 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2018 - Andre Leiradella
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#include "fixup.h"
-#include "cheevos.h"
-#include "util.h"
-
-#include "../retroarch.h"
-#include "../core.h"
-
-#include "../deps/rcheevos/include/rcheevos.h"
-
-static int rcheevos_cmpaddr(const void* e1, const void* e2)
-{
-   const rcheevos_fixup_t* f1 = (const rcheevos_fixup_t*)e1;
-   const rcheevos_fixup_t* f2 = (const rcheevos_fixup_t*)e2;
-
-   if (f1->address < f2->address)
-   {
-      return -1;
-   }
-   else if (f1->address > f2->address)
-   {
-      return 1;
-   }
-   else
-   {
-      return 0;
-   }
-}
-
-static size_t rcheevos_var_reduce(size_t addr, size_t mask)
-{
-   while (mask)
-   {
-      size_t tmp = (mask - 1) & ~mask;
-      addr = (addr & tmp) | ((addr >> 1) & ~tmp);
-      mask = (mask & (mask - 1)) >> 1;
-   }
-
-   return addr;
-}
-
-static size_t rcheevos_var_highest_bit(size_t n)
-{
-   n |= n >>  1;
-   n |= n >>  2;
-   n |= n >>  4;
-   n |= n >>  8;
-   n |= n >> 16;
-
-   return n ^ (n >> 1);
-}
-
-void rcheevos_fixup_init(rcheevos_fixups_t* fixups)
-{
-   fixups->elements = NULL;
-   fixups->capacity = fixups->count = 0;
-   fixups->dirty = false;
-}
-
-void rcheevos_fixup_destroy(rcheevos_fixups_t* fixups)
-{
-   CHEEVOS_FREE(fixups->elements);
-   rcheevos_fixup_init(fixups);
-}
-
-const uint8_t* rcheevos_fixup_find(rcheevos_fixups_t* fixups, unsigned address, int console)
-{
-   rcheevos_fixup_t key;
-   rcheevos_fixup_t* found;
-   const uint8_t* location;
-
-   if (fixups->dirty)
-   {
-      qsort(fixups->elements, fixups->count, sizeof(rcheevos_fixup_t), rcheevos_cmpaddr);
-      fixups->dirty = false;
-   }
-
-   key.address = address;
-   found = (rcheevos_fixup_t*)bsearch(&key, fixups->elements, fixups->count, sizeof(rcheevos_fixup_t), rcheevos_cmpaddr);
-
-   if (found != NULL)
-   {
-      return found->location;
-   }
-
-   if (fixups->count == fixups->capacity)
-   {
-      unsigned new_capacity = fixups->capacity == 0 ? 16 : fixups->capacity * 2;
-      rcheevos_fixup_t* new_elements = (rcheevos_fixup_t*)
-         realloc(fixups->elements, new_capacity * sizeof(rcheevos_fixup_t));
-
-      if (new_elements == NULL)
-      {
-         return NULL;
-      }
-
-      fixups->elements = new_elements;
-      fixups->capacity = new_capacity;
-   }
-
-   fixups->elements[fixups->count].address = address;
-   fixups->elements[fixups->count++].location = location =
-      rcheevos_patch_address(address, console);
-   fixups->dirty = true;
-
-   return location;
-}
-
-const uint8_t* rcheevos_patch_address(unsigned address, int console)
-{
-   rarch_system_info_t* system = runloop_get_system_info();
-   const void* pointer = NULL;
-
-   if (console == RC_CONSOLE_NINTENDO)
-   {
-      if (address >= 0x0800 && address < 0x2000)
-      {
-         /* Address in the mirrorred RAM, adjust to real RAM. */
-         CHEEVOS_LOG(RCHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", address, address & 0x07ff);
-         address &= 0x07ff;
-      }
-   }
-   else if (console == RC_CONSOLE_GAMEBOY_COLOR)
-   {
-      if (address >= 0xe000 && address <= 0xfdff)
-      {
-         /* Address in the echo RAM, adjust to real RAM. */
-         CHEEVOS_LOG(RCHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", address, address - 0x2000);
-         address -= 0x2000;
-      }
-   }
-
-   if (system->mmaps.num_descriptors != 0)
-   {
-      /* We have memory descriptors, use it. */
-      const rarch_memory_descriptor_t* desc = NULL;
-      const rarch_memory_descriptor_t* end  = NULL;
-
-      /* Patch the address to correctly map it to the mmaps. */
-      if (console == RC_CONSOLE_GAMEBOY_ADVANCE)
-      {
-         if (address < 0x8000)
-         {
-            /* Internal RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x3000000);
-            address += 0x3000000;
-         }
-         else
-         {
-            /* Work RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x2000000 - 0x8000);
-            address += 0x2000000 - 0x8000;
-         }
-      }
-      else if (console == RC_CONSOLE_PC_ENGINE)
-      {
-         if (address < 0x002000)
-         {
-            /* RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x1f0000);
-            address += 0x1f0000;
-         }
-         else if (address < 0x012000)
-         {
-            /* CD-ROM RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x100000 - 0x002000);
-            address += 0x100000 - 0x002000;
-         }
-         else if (address < 0x042000)
-         {
-            /* Super System Card RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x0d0000 - 0x012000);
-            address += 0x0d0000 - 0x012000;
-         }
-         else
-         {
-            /* CD-ROM battery backed RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x1ee000 - 0x042000);
-            address += 0x1ee000 - 0x042000;
-         }
-      }
-      else if (console == RC_CONSOLE_SUPER_NINTENDO)
-      {
-         if (address < 0x020000)
-         {
-            /* Work RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x7e0000);
-            address += 0x7e0000;
-         }
-         else
-         {
-            /* Save RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x006000 - 0x020000);
-            address += 0x006000 - 0x020000;
-         }
-      }
-
-      desc = system->mmaps.descriptors;
-      end  = desc + system->mmaps.num_descriptors;
-
-      for (; desc < end; desc++)
-      {
-         if (((desc->core.start ^ address) & desc->core.select) == 0)
-         {
-            unsigned addr = address;
-            pointer       = desc->core.ptr;
-
-            address       = (unsigned)rcheevos_var_reduce(
-               (addr - desc->core.start) & desc->disconnect_mask,
-               desc->core.disconnect);
-
-            if (address >= desc->core.len)
-               address -= rcheevos_var_highest_bit(address);
-
-            address += desc->core.offset;
-
-            CHEEVOS_LOG(RCHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", addr, (int)((desc - system->mmaps.descriptors) + 1), address);
-            break;
-         }
-      }
-   }
-   else
-   {
-      unsigned i;
-
-      for (i = 0; i < 4; i++)
-      {
-         retro_ctx_memory_info_t meminfo;
-
-         switch (i)
-         {
-            case 0:
-               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
-               break;
-            case 1:
-               meminfo.id = RETRO_MEMORY_SAVE_RAM;
-               break;
-            case 2:
-               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
-               break;
-            case 3:
-               meminfo.id = RETRO_MEMORY_RTC;
-               break;
-         }
-
-         core_get_memory(&meminfo);
-
-         if (address < meminfo.size)
-         {
-            pointer = meminfo.data;
-            break;
-         }
-
-         /**
-          * HACK Subtract the correct amount of bytes to reach the save RAM as
-          * it's size is not always set correctly in the core.
-          */
-         if (i == 0 && console == RC_CONSOLE_NINTENDO)
-            address -= 0x6000;
-         else
-            address -= meminfo.size;
-      }
-   }
-
-   if (pointer == NULL)
-   {
-      return NULL;
-   }
-
-   return (const uint8_t*)pointer + address;
-}

cheevos/badges.c

@@ -0,0 +1,88 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2016 - Andre Leiradella
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <file/file_path.h>
+
+#include "../file_path_special.h"
+#include "../configuration.h"
+#include "../gfx/gfx_display.h"
+
+#include "badges.h"
+
+#ifdef HAVE_MENU
+
+#define CHEEVOS_MENU_BADGE_LIMIT 256
+/* TODO/FIXME - public global variables */
+static uintptr_t cheevos_badge_menu_texture_list[CHEEVOS_MENU_BADGE_LIMIT] = { 0 };
+
+void cheevos_reset_menu_badges(void)
+{
+   int index;
+   for (index = 0; index < CHEEVOS_MENU_BADGE_LIMIT; ++index)
+   {
+      if (cheevos_badge_menu_texture_list[index])
+         video_driver_texture_unload(&cheevos_badge_menu_texture_list[index]);
+   }
+
+   memset(&cheevos_badge_menu_texture_list, 0, sizeof(cheevos_badge_menu_texture_list));
+}
+
+void cheevos_set_menu_badge(int index, const char *badge, bool locked)
+{
+   settings_t *settings = config_get_ptr();
+
+   if (index >= CHEEVOS_MENU_BADGE_LIMIT)
+      return;
+
+   if (!settings || !settings->bools.cheevos_badges_enable)
+      cheevos_badge_menu_texture_list[index] = 0;
+   else
+      cheevos_badge_menu_texture_list[index] = cheevos_get_badge_texture(badge, locked);
+}
+
+uintptr_t cheevos_get_menu_badge_texture(int index)
+{
+   if (index < CHEEVOS_MENU_BADGE_LIMIT)
+      return cheevos_badge_menu_texture_list[index];
+
+   return 0;
+}
+
+#endif
+
+uintptr_t cheevos_get_badge_texture(const char *badge, bool locked)
+{
+   char badge_file[24];
+   char fullpath[PATH_MAX_LENGTH];
+   uintptr_t tex = 0;
+
+   if (!badge)
+      return 0;
+
+   strlcpy(badge_file, badge, sizeof(badge_file));
+   if (locked)
+      strlcat(badge_file, "_lock", sizeof(badge_file));
+   strlcat(badge_file, ".png", sizeof(badge_file));
+
+   fill_pathname_application_special(fullpath,
+      PATH_MAX_LENGTH * sizeof(char),
+      APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);
+
+   if (!gfx_display_reset_textures_list(badge_file, fullpath,
+      &tex, TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
+      tex = 0;
+
+   return tex;
+}

cheevos/badges.h

@@ -16,28 +16,19 @@
 #ifndef __RARCH_CHEEVOS_BADGE_H
 #define __RARCH_CHEEVOS_BADGE_H
 
+#include <stdint.h>
 #include <retro_common_api.h>
-
-#include "../menu/menu_driver.h"
+#include <boolean.h>
 
 RETRO_BEGIN_DECLS
 
-#define CHEEVOS_BADGE_LIMIT 256
+#ifdef HAVE_MENU
+void cheevos_reset_menu_badges(void);
+void cheevos_set_menu_badge(int index, const char *badge, bool locked);
+uintptr_t cheevos_get_menu_badge_texture(int index);
+#endif
 
-typedef struct
-{
-  bool badge_locked[CHEEVOS_BADGE_LIMIT];
-  const char * badge_id_list[CHEEVOS_BADGE_LIMIT];
-  menu_texture_item menu_texture_list[CHEEVOS_BADGE_LIMIT];
-} badges_ctx_t;
-
-bool badge_exists(const char* filepath);
-void set_badge_menu_texture(badges_ctx_t * badges, int i);
-extern void set_badge_info (badges_ctx_t *badge_struct, int id, const char *badge_id, bool active);
-extern menu_texture_item get_badge_texture(int id);
-
-extern badges_ctx_t badges_ctx;
-static badges_ctx_t new_badges_ctx;
+uintptr_t cheevos_get_badge_texture(const char* badge, bool locked);
 
 RETRO_END_DECLS
 

cheevos/cheevos.h

@@ -45,10 +45,11 @@ bool rcheevos_load(const void *data);
 void rcheevos_reset_game(void);
 
 void rcheevos_populate_menu(void *data);
+void rcheevos_get_achievement_state(unsigned index, char* buffer, size_t buffer_size);
 
 bool rcheevos_get_description(rcheevos_ctx_desc_t *desc);
 
-bool rcheevos_apply_cheats(bool *data_bool);
+void rcheevos_pause_hardcore();
 
 bool rcheevos_unload(void);
 
@@ -56,20 +57,20 @@ bool rcheevos_toggle_hardcore_mode(void);
 
 void rcheevos_test(void);
 
-bool rcheevos_set_cheats(void);
-
 void rcheevos_set_support_cheevos(bool state);
 
 bool rcheevos_get_support_cheevos(void);
 
 int rcheevos_get_console(void);
 
+const char* rcheevos_get_hash(void);
+
+const char *rcheevos_get_richpresence(void);
+
 extern bool rcheevos_loaded;
 extern bool rcheevos_hardcore_active;
 extern bool rcheevos_hardcore_paused;
 extern bool rcheevos_state_loaded_flag;
-extern int rcheevos_cheats_are_enabled;
-extern int rcheevos_cheats_were_enabled;
 
 RETRO_END_DECLS
 

cheevos/fixup.c

@@ -0,0 +1,314 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "fixup.h"
+#include "cheevos.h"
+#include "util.h"
+
+#include "../retroarch.h"
+#include "../core.h"
+
+#include "../deps/rcheevos/include/rcheevos.h"
+#include "../deps/rcheevos/include/rconsoles.h"
+
+static int rcheevos_cmpaddr(const void* e1, const void* e2)
+{
+   const rcheevos_fixup_t* f1 = (const rcheevos_fixup_t*)e1;
+   const rcheevos_fixup_t* f2 = (const rcheevos_fixup_t*)e2;
+
+   if (f1->address < f2->address)
+      return -1;
+   else if (f1->address > f2->address)
+      return 1;
+   return 0;
+}
+
+static size_t rcheevos_var_reduce(size_t addr, size_t mask)
+{
+   while (mask)
+   {
+      size_t tmp = (mask - 1) & ~mask;
+      addr       = (addr & tmp) | ((addr >> 1) & ~tmp);
+      mask       = (mask & (mask - 1)) >> 1;
+   }
+
+   return addr;
+}
+
+static size_t rcheevos_var_highest_bit(size_t n)
+{
+   n |= n >>  1;
+   n |= n >>  2;
+   n |= n >>  4;
+   n |= n >>  8;
+   n |= n >> 16;
+
+   return n ^ (n >> 1);
+}
+
+void rcheevos_fixup_init(rcheevos_fixups_t* fixups)
+{
+   fixups->elements = NULL;
+   fixups->capacity = fixups->count = 0;
+   fixups->dirty    = false;
+}
+
+void rcheevos_fixup_destroy(rcheevos_fixups_t* fixups)
+{
+   CHEEVOS_FREE(fixups->elements);
+   rcheevos_fixup_init(fixups);
+}
+
+const uint8_t* rcheevos_fixup_find(
+      rcheevos_fixups_t* fixups, unsigned address, int console)
+{
+   rcheevos_fixup_t key;
+   rcheevos_fixup_t* found;
+   const uint8_t* location;
+
+   if (fixups->dirty)
+   {
+      qsort(fixups->elements, fixups->count,
+            sizeof(rcheevos_fixup_t), rcheevos_cmpaddr);
+      fixups->dirty = false;
+   }
+
+   key.address = address;
+   found       = (rcheevos_fixup_t*)bsearch(&key,
+         fixups->elements, fixups->count,
+         sizeof(rcheevos_fixup_t), rcheevos_cmpaddr);
+
+   if (found)
+      return found->location;
+
+   if (fixups->count == fixups->capacity)
+   {
+      unsigned new_capacity = fixups->capacity == 0 ? 16 : fixups->capacity * 2;
+      rcheevos_fixup_t* new_elements = (rcheevos_fixup_t*)
+         realloc(fixups->elements, new_capacity * sizeof(rcheevos_fixup_t));
+
+      if (!new_elements)
+         return NULL;
+
+      fixups->elements = new_elements;
+      fixups->capacity = new_capacity;
+   }
+
+   fixups->elements[fixups->count].address    = address;
+   fixups->elements[fixups->count++].location = location =
+      rcheevos_patch_address(address, console);
+   fixups->dirty                              = true;
+
+   return location;
+}
+
+const uint8_t* rcheevos_patch_address(unsigned address, int console)
+{
+   rarch_system_info_t* system = runloop_get_system_info();
+   const void* pointer         = NULL;
+   unsigned original_address   = address;
+
+   switch (console)
+   {
+      case RC_CONSOLE_NINTENDO:
+         if (address >= 0x0800 && address < 0x2000)
+         {
+            /* Address in the mirrorred RAM, 
+             * adjust to real RAM. */
+            CHEEVOS_LOG(RCHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", address, address & 0x07ff);
+            address &= 0x07ff;
+         }
+         break;
+      case RC_CONSOLE_GAMEBOY_COLOR:
+         if (address >= 0xe000 && address <= 0xfdff)
+         {
+            /* Address in the echo RAM, adjust to real RAM. */
+            CHEEVOS_LOG(RCHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", address, address - 0x2000);
+            address -= 0x2000;
+         }
+         break;
+      default:
+         break;
+   }
+
+   if (system->mmaps.num_descriptors != 0)
+   {
+      /* We have memory descriptors, use it. */
+      const rarch_memory_descriptor_t* desc = NULL;
+      const rarch_memory_descriptor_t* end  = NULL;
+
+      /* Patch the address to correctly map it to the mmaps. */
+      switch (console)
+      {
+         case RC_CONSOLE_GAMEBOY_ADVANCE:
+            if (address < 0x8000)
+            {
+               /* Internal RAM. */
+               CHEEVOS_LOG(RCHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x3000000);
+               address += 0x3000000;
+            }
+            else
+            {
+               /* Work RAM. */
+               CHEEVOS_LOG(RCHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x2000000 - 0x8000);
+               address += 0x2000000 - 0x8000;
+            }
+            break;
+         case RC_CONSOLE_PC_ENGINE:
+            if (address < 0x002000)
+            {
+               /* RAM. */
+               CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x1f0000);
+               address += 0x1f0000;
+            }
+            else if (address < 0x012000)
+            {
+               /* CD-ROM RAM. */
+               CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x100000 - 0x002000);
+               address += 0x100000 - 0x002000;
+            }
+            else if (address < 0x042000)
+            {
+               /* Super System Card RAM. */
+               CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x0d0000 - 0x012000);
+               address += 0x0d0000 - 0x012000;
+            }
+            else
+            {
+               /* CD-ROM battery backed RAM. */
+               CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x1ee000 - 0x042000);
+               address += 0x1ee000 - 0x042000;
+            }
+            break;
+         case RC_CONSOLE_SUPER_NINTENDO:
+            if (address < 0x020000)
+            {
+               /* Work RAM. */
+               CHEEVOS_LOG(RCHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x7e0000);
+               address += 0x7e0000;
+            }
+            else
+            {
+               /* Save RAM. */
+               CHEEVOS_LOG(RCHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x006000 - 0x020000);
+               address += 0x006000 - 0x020000;
+            }
+            break;
+         case RC_CONSOLE_SEGA_CD:
+            if (address < 0x010000)
+            {
+               /* Work RAM. */
+               address += 0xFF0000;
+               CHEEVOS_LOG(RCHEEVOS_TAG "Sega CD memory address %X adjusted to %X\n", original_address, address);
+            }
+            else
+            {
+               /* CD-ROM peripheral RAM - exposed at virtual address to avoid banking */
+               address += 0x80020000 - 0x010000;
+               CHEEVOS_LOG(RCHEEVOS_TAG "Sega CD memory address %X adjusted to %X\n", original_address, address);
+            }
+            break;
+         default:
+            break;
+      }
+
+      desc = system->mmaps.descriptors;
+      end  = desc + system->mmaps.num_descriptors;
+
+      for (; desc < end; desc++)
+      {
+         if (((desc->core.start ^ address) & desc->core.select) == 0)
+         {
+            pointer = desc->core.ptr;
+            address -= desc->core.start;
+
+            if (desc->disconnect_mask)
+               address = (unsigned)rcheevos_var_reduce(
+                     address & desc->disconnect_mask, desc->core.disconnect);
+
+            if (address >= desc->core.len)
+               address -= rcheevos_var_highest_bit(address);
+
+            address += desc->core.offset;
+
+            CHEEVOS_LOG(RCHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", original_address,
+                  (int)((desc - system->mmaps.descriptors) + 1), address);
+            break;
+         }
+      }
+   }
+   else if (console == RC_CONSOLE_GAMEBOY_ADVANCE)
+   {
+      /* The RetroAchievements implementation of memory access 
+       * for GBA puts the save RAM first,
+       * so the default looping behavior below is backwards. 
+       *
+       * If the core doesn't expose a
+       * memory map, say it isn't supported.
+       */
+       pointer = NULL;
+   }
+   else
+   {
+      unsigned i;
+
+      for (i = 0; i < 4; i++)
+      {
+         retro_ctx_memory_info_t meminfo;
+
+         switch (i)
+         {
+            case 0:
+               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
+               break;
+            case 1:
+               meminfo.id = RETRO_MEMORY_SAVE_RAM;
+               break;
+            case 2:
+               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
+               break;
+            case 3:
+               meminfo.id = RETRO_MEMORY_RTC;
+               break;
+         }
+
+         core_get_memory(&meminfo);
+
+         if (address < meminfo.size)
+         {
+            pointer = meminfo.data;
+            break;
+         }
+
+         /**
+          * HACK Subtract the correct amount of bytes to 
+          * reach the save RAM as its size is not always 
+          * set correctly in the core.
+          */
+         if (i == 0 && console == RC_CONSOLE_NINTENDO)
+            address -= 0x6000;
+         else
+            address -= meminfo.size;
+      }
+   }
+
+   if (!pointer)
+   {
+      CHEEVOS_LOG(RCHEEVOS_TAG "address %X not supported\n", original_address);
+      return NULL;
+   }
+
+   return (const uint8_t*)pointer + address;
+}

cheevos/parser.c

@@ -3,6 +3,7 @@
 #include "hash.h"
 #include "util.h"
 
+#include <encodings/utf.h>
 #include <formats/jsonsax.h>
 #include <string/stdstring.h>
 #include <compat/strl.h>
@@ -23,6 +24,7 @@
 #define CHEEVOS_JSON_KEY_TOKEN        0x0e2dbd26U
 #define CHEEVOS_JSON_KEY_FLAGS        0x0d2e96b2U
 #define CHEEVOS_JSON_KEY_LEADERBOARDS 0xf1247d2dU
+#define CHEEVOS_JSON_KEY_RICHPRESENCE 0xf18dd230U
 #define CHEEVOS_JSON_KEY_MEM          0x0b8807e4U
 #define CHEEVOS_JSON_KEY_FORMAT       0xb341208eU
 #define CHEEVOS_JSON_KEY_SUCCESS      0x110461deU
@@ -139,7 +141,7 @@ static int rcheevos_get_value(const char* json, unsigned key_hash,
 }
 
 /*****************************************************************************
-Returns the token of the error message
+Returns the token or the error message
 *****************************************************************************/
 
 int rcheevos_get_token(const char* json, char* token, size_t length)
@@ -152,6 +154,11 @@ int rcheevos_get_token(const char* json, char* token, size_t length)
    return rcheevos_get_value(json, CHEEVOS_JSON_KEY_TOKEN, token, length);
 }
 
+int rcheevos_get_json_error(const char* json, char* token, size_t length)
+{
+   return rcheevos_get_value(json, CHEEVOS_JSON_KEY_ERROR, token, length);
+}
+
 /*****************************************************************************
 Count number of achievements in a JSON file
 *****************************************************************************/
@@ -160,6 +167,7 @@ typedef struct
 {
    int      in_cheevos;
    int      in_lboards;
+   int      has_error;
    uint32_t field_hash;
    unsigned core_count;
    unsigned unofficial_count;
@@ -183,9 +191,11 @@ static int rcheevos_count_key(void* userdata,
    ud->field_hash        = rcheevos_djb2(name, length);
 
    if (ud->field_hash == CHEEVOS_JSON_KEY_ACHIEVEMENTS)
-      ud->in_cheevos     = 1;
+      ud->in_cheevos = 1;
    else if (ud->field_hash == CHEEVOS_JSON_KEY_LEADERBOARDS)
-      ud->in_lboards     = 1;
+      ud->in_lboards = 1;
+   else if (ud->field_hash == CHEEVOS_JSON_KEY_ERROR)
+      ud->has_error  = 1;
 
    return 0;
 }
@@ -212,7 +222,7 @@ static int rcheevos_count_number(void* userdata,
 
 static int rcheevos_count_cheevos(const char* json,
       unsigned* core_count, unsigned* unofficial_count,
-      unsigned* lboard_count)
+      unsigned* lboard_count, int* has_error)
 {
    static const jsonsax_handlers_t handlers =
    {
@@ -234,6 +244,7 @@ static int rcheevos_count_cheevos(const char* json,
    rcheevos_countud_t ud;
    ud.in_cheevos       = 0;
    ud.in_lboards       = 0;
+   ud.has_error        = 0;
    ud.core_count       = 0;
    ud.unofficial_count = 0;
    ud.lboard_count     = 0;
@@ -243,6 +254,7 @@ static int rcheevos_count_cheevos(const char* json,
    *core_count         = ud.core_count;
    *unofficial_count   = ud.unofficial_count;
    *lboard_count       = ud.lboard_count;
+   *has_error          = ud.has_error;
 
    return res;
 }
@@ -261,7 +273,10 @@ typedef struct
 {
    int      in_cheevos;
    int      in_lboards;
+   int      is_game_id;
+   int      is_title;
    int      is_console_id;
+   int      is_richpresence;
    unsigned core_count;
    unsigned unofficial_count;
    unsigned lboard_count;
@@ -273,16 +288,76 @@ typedef struct
    rcheevos_rapatchdata_t* patchdata;
 } rcheevos_readud_t;
 
-static const char* rcheevos_dupstr(const rcheevos_field_t* field)
+static char* rcheevos_unescape_string(const char* string, size_t length)
 {
-   char* string = (char*)malloc(field->length + 1);
+   const char* end = string + length;
+   char* buffer    = (char*)malloc(length + 1);
+   char* buffer_it = buffer;
 
-   if (!string)
+   if (buffer == NULL)
       return NULL;
 
-   memcpy((void*)string, (void*)field->string, field->length);
-   string[field->length] = 0;
-   return string;
+   while (string < end)
+   {
+      if (*string == '\\')
+      {
+         char escaped_char = string[1];
+         switch (escaped_char)
+         {
+            case 'r': /* Ignore carriage return */
+               string += 2;
+               break;
+
+            case 'n': /* Accept newlines */
+               *buffer_it++ = '\n';
+               string += 2;
+               break;
+
+            case 'u': /* Accept UTF-16 unicode characters */
+            {
+#define MAX_SEQUENCES 16
+               uint16_t  utf16[MAX_SEQUENCES];
+               char      utf8[MAX_SEQUENCES * 4];
+               uint8_t   i, j;
+
+               for (i = 1; i < MAX_SEQUENCES - 1; i++)
+                  if (strncmp((string + 6 * i), "\\u", 2))
+                     break;
+
+               /* Get escaped hex values and add them to the string */
+               for (j = 0; j < i; j++)
+               {
+                  char temp[5];
+
+                  string   += 2;
+                  memcpy(temp, string, 4);
+                  temp[4]   = '\0';
+                  utf16[j]  = string_hex_to_unsigned(temp);
+                  string   += 4;
+               }
+               utf16[j] = 0;
+
+               if (utf16_to_char_string(utf16, utf8, sizeof(utf8)))
+               {
+                  size_t utf8_len = strlen(utf8);
+                  memcpy(buffer_it, utf8, utf8_len);
+                  buffer_it += utf8_len;
+               }
+            }
+            break;
+
+            default:
+               *buffer_it++ = escaped_char;
+               string += 2;
+               break;
+         }
+      }
+      else
+         *buffer_it++ = *string++;
+   }
+   *buffer_it = '\0';
+
+   return buffer;
 }
 
 static int rcheevos_new_cheevo(rcheevos_readud_t* ud)
@@ -297,10 +372,10 @@ static int rcheevos_new_cheevo(rcheevos_readud_t* ud)
    else
       return 0;
 
-   cheevo->title       = rcheevos_dupstr(&ud->title);
-   cheevo->description = rcheevos_dupstr(&ud->desc);
-   cheevo->badge       = rcheevos_dupstr(&ud->badge);
-   cheevo->memaddr     = rcheevos_dupstr(&ud->memaddr);
+   cheevo->title       = rcheevos_unescape_string(ud->title.string, ud->title.length);
+   cheevo->description = rcheevos_unescape_string(ud->desc.string, ud->desc.length);
+   cheevo->badge       = rcheevos_unescape_string(ud->badge.string, ud->badge.length);
+   cheevo->memaddr     = rcheevos_unescape_string(ud->memaddr.string, ud->memaddr.length);
    cheevo->points      = (unsigned)strtol(ud->points.string, NULL, 10);
    cheevo->id          = (unsigned)strtol(ud->id.string, NULL, 10);
 
@@ -323,11 +398,11 @@ static int rcheevos_new_lboard(rcheevos_readud_t* ud)
 {
    rcheevos_ralboard_t* lboard = ud->patchdata->lboards + ud->lboard_count++;
 
-   lboard->title              = rcheevos_dupstr(&ud->title);
-   lboard->description        = rcheevos_dupstr(&ud->desc);
-   lboard->format             = rcheevos_dupstr(&ud->format);
-   lboard->mem                = rcheevos_dupstr(&ud->memaddr);
-   lboard->id                 = (unsigned)strtol(ud->id.string, NULL, 10);
+   lboard->title       = rcheevos_unescape_string(ud->title.string, ud->title.length);
+   lboard->description = rcheevos_unescape_string(ud->desc.string, ud->desc.length);
+   lboard->format      = rcheevos_unescape_string(ud->format.string, ud->format.length);
+   lboard->mem         = rcheevos_unescape_string(ud->memaddr.string, ud->memaddr.length);
+   lboard->id          = (unsigned)strtol(ud->id.string, NULL, 10);
 
    if (   !lboard->title
        || !lboard->description
@@ -386,9 +461,14 @@ static int rcheevos_read_key(void* userdata,
       case CHEEVOS_JSON_KEY_CONSOLE_ID:
          ud->is_console_id = 1;
          break;
+      case CHEEVOS_JSON_KEY_RICHPRESENCE:
+         ud->is_richpresence = 1;
+         break;
       case CHEEVOS_JSON_KEY_ID:
          if (common)
             ud->field = &ud->id;
+         else
+            ud->is_game_id = 1;
          break;
       case CHEEVOS_JSON_KEY_MEMADDR:
          if (ud->in_cheevos)
@@ -401,6 +481,8 @@ static int rcheevos_read_key(void* userdata,
       case CHEEVOS_JSON_KEY_TITLE:
          if (common)
             ud->field = &ud->title;
+         else
+            ud->is_title = 1;
          break;
       case CHEEVOS_JSON_KEY_DESCRIPTION:
          if (common)
@@ -451,6 +533,16 @@ static int rcheevos_read_string(void* userdata,
       ud->field->string = string;
       ud->field->length = length;
    }
+   else if (ud->is_title)
+   {
+      ud->patchdata->title = rcheevos_unescape_string(string, length);
+      ud->is_title = 0;
+   }
+   else if (ud->is_richpresence)
+   {
+      ud->patchdata->richpresence_script = rcheevos_unescape_string(string, length);
+      ud->is_richpresence = 0;
+   }
 
    return 0;
 }
@@ -465,6 +557,11 @@ static int rcheevos_read_number(void* userdata,
       ud->field->string = number;
       ud->field->length = length;
    }
+   else if (ud->is_game_id)
+   {
+      ud->patchdata->game_id = (unsigned)strtol(number, NULL, 10);
+      ud->is_game_id         = 0;
+   }
    else if (ud->is_console_id)
    {
       ud->patchdata->console_id = (unsigned)strtol(number, NULL, 10);
@@ -494,12 +591,13 @@ int rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata)
 
    rcheevos_readud_t ud;
    int res;
+   int has_error;
 
    /* Count the number of achievements in the JSON file. */
    res = rcheevos_count_cheevos(json, &patchdata->core_count,
-      &patchdata->unofficial_count, &patchdata->lboard_count);
+      &patchdata->unofficial_count, &patchdata->lboard_count, &has_error);
 
-   if (res != JSONSAX_OK)
+   if (res != JSONSAX_OK || has_error)
       return -1;
 
    /* Allocate the achievements. */
@@ -524,10 +622,16 @@ int rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata)
       return -1;
    }
 
+   patchdata->richpresence_script = NULL;
+   patchdata->title = NULL;
+
    /* Load the achievements. */
    ud.in_cheevos       = 0;
    ud.in_lboards       = 0;
+   ud.is_game_id       = 0;
+   ud.is_title         = 0;
    ud.is_console_id    = 0;
+   ud.is_richpresence  = 0;
    ud.field            = NULL;
    ud.core_count       = 0;
    ud.unofficial_count = 0;
@@ -586,7 +690,10 @@ void rcheevos_free_patchdata(rcheevos_rapatchdata_t* patchdata)
    CHEEVOS_FREE(patchdata->core);
    CHEEVOS_FREE(patchdata->unofficial);
    CHEEVOS_FREE(patchdata->lboards);
+   CHEEVOS_FREE(patchdata->richpresence_script);
+   CHEEVOS_FREE(patchdata->title);
 
+   patchdata->game_id          = 0;
    patchdata->console_id       = 0;
    patchdata->core             = NULL;
    patchdata->unofficial       = NULL;

cheevos/parser.h

@@ -42,11 +42,14 @@ typedef struct {
 } rcheevos_ralboard_t;
 
 typedef struct {
+   unsigned game_id;
    unsigned console_id;
+   char* title;
 
    rcheevos_racheevo_t* core;
    rcheevos_racheevo_t* unofficial;
    rcheevos_ralboard_t* lboards;
+   char* richpresence_script;
 
    unsigned core_count;
    unsigned unofficial_count;
@@ -55,6 +58,7 @@ typedef struct {
 
 typedef void (*rcheevos_unlock_cb_t)(unsigned id, void* userdata);
 
+int rcheevos_get_json_error(const char* json, char* token, size_t length);
 int rcheevos_get_token(const char* json, char* token, size_t length);
 
 int  rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata);

cheevos/util.h

@@ -32,7 +32,7 @@ End of setup
 *****************************************************************************/
 
 #define RCHEEVOS_TAG "[RCHEEVOS]: "
-#define CHEEVOS_FREE(p) do { void* q = (void*)p; if (q != NULL) free(q); } while (0)
+#define CHEEVOS_FREE(p) do { void* q = (void*)p; if (q) free(q); } while (0)
 
 #ifdef CHEEVOS_VERBOSE
 

com.libretro.RetroArch.appdata.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>com.libretro.RetroArch</id>
+  <launchable type="desktop-id">retroarch.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>RetroArch</name>
+  <summary>Frontend for emulators, game engines and media players</summary>
+  <description>
+    <p>
+      RetroArch is an open source and cross platform frontend/framework for emulators, game engines, video games, media players and other applications.
+    </p>
+    <p>
+      While it can do many things besides this, it is most widely known for enabling you to run classic games on a wide range of computers and consoles through a slick graphical interface. Settings are also unified so configuration is done once and for all.
+    </p>
+    <p>
+      In addition to this, you will soon be able to run original game discs (CDs) from RetroArch. We take videogame preservation seriously and want to ensure you can run your originally bought content on modern day PCs.
+    </p>
+    <p>
+      RetroArch has advanced features like shaders, netplay, rewinding, next-frame response times, runahead, and more!
+    </p>
+  </description>
+  <url type="homepage">https://www.retroarch.com/</url>
+  <url type="bugtracker">https://github.com/libretro/RetroArch/issues</url>
+  <url type="donation">https://www.retroarch.com/index.php?page=donate</url>
+  <releases>
+    <release version="1.9.0"/>
+  </releases>
+  <project_group>Libretro</project_group>
+  <project_license>GPL-3.0</project_license>
+  <developer_name>Libretro</developer_name>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://www.retroarch.com/images/xmb-tabs.png</image>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://www.retroarch.com/images/xmb-updater.png</image>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://www.retroarch.com/images/xmb-osk.png</image>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://www.retroarch.com/images/xmb-playlists.png</image>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://www.retroarch.com/images/xmb-metadata.png</image>
+    </screenshot>
+  </screenshots>
+</component>

command.h

@@ -180,6 +180,8 @@ enum event_command
    CMD_EVENT_DISK_NEXT,
    /* Cycle to previous disk. */
    CMD_EVENT_DISK_PREV,
+   /* Switch to specified disk index */
+   CMD_EVENT_DISK_INDEX,
    /* Appends disk image to disk image list. */
    CMD_EVENT_DISK_APPEND_IMAGE,
    /* Stops rumbling. */
@@ -208,11 +210,10 @@ enum event_command
    CMD_EVENT_CHEAT_INDEX_PLUS,
    CMD_EVENT_CHEAT_INDEX_MINUS,
    CMD_EVENT_CHEAT_TOGGLE,
-   CMD_EVENT_AI_SERVICE_CALL
+   CMD_EVENT_AI_SERVICE_CALL,
+   CMD_EVENT_SAVE_FILES
 };
 
-bool command_set_shader(const char *arg);
-
 /**
  * command_event:
  * @cmd                  : Command index.

config.def.h

@@ -53,46 +53,6 @@
 #define DEFAULT_ASPECT_RATIO -1.0f
 #endif
 
-#if defined(ANDROID)
-#define DEFAULT_MAX_PADS 8
-#define ANDROID_KEYBOARD_PORT DEFAULT_MAX_PADS
-#elif defined(_3DS)
-#define DEFAULT_MAX_PADS 1
-#elif defined(SWITCH) || defined(HAVE_LIBNX)
-#define DEFAULT_MAX_PADS 8
-#elif defined(WIIU)
-#ifdef WIIU_HID
-#define DEFAULT_MAX_PADS 16
-#else
-#define DEFAULT_MAX_PADS 5
-#endif
-#elif defined(DJGPP)
-#define DEFAULT_MAX_PADS 1
-#define DOS_KEYBOARD_PORT DEFAULT_MAX_PADS
-#elif defined(XENON)
-#define DEFAULT_MAX_PADS 4
-#elif defined(VITA) || defined(SN_TARGET_PSP2)
-#define DEFAULT_MAX_PADS 4
-#elif defined(PSP)
-#define DEFAULT_MAX_PADS 1
-#elif defined(PS2)
-#define DEFAULT_MAX_PADS 2
-#elif defined(GEKKO) || defined(HW_RVL)
-#define DEFAULT_MAX_PADS 4
-#elif defined(__linux__) || (defined(BSD) && !defined(__MACH__))
-#define DEFAULT_MAX_PADS 8
-#elif defined(__QNX__)
-#define DEFAULT_MAX_PADS 8
-#elif defined(__CELLOS_LV2__)
-#define DEFAULT_MAX_PADS 7
-#elif defined(_XBOX)
-#define DEFAULT_MAX_PADS 4
-#elif defined(HAVE_XINPUT) && !defined(HAVE_DINPUT)
-#define DEFAULT_MAX_PADS 4
-#else
-#define DEFAULT_MAX_PADS 16
-#endif
-
 #if defined(GEKKO)
 #define DEFAULT_MOUSE_SCALE 1
 #endif
@@ -116,6 +76,8 @@
 #ifdef HAVE_MATERIALUI
 /* Show icons to the left of each menu entry */
 #define DEFAULT_MATERIALUI_ICONS_ENABLE true
+/* Show system-specific icons in the playlists tab */
+#define DEFAULT_MATERIALUI_PLAYLIST_ICONS_ENABLE true
 #endif
 
 /* Material UI colour theme */
@@ -137,6 +99,11 @@
 #define DEFAULT_MATERIALUI_LANDSCAPE_LAYOUT_OPTIMIZATION MATERIALUI_LANDSCAPE_LAYOUT_OPTIMIZATION_ALWAYS
 #endif
 
+/* Show/hide navigation bar
+ * > When hidden, MaterialUI menu navigation
+ *   behaves like RGUI */
+#define DEFAULT_MATERIALUI_SHOW_NAV_BAR true
+
 /* Reposition navigation bar to make better use
  * of screen space when using landscape layouts */
 #define DEFAULT_MATERIALUI_AUTO_ROTATE_NAV_BAR true
@@ -168,6 +135,8 @@
 
 #define DEFAULT_CRT_SWITCH_CENTER_ADJUST 0
 
+#define DEFAULT_CRT_SWITCH_PORCH_ADJUST 0
+
 #define DEFAULT_HISTORY_LIST_ENABLE true
 
 #define DEFAULT_PLAYLIST_ENTRY_RENAME true
@@ -251,6 +220,18 @@
 #endif
 #define DEFAULT_CHECK_FIRMWARE_BEFORE_LOADING false
 
+/* Specifies whether to 'reload' (fork and quit)
+ * RetroArch when launching content with the
+ * currently loaded core
+ * > Only relevant on platforms without dynamic core
+ *   loading support
+ * > Setting this to 'false' will decrease loading
+ *   times when required core is already running,
+ *   but may cause stability issues (if core misbehaves) */
+#ifndef HAVE_DYNAMIC
+#define DEFAULT_ALWAYS_RELOAD_CORE_ON_RUN_CONTENT true
+#endif
+
 /* Forcibly disable composition.
  * Only valid on Windows Vista/7/8 for now. */
 #define DEFAULT_DISABLE_COMPOSITION false
@@ -327,7 +308,14 @@
 #endif
 
 /* Smooths picture. */
+#if defined(_3DS) || defined(GEKKO) || defined(HW_RVL) || defined(PSP) || defined(VITA) || defined(SN_TARGET_PSP2) || defined(PS2) || defined(_XBOX)
 #define DEFAULT_VIDEO_SMOOTH true
+#else
+#define DEFAULT_VIDEO_SMOOTH false
+#endif
+
+/* Graphics context specific scaling */
+#define DEFAULT_VIDEO_CTX_SCALING false
 
 /* On resize and fullscreen, rendering area will stay 4:3 */
 #define DEFAULT_FORCE_ASPECT true
@@ -384,9 +372,9 @@
 #define DEFAULT_OVERLAY_AUTO_ROTATE false
 #endif
 
+#include "runtime_file.h"
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
-#include "menu/menu_animation.h"
 
 #ifdef HAVE_LIBNX
 #define DEFAULT_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME true
@@ -395,8 +383,11 @@
 #endif
 
 #ifdef HAVE_OZONE
+/* Ozone colour theme: 1 == Basic Black */
+#define DEFAULT_OZONE_COLOR_THEME 1
 #define DEFAULT_OZONE_COLLAPSE_SIDEBAR false
 #define DEFAULT_OZONE_TRUNCATE_PLAYLIST_NAME true
+#define DEFAULT_OZONE_SORT_AFTER_TRUNCATE_PLAYLIST_NAME true
 #define DEFAULT_OZONE_SCROLL_CONTENT_METADATA false
 #endif
 
@@ -446,89 +437,116 @@
 
 #define DEFAULT_QUICK_MENU_SHOW_CLOSE_CONTENT true
 
-static bool quick_menu_show_take_screenshot             = true;
-static bool quick_menu_show_save_load_state             = true;
-static bool quick_menu_show_undo_save_load_state        = true;
-static bool quick_menu_show_add_to_favorites            = true;
-static bool quick_menu_show_start_recording             = true;
-static bool quick_menu_show_start_streaming             = true;
-static bool quick_menu_show_set_core_association        = true;
-static bool quick_menu_show_reset_core_association      = true;
-static bool quick_menu_show_options                     = true;
-static bool quick_menu_show_controls                    = true;
-static bool quick_menu_show_cheats                      = true;
-static bool quick_menu_show_shaders                     = true;
-static bool quick_menu_show_information                 = true;
-static bool quick_menu_show_recording                   = true;
-static bool quick_menu_show_streaming                   = true;
+#define DEFAULT_QUICK_MENU_SHOW_TAKE_SCREENSHOT true
 
-static bool quick_menu_show_save_core_overrides         = true;
-static bool quick_menu_show_save_game_overrides         = true;
-static bool quick_menu_show_save_content_dir_overrides  = true;
+#define DEFAULT_QUICK_MENU_SHOW_SAVE_LOAD_STATE true
 
-static bool quick_menu_show_download_thumbnails         = true;
+#define DEFAULT_QUICK_MENU_SHOW_UNDO_SAVE_LOAD_STATE true
 
-static bool kiosk_mode_enable            = false;
+static const bool quick_menu_show_add_to_favorites            = true;
+static const bool quick_menu_show_start_recording             = true;
+static const bool quick_menu_show_start_streaming             = true;
+static const bool quick_menu_show_set_core_association        = true;
+static const bool quick_menu_show_reset_core_association      = true;
+static const bool quick_menu_show_options                     = true;
+static const bool quick_menu_show_controls                    = true;
+static const bool quick_menu_show_cheats                      = true;
+static const bool quick_menu_show_shaders                     = true;
+static const bool quick_menu_show_information                 = true;
+static const bool quick_menu_show_recording                   = true;
+static const bool quick_menu_show_streaming                   = true;
+
+static const bool quick_menu_show_save_core_overrides         = true;
+static const bool quick_menu_show_save_game_overrides         = true;
+static const bool quick_menu_show_save_content_dir_overrides  = true;
+
+#ifdef HAVE_NETWORKING
+static const bool quick_menu_show_download_thumbnails         = true;
+#endif
+
+#define DEFAULT_KIOSK_MODE_ENABLE false
 
 #define DEFAULT_MENU_HORIZONTAL_ANIMATION true
 
-static bool menu_show_online_updater     = true;
-static bool menu_show_load_core          = true;
-static bool menu_show_load_content       = true;
+static const bool menu_show_online_updater     = true;
+static const bool menu_show_load_core          = true;
+static const bool menu_show_load_content       = true;
 #ifdef HAVE_CDROM
-static bool menu_show_load_disc          = true;
-static bool menu_show_dump_disc          = true;
+static const bool menu_show_load_disc          = true;
+static const bool menu_show_dump_disc          = true;
 #endif
-static bool menu_show_information        = true;
-static bool menu_show_configurations     = true;
-static bool menu_show_help               = true;
-static bool menu_show_quit_retroarch     = true;
-static bool menu_show_restart_retroarch  = true;
-static bool menu_show_reboot             = true;
-static bool menu_show_shutdown           = true;
+static const bool menu_show_information        = true;
+static const bool menu_show_configurations     = true;
+static const bool menu_show_help               = true;
+static const bool menu_show_quit_retroarch     = true;
+static const bool menu_show_restart_retroarch  = true;
+static const bool menu_show_reboot             = true;
+static const bool menu_show_shutdown           = true;
 #if defined(HAVE_LAKKA) || defined(VITA) || defined(_3DS)
-static bool menu_show_core_updater       = false;
+static const bool menu_show_core_updater       = false;
 #else
-static bool menu_show_core_updater       = true;
+static const bool menu_show_core_updater       = true;
 #endif
-static bool menu_show_legacy_thumbnail_updater = false;
-static bool menu_show_sublabels          = true;
+static const bool menu_show_legacy_thumbnail_updater = false;
+static const bool menu_show_sublabels          = true;
 
-static unsigned menu_ticker_type         = TICKER_TYPE_BOUNCE;
-static float menu_ticker_speed           = 1.0f;
+static const bool menu_scroll_fast             = false;
+
+#define DEFAULT_MENU_TICKER_TYPE                 (TICKER_TYPE_LOOP)
+static const float menu_ticker_speed           = 2.0f;
 
 #define DEFAULT_MENU_TICKER_SMOOTH true
 
 #if defined(HAVE_THREADS)
-static bool menu_savestate_resume     = true;
+static const bool menu_savestate_resume     = true;
 #else
-static bool menu_savestate_resume     = false;
+static const bool menu_savestate_resume     = false;
 #endif
 
-static bool content_show_settings     = true;
-static bool content_show_favorites    = true;
+#define DEFAULT_MENU_INSERT_DISK_RESUME true
+
+static const bool content_show_settings     = true;
+static const bool content_show_favorites    = true;
 #ifdef HAVE_IMAGEVIEWER
-static bool content_show_images       = true;
+static const bool content_show_images       = true;
 #endif
-static bool content_show_music        = true;
+static const bool content_show_music        = true;
 #if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
-static bool content_show_video        = true;
+static const bool content_show_video        = true;
 #endif
-#ifdef HAVE_NETWORKING
-static bool content_show_netplay      = true;
+#if defined(HAVE_NETWORKING)
+#if defined(_3DS)
+static const bool content_show_netplay      = false;
+#else
+static const bool content_show_netplay      = true;
+#endif
+#endif
+static const bool content_show_history      = true;
+
+/* Specifies 'add content' visibility when using
+ * menus WITH a dedicated 'Import Content' tab */
+#define DEFAULT_MENU_CONTENT_SHOW_ADD true
+/* Specifies 'add content' visibility when using
+ * menus WITHOUT a dedicated 'Import Content' tab */
+#define DEFAULT_MENU_CONTENT_SHOW_ADD_ENTRY MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB
+
+static const bool content_show_playlists    = true;
+#if defined(HAVE_LIBRETRODB)
+#define DEFAULT_MENU_CONTENT_SHOW_EXPLORE true
 #endif
-static bool content_show_history      = true;
-static bool content_show_add     	  = true;
-static bool content_show_playlists    = true;
 
 #ifdef HAVE_XMB
-static unsigned xmb_alpha_factor      = 75;
-static unsigned menu_font_color_red   = 255;
-static unsigned menu_font_color_green = 255;
-static unsigned menu_font_color_blue  = 255;
-static unsigned xmb_menu_layout       = 0;
-static unsigned xmb_icon_theme        = XMB_ICON_THEME_MONOCHROME;
-static unsigned xmb_theme             = XMB_THEME_ELECTRIC_BLUE;
+static const unsigned xmb_alpha_factor      = 75;
+static const unsigned menu_font_color_red   = 255;
+static const unsigned menu_font_color_green = 255;
+static const unsigned menu_font_color_blue  = 255;
+#ifdef HAVE_ODROIDGO2
+static const unsigned xmb_menu_layout       = 2;
+#else
+static const unsigned xmb_menu_layout       = 0;
+#endif
+static const unsigned xmb_icon_theme        = XMB_ICON_THEME_MONOCHROME;
+static const unsigned xmb_theme             = XMB_THEME_ELECTRIC_BLUE;
 
 #if defined(HAVE_LAKKA) || defined(__arm__) || defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
 #define DEFAULT_XMB_SHADOWS_ENABLE false
@@ -537,13 +555,13 @@ static unsigned xmb_theme             = XMB_THEME_ELECTRIC_BLUE;
 #endif
 #endif
 
-static float menu_framebuffer_opacity = 0.900;
+static const float menu_framebuffer_opacity = 0.900;
 
-static float menu_wallpaper_opacity = 0.300;
+static const float menu_wallpaper_opacity = 0.300;
 
-static float menu_footer_opacity = 1.000;
+static const float menu_footer_opacity = 1.000;
 
-static float menu_header_opacity = 1.000;
+static const float menu_header_opacity = 1.000;
 
 #if defined(HAVE_OPENGLES2) || (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
 #define DEFAULT_MENU_SHADER_PIPELINE 1
@@ -555,18 +573,19 @@ static float menu_header_opacity = 1.000;
 
 #define DEFAULT_RGUI_COLOR_THEME RGUI_THEME_CLASSIC_GREEN
 
-static bool rgui_inline_thumbnails = false;
-static bool rgui_swap_thumbnails = false;
-static unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT;
-static unsigned rgui_thumbnail_delay = 0;
-static unsigned rgui_internal_upscale_level = RGUI_UPSCALE_NONE;
-static bool rgui_full_width_layout = true;
-static unsigned rgui_aspect = RGUI_ASPECT_RATIO_4_3;
-static unsigned rgui_aspect_lock = RGUI_ASPECT_RATIO_LOCK_NONE;
-static bool rgui_shadows = false;
-static unsigned rgui_particle_effect = RGUI_PARTICLE_EFFECT_NONE;
+static const bool rgui_inline_thumbnails = false;
+static const bool rgui_swap_thumbnails = false;
+static const unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT;
+static const unsigned rgui_thumbnail_delay = 0;
+static const unsigned rgui_internal_upscale_level = RGUI_UPSCALE_NONE;
+static const bool rgui_full_width_layout = true;
+static const unsigned rgui_aspect = RGUI_ASPECT_RATIO_4_3;
+static const unsigned rgui_aspect_lock = RGUI_ASPECT_RATIO_LOCK_NONE;
+static const bool rgui_shadows = false;
+static const unsigned rgui_particle_effect = RGUI_PARTICLE_EFFECT_NONE;
 #define DEFAULT_RGUI_PARTICLE_EFFECT_SPEED 1.0f
-static bool rgui_extended_ascii = false;
+static const bool rgui_extended_ascii = false;
+#define DEFAULT_RGUI_SWITCH_ICONS true
 #endif
 
 #ifdef HAVE_MENU
@@ -578,39 +597,41 @@ static bool rgui_extended_ascii = false;
 /* TODO/FIXME - this setting is thread-unsafe right now and can corrupt the stack - default to off */
 #define DEFAULT_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST false
 
-static bool default_game_specific_options = true;
-static bool default_auto_overrides_enable = true;
-static bool default_auto_remaps_enable = true;
-static bool default_global_core_options = true;
-static bool default_auto_shaders_enable = true;
+static const bool default_game_specific_options = true;
+static const bool default_auto_overrides_enable = true;
+static const bool default_auto_remaps_enable = true;
+static const bool default_global_core_options = false;
+static const bool default_auto_shaders_enable = true;
 
-static bool default_sort_savefiles_enable = false;
-static bool default_sort_savestates_enable = false;
+static const bool default_sort_savefiles_enable = false;
+static const bool default_sort_savestates_enable = false;
 
-static bool default_savestates_in_content_dir = false;
-static bool default_savefiles_in_content_dir = false;
-static bool default_systemfiles_in_content_dir = false;
-static bool default_screenshots_in_content_dir = false;
+static const bool default_savestates_in_content_dir = false;
+static const bool default_savefiles_in_content_dir = false;
+static const bool default_systemfiles_in_content_dir = false;
+static const bool default_screenshots_in_content_dir = false;
 
-#if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360)
-static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L3_R3;
+#if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360) || defined(DINGUX)
+static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L3_R3;
 #elif defined(PS2) || defined(PSP)
-static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_HOLD_START;
+static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_HOLD_START;
 #elif defined(VITA)
-static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L1_R1_START_SELECT;
+static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L1_R1_START_SELECT;
 #elif defined(SWITCH) || defined(ORBIS)
-static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_START_SELECT;
+static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_START_SELECT;
 #elif TARGET_OS_TV
-static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_DOWN_Y_L_R;
+static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_DOWN_Y_L_R;
 #else
-static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_NONE;
+static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_NONE;
 #endif
 
 #if defined(VITA)
-static unsigned input_backtouch_enable       = false;
-static unsigned input_backtouch_toggle       = false;
+static const unsigned input_backtouch_enable       = false;
+static const unsigned input_backtouch_toggle       = false;
 #endif
 
+#define DEFAULT_OVERLAY_ENABLE_AUTOPREFERRED true
+
 #define DEFAULT_SHOW_PHYSICAL_INPUTS true
 
 #define DEFAULT_ALL_USERS_CONTROL_MENU false
@@ -631,7 +652,12 @@ static unsigned input_backtouch_toggle       = false;
 #define DEFAULT_CROP_OVERSCAN true
 
 /* Font size for on-screen messages. */
+#if defined(DINGUX)
+#define DEFAULT_FONT_SIZE 12
+#else
 #define DEFAULT_FONT_SIZE 32
+#endif
+
 
 /* Offset for where messages will be placed on-screen.
  * Values are in range [0.0, 1.0]. */
@@ -710,12 +736,62 @@ static const bool audio_enable_menu_cancel = false;
 static const bool audio_enable_menu_notice = false;
 static const bool audio_enable_menu_bgm    = false;
 
-#ifdef HAVE_MENU_WIDGETS
+#ifdef HAVE_GFX_WIDGETS
 #define DEFAULT_MENU_ENABLE_WIDGETS true
 #else
 #define DEFAULT_MENU_ENABLE_WIDGETS false
 #endif
 
+/* Display an animation when loading content
+ * > Currently implemented only as a widget */
+#define DEFAULT_MENU_SHOW_LOAD_CONTENT_ANIMATION DEFAULT_MENU_ENABLE_WIDGETS
+
+/* Display a notification when successfully
+ * connecting/disconnecting an autoconfigured
+ * controller
+ * > Disabled by default on the Switch */
+#if defined(HAVE_LIBNX) && defined(HAVE_GFX_WIDGETS)
+#define DEFAULT_NOTIFICATION_SHOW_AUTOCONFIG false
+#else
+#define DEFAULT_NOTIFICATION_SHOW_AUTOCONFIG true
+#endif
+
+#if defined(HAVE_SCREENSHOTS)
+#define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_TAKEN true
+#else
+#define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_TAKEN false
+#endif
+
+/* Display a notification when cheats are being
+ * applied */
+#define DEFAULT_NOTIFICATION_SHOW_CHEATS_APPLIED true
+
+/* Display a notification when loading an
+ * input remap file */
+#define DEFAULT_NOTIFICATION_SHOW_REMAP_LOAD true
+
+/* Display a notification when loading a
+ * configuration override file */
+#define DEFAULT_NOTIFICATION_SHOW_CONFIG_OVERRIDE_LOAD true
+
+/* Display a notification when automatically restoring
+ * at launch the last used disk of multi-disk content */
+#define DEFAULT_NOTIFICATION_SHOW_SET_INITIAL_DISK true
+
+/* Display a notification when fast forwarding
+ * content */
+#define DEFAULT_NOTIFICATION_SHOW_FAST_FORWARD true
+
+/*Display a notification when taking a screenshot*/
+#define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT true
+
+/*Desired duration of the screenshot notification*/
+#define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_DURATION 0
+
+/* Display a white flashing effect with the desired 
+ * duration when taking a screenshot*/
+#define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_FLASH 0
+
 /* Output samplerate. */
 #ifdef GEKKO
 #define DEFAULT_OUTPUT_RATE 32000
@@ -763,11 +839,16 @@ static const bool audio_enable_menu_bgm    = false;
 
 #ifdef HAVE_WASAPI
 /* WASAPI defaults */
-static const bool wasapi_exclusive_mode  = true;
-static const bool wasapi_float_format    = false;
-static const int wasapi_sh_buffer_length = -16; /* auto */
+#define DEFAULT_WASAPI_EXCLUSIVE_MODE true
+#define DEFAULT_WASAPI_FLOAT_FORMAT false
+/* auto */
+#define DEFAULT_WASAPI_SH_BUFFER_LENGTH -16
 #endif
 
+/* Automatically mute audio when fast forward
+ * is enabled */
+#define DEFAULT_AUDIO_FASTFORWARD_MUTE false
+
 /* MISC */
 
 /* Enables displaying the current frames per second. */
@@ -776,6 +857,9 @@ static const int wasapi_sh_buffer_length = -16; /* auto */
 /* FPS display will be updated at the set interval (in frames) */
 #define DEFAULT_FPS_UPDATE_INTERVAL 256
 
+/* Memory status display will be updated at the set interval (in frames) */
+#define DEFAULT_MEMORY_UPDATE_INTERVAL 256
+
 /* Enables displaying the current frame count. */
 #define DEFAULT_FRAMECOUNT_SHOW false
 
@@ -849,7 +933,7 @@ static const int netplay_check_frames = 600;
 
 static const bool netplay_use_mitm_server = false;
 
-static const char *netplay_mitm_server = "nyc";
+#define DEFAULT_NETPLAY_MITM_SERVER "nyc"
 
 #ifdef HAVE_NETWORKING
 static const unsigned netplay_share_digital = RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE;
@@ -876,6 +960,23 @@ static const bool savestate_auto_load = false;
 
 static const bool savestate_thumbnail_enable = false;
 
+/* When creating save (srm) files, compress
+ * written data */
+#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#define DEFAULT_SAVE_FILE_COMPRESSION true
+#else
+#define DEFAULT_SAVE_FILE_COMPRESSION false
+#endif
+
+/* When creating save state files, compress
+ * written data */
+#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+/* TODO/FIXME Apparently this is an issue on UWP for now, so disable it for now */
+#define DEFAULT_SAVESTATE_FILE_COMPRESSION false
+#else
+#define DEFAULT_SAVESTATE_FILE_COMPRESSION true
+#endif
+
 /* Slowmotion ratio. */
 #define DEFAULT_SLOWMOTION_RATIO 3.0
 
@@ -889,10 +990,10 @@ static const bool savestate_thumbnail_enable = false;
 #define DEFAULT_RUN_AHEAD_FRAMES 1
 
 /* When using the Run Ahead feature, use a secondary instance of the core. */
-static const bool run_ahead_secondary_instance = true;
+#define DEFAULT_RUN_AHEAD_SECONDARY_INSTANCE true
 
 /* Hide warning messages when using the Run Ahead feature. */
-static const bool run_ahead_hide_warnings = false;
+#define DEFAULT_RUN_AHEAD_HIDE_WARNINGS false
 
 /* Enable stdin/network command interface. */
 static const bool network_cmd_enable = false;
@@ -901,39 +1002,63 @@ static const bool stdin_cmd_enable = false;
 
 static const uint16_t network_remote_base_port = 55400;
 
-#if defined(ANDROID) || defined(IOS)
-static const bool network_on_demand_thumbnails = true;
+#define DEFAULT_NETWORK_BUILDBOT_AUTO_EXTRACT_ARCHIVE true
+#define DEFAULT_NETWORK_BUILDBOT_SHOW_EXPERIMENTAL_CORES false
+
+/* Automatically create a backup whenever a core is
+ * updated via the online updater
+ * > Enable by default on all modern platforms with
+ *   online updater support */
+#if defined(HAVE_ONLINE_UPDATER) && (defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(__x86_64__) || defined(_M_X64) || defined(_WIN32) || defined(OSX) || defined(ANDROID) || defined(IOS))
+#define DEFAULT_CORE_UPDATER_AUTO_BACKUP true
 #else
-static const bool network_on_demand_thumbnails = false;
+#define DEFAULT_CORE_UPDATER_AUTO_BACKUP false
+#endif
+/* Number of automatic core backups to retain
+ * (oldest backup will be deleted when creating
+ * a new one) */
+#define DEFAULT_CORE_UPDATER_AUTO_BACKUP_HISTORY_SIZE 1
+
+#if defined(ANDROID) || defined(IOS)
+#define DEFAULT_NETWORK_ON_DEMAND_THUMBNAILS true
+#else
+#define DEFAULT_NETWORK_ON_DEMAND_THUMBNAILS false
 #endif
 
 /* Number of entries that will be kept in content history playlist file. */
-static const unsigned default_content_history_size = 100;
+static const unsigned default_content_history_size = 200;
 
 /* Number of entries that will be kept in content favorites playlist file.
  * -1 == 'unlimited' (99999) */
-static const int default_content_favorites_size = 100;
+static const int default_content_favorites_size = 200;
 
 /* Sort all playlists (apart from histories) alphabetically */
-static const bool playlist_sort_alphabetical = true;
+#define DEFAULT_PLAYLIST_SORT_ALPHABETICAL true
 
 /* File format to use when writing playlists to disk */
-static const bool playlist_use_old_format = false;
+#define DEFAULT_PLAYLIST_USE_OLD_FORMAT false
+
+/* When creating/updating playlists, compress written data */
+#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#define DEFAULT_PLAYLIST_COMPRESSION true
+#else
+#define DEFAULT_PLAYLIST_COMPRESSION false
+#endif
 
 #ifdef HAVE_MENU
 /* Specify when to display 'core name' inline on playlist entries */
-static const unsigned playlist_show_inline_core_name = PLAYLIST_INLINE_CORE_DISPLAY_HIST_FAV;
+#define DEFAULT_PLAYLIST_SHOW_INLINE_CORE_NAME PLAYLIST_INLINE_CORE_DISPLAY_HIST_FAV
 
 /* Specifies which runtime record to use on playlist sublabels */
-static const unsigned playlist_sublabel_runtime_type = PLAYLIST_RUNTIME_PER_CORE;
+#define DEFAULT_PLAYLIST_SUBLABEL_RUNTIME_TYPE PLAYLIST_RUNTIME_PER_CORE
 
 /* Specifies time/date display format for runtime 'last played' data */
 #define DEFAULT_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS
 
-static const unsigned playlist_entry_remove_enable = PLAYLIST_ENTRY_REMOVE_ENABLE_ALL;
+#define DEFAULT_PLAYLIST_ENTRY_REMOVE_ENABLE PLAYLIST_ENTRY_REMOVE_ENABLE_ALL
 #endif
 
-static const bool scan_without_core_match      = false;
+#define DEFAULT_SCAN_WITHOUT_CORE_MATCH false
 
 #ifdef __WINRT__
 /* Be paranoid about WinRT file I/O performance, and leave this disabled by
@@ -943,14 +1068,25 @@ static const bool scan_without_core_match      = false;
 #define DEFAULT_PLAYLIST_SHOW_SUBLABELS true
 #endif
 
-static const bool playlist_fuzzy_archive_match = false;
+#define DEFAULT_PLAYLIST_FUZZY_ARCHIVE_MATCH false
+
+#define DEFAULT_PLAYLIST_PORTABLE_PATHS false
 
 /* Show Menu start-up screen on boot. */
-static const bool default_menu_show_start_screen = true;
+#define DEFAULT_MENU_SHOW_START_SCREEN true
 
-/* Default scale factor for non-frambuffer-based menu
- * drivers and menu widgets */
+/* Default scale factor for non-frambuffer-based display
+ * drivers and display widgets */
 #define DEFAULT_MENU_SCALE_FACTOR 1.0f
+/* Specifies whether display widgets should be scaled
+ * automatically using the default menu scale factor */
+#define DEFAULT_MENU_WIDGET_SCALE_AUTO true
+/* Default scale factor for display widgets when widget
+ * auto scaling is disabled (fullscreen mode) */
+#define DEFAULT_MENU_WIDGET_SCALE_FACTOR 1.0f
+/* Default scale factor for display widgets when widget
+ * auto scaling is disabled (windowed mode) */
+#define DEFAULT_MENU_WIDGET_SCALE_FACTOR_WINDOWED 1.0f
 
 /* Log level for the frontend */
 #define DEFAULT_FRONTEND_LOG_LEVEL 1
@@ -970,11 +1106,11 @@ static const bool default_menu_show_start_screen = true;
 
 /* Axis threshold (between 0.0 and 1.0)
  * How far an axis must be tilted to result in a button press. */
-static const float axis_threshold         = 0.5f;
+#define DEFAULT_AXIS_THRESHOLD 0.5f
 
-static const float analog_deadzone        = 0.0f;
+#define DEFAULT_ANALOG_DEADZONE 0.0f
 
-static const float analog_sensitivity     = 1.0f;
+#define DEFAULT_ANALOG_SENSITIVITY 1.0f
 
 /* Describes speed of which turbo-enabled buttons toggle. */
 static const unsigned turbo_period        = 6;
@@ -1000,14 +1136,17 @@ static const unsigned input_bind_timeout = 5;
 
 static const unsigned input_bind_hold = 2;
 
-static const unsigned menu_thumbnails_default = 3;
+#define DEFAULT_INPUT_HOTKEY_BLOCK_DELAY 5
+
+static const unsigned gfx_thumbnails_default = 3;
 
 static const unsigned menu_left_thumbnails_default = 0;
 
-static const unsigned menu_thumbnail_upscale_threshold = 0;
+static const unsigned gfx_thumbnail_upscale_threshold = 0;
 
 #ifdef HAVE_MENU
-static const unsigned menu_timedate_style = MENU_TIMEDATE_STYLE_DM_HM;
+#define DEFAULT_MENU_TIMEDATE_STYLE          MENU_TIMEDATE_STYLE_DDMM_HM
+#define DEFAULT_MENU_TIMEDATE_DATE_SEPARATOR MENU_TIMEDATE_DATE_SEPARATOR_HYPHEN
 #endif
 
 static const bool xmb_vertical_thumbnails = false;
@@ -1026,7 +1165,7 @@ static const bool ui_companion_enable = false;
 static const bool ui_companion_toggle = false;
 
 /* Only init the WIMP UI for this session if this is enabled */
-static const bool desktop_menu_enable = true;
+#define DEFAULT_DESKTOP_MENU_ENABLE true
 
 /* Keep track of how long each core+content has been running for over time */
 
@@ -1038,22 +1177,25 @@ static const bool desktop_menu_enable = true;
 #define DEFAULT_CONTENT_RUNTIME_LOG true
 #endif
 
-/* Keep track of how long each content has been running for over time (ignores core) */
-static const bool content_runtime_log_aggregate = false;
+/* Keep track of how long each content has been running 
+ * for over time (ignores core) */
+#define DEFAULT_CONTENT_RUNTIME_LOG_AGGREGATE false
 
 #define DEFAULT_UI_MENUBAR_ENABLE true
 
 #if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__)
-static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER;
-#elif defined(PSP) || defined(_3DS) || defined(VITA) || defined(PS2)
-static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWEST;
+static const enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER;
+#elif defined(PSP) || defined(_3DS) || defined(VITA) || defined(PS2) || defined(DINGUX)
+static const enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWEST;
 #else
-static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_NORMAL;
+static const enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_NORMAL;
 #endif
 
 /* MIDI */
-static const char *midi_input     = "Off";
-static const char *midi_output    = "Off";
+#define DEFAULT_MIDI_INPUT  "Off"
+
+#define DEFAULT_MIDI_OUTPUT "Off"
+
 static const unsigned midi_volume = 100;
 
 /* Only applies to Android 7.0 (API 24) and up */
@@ -1079,100 +1221,100 @@ static const bool enable_device_vibration    = false;
 #endif
 
 #if defined(HAKCHI)
-static char buildbot_server_url[] = "http://hakchicloud.com/Libretro_Cores/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/"
 #elif defined(ANDROID)
 #if defined(ANDROID_ARM_V7)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/"
 #elif defined(ANDROID_ARM)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi/"
 #elif defined(ANDROID_AARCH64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/"
 #elif defined(ANDROID_X86)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86/"
 #elif defined(ANDROID_X64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86_64/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86_64/"
 #else
-static char buildbot_server_url[] = "";
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #elif defined(__QNX__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/blackberry/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/blackberry/latest/"
 #elif defined(IOS)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ios/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/ios/latest/"
 #elif defined(OSX)
 #if defined(__x86_64__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/"
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
-static char buildbot_server_url[] = "http://bot.libretro.com/nightly/apple/osx/x86/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://bot.libretro.com/nightly/apple/osx/x86/latest/"
 #else
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/"
 #endif
 #elif defined(_WIN32) && !defined(_XBOX)
 #if _MSC_VER >= 1910
 #ifndef __WINRT__
 #if defined(__x86_64__) || defined(_M_X64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x64/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x64/latest/"
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/"
 #elif defined(__arm__) || defined(_M_ARM)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm/latest/"
 #elif defined(__aarch64__) || defined(_M_ARM64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm64/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm64/latest/"
 #endif
 #else
 #if defined(__x86_64__) || defined(_M_X64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x64/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x64/latest/"
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/"
 #elif defined(__arm__) || defined(_M_ARM)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/"
 #elif defined(__aarch64__) || defined(_M_ARM64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm64/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm64/latest/"
 #endif
 #endif
 #elif _MSC_VER == 1600
 #if defined(__x86_64__) || defined(_M_X64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/"
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/"
 #endif
 #elif _MSC_VER == 1400
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/"
 #elif _MSC_VER == 1310
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/"
 #else
 #if defined(__x86_64__) || defined(_M_X64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86_64/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86_64/latest/"
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86/latest/"
 #endif
 #endif
 #elif defined(__linux__)
 #if defined(__x86_64__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/x86_64/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86_64/latest/"
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/x86/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86/latest/"
 #elif defined(__arm__) && __ARM_ARCH == 7 && defined(__ARM_PCS_VFP)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/armhf/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/armhf/latest/"
 #else
-static char buildbot_server_url[] = "";
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #elif defined(WIIU)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"
 #elif defined(HAVE_LIBNX)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/"
 #elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
-static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/"
 #elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
-static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/"
 #elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
-static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/";
+#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/"
 #else
-static char buildbot_server_url[] = "";
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 
-static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/";
+#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "http://buildbot.libretro.com/assets/"
 
-static char default_discord_app_id[] = "475456035851599874";
+#define DEFAULT_DISCORD_APP_ID "475456035851599874"
 
 #define DEFAULT_AI_SERVICE_SOURCE_LANG 0
 
@@ -1186,4 +1328,18 @@ static char default_discord_app_id[] = "475456035851599874";
 
 #define DEFAULT_AI_SERVICE_URL "http://localhost:4404/"
 
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+#define DEFAULT_BUILTIN_MEDIAPLAYER_ENABLE true
+#else
+#define DEFAULT_BUILTIN_MEDIAPLAYER_ENABLE false
+#endif
+
+#if defined(HAVE_IMAGEVIEWER)
+#define DEFAULT_BUILTIN_IMAGEVIEWER_ENABLE true
+#else
+#define DEFAULT_BUILTIN_IMAGEVIEWER_ENABLE false
+#endif
+
+#define DEFAULT_FILTER_BY_CURRENT_CORE false
+
 #endif

config.def.keybinds.h

@@ -71,7 +71,11 @@ static const struct retro_keybind retro_keybinds_1[] = {
    { true, RARCH_LOAD_STATE_KEY,          MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_SAVE_STATE_KEY,          MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_FULLSCREEN_TOGGLE_KEY,   MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,  RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+#ifdef HAVE_LAKKA
+   { true, RARCH_QUIT_KEY,                MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+#else
    { true, RARCH_QUIT_KEY,                MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,               RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+#endif
    { true, RARCH_STATE_SLOT_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_STATE_SLOT_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_REWIND,                  MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,                 RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
@@ -105,6 +109,88 @@ static const struct retro_keybind retro_keybinds_1[] = {
    { true, RARCH_RECORDING_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_STREAMING_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_AI_SERVICE,              MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+#elif defined(DINGUX)
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,                    RETROK_LALT,      NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,                    RETROK_LSHIFT,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,               RETROK_ESCAPE,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,                RETROK_RETURN,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,                   RETROK_UP,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,                 RETROK_DOWN,      NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,                 RETROK_LEFT,      NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,                RETROK_RIGHT,     NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,                    RETROK_LCTRL,     NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,                    RETROK_SPACE,     NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,                    RETROK_TAB,       NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,                    RETROK_BACKSPACE, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,                   RETROK_PAGEUP,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,                   RETROK_PAGEDOWN,  NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,                   RETROK_KP_DIVIDE, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,                   RETROK_KP_PERIOD, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+
+   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+
+   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,               RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+
+   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY, RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SLOWMOTION_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SLOWMOTION_HOLD_KEY,      MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY, RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,                RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_BSV_RECORD_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,     RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                 RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,           RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,           RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,     RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                  RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FPS_TOGGLE,               MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SEND_DEBUG_INFO,          MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_NETPLAY_HOST_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_TOGGLE,   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,    RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,           RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,     RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,     RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,     RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_UI_COMPANION_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,           RETROK_HOME,      NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_RECORDING_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STREAMING_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_AI_SERVICE,               MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
 #else
    { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,                    RETROK_z,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,                    RETROK_a,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
@@ -153,7 +239,11 @@ static const struct retro_keybind retro_keybinds_1[] = {
    { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,        RETROK_F4,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,        RETROK_F2,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY, RETROK_f,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+#ifdef HAVE_LAKKA
+   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY,           RETROK_ESCAPE,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+#else
    { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,              RETROK_ESCAPE,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+#endif
    { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,       RETROK_F7,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,      RETROK_F6,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
    { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,                RETROK_r,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

config.features.h

@@ -50,7 +50,7 @@
 #define SUPPORTS_LIBUSB false
 #endif
 
-#ifdef HAVE_SDL
+#if defined(HAVE_SDL)
 #define SUPPORTS_SDL true
 #else
 #define SUPPORTS_SDL false

configuration.h

@@ -53,6 +53,12 @@
    var = newvar; \
 }
 
+#define configuration_set_string(settings, var, newvar) \
+{ \
+   settings->modified = true; \
+   strlcpy(var, newvar, sizeof(var)); \
+}
+
 enum crt_switch_type
 {
    CRT_SWITCH_NONE = 0,
@@ -85,6 +91,7 @@ typedef struct settings
       bool video_black_frame_insertion;
       bool video_vfilter;
       bool video_smooth;
+      bool video_ctx_scaling;
       bool video_force_aspect;
       bool video_crop_overscan;
       bool video_aspect_ratio_auto;
@@ -124,6 +131,7 @@ typedef struct settings
       bool audio_rate_control;
       bool audio_wasapi_exclusive_mode;
       bool audio_wasapi_float_format;
+      bool audio_fastforward_mute;
 
       /* Input */
       bool input_remap_binds_enable;
@@ -136,7 +144,6 @@ typedef struct settings
       bool input_overlay_auto_rotate;
       bool input_descriptor_label_show;
       bool input_descriptor_hide_unbound;
-      bool input_all_users_control_menu;
       bool input_menu_swap_ok_cancel_buttons;
       bool input_backtouch_enable;
       bool input_backtouch_toggle;
@@ -151,9 +158,19 @@ typedef struct settings
       /* Menu */
       bool filter_by_current_core;
       bool menu_enable_widgets;
+      bool menu_show_load_content_animation;
+      bool notification_show_autoconfig;
+      bool notification_show_cheats_applied;
+      bool notification_show_remap_load;
+      bool notification_show_config_override_load;
+      bool notification_show_set_initial_disk;
+      bool notification_show_fast_forward;
+      bool notification_show_screenshot;
+      bool menu_widget_scale_auto;
       bool menu_show_start_screen;
       bool menu_pause_libretro;
       bool menu_savestate_resume;
+      bool menu_insert_disk_resume;
       bool menu_timedate_enable;
       bool menu_battery_level_enable;
       bool menu_core_enable;
@@ -168,6 +185,7 @@ typedef struct settings
       bool menu_throttle_framerate;
       bool menu_linear_filter;
       bool menu_horizontal_animation;
+      bool menu_scroll_fast;
       bool menu_show_online_updater;
       bool menu_show_core_updater;
       bool menu_show_load_core;
@@ -189,6 +207,8 @@ typedef struct settings
       bool menu_show_video_layout;
 #endif
       bool menu_materialui_icons_enable;
+      bool menu_materialui_playlist_icons_enable;
+      bool menu_materialui_show_nav_bar;
       bool menu_materialui_auto_rotate_nav_bar;
       bool menu_materialui_dual_thumbnail_list_view_enable;
       bool menu_materialui_thumbnail_background_enable;
@@ -200,6 +220,7 @@ typedef struct settings
       bool menu_rgui_inline_thumbnails;
       bool menu_rgui_swap_thumbnails;
       bool menu_rgui_extended_ascii;
+      bool menu_rgui_switch_icons;
       bool menu_xmb_shadows_enable;
       bool menu_xmb_vertical_thumbnails;
       bool menu_content_show_settings;
@@ -211,6 +232,7 @@ typedef struct settings
       bool menu_content_show_history;
       bool menu_content_show_add;
       bool menu_content_show_playlists;
+      bool menu_content_show_explore;
       bool menu_use_preferred_system_color_theme;
       bool menu_preferred_system_color_theme_set;
       bool menu_unified_controls;
@@ -273,7 +295,9 @@ typedef struct settings
 
       /* Network */
       bool network_buildbot_auto_extract_archive;
+      bool network_buildbot_show_experimental_cores;
       bool network_on_demand_thumbnails;
+      bool core_updater_auto_backup;
 
       /* UI */
       bool ui_menubar_enable;
@@ -288,13 +312,19 @@ typedef struct settings
       bool cheevos_test_unofficial;
       bool cheevos_hardcore_mode_enable;
       bool cheevos_leaderboards_enable;
+      bool cheevos_richpresence_enable;
       bool cheevos_badges_enable;
       bool cheevos_verbose_enable;
       bool cheevos_auto_screenshot;
+      bool cheevos_start_active;
+      bool cheevos_unlock_sound_enable;
 
       /* Camera */
       bool camera_allow;
 
+      /* Bluetooth */
+      bool bluetooth_allow;
+
       /* WiFi */
       bool wifi_allow;
 
@@ -332,6 +362,8 @@ typedef struct settings
       bool savestate_auto_save;
       bool savestate_auto_load;
       bool savestate_thumbnail_enable;
+      bool save_file_compression;
+      bool savestate_file_compression;
       bool network_cmd_enable;
       bool stdin_cmd_enable;
       bool keymapper_enable;
@@ -339,6 +371,9 @@ typedef struct settings
       bool network_remote_enable_user[MAX_USERS];
       bool load_dummy_on_core_shutdown;
       bool check_firmware_before_loading;
+#ifndef HAVE_DYNAMIC
+      bool always_reload_core_on_run_content;
+#endif
 
       bool game_specific_options;
       bool auto_overrides_enable;
@@ -360,24 +395,26 @@ typedef struct settings
       bool bluetooth_enable;
       bool localap_enable;
 
-      bool automatically_add_content_to_playlist;
       bool video_window_show_decorations;
       bool video_window_save_positions;
 
       bool sustained_performance_mode;
       bool playlist_use_old_format;
+      bool playlist_compression;
       bool content_runtime_log;
       bool content_runtime_log_aggregate;
 
       bool playlist_sort_alphabetical;
       bool playlist_show_sublabels;
       bool playlist_fuzzy_archive_match;
+      bool playlist_portable_paths;
 
       bool quit_press_twice;
       bool vibrate_on_keypress;
       bool enable_device_vibration;
       bool ozone_collapse_sidebar;
       bool ozone_truncate_playlist_name;
+      bool ozone_sort_after_truncate_playlist_name;
       bool ozone_scroll_content_metadata;
 
       bool log_to_file;
@@ -405,6 +442,8 @@ typedef struct settings
       float video_msg_bgcolor_opacity;
 
       float menu_scale_factor;
+      float menu_widget_scale_factor;
+      float menu_widget_scale_factor_windowed;
       float menu_wallpaper_opacity;
       float menu_framebuffer_opacity;
       float menu_footer_opacity;
@@ -418,6 +457,8 @@ typedef struct settings
 
       float input_overlay_opacity;
       float input_overlay_scale;
+      float input_overlay_center_x;
+      float input_overlay_center_y;
 
       float slowmotion_ratio;
       float fastforward_ratio;
@@ -434,6 +475,7 @@ typedef struct settings
       int state_slot;
       int audio_wasapi_sh_buffer_length;
       int crt_switch_center_adjust;
+      int crt_switch_porch_adjust;
 #ifdef HAVE_VULKAN
       int vulkan_gpu_index;
 #endif
@@ -457,6 +499,7 @@ typedef struct settings
       unsigned audio_latency;
 
       unsigned fps_update_interval;
+      unsigned memory_update_interval;
 
       unsigned input_block_timeout;
 
@@ -472,6 +515,7 @@ typedef struct settings
 #ifdef GEKKO
       unsigned input_mouse_scale;
 #endif
+      unsigned input_hotkey_block_delay;
       unsigned input_menu_toggle_gamepad_combo;
       unsigned input_keyboard_gamepad_mapping_type;
       unsigned input_poll_type_behavior;
@@ -522,14 +566,17 @@ typedef struct settings
       unsigned video_overscan_correction_bottom;
 #endif
       unsigned video_shader_delay;
+      unsigned notification_show_screenshot_duration;
+      unsigned notification_show_screenshot_flash;
 
       /* Accessibility */
       unsigned accessibility_narrator_speech_speed;
 
       unsigned menu_timedate_style;
-      unsigned menu_thumbnails;
+      unsigned menu_timedate_date_separator;
+      unsigned gfx_thumbnails;
       unsigned menu_left_thumbnails;
-      unsigned menu_thumbnail_upscale_threshold;
+      unsigned gfx_thumbnail_upscale_threshold;
       unsigned menu_rgui_thumbnail_downscaler;
       unsigned menu_rgui_thumbnail_delay;
       unsigned menu_rgui_color_theme;
@@ -556,6 +603,7 @@ typedef struct settings
       unsigned menu_rgui_aspect_ratio_lock;
       unsigned menu_rgui_particle_effect;
       unsigned menu_ticker_type;
+      unsigned menu_content_show_add_entry;
 
       unsigned playlist_entry_remove_enable;
       unsigned playlist_show_inline_core_name;
@@ -598,6 +646,8 @@ typedef struct settings
       unsigned ai_service_mode;
       unsigned ai_service_target_lang;
       unsigned ai_service_source_lang;
+
+      unsigned core_updater_auto_backup_history_size;
    } uints;
 
    struct
@@ -613,6 +663,7 @@ typedef struct settings
       char video_driver[32];
       char record_driver[32];
       char camera_driver[32];
+      char bluetooth_driver[32];
       char wifi_driver[32];
       char led_driver[32];
       char location_driver[32];
@@ -626,26 +677,23 @@ typedef struct settings
       char input_driver[32];
       char input_joypad_driver[32];
       char midi_driver[32];
+      char midi_input[32];
+      char midi_output[32];
 
       char input_keyboard_layout[64];
 
       char audio_device[255];
       char camera_device[255];
+      char netplay_mitm_server[255];
+
+      char translation_service_url[2048];
 
       char bundle_assets_src[PATH_MAX_LENGTH];
       char bundle_assets_dst[PATH_MAX_LENGTH];
       char bundle_assets_dst_subdir[PATH_MAX_LENGTH];
-
-      char netplay_mitm_server[255];
-
-      char midi_input[32];
-      char midi_output[32];
-
       char youtube_stream_key[PATH_MAX_LENGTH];
       char twitch_stream_key[PATH_MAX_LENGTH];
-
       char discord_app_id[PATH_MAX_LENGTH];
-      char translation_service_url[2048];
       char ai_service_url[PATH_MAX_LENGTH];
    } arrays;
 
@@ -654,12 +702,16 @@ typedef struct settings
       char placeholder;
 
       char username[32];
+
       char netplay_password[128];
       char netplay_spectate_password[128];
+
       char netplay_server[255];
       char network_buildbot_url[255];
       char network_buildbot_assets_url[255];
+
       char browse_url[4096];
+
       char path_stream_url[8192];
 
       char path_menu_xmb_font[PATH_MAX_LENGTH];
@@ -732,6 +784,15 @@ typedef struct settings
  **/
 const char *config_get_default_camera(void);
 
+/**
+ * config_get_default_bluetooth:
+ *
+ * Gets default bluetooth driver.
+ *
+ * Returns: Default bluetooth driver.
+ **/
+const char *config_get_default_bluetooth(void);
+
 /**
  * config_get_default_wifi:
  *
@@ -809,14 +870,7 @@ const char *config_get_midi_driver_options(void);
 
 const char *config_get_default_record(void);
 
-/**
- * config_parse_file:
- *
- * Loads a config file and reads all the values into memory.
- *
- */
-void config_parse_file(void *data);
-
+#ifdef HAVE_CONFIGFILE
 /**
  * config_load_override:
  *
@@ -827,7 +881,7 @@ void config_parse_file(void *data);
  * Returns: false if there was an error or no action was performed.
  *
  */
-bool config_load_override(void);
+bool config_load_override(void *data);
 
 /**
  * config_unload_override:
@@ -847,15 +901,16 @@ bool config_unload_override(void);
  * Returns: false if there was an error or no action was performed.
  *
  */
-bool config_load_remap(const char *directory_input_remapping);
+bool config_load_remap(const char *directory_input_remapping,
+      void *data);
 
 /**
  * config_save_autoconf_profile:
- * @path            : Path that shall be written to.
+ * @device_name       : Input device name
  * @user              : Controller number to save
  * Writes a controller autoconf file to disk.
  **/
-bool config_save_autoconf_profile(const char *path, unsigned user);
+bool config_save_autoconf_profile(const char *device_name, unsigned user);
 
 /**
  * config_save_file:
@@ -875,17 +930,20 @@ bool config_save_file(const char *path);
  *
  * Returns: true (1) on success, otherwise returns false (0).
  **/
-bool config_save_overrides(int override_type);
+bool config_save_overrides(enum override_type type, void *data);
 
 /* Replaces currently loaded configuration file with
  * another one. Will load a dummy core to flush state
  * properly. */
 bool config_replace(bool config_save_on_exit, char *path);
+#endif
 
 bool config_overlay_enable_default(void);
 
 void config_set_defaults(void *data);
 
+void config_load(void *data);
+
 settings_t *config_get_ptr(void);
 
 RETRO_END_DECLS

content.h

@@ -43,7 +43,7 @@ typedef struct content_ctx_info
 bool content_load_ram_file(unsigned slot);
 
 /* Save a RAM state from memory to disk. */
-bool content_save_ram_file(unsigned slot);
+bool content_save_ram_file(unsigned slot, bool compress);
 
 /* Load a state from disk to memory. */
 bool content_load_state(const char* path, bool load_to_backup_buffer, bool autoload);
@@ -51,6 +51,9 @@ bool content_load_state(const char* path, bool load_to_backup_buffer, bool autol
 /* Save a state from memory to disk. */
 bool content_save_state(const char *path, bool save_to_disk, bool autosave);
 
+/* Waits for any in-progress save state tasks to finish */
+void content_wait_for_save_state_task(void);
+
 /* Copy a save state. */
 bool content_rename_state(const char *origin, const char *dest);
 
@@ -82,9 +85,6 @@ bool content_reset_savestate_backups(void);
 bool content_undo_load_buf_is_empty(void);
 bool content_undo_save_buf_is_empty(void);
 
-/* Checks if launched from the commandline */
-bool content_launched_from_cli(void);
-
 /* Clears the pending subsystem rom buffer */
 bool content_is_subsystem_pending_load(void);
 

core.h

@@ -25,6 +25,7 @@
 
 #include "core_type.h"
 #include "input/input_defines.h"
+#include "disk_control_interface.h"
 
 RETRO_BEGIN_DECLS
 
@@ -67,8 +68,8 @@ typedef struct rarch_system_info
 
    bool supports_vfs;
 
-   struct retro_disk_control_callback  disk_control_cb;
-   struct retro_location_callback      location_cb;
+   disk_control_interface_t disk_control;
+   struct retro_location_callback location_cb;
 
    struct
    {
@@ -155,7 +156,9 @@ typedef struct retro_callbacks
 
 bool core_set_default_callbacks(struct retro_callbacks *cbs);
 
+#ifdef HAVE_REWIND
 bool core_set_rewind_callbacks(void);
+#endif
 
 #ifdef HAVE_NETWORKING
 bool core_set_netplay_callbacks(void);

core_backup.c

@@ -0,0 +1,767 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2019 - Brad Parker
+ *  Copyright (C) 2019-2020 - James Leaver
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <string/stdstring.h>
+#include <lists/string_list.h>
+#include <file/file_path.h>
+#include <streams/interface_stream.h>
+#include <streams/file_stream.h>
+#include <lists/dir_list.h>
+#include <time/rtime.h>
+#include <retro_miscellaneous.h>
+
+#include "frontend/frontend_driver.h"
+#include "file_path_special.h"
+#include "verbosity.h"
+
+#include "core_backup.h"
+
+/* Holds all entries in a core backup list */
+struct core_backup_list
+{
+   size_t size;
+   size_t capacity;
+   core_backup_list_entry_t *entries;
+};
+
+/*********************/
+/* Utility Functions */
+/*********************/
+
+/* Generates backup directory path for specified core.
+ * Returns false if 'core_path' and/or 'dir_core_assets'
+ * are invalid, or a filesystem error occurs */
+static bool core_backup_get_backup_dir(
+      const char *dir_libretro, const char *dir_core_assets,
+      const char *core_filename,
+      char *backup_dir, size_t len)
+{
+   char *last_underscore = NULL;
+   char core_file_id[PATH_MAX_LENGTH];
+   char tmp[PATH_MAX_LENGTH];
+
+   core_file_id[0] = '\0';
+   tmp[0]          = '\0';
+
+   /* Extract core file 'ID' (name without extension + suffix)
+    * from core path */
+   if (string_is_empty(dir_libretro) ||
+       string_is_empty(core_filename) ||
+       (len < 1))
+      return false;
+
+   strlcpy(core_file_id, core_filename, sizeof(core_file_id));
+
+   /* > Remove file extension */
+   path_remove_extension(core_file_id);
+
+   if (string_is_empty(core_file_id))
+      return false;
+
+   /* > Remove platform-specific file name suffix,
+    *   if required */
+   last_underscore = strrchr(core_file_id, '_');
+
+   if (!string_is_empty(last_underscore))
+      if (!string_is_equal(last_underscore, "_libretro"))
+         *last_underscore = '\0';
+
+   if (string_is_empty(core_file_id))
+      return false;
+
+   /* Get core backup directory
+    * > If no assets directory is defined, use
+    *   core directory as a base */
+   fill_pathname_join(tmp, string_is_empty(dir_core_assets) ?
+         dir_libretro : dir_core_assets,
+               "core_backups", sizeof(tmp));
+
+   fill_pathname_join(backup_dir, tmp,
+         core_file_id, len);
+
+   if (string_is_empty(backup_dir))
+      return false;
+
+   /* > Create directory, if required */
+   if (!path_is_directory(backup_dir))
+   {
+      if (!path_mkdir(backup_dir))
+      {
+         RARCH_ERR("[core backup] Failed to create backup directory: %s.\n", backup_dir);
+         return false;
+      }
+   }
+
+   return true;
+}
+
+/* Generates a timestamped core backup file path from
+ * the specified core path. Returns true if successful */
+bool core_backup_get_backup_path(
+      const char *core_path, uint32_t crc, enum core_backup_mode backup_mode,
+      const char *dir_core_assets, char *backup_path, size_t len)
+{
+   int n;
+   time_t current_time;
+   struct tm time_info;
+   const char *core_filename = NULL;
+   char core_dir[PATH_MAX_LENGTH];
+   char backup_dir[PATH_MAX_LENGTH];
+   char backup_filename[PATH_MAX_LENGTH];
+
+   core_dir[0]        = '\0'; 
+   backup_dir[0]      = '\0';
+   backup_filename[0] = '\0';
+
+   /* Get core filename and parent directory */
+   if (string_is_empty(core_path))
+      return false;
+
+   core_filename = path_basename(core_path);
+
+   if (string_is_empty(core_filename))
+      return false;
+
+   fill_pathname_parent_dir(core_dir, core_path, sizeof(core_dir));
+
+   if (string_is_empty(core_dir))
+      return false;
+
+   /* Get backup directory */
+   if (!core_backup_get_backup_dir(core_dir, dir_core_assets, core_filename,
+         backup_dir, sizeof(backup_dir)))
+      return false;
+
+   /* Get current time */
+   time(&current_time);
+   rtime_localtime(&current_time, &time_info);
+
+   /* Generate backup filename */
+   n = snprintf(backup_filename, sizeof(backup_filename),
+         "%s.%04u%02u%02uT%02u%02u%02u.%08x.%u%s",
+         core_filename,
+         (unsigned)time_info.tm_year + 1900,
+         (unsigned)time_info.tm_mon + 1,
+         (unsigned)time_info.tm_mday,
+         (unsigned)time_info.tm_hour,
+         (unsigned)time_info.tm_min,
+         (unsigned)time_info.tm_sec,
+         crc,
+         (unsigned)backup_mode,
+         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION));
+
+   if ((n < 0) || (n >= 128))
+      n = 0; /* Silence GCC warnings... */
+
+   /* Build final path */
+   fill_pathname_join(backup_path, backup_dir,
+         backup_filename, len);
+
+   return true;
+}
+
+/* Returns detected type of specified core backup file */
+enum core_backup_type core_backup_get_backup_type(const char *backup_path)
+{
+   const char *backup_ext            = NULL;
+   struct string_list *metadata_list = NULL;
+   char core_ext[255];
+
+   core_ext[0] = '\0';
+
+   if (string_is_empty(backup_path) || !path_is_valid(backup_path))
+      goto error;
+
+   /* Get backup file extension */
+   backup_ext = path_get_extension(backup_path);
+
+   if (string_is_empty(backup_ext))
+      goto error;
+
+   /* Get platform-specific dynamic library extension */
+   if (!frontend_driver_get_core_extension(core_ext, sizeof(core_ext)))
+      goto error;
+
+   /* Check if this is an archived backup */
+   if (string_is_equal_noncase(backup_ext,
+         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT)))
+   {
+      const char *backup_filename = NULL;
+      const char *src_ext         = NULL;
+
+      /* Split the backup filename into its various
+       * metadata components */
+      backup_filename = path_basename(backup_path);
+
+      if (string_is_empty(backup_filename))
+         goto error;
+
+      metadata_list = string_split(backup_filename, ".");
+
+      if (!metadata_list || (metadata_list->size != 6))
+         goto error;
+
+      /* Get extension of source core file */
+      src_ext = metadata_list->elems[1].data;
+
+      if (string_is_empty(src_ext))
+         goto error;
+
+      /* Check whether extension is valid */
+      if (!string_is_equal_noncase(src_ext, core_ext))
+         goto error;
+
+      string_list_free(metadata_list);
+      metadata_list = NULL;
+   
+      return CORE_BACKUP_TYPE_ARCHIVE;
+   }
+
+   /* Check if this is a plain dynamic library file */
+   if (string_is_equal_noncase(backup_ext, core_ext))
+      return CORE_BACKUP_TYPE_LIB;
+
+error:
+   if (metadata_list)
+   {
+      string_list_free(metadata_list);
+      metadata_list = NULL;
+   }
+
+   return CORE_BACKUP_TYPE_INVALID;
+}
+
+/* Fetches crc value of specified core backup file.
+ * Returns true if successful */
+bool core_backup_get_backup_crc(char *backup_path, uint32_t *crc)
+{
+   struct string_list *metadata_list = NULL;
+   enum core_backup_type backup_type;
+
+   if (string_is_empty(backup_path) || !crc)
+      goto error;
+
+   /* Get backup type */
+   backup_type = core_backup_get_backup_type(backup_path);
+
+   switch (backup_type)
+   {
+      case CORE_BACKUP_TYPE_ARCHIVE:
+         {
+            const char *backup_filename = NULL;
+            const char *crc_str         = NULL;
+
+            /* Split the backup filename into its various
+             * metadata components */
+            backup_filename = path_basename(backup_path);
+
+            if (string_is_empty(backup_filename))
+               goto error;
+
+            metadata_list = string_split(backup_filename, ".");
+
+            if (!metadata_list || (metadata_list->size != 6))
+               goto error;
+
+            /* Get crc string */
+            crc_str = metadata_list->elems[3].data;
+
+            if (string_is_empty(crc_str))
+               goto error;
+
+            /* Convert to an integer */
+            *crc = (uint32_t)string_hex_to_unsigned(crc_str);
+
+            if (*crc == 0)
+               goto error;
+
+            string_list_free(metadata_list);
+            metadata_list = NULL;
+
+         }
+         return true;
+      case CORE_BACKUP_TYPE_LIB:
+         {
+            intfstream_t *backup_file = NULL;
+
+            /* This is a plain dynamic library file,
+             * have to read file data to determine crc */
+
+            /* Open backup file */
+            backup_file = intfstream_open_file(
+                  backup_path, RETRO_VFS_FILE_ACCESS_READ,
+                  RETRO_VFS_FILE_ACCESS_HINT_NONE);
+
+            if (backup_file)
+            {
+               bool success;
+
+               /* Get crc value */
+               success = intfstream_get_crc(backup_file, crc);
+
+               /* Close backup file */
+               intfstream_close(backup_file);
+               free(backup_file);
+               backup_file = NULL;
+
+               return success;
+            }
+         }
+         break;
+      default:
+         /* Backup is invalid */
+         break;
+   }
+
+error:
+   if (metadata_list)
+   {
+      string_list_free(metadata_list);
+      metadata_list = NULL;
+   }
+
+   return false;
+}
+
+/* Fetches core path associated with specified core
+ * backup file. Returns detected type of backup
+ * file - CORE_BACKUP_TYPE_INVALID indicates that
+ * backup file cannot be restored/installed, or
+ * arguments are otherwise invalid */
+enum core_backup_type core_backup_get_core_path(
+      const char *backup_path, const char *dir_libretro,
+      char *core_path, size_t len)
+{
+   const char *backup_filename       = NULL;
+   char *core_filename               = NULL;
+   enum core_backup_type backup_type = CORE_BACKUP_TYPE_INVALID;
+
+   if (string_is_empty(backup_path) || string_is_empty(dir_libretro))
+      return backup_type;
+
+   backup_filename = path_basename(backup_path);
+
+   if (string_is_empty(backup_filename))
+      return backup_type;
+
+   /* Check backup type */
+   switch (core_backup_get_backup_type(backup_path))
+   {
+      case CORE_BACKUP_TYPE_ARCHIVE:
+         {
+            char *period  = NULL;
+
+            /* This is an archived backup with timestamp/crc
+             * metadata in the filename */
+            core_filename = strdup(backup_filename);
+
+            /* Find the location of the second period */
+            period = strchr(core_filename, '.');
+            if (!period || (*(++period) == '\0'))
+               break;
+
+            period = strchr(period, '.');
+            if (!period)
+               break;
+
+            /* Trim everything after (and including) the
+             * second period */
+            *period = '\0';
+
+            if (string_is_empty(core_filename))
+               break;
+
+            /* All good - build core path */
+            fill_pathname_join(core_path, dir_libretro,
+                  core_filename, len);
+
+            backup_type = CORE_BACKUP_TYPE_ARCHIVE;
+         }
+         break;
+      case CORE_BACKUP_TYPE_LIB:
+         /* This is a plain dynamic library file */
+         fill_pathname_join(core_path, dir_libretro,
+               backup_filename, len);
+         backup_type = CORE_BACKUP_TYPE_LIB;
+         break;
+      default:
+         /* Backup is invalid */
+         break;
+   }
+
+   if (core_filename)
+   {
+      free(core_filename);
+      core_filename = NULL;
+   }
+
+   return backup_type;
+}
+
+/*************************/
+/* Backup List Functions */
+/*************************/
+
+/**************************************/
+/* Initialisation / De-Initialisation */
+/**************************************/
+
+/* Parses backup file name and adds to backup list, if valid */
+static bool core_backup_add_entry(core_backup_list_t *backup_list,
+      const char *core_filename, const char *backup_path)
+{
+   char *backup_filename           = NULL;
+   core_backup_list_entry_t *entry = NULL;
+   unsigned backup_mode            = 0;
+
+   if (!backup_list ||
+       string_is_empty(core_filename) ||
+       string_is_empty(backup_path) ||
+       (backup_list->size >= backup_list->capacity))
+      goto error;
+
+   backup_filename = strdup(path_basename(backup_path));
+
+   if (string_is_empty(backup_filename))
+      goto error;
+
+   /* Ensure base backup filename matches core */
+   if (!string_starts_with(backup_filename, core_filename))
+      goto error;
+
+   /* Remove backup file extension */
+   path_remove_extension(backup_filename);
+
+   /* Parse backup filename metadata
+    * - <core_filename>.<timestamp>.<crc>.<backup_mode>
+    * - timestamp: YYYYMMDDTHHMMSS */
+   entry = &backup_list->entries[backup_list->size];
+
+   if (sscanf(backup_filename + strlen(core_filename),
+       ".%04u%02u%02uT%02u%02u%02u.%08x.%u",
+       &entry->date.year, &entry->date.month, &entry->date.day,
+       &entry->date.hour, &entry->date.minute, &entry->date.second,
+       &entry->crc, &backup_mode) != 8)
+      goto error;
+
+   entry->backup_mode = (enum core_backup_mode)backup_mode;
+
+   /* Cache backup path */
+   entry->backup_path = strdup(backup_path);
+   backup_list->size++;
+
+   free(backup_filename);
+
+   return true;
+
+error:
+   if (backup_filename)
+      free(backup_filename);
+
+   return false;
+}
+
+/* Creates a new core backup list containing entries
+ * for all existing backup files.
+ * Returns a handle to a new core_backup_list_t object
+ * on success, otherwise returns NULL. */
+core_backup_list_t *core_backup_list_init(
+      const char *core_path, const char *dir_core_assets)
+{
+   size_t i;
+   const char *core_filename         = NULL;
+   struct string_list *dir_list      = NULL;
+   core_backup_list_t *backup_list   = NULL;
+   core_backup_list_entry_t *entries = NULL;
+   char core_dir[PATH_MAX_LENGTH];
+   char backup_dir[PATH_MAX_LENGTH];
+
+   core_dir[0]   = '\0'; 
+   backup_dir[0] = '\0';
+
+   /* Get core filename and parent directory */
+   if (string_is_empty(core_path))
+      goto error;
+
+   core_filename = path_basename(core_path);
+
+   if (string_is_empty(core_filename))
+      goto error;
+
+   fill_pathname_parent_dir(core_dir, core_path, sizeof(core_dir));
+
+   if (string_is_empty(core_dir))
+      goto error;
+
+   /* Get backup directory */
+   if (!core_backup_get_backup_dir(core_dir, dir_core_assets, core_filename,
+         backup_dir, sizeof(backup_dir)))
+      goto error;
+
+   /* Get backup file list */
+   dir_list = dir_list_new(
+         backup_dir,
+         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION),
+         false, /* include_dirs */
+         false, /* include_hidden */
+         false, /* include_compressed */
+         false  /* recursive */
+   );
+
+   /* Sanity check */
+   if (!dir_list)
+      goto error;
+
+   if (dir_list->size < 1)
+      goto error;
+
+   /* Ensure list is sorted in alphabetical order
+    * > This corresponds to 'timestamp' order */
+   dir_list_sort(dir_list, true);
+
+   /* Create core backup list */
+   backup_list = (core_backup_list_t*)malloc(sizeof(*backup_list));
+
+   if (!backup_list)
+      goto error;
+
+   backup_list->entries  = NULL;
+   backup_list->capacity = 0;
+   backup_list->size     = 0;
+
+   /* Create entries array
+    * (Note: Set this to the full size of the directory
+    * list - this may be larger than we need, but saves
+    * many inefficiencies later)   */
+   entries               = (core_backup_list_entry_t*)
+      calloc(dir_list->size, sizeof(*entries));
+
+   if (!entries)
+      goto error;
+
+   backup_list->entries  = entries;
+   backup_list->capacity = dir_list->size;
+
+   /* Loop over backup files and parse file names */
+   for (i = 0; i < dir_list->size; i++)
+   {
+      const char *backup_path = dir_list->elems[i].data;
+      core_backup_add_entry(backup_list, core_filename, backup_path);
+   }
+
+   if (backup_list->size == 0)
+      goto error;
+
+   string_list_free(dir_list);
+
+   return backup_list;
+
+error:
+   if (dir_list)
+      string_list_free(dir_list);
+
+   if (backup_list)
+      core_backup_list_free(backup_list);
+
+   return NULL;
+}
+
+/* Frees specified core backup list */
+void core_backup_list_free(core_backup_list_t *backup_list)
+{
+   size_t i;
+
+   if (!backup_list)
+      return;
+
+   if (backup_list->entries)
+   {
+      for (i = 0; i < backup_list->size; i++)
+      {
+         core_backup_list_entry_t *entry = &backup_list->entries[i];
+
+         if (!entry)
+            continue;
+
+         if (entry->backup_path)
+         {
+            free(entry->backup_path);
+            entry->backup_path = NULL;
+         }
+      }
+
+      free(backup_list->entries);
+      backup_list->entries = NULL;
+   }
+
+   free(backup_list);
+}
+
+/***********/
+/* Getters */
+/***********/
+
+/* Returns number of entries in core backup list */
+size_t core_backup_list_size(core_backup_list_t *backup_list)
+{
+   if (!backup_list)
+      return 0;
+
+   return backup_list->size;
+}
+
+/* Returns number of entries of specified 'backup mode'
+ * (manual or automatic) in core backup list */
+size_t core_backup_list_get_num_backups(
+      core_backup_list_t *backup_list,
+      enum core_backup_mode backup_mode)
+{
+   size_t i;
+   size_t num_backups = 0;
+
+   if (!backup_list || !backup_list->entries)
+      return 0;
+
+   for (i = 0; i < backup_list->size; i++)
+   {
+      core_backup_list_entry_t *current_entry = &backup_list->entries[i];
+
+      if (current_entry &&
+          (current_entry->backup_mode == backup_mode))
+         num_backups++;
+   }
+
+   return num_backups;
+}
+
+/* Fetches core backup list entry corresponding
+ * to the specified entry index.
+ * Returns false if index is invalid. */
+bool core_backup_list_get_index(
+      core_backup_list_t *backup_list,
+      size_t idx,
+      const core_backup_list_entry_t **entry)
+{
+   if (!backup_list || !backup_list->entries || !entry)
+      return false;
+
+   if (idx >= backup_list->size)
+      return false;
+
+   *entry = &backup_list->entries[idx];
+
+   if (*entry)
+      return true;
+
+   return false;
+}
+
+/* Fetches core backup list entry corresponding
+ * to the specified core crc checksum value.
+ * Note that 'manual' and 'auto' backups are
+ * considered independent - we only compare
+ * crc values for the specified backup_mode.
+ * Returns false if entry is not found. */
+bool core_backup_list_get_crc(
+      core_backup_list_t *backup_list,
+      uint32_t crc, enum core_backup_mode backup_mode,
+      const core_backup_list_entry_t **entry)
+{
+   size_t i;
+
+   if (!backup_list || !backup_list->entries || !entry)
+      return false;
+
+   for (i = 0; i < backup_list->size; i++)
+   {
+      core_backup_list_entry_t *current_entry = &backup_list->entries[i];
+
+      if (current_entry &&
+          (current_entry->crc == crc) &&
+          (current_entry->backup_mode == backup_mode))
+      {
+         *entry = current_entry;
+         return true;
+      }
+   }
+
+   return false;
+}
+
+/* Fetches a string representation of a backup
+ * list entry timestamp.
+ * Returns false in the event of an error */
+bool core_backup_list_get_entry_timestamp_str(
+      const core_backup_list_entry_t *entry,
+      enum core_backup_date_separator_type date_separator,
+      char *timestamp, size_t len)
+{
+   int n;
+   const char *format_str = "";
+
+   if (!entry || (len < 20))
+      return false;
+
+   /* Get time format string */
+   switch (date_separator)
+   {
+      case CORE_BACKUP_DATE_SEPARATOR_SLASH:
+         format_str = "%04u/%02u/%02u %02u:%02u:%02u";
+         break;
+      case CORE_BACKUP_DATE_SEPARATOR_PERIOD:
+         format_str = "%04u.%02u.%02u %02u:%02u:%02u";
+         break;
+      default:
+         format_str = "%04u-%02u-%02u %02u:%02u:%02u";
+         break;
+   }
+
+   n = snprintf(timestamp, len,
+         format_str,
+         entry->date.year,
+         entry->date.month,
+         entry->date.day,
+         entry->date.hour,
+         entry->date.minute,
+         entry->date.second);
+
+   if ((n < 0) || (n >= 32))
+      n = 0; /* Silence GCC warnings... */
+
+   return true;
+}
+
+/* Fetches a string representation of a backup
+ * list entry crc value.
+ * Returns false in the event of an error */
+bool core_backup_list_get_entry_crc_str(
+      const core_backup_list_entry_t *entry,
+      char *crc, size_t len)
+{
+   int n;
+
+   if (!entry || (len < 9))
+      return false;
+
+   n = snprintf(crc, len, "%08x", entry->crc);
+
+   if ((n < 0) || (n >= 32))
+      n = 0; /* Silence GCC warnings... */
+
+   return true;
+}

core_backup.h

@@ -0,0 +1,177 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2019 - Brad Parker
+ *  Copyright (C) 2019-2020 - James Leaver
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CORE_BACKUP_H
+#define __CORE_BACKUP_H
+
+#include <retro_common_api.h>
+#include <libretro.h>
+
+#include <boolean.h>
+
+RETRO_BEGIN_DECLS
+
+/* Defines the various types of supported core backup
+ * file. Allows us to handle manual core installs
+ * (via downloaded/compiled dynamic libraries dropped
+ * in the 'downloads' folder) using the same task
+ * interface as 'managed'/archived backups */
+enum core_backup_type
+{
+   CORE_BACKUP_TYPE_INVALID = 0,
+   CORE_BACKUP_TYPE_ARCHIVE,
+   CORE_BACKUP_TYPE_LIB
+};
+
+/* Used to distinguish manual and automatic
+ * core backups */
+enum core_backup_mode
+{
+   CORE_BACKUP_MODE_MANUAL = 0,
+   CORE_BACKUP_MODE_AUTO
+};
+
+/* Note: These must be kept synchronised with
+ * 'enum menu_timedate_date_separator_type' in
+ * 'menu_defines.h' */
+enum core_backup_date_separator_type
+{
+   CORE_BACKUP_DATE_SEPARATOR_HYPHEN = 0,
+   CORE_BACKUP_DATE_SEPARATOR_SLASH,
+   CORE_BACKUP_DATE_SEPARATOR_PERIOD,
+   CORE_BACKUP_DATE_SEPARATOR_LAST
+};
+
+/* Holds all timestamp info for a core backup file */
+typedef struct
+{
+   unsigned year;
+   unsigned month;
+   unsigned day;
+   unsigned hour;
+   unsigned minute;
+   unsigned second;
+} core_backup_list_date_t;
+
+/* Holds all info related to a core backup file */
+typedef struct
+{
+   char *backup_path;
+   core_backup_list_date_t date;
+   uint32_t crc;
+   enum core_backup_mode backup_mode;
+} core_backup_list_entry_t;
+
+/* Prevent direct access to core_backup_list_t
+ * members */
+typedef struct core_backup_list core_backup_list_t;
+
+/*********************/
+/* Utility Functions */
+/*********************/
+
+/* Generates a timestamped core backup file path from
+ * the specified core path. Returns true if successful */
+bool core_backup_get_backup_path(
+      const char *core_path, uint32_t crc, enum core_backup_mode backup_mode,
+      const char *dir_core_assets, char *backup_path, size_t len);
+
+/* Returns detected type of specified core backup file */
+enum core_backup_type core_backup_get_backup_type(const char *backup_path);
+
+/* Fetches crc value of specified core backup file.
+ * Returns true if successful */
+bool core_backup_get_backup_crc(char *backup_path, uint32_t *crc);
+
+/* Fetches core path associated with specified core
+ * backup file. Returns detected type of backup
+ * file - CORE_BACKUP_TYPE_INVALID indicates that
+ * backup file cannot be restored/installed, or
+ * arguments are otherwise invalid */
+enum core_backup_type core_backup_get_core_path(
+      const char *backup_path, const char *dir_libretro,
+      char *core_path, size_t len);
+
+/*************************/
+/* Backup List Functions */
+/*************************/
+
+/**************************************/
+/* Initialisation / De-Initialisation */
+/**************************************/
+
+/* Creates a new core backup list containing entries
+ * for all existing backup files.
+ * Returns a handle to a new core_backup_list_t object
+ * on success, otherwise returns NULL. */
+core_backup_list_t *core_backup_list_init(
+      const char *core_path, const char *dir_core_assets);
+
+/* Frees specified core backup list */
+void core_backup_list_free(core_backup_list_t *backup_list);
+
+/***********/
+/* Getters */
+/***********/
+
+/* Returns number of entries in core backup list */
+size_t core_backup_list_size(core_backup_list_t *backup_list);
+
+/* Returns number of entries of specified 'backup mode'
+ * (manual or automatic) in core backup list */
+size_t core_backup_list_get_num_backups(
+      core_backup_list_t *backup_list,
+      enum core_backup_mode backup_mode);
+
+/* Fetches core backup list entry corresponding
+ * to the specified entry index.
+ * Returns false if index is invalid. */
+bool core_backup_list_get_index(
+      core_backup_list_t *backup_list,
+      size_t idx,
+      const core_backup_list_entry_t **entry);
+
+/* Fetches core backup list entry corresponding
+ * to the specified core crc checksum value.
+ * Note that 'manual' and 'auto' backups are
+ * considered independent - we only compare
+ * crc values for the specified backup_mode.
+ * Returns false if entry is not found. */
+bool core_backup_list_get_crc(
+      core_backup_list_t *backup_list,
+      uint32_t crc, enum core_backup_mode backup_mode,
+      const core_backup_list_entry_t **entry);
+
+/* Fetches a string representation of a backup
+ * list entry timestamp.
+ * Returns false in the event of an error */
+bool core_backup_list_get_entry_timestamp_str(
+      const core_backup_list_entry_t *entry,
+      enum core_backup_date_separator_type date_separator,
+      char *timestamp, size_t len);
+
+/* Fetches a string representation of a backup
+ * list entry crc value.
+ * Returns false in the event of an error */
+bool core_backup_list_get_entry_crc_str(
+      const core_backup_list_entry_t *entry,
+      char *crc, size_t len);
+
+RETRO_END_DECLS
+
+#endif