Merge branch 'main' into develop

Author: bbsan2k

.github/workflows/cmake.yml

@@ -2,9 +2,10 @@ name: CMake
 
 on:
   push:
-    branches: [ "main", "develop" ]
-  pull_request:
-    branches: [ "main", "develop" ]
+    branches:
+      - '*'
+    tags:
+      - 'v*'
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -35,12 +36,10 @@ jobs:
           echo "SD2PSX_RLS_TAG=nightly" >> $GITHUB_ENV
           echo "nightly"
         fi
-      
+
     - name: add build essential
       run: sudo apt update && sudo apt install -y build-essential gcc-arm-none-eabi
 
-
-
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
@@ -49,7 +48,7 @@ jobs:
     - name: Build
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-      
+
     - name: Configure CMake for Debug USB
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
@@ -58,21 +57,26 @@ jobs:
     - name: Build Debug USB
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build_usb --config ${{env.BUILD_TYPE}}
-      
+
     - name: Rename Debug USB uf2
       run: mv build_usb/sd2psx.uf2 build/sd2psx_usb_debug.uf2
 
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: SD2PSX-${{ github.sha }}
+        path: |
+          build/*.uf2
+        
+
     - uses: marvinpinto/action-automatic-releases@v1.2.1
-      if: github.event_name != 'pull_request'
-      # uses: marvinpinto/action-automatic-releases@919008cf3f741b179569b7a6fb4d8860689ab7f0
+      if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') #only release on tag or master branch
       with:
         # GitHub secret token
         title:  "${{ env.SD2PSX_VERSION }}"
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: ${{ env.SD2PSX_RLS_TAG }}
-        prerelease: true
+        prerelease: ${{ !startsWith(github.ref, 'refs/tags/v') }}        
         # Assets to upload to the release
         files: |
           build/*.uf2
-
- 

.gitignore

@@ -3,4 +3,4 @@ build
 keys.c
 .cache
 gamedbps*.dat
-src/version/version.c
+src/version/version.c

CMakeLists.txt

@@ -8,10 +8,6 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
 # set(PICO_COPY_TO_RAM 1)
 
-if (CMAKE_C_BYTE_ORDER EQUAL BIG_ENDIAN)
-    add_compile_definitions("-DBIG_ENDIAN")
-endif()
-
 pico_sdk_init()
 
 set(LV_CONF_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/lv_conf.h CACHE STRING "" FORCE)

database/CMakeLists.txt

@@ -14,6 +14,7 @@ add_custom_command(OUTPUT "${GAMEDB_PS1_OBJ}"
 
 add_custom_target(gamedbobjs DEPENDS "${GAMEDB_PS1_OBJ}")
 
+
 add_library(gamedb INTERFACE)
 add_dependencies(gamedb gamedbobjs)
 

database/db_obj_builder.cmake

@@ -0,0 +1,30 @@
+string(TIMESTAMP date "%Y%m%d")
+
+if(NOT EXISTS "${OUTPUT_DIR}/gamedb${SYSTEM}_${date}.o")
+
+find_package (Python COMPONENTS Interpreter)
+
+file(GLOB files "${OUTPUT_DIR}/gamedb${SYSTEM}_*")
+foreach(file ${files})
+file(REMOVE "${file}")
+endforeach()
+
+
+set(GAMEDB_${SYSTEM}_BIN "gamedb${SYSTEM}.dat")
+set(GAMEDB_${SYSTEM}_OBJ "${OUTPUT_DIR}/gamedb${SYSTEM}_${date}.o")
+
+execute_process(
+    COMMAND ${Python_EXECUTABLE} ${PYTHON_SCRIPT} ${SYSTEM} ${OUTPUT_DIR}
+    WORKING_DIRECTORY ${OUTPUT_DIR}
+    OUTPUT_QUIET
+)
+execute_process(
+    COMMAND ${CMAKE_OBJCOPY} --input-target=binary --output-target=elf32-littlearm --binary-architecture arm --rename-section .data=.rodata "${GAMEDB_${SYSTEM}_BIN}" "${GAMEDB_${SYSTEM}_OBJ}"
+    WORKING_DIRECTORY ${OUTPUT_DIR}
+    OUTPUT_QUIET
+)
+
+file(CREATE_LINK ${GAMEDB_${SYSTEM}_OBJ} "${OUTPUT_DIR}/gamedb${SYSTEM}.o" SYMBOLIC)
+file(REMOVE_RECURSE "${OUTPUT_DIR}/${SYSTEM}")
+
+endif()

src/ps1/ps1_cardman.c

@@ -64,14 +64,14 @@ static bool ps1_cardman_sanity_check_game_id(const char* const game_id) {
     return (i > 0);
 }
 
+#pragma GCC diagnostic ignored "-Warray-bounds"
 static uint32_t ps1_cardman_char_array_to_uint32(const char in[4]) {
-#if BIG_ENDIAN
     char inter[4] = {in[3], in[2], in[1], in[0]};
-#else
-    char* inter = in;
-#endif
-    return *(uint32_t*)inter;
+    uint32_t tgt;
+    memcpy(&tgt, inter, sizeof(tgt));
+    return tgt;
 }
+#pragma GCC diagnostic pop
 
 static uint32_t ps1_cardman_find_prefix_offset(uint32_t numericPrefix) {
     uint32_t offset = 0;
@@ -156,11 +156,7 @@ static bool ps1_cardman_update_game_data(const char* const id) {
 
 void ps1_cardman_init(void) {
     card_idx = settings_get_ps1_card();
-    if (card_idx < IDX_MIN)
-        card_idx = IDX_MIN;
     card_chan = settings_get_ps1_channel();
-    if (card_chan < CHAN_MIN || card_chan > CHAN_MAX)
-        card_chan = CHAN_MIN;
     memset(card_game_id, 0, sizeof(card_game_id));
 }
 

src/ps2/ps2_cardman.c

@@ -19,11 +19,6 @@
 static uint8_t flushbuf[BLOCK_SIZE];
 static int fd = -1;
 
-#define IDX_MIN 1
-#define IDX_BOOT 0
-#define CHAN_MIN 1
-#define CHAN_MAX 8
-
 static int card_idx;
 static int card_chan;
 static uint32_t card_size;
@@ -38,11 +33,7 @@ void ps2_cardman_init(void) {
         card_chan = CHAN_MIN;
     } else {
         card_idx = settings_get_ps2_card();
-        if (card_idx < IDX_MIN)
-            card_idx = IDX_MIN;
         card_chan = settings_get_ps2_channel();
-        if (card_chan < CHAN_MIN || card_chan > CHAN_MAX)
-            card_chan = CHAN_MIN;
     }
 }
 
@@ -68,7 +59,7 @@ static void ensuredirs(void) {
     char cardpath[32];
     if (IDX_BOOT == card_idx)
         snprintf(cardpath, sizeof(cardpath), "MemoryCards/PS2/BOOT");
-    else 
+    else
         snprintf(cardpath, sizeof(cardpath), "MemoryCards/PS2/Card%d", card_idx);
 
     sd_mkdir("MemoryCards");
@@ -219,10 +210,9 @@ void ps2_cardman_open(void) {
     char path[64];
 
     ensuredirs();
-    if (IDX_BOOT == card_idx)
+    if (IDX_BOOT == card_idx) {
         snprintf(path, sizeof(path), "MemoryCards/PS2/BOOT/BootCard.mcd");
-    else
-    {
+    } else {
         snprintf(path, sizeof(path), "MemoryCards/PS2/Card%d/Card%d-%d.mcd", card_idx, card_idx, card_chan);
         /* this is ok to do on every boot because it wouldn't update if the value is the same as currently stored */
         settings_set_ps2_card(card_idx);
@@ -270,13 +260,13 @@ void ps2_cardman_open(void) {
             fatal("cannot open card");
 
         card_size = sd_filesize(fd);
-        if ((card_size != PS2_CARD_SIZE_512K) 
-            && (card_size != PS2_CARD_SIZE_1M) 
-            && (card_size != PS2_CARD_SIZE_2M) 
-            && (card_size != PS2_CARD_SIZE_4M) 
+        if ((card_size != PS2_CARD_SIZE_512K)
+            && (card_size != PS2_CARD_SIZE_1M)
+            && (card_size != PS2_CARD_SIZE_2M)
+            && (card_size != PS2_CARD_SIZE_4M)
             && (card_size != PS2_CARD_SIZE_8M))
             fatal("Card %d Channel %d is corrupted", card_idx, card_chan);
-        
+
         /* read 8 megs of card image */
         printf("reading card (%lu KB).... ", (uint32_t)(card_size / 1024));
         cardprog_start = time_us_64();

src/ps2/ps2_memory_card.c

@@ -178,7 +178,7 @@ static inline void __time_critical_func(mc_respond_slow)(uint8_t ch) {
     pio_sm_put_blocking(pio0, dat_writer_slow.sm, ch);
 }
 
-static uint8_t Table[] = {
+static uint8_t EccTable[] = {
 	0x00, 0x87, 0x96, 0x11, 0xa5, 0x22, 0x33, 0xb4,0xb4, 0x33, 0x22, 0xa5, 0x11, 0x96, 0x87, 0x00,
 	0xc3, 0x44, 0x55, 0xd2, 0x66, 0xe1, 0xf0, 0x77,0x77, 0xf0, 0xe1, 0x66, 0xd2, 0x55, 0x44, 0xc3,
 	0xd2, 0x55, 0x44, 0xc3, 0x77, 0xf0, 0xe1, 0x66,0x66, 0xe1, 0xf0, 0x77, 0xc3, 0x44, 0x55, 0xd2,
@@ -197,33 +197,6 @@ static uint8_t Table[] = {
 	0x00, 0x87, 0x96, 0x11, 0xa5, 0x22, 0x33, 0xb4,0xb4, 0x33, 0x22, 0xa5, 0x11, 0x96, 0x87, 0x00
 };
 
-void calcECC(uint8_t *ecc, const uint8_t *data)
-{
-	int i, c;
-
-	ecc[0] = ecc[1] = ecc[2] = 0;
-
-	for (i = 0 ; i < 0x80 ; i ++) {
-		c = Table[data[i]];
-
-		ecc[0] ^= c;
-		if (c & 0x80) {
-			ecc[1] ^= ~i;
-			ecc[2] ^= i;
-		}
-	}
-	ecc[0] = ~ecc[0];
-	ecc[0] &= 0x77;
-
-	ecc[1] = ~ecc[1];
-	ecc[1] &= 0x7f;
-
-	ecc[2] = ~ecc[2];
-	ecc[2] &= 0x7f;
-
-	return;
-}
-
 // keysource and key are self generated values
 uint8_t keysource[] = { 0xf5, 0x80, 0x95, 0x3c, 0x4c, 0x84, 0xa9, 0xc0 };
 uint8_t dex_key[16] = { 0x17, 0x39, 0xd3, 0xbc, 0xd0, 0x2c, 0x18, 0x07, 0x4b, 0x17, 0xf0, 0xea, 0xc4, 0x66, 0x30, 0xf9 };

src/ps2/ps2_memory_card.in.c

@@ -182,7 +182,7 @@ if (ch == 0x11) {
             send(b);
 
             if (readptr <= 512) {
-                uint8_t c = Table[b];
+                uint8_t c = EccTable[b];
                 eccptr[0] ^= c;
                 if (c & 0x80) {
                     eccptr[1] ^= ~(readptr & 0x7F);

src/settings.c

@@ -65,10 +65,14 @@ void settings_update_part(void *settings_ptr, uint32_t sz) {
 #define SETTINGS_UPDATE_FIELD(field) settings_update_part(&settings.field, sizeof(settings.field))
 
 int settings_get_ps2_card(void) {
+    if (settings.ps2_card < IDX_MIN)
+        return IDX_MIN;
     return settings.ps2_card;
 }
 
 int settings_get_ps2_channel(void) {
+    if (settings.ps2_channel < CHAN_MIN || settings.ps2_channel > CHAN_MAX)
+        return CHAN_MIN;
     return settings.ps2_channel;
 }
 
@@ -87,10 +91,14 @@ void settings_set_ps2_channel(int chan) {
 }
 
 int settings_get_ps1_card(void) {
+    if (settings.ps1_card < IDX_MIN)
+        return IDX_MIN;
     return settings.ps1_card;
 }
 
 int settings_get_ps1_channel(void) {
+    if (settings.ps1_channel < CHAN_MIN || settings.ps1_channel > CHAN_MAX)
+        return CHAN_MIN;
     return settings.ps1_channel;
 }
 
@@ -131,5 +139,5 @@ bool settings_get_ps2_autoboot(void) {
 void settings_set_ps2_autoboot(bool autoboot) {
     if (autoboot != settings_get_ps2_autoboot())
         settings.ps2_flags ^= SETTINGS_FLAGS_AUTOBOOT;
-    SETTINGS_UPDATE_FIELD(ps2_flags);    
-}
+    SETTINGS_UPDATE_FIELD(ps2_flags);
+}