Merge pull request #32 from fhoedemakers/retroJam

Aligned with changes for retroJam

Author: fhoedemakers

CHANGELOG.md

@@ -7,33 +7,13 @@
 
 [See setup section in in Pico-infoNesPlus readme how to install and wire up](https://github.com/fhoedemakers/pico-infonesPlus#pico-setup)
 
-# v0.23 Release Notes
-
-- Implemented savestates [#140](https://github.com/fhoedemakers/pico-infonesPlus/issues/140)
-  - Up to 5 manual save state slots per game, accessible via the in-game menu (SELECT + START).
-  - In-game quick savestate Save/Restore via (START + DOWN) and (START + UP).
-  - Auto Save can be enabled per game, which allows to save the current state when exiting to the menu. When the game is launched, player can choose to restore that state.
-  
-  When loading a state, the game mostly resumes paused. Press START to continue playing.
-
-- Added support for [Murmulator M1 and M2 boards](https://murmulator.ru). [@javavi](https://github.com/javavi)  [#150](https://github.com/fhoedemakers/pico-infonesPlus/issues/150)
-  - M1: RP2040/RP2350 **Note**: Untested
-  - M2: RP2350 only   **Note**: Untested
-- **Fruit Jam only**: Add volume controls to settings menu. Can also be changed in-game via (START + LEFT/RIGHT). Note that too high volume levels may cause distortion. (Ext speaker, advised 16 db max, internal advised 18 dB max). Latest metadata package includes a sample.wav file to test the volume level.
-- Updated SMSPlusMetaData.zip: Added **sample.wav**. This sample will be played when using the Fruit Jam volume control in the settings menu. Note when **/soundrecorder.wav** is found, this file will be played in stead.
-- **RP2350 only**: Updated the menu to also list .wav audio files.
-- **RP2350 Only**: Added basic wav audio playback from within the menu. Press BUTTON2 or START to play the wav file. Tested with https://lonepeakmusic.itch.io/retro-midi-music-pack-1 The wav file must have the following specs:
-  - 16/24 bit PCM wav files only.  (24 bit files are downsampled to 16 bit) 
-  - 2ch stereo only.
-  - Sample rate supported: 44100.
-- **RP2350 with PSRAM only**: Record about 30 seconds of audio by pressing START to pause the game and then START + BUTTON1. Audio is recorded to **/soundrecorder.wav** on the SD-card.
+# v0.24 Release Notes
 
 ## Fixes
 
-- Fruit Jam audio fixes.
-- Settings changed by in-game button combos are saved when exiting to menu.
-- DVI audio volume was somewhat too low, fixed. [#146](https://github.com/fhoedemakers/pico-infonesPlus/issues/146)
-- Workaround for memory issues on RP2040 boards: When exiting from a game, the board will be rebooted to free up memory.  
+- Emulator buffers are now allocated dynmically. 
+- Pimoroni Pico DV Demo base: Settings are accessible from within the menu again.
+- ENding a game will now go back to the menu instead of rebooting the board.
 
 # previous changes
 

CMakeLists.txt

@@ -21,7 +21,7 @@ if (NOT USE_HSTX)
 endif()
 include("pico_shared/BoardConfigs.cmake")
 if (NOT PICO_BOARD )
-    set(PICO_BOARD pico2 CACHE STRING "Board type")
+    set(PICO_BOARD pico CACHE STRING "Board type")
     message("PICO_BOARD not set, using default: ${PICO_BOARD}")
 endif()
 add_definitions( -DNDEBUG )

HISTORY.md

@@ -1,5 +1,33 @@
 # History of changes
 
+# v0.23 Release Notes
+
+- Implemented savestates [#140](https://github.com/fhoedemakers/pico-infonesPlus/issues/140)
+  - Up to 5 manual save state slots per game, accessible via the in-game menu (SELECT + START).
+  - In-game quick savestate Save/Restore via (START + DOWN) and (START + UP).
+  - Auto Save can be enabled per game, which allows to save the current state when exiting to the menu. When the game is launched, player can choose to restore that state.
+  
+  When loading a state, the game mostly resumes paused. Press START to continue playing.
+
+- Added support for [Murmulator M1 and M2 boards](https://murmulator.ru). [@javavi](https://github.com/javavi)  [#150](https://github.com/fhoedemakers/pico-infonesPlus/issues/150)
+  - M1: RP2040/RP2350 **Note**: Untested
+  - M2: RP2350 only   **Note**: Untested
+- **Fruit Jam only**: Add volume controls to settings menu. Can also be changed in-game via (START + LEFT/RIGHT). Note that too high volume levels may cause distortion. (Ext speaker, advised 16 db max, internal advised 18 dB max). Latest metadata package includes a sample.wav file to test the volume level.
+- Updated SMSPlusMetaData.zip: Added **sample.wav**. This sample will be played when using the Fruit Jam volume control in the settings menu. Note when **/soundrecorder.wav** is found, this file will be played in stead.
+- **RP2350 only**: Updated the menu to also list .wav audio files.
+- **RP2350 Only**: Added basic wav audio playback from within the menu. Press BUTTON2 or START to play the wav file. Tested with https://lonepeakmusic.itch.io/retro-midi-music-pack-1 The wav file must have the following specs:
+  - 16/24 bit PCM wav files only.  (24 bit files are downsampled to 16 bit) 
+  - 2ch stereo only.
+  - Sample rate supported: 44100.
+- **RP2350 with PSRAM only**: Record about 30 seconds of audio by pressing START to pause the game and then START + BUTTON1. Audio is recorded to **/soundrecorder.wav** on the SD-card.
+
+## Fixes
+
+- Fruit Jam audio fixes.
+- Settings changed by in-game button combos are saved when exiting to menu.
+- DVI audio volume was somewhat too low, fixed. [#146](https://github.com/fhoedemakers/pico-infonesPlus/issues/146)
+- Workaround for memory issues on RP2040 boards: When exiting from a game, the board will be rebooted to free up memory.  
+
 # v0.22 Release Notes
 
 - Settings are saved to /settings_sms.dat instead of /settings.dat. This allows to have separate settings files for different emulators (e.g. pico-infonesPlus and pico-peanutGB etc.).

README.md

@@ -135,9 +135,6 @@ Gamepad buttons:
 - START: Show metadata and box art (when available). 
 - SELECT: Opens a setting menu. Here you can change settings like screen mode, scanlines, framerate display, menu colors and other board specific settings. Settings can also be changed in-game by pressing some button combinations as explained below. The settings menu can also be opened in-game.
 
->[!NOTE]
->On the Pimoroni Pico DV Demo Base with a Raspberry Pi Pico (RP2040), the settings menu can only be accessed during gameplay. Accessing the settings from the main menu is disabled due to occasional crashes with this specific hardware configuration.
-
 ## Emulator (in game)
 Gamepad buttons:
 - SELECT + START, Xbox button: opens the settings menu. From there, you can:

main.cpp

@@ -56,7 +56,7 @@ static uint32_t CPUFreqKHz = EMULATOR_CLOCKFREQ_KHZ;
 // Visibility configuration for options menu (NES specific)
 // 1 = show option line, 0 = hide.
 // Order must match enum in menu_options.h
-const int8_t g_settings_visibility[MOPT_COUNT] = {
+const int8_t g_settings_visibility_sms[MOPT_COUNT] = {
     0,                               // Exit Game, or back to menu. Always visible when in-game.
     0,                               // Save / Restore State
     !HSTX,                           // Screen Mode (only when not HSTX)
@@ -75,7 +75,7 @@ const int8_t g_settings_visibility[MOPT_COUNT] = {
     0,                               // Rapid Fire on A
     0,                               // Rapid Fire on B
 };
-const uint8_t g_available_screen_modes[] = {
+const uint8_t g_available_screen_modes_sms[] = {
 #if PICO_RP2350
     0, // SCANLINE_8_7, Does not work well with borders
 #else
@@ -1108,6 +1108,8 @@ int main()
     scaleMode8_7_ = Frens::applyScreenMode(settings.screenMode);
 #endif
     bool showSplash = true;
+    g_settings_visibility = g_settings_visibility_sms;
+    g_available_screen_modes = g_available_screen_modes_sms;
     while (true)
     {
         #if 1
@@ -1192,25 +1194,12 @@ int main()
         system_reset();
         printf("Starting game\n");
         process();
-#if PICO_RP2350
         system_shutdown();
         selectedRom[0] = 0;
         showSplash = false;
 #if ENABLE_VU_METER
         turnOffAllLeds();
 #endif
-#else
-        // RP2040: to avoid possible out of memory errors after reset, reboot the system
-        printf("Rebooting...\n");
-        f_unlink(ROMINFOFILE); // remove rom info file to prevent loading same rom again at startup
-        watchdog_enable(1, 1);
-        while (1)
-        {
-            tight_loop_contents();
-            // printf("Waiting for reboot...\n");
-        };
-#endif
-
     }
 
     return 0;

pico_shared

@@ -95,6 +95,7 @@ typedef struct
 
 //     return 1;
 // }
+void *frens_f_malloc(size_t size);
 int load_rom(uintptr_t addr,   int size, bool isGameGear)
 {
     uint8_t *start = (uint8_t *)addr;
@@ -105,7 +106,8 @@ int load_rom(uintptr_t addr,   int size, bool isGameGear)
     }
     sms.use_fm = 0;
     sms.country = TYPE_OVERSEAS;
-    sms.sram = sram;
+    sms.ram = (uint8 *)frens_f_malloc(RAMSIZEBYTES);    
+    sms.sram = (uint8 *)frens_f_malloc(SRAMSIZEBYTES);
     sms.dummy = smsBufferLine;
     bitmap.data = smsBufferLine;
     bitmap.width = BMP_WIDTH;

smsplus/loadrom.c

@@ -80,7 +80,7 @@ void sms_init(void) {
 void sms_reset(void) {
     /* Clear SMS context */
 
-    __builtin_memset(sram, 0, SRAMSIZEBYTES);
+    __builtin_memset(sms.sram, 0, SRAMSIZEBYTES);
     __builtin_memset(sms.ram, 0, RAMSIZEBYTES);
 
     sms.paused = sms.save = sms.port_3F = sms.port_F2 = sms.irq = 0x00;

smsplus/sms.c

@@ -22,11 +22,11 @@ static int palette444[32];
 #define RAMSIZE  0x2000
 #define RAMSIZEBYTES  (0x2000 * sizeof(uint8))
 
-static uint8 sram[SRAMSIZE];
+//static uint8 sram[SRAMSIZE];
 /* SMS context */
 typedef struct {
     uint8 *dummy; //JMD: Point this into outher space plz.
-    uint8 ram[RAMSIZE];
+    uint8 *ram;   // [RAMSIZE];
 //    uint8 sram[0x8000];
     uint8 *sram;
     uint8 fcr[4];

smsplus/sms.h

@@ -55,7 +55,7 @@ void system_init(int rate) {
     render_init();
 
     /* Enable sound emulation if the sample rate was specified */
-    audio_init(rate);
+    system_audio_init(rate);
 
     /* Don't save SRAM by default */
     sms.save = 0;
@@ -64,7 +64,7 @@ void system_init(int rate) {
     __builtin_memset(&input, 0, sizeof(t_input));
 }
 
-void audio_init(int rate) {
+void system_audio_init(int rate) {
     /* Clear sound context */
     __builtin_memset(&snd, 0, sizeof(t_snd));
 
@@ -119,6 +119,9 @@ void system_shutdown(void)
     frens_f_free(cacheStoreUsed);
     frens_f_free(cacheStore);
     frens_f_free(cachePtr);
+    frens_f_free(sms.sram);
+    frens_f_free(sms.ram);
+
     if (snd.enabled)
     {
         //        OPLL_delete(opll);