Merge pull request #84 from LouDnl/dev

Stoopid optimizations causing who knows what v0.6.4-BBbbbbettaaa

Author: LouDnl

CMakeLists.txt

@@ -30,7 +30,7 @@ set(PROJECT_NAME usbsidpico)
 set(PROJECT_MANUFACTURER "LouD")
 set(PRODUCT_STRING "USBSID-Pico")
 string(TIMESTAMP MAGIC_SMOKE "%Y%m%d")  # Auto generate dated version
-set(PROJECT_VERSION "0.6.3-BETA.${MAGIC_SMOKE}")  # Generate compile version
+set(PROJECT_VERSION "0.6.4-BETA.${MAGIC_SMOKE}")  # Generate compile version
 
 ### Want a cookie?
 # NOTICE: ENABLING THESE DEBUGGING DEFINITIONS WILL HAVE SIGNIFICANT IMPACT AND WILL DELAY PLAYING!

src/config.c

@@ -157,15 +157,15 @@ bool
   stopping_emulator;
 #endif /* ONBOARD_EMULATOR */
 #if defined(ONBOARD_SIDPLAYER)
-extern bool
+extern volatile bool
   sidplayer_init,
   sidplayer_start,
   sidplayer_playing,
   sidplayer_stop,
   sidplayer_next,
   sidplayer_prev;
 /* SID player locals */
-volatile uint8_t * sidfile = NULL; /* Temporary buffer to store incoming data */
+uint8_t * sidfile = NULL; /* Temporary buffer to store incoming data */
 volatile int sidfile_size = 0;
 volatile char tuneno = 0;
 volatile bool is_prg = false; /* Default to SID file */

src/usbsid.c

@@ -138,9 +138,9 @@ volatile bool sidplayer_next = false;
 volatile bool sidplayer_prev = false;
 
 extern uint8_t * sidfile; /* Temporary buffer to store incoming data */
-extern int sidfile_size;
-extern char tuneno;
-extern bool is_prg;
+extern volatile int sidfile_size;
+extern volatile char tuneno;
+extern volatile bool is_prg;
 extern void load_prg(uint8_t * binary_, size_t binsize_, bool loop);
 extern void load_sidtune(uint8_t * sidfile, int sidfilesize, char subt);
 extern void init_sidplayer(void);
@@ -945,7 +945,7 @@ int main()
   enable_sid(false);
 
   /* Clear the dirt */
-#if !defined(ONBOARD_EMULATOR) || !defined(ONBOARD_SIDPLAYER)
+#if !defined(ONBOARD_EMULATOR) && !defined(ONBOARD_SIDPLAYER)
   memset(sid_memory, 0, sizeof sid_memory);
 #endif