Explorar o código

Bump default clocking to 200MHz for both MCUs. New default for 2040 by pi foundation and slight OC for 2350.

Eric Helgeson hai 4 meses
pai
achega
12e5d233f7

+ 4 - 2
lib/BlueSCSI_platform_RP2MCU/timings_RP2MCU.c

@@ -609,7 +609,6 @@ static bluescsi_timings_t  predefined_timings[]  = {
     },
     
 };
-static bluescsi_timings_t  current_timings;
 
 #ifdef ENABLE_AUDIO_OUTPUT_SPDIF
 bluescsi_timings_t *g_bluescsi_timings = &predefined_timings[2];
@@ -644,6 +643,7 @@ bool set_timings(bluescsi_speed_grade_t speed_grade)
     case SPEED_GRADE_AUDIO_SPDIF:
         timings_index = 2;
         break;
+    case SPEED_GRADE_200MHZ:
     case SPEED_GRADE_AUDIO_I2S:
         timings_index = 7;
         break;
@@ -654,6 +654,7 @@ bool set_timings(bluescsi_speed_grade_t speed_grade)
     case SPEED_GRADE_A:
         timings_index = 4;
         break;
+    case SPEED_GRADE_200MHZ:
     case SPEED_GRADE_B:
         timings_index = 7;
         break;
@@ -683,13 +684,14 @@ case SPEED_GRADE_MAX:
     case SPEED_GRADE_AUDIO_I2S:
         timings_index = 5;
         break;
+    case SPEED_GRADE_200MHZ:
+        timings_index = 7;
 #endif
         default:
             break;
     }
     if (speed_grade != SPEED_GRADE_DEFAULT && speed_grade != SPEED_GRADE_CUSTOM)
     {
-        g_bluescsi_timings = &current_timings;
         memcpy(g_bluescsi_timings, &predefined_timings[timings_index], sizeof(*g_bluescsi_timings));
         g_max_sync_10_period = g_bluescsi_timings->scsi_10.max_sync;
         g_max_sync_20_period = g_bluescsi_timings->scsi_20.max_sync;

+ 4 - 0
src/BlueSCSI_settings.cpp

@@ -322,7 +322,11 @@ scsi_system_settings_t *BlueSCSISettings::initSystem(const char *presetName)
     cfgSys.usbMassStoragePresentImages = false;
     cfgSys.invertStatusLed = false;
 
+#if defined(BLUESCSI_MCU_RP23XX) || defined(BLUESCSI_MCU_RP20XX)
+    cfgSys.speedGrade = bluescsi_speed_grade_t::SPEED_GRADE_200MHZ;
+#else
     cfgSys.speedGrade = bluescsi_speed_grade_t::SPEED_GRADE_DEFAULT;
+#endif
 
     // setting set for all or specific devices
     cfgDev.deviceType = S2S_CFG_NOT_SET;

+ 2 - 1
src/BlueSCSI_settings.h

@@ -34,7 +34,8 @@ typedef enum
     SPEED_GRADE_A,
     SPEED_GRADE_B,
     SPEED_GRADE_C,
-    SPEED_GRADE_WIFI_RM2
+    SPEED_GRADE_WIFI_RM2,
+    SPEED_GRADE_200MHZ,
 } bluescsi_speed_grade_t;
 
 #ifdef __cplusplus