Merge pull request #83 from LouDnl/dev

Dev v0.6.3-BETA

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.2-BETA.${MAGIC_SMOKE}")  # Generate compile version
+set(PROJECT_VERSION "0.6.3-BETA.${MAGIC_SMOKE}")  # Generate compile version
 
 ### Want a cookie?
 # NOTICE: ENABLING THESE DEBUGGING DEFINITIONS WILL HAVE SIGNIFICANT IMPACT AND WILL DELAY PLAYING!

src/asid_buffer.c

@@ -54,41 +54,41 @@ extern Config usbsid_config;
 extern uint32_t clockcycles(void);
 
 /* PIO */
-PIO raster_pio = pio1;
+const PIO raster_pio = pio1;
 static uint sm_buffer, offset_buffer;
-bool buffer_sm_started = false;
-bool buffer_sm_claimed = false;
+static bool buffer_sm_started = false;
+static bool buffer_sm_claimed = false;
 
 /* Arrival rate tracking */
 #define ARRIVAL_HISTORY_SIZE 8
 #define MULTISID_TIMEOUT_FRAMES 30  /* Reset to 1-SID after this many frames without SID2+ */
 #define NOWRITES_TIMEOUT_FRAMES 100  /* Disable everything after this amount of frames */
 
-static bool still_receiving = false;
+static bool still_receiving = false; /* IRQ */
 static uint32_t arrival_times[ARRIVAL_HISTORY_SIZE];
 volatile uint8_t arrival_index = 0;
 volatile uint8_t arrival_count = 0;
 volatile uint32_t calculated_rate = 0;
-static uint16_t base_rate = 0;  /* The rate from env message */
-static uint8_t sid_count_estimate = 1;  /* Estimated number of SIDs in tune */
-volatile /* static */ uint8_t frames_since_nowrites = 0;  /* Frames since last SID2/3/4 message */
-static uint8_t frames_since_multisid = 0;  /* Frames since last SID2/3/4 message */
+volatile static uint16_t base_rate = 0;  /* The rate from env message */
+volatile static uint8_t sid_count_estimate = 1;  /* Estimated number of SIDs in tune */
+volatile uint8_t frames_since_nowrites = 0;  /* Frames since last SID2/3/4 message */
+volatile static uint8_t frames_since_multisid = 0;  /* Frames since last SID2/3/4 message */
 
 /* IRQ */
-int pio_irq;
-static int8_t buffer_irq;
 const int BUFFPIOIRQ = 2;
-bool buffer_irq_started = false;
+volatile static int pio_irq = 0;
+volatile static int8_t buffer_irq = 0;
+volatile static bool buffer_irq_started = false;
 volatile uint32_t irq_now_at = 0;
 volatile uint32_t irq_end_at = 0;
 volatile uint32_t irq_prev_at = 0;
 
 /* Ring buffer */
-static const uint8_t ASID_FRAME_WRITES_MAX = 28;
 static uint8_t ring_get(void);
 static int ring_diff(void);
+static const uint8_t ASID_FRAME_WRITES_MAX = 28;
 volatile uint16_t corrected_rate = 0;
-uint8_t diff_size = (2 * (4 * ASID_FRAME_WRITES_MAX)); /* = 224 bytes | 112 bytes == 1 frame, was 64 bytes */
+const uint8_t diff_size = (2 * (4 * ASID_FRAME_WRITES_MAX)); /* = 224 bytes | 112 bytes == 1 frame, was 64 bytes */
 typedef struct {
   uint16_t ring_read;
   uint16_t ring_write;
@@ -104,8 +104,6 @@ static const uint16_t RING_SIZE_MAX = (150 * 224);    /* 33600 bytes - maximum s
 static const uint16_t RING_SIZE_STEP = (20 * 224);    /* 4480 bytes - grow/shrink increment */
 volatile uint16_t ring_size = RING_SIZE_DEFAULT;      /* Current effective size */
 static uint16_t ring_size_allocated = 0;              /* Actual allocated size */
-/* TODO: REMOVE ~ TEMPORARY */
-volatile bool in_asid_irq = false;
 
 
 /**
@@ -430,7 +428,6 @@ void reset_arrival_tracking(void)
  */
 void __not_in_flash_func(buffer_irq_handler)(void)
 {
-  in_asid_irq = true;
   irq_prev_at = irq_now_at;
   irq_now_at = clockcycles();
 
@@ -478,7 +475,6 @@ void __not_in_flash_func(buffer_irq_handler)(void)
     frames_since_nowrites = 0;
     still_receiving = true;
   }
-  in_asid_irq = false;
 
   /* Interrupt cleared at end of routine
    * if play becomes irregular, irq's might be
@@ -668,6 +664,9 @@ static uint8_t __not_in_flash_func(ring_get)(void)
  */
 void asid_ring_init(void)
 {
+  /* Explicitely set sid_count_estimate to 1 at start for potential compiler zeroing issue */
+  sid_count_estimate = 1;
+
   if (!asid_ringbuffer.is_allocated) {
     if (asid_ringbuffer.ringbuffer != NULL) { free(asid_ringbuffer.ringbuffer); }
     /* Allocate max size upfront - allows growth without reallocation */

src/bus.c

@@ -65,12 +65,13 @@ extern void stop_pios(void);
 volatile bool is_muted; /* Global muting state */
 
 /* Direct Pio IRQ access */
-volatile const uint32_t *IRQState = &pio0_hw->irq;
+#define IRQState (pio0_hw->irq)
 
 /* DMA bus data variables */
-uint8_t control_word, read_data;
-uint16_t delay_word;
-uint32_t data_word, dir_mask;
+volatile uint8_t control_word, read_data;
+volatile uint16_t delay_word;
+volatile uint32_t data_word, dir_mask;
+
 
 /**
  * @brief Set the bits going to the PIO databus based on provided address
@@ -197,13 +198,14 @@ uint16_t __no_inline_not_in_flash_func(cycled_delay_operation)(uint16_t cycles)
   pio_sm_exec(bus_pio, sm_delay, pio_encode_irq_clear(false, PIO_IRQ0));  /* Clear the statemachine IRQ before starting */
   pio_sm_exec(bus_pio, sm_delay, pio_encode_irq_clear(false, PIO_IRQ1));  /* Clear the statemachine IRQ before starting */
   dma_channel_set_read_addr(dma_tx_delay, &delay_word, false);
-  dma_hw->multi_channel_trigger = (1u << dma_tx_delay);  /* Delay cycle s DMA transfer */
+  dma_channel_set_trans_count(dma_tx_delay, 1, false);  /* Reset transfer count to 1 */
+  dma_hw->multi_channel_trigger = (1u << dma_tx_delay);  /* Delay cycles DMA transfer */
 
   for (;;) {  /* Keep mofo waiting yeah! */
-    if (((*IRQState & (1u << PIO_IRQ1)) >> PIO_IRQ1) != 1)
+    if (((IRQState & (1u << PIO_IRQ1)) >> PIO_IRQ1) != 1)
       continue;
-    pio_sm_exec(bus_pio, sm_delay, pio_encode_irq_clear(false, PIO_IRQ0));  /* Clear the statemachine IRQ after finishing */
-    pio_sm_exec(bus_pio, sm_delay, pio_encode_irq_clear(false, PIO_IRQ1));  /* Clear the statemachine IRQ after finishing */
+    /* Clear the statemachine IRQ after finishing */
+    IRQState = (1u << PIO_IRQ0) | (1u << PIO_IRQ1);  /* Write-1-to-Clear to clear both flags */
     return cycles;
   }
 
@@ -312,8 +314,8 @@ uint16_t __no_inline_not_in_flash_func(cycled_delayed_write_operation)(uint8_t a
 void __no_inline_not_in_flash_func(cycled_write_operation)(uint8_t address, uint8_t data, uint16_t cycles)
 {
   delay_word = cycles;
-  sid_memory[(address & 0x7F)] = data;
-  if (set_bus_bits(address, true) != 1) {
+  sid_memory[(address & 0x7F)] = data; /* Store SID write data in SID memory */
+  if (set_bus_bits(address, true) != 1) { /* Set bus bits (uses SID memory as source) */
     return;
   }
 
@@ -371,7 +373,7 @@ uint8_t __no_inline_not_in_flash_func(cycled_read_operation)(uint8_t address, ui
   );
   dma_channel_wait_for_finish_blocking(dma_rx_data);  /* Wait for data */
   sid_memory[(address & 0x7F)] = (read_data & 0xFF);
-  return (read_data & 0xFF);
+  return sid_memory[(address & 0x7F)];
 }
 
 /**