Fixups for SDK 5384b6b: rename lock core member, workaround for scope change of default bs2 file

software/apps/bad_apple/CMakeLists.txt

@@ -10,7 +10,7 @@ add_executable(bad_apple
 
 # Increase CLKDIV to 4, because we're going to run the system at 372 MHz, and
 # the flash gets rather unhappy if you try to clock it at 186 MHz
-pico_define_boot_stage2(bad_apple_boot2 ${PICO_DEFAULT_BOOT_STAGE2_FILE})
+pico_define_boot_stage2(bad_apple_boot2 ${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_w25q080.S)
 target_compile_definitions(bad_apple_boot2 PRIVATE PICO_FLASH_SPI_CLKDIV=4)
 pico_set_boot_stage2(bad_apple bad_apple_boot2)
 

software/apps/vista-palette/CMakeLists.txt

@@ -10,7 +10,7 @@ add_executable(vista-palette
 # flash using direct SSI DMA, which would trample on XIP.
 pico_set_binary_type(vista-palette copy_to_ram)
 
-pico_define_boot_stage2(vista-palette_boot2 ${PICO_DEFAULT_BOOT_STAGE2_FILE})
+pico_define_boot_stage2(vista-palette_boot2 ${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_w25q080.S)
 target_compile_definitions(vista-palette_boot2 PRIVATE PICO_FLASH_SPI_CLKDIV=4)
 pico_set_boot_stage2(vista-palette vista-palette_boot2)
 

software/apps/vista/CMakeLists.txt

@@ -1,7 +1,3 @@
-# Replace TMDS with 10 bit UART (same baud rate):
-# add_definitions(-DDVI_SERIAL_DEBUG=1)
-# add_definitions(-DRUN_FROM_CRYSTAL)
-
 add_executable(vista
 	main.c
 )

software/libdvi/util_queue_u32_inline.h

@@ -18,38 +18,38 @@ static inline uint16_t _queue_inc_index_u32(queue_t *q, uint16_t index) {
 
 static inline bool queue_try_add_u32(queue_t *q, void *data) {
     bool success = false;
-    uint32_t flags = spin_lock_blocking(q->lock);
+    uint32_t flags = spin_lock_blocking(q->core.spin_lock);
     if (queue_get_level_unsafe(q) != q->element_count) {
         ((uint32_t*)q->data)[q->wptr] = *(uint32_t*)data;
         q->wptr = _queue_inc_index_u32(q, q->wptr);
         success = true;
     }
-    spin_unlock(q->lock, flags);
+    spin_unlock(q->core.spin_lock, flags);
     if (success) __sev();
     return success;
 }
 
 static inline bool queue_try_remove_u32(queue_t *q, void *data) {
     bool success = false;
-    uint32_t flags = spin_lock_blocking(q->lock);
+    uint32_t flags = spin_lock_blocking(q->core.spin_lock);
     if (queue_get_level_unsafe(q) != 0) {
         *(uint32_t*)data = ((uint32_t*)q->data)[q->rptr];
         q->rptr = _queue_inc_index_u32(q, q->rptr);
         success = true;
     }
-    spin_unlock(q->lock, flags);
+    spin_unlock(q->core.spin_lock, flags);
     if (success) __sev();
     return success;
 }
 
 static inline bool queue_try_peek_u32(queue_t *q, void *data) {
     bool success = false;
-    uint32_t flags = spin_lock_blocking(q->lock);
+    uint32_t flags = spin_lock_blocking(q->core.spin_lock);
     if (queue_get_level_unsafe(q) != 0) {
         *(uint32_t*)data = ((uint32_t*)q->data)[q->rptr];
         success = true;
     }
-    spin_unlock(q->lock, flags);
+    spin_unlock(q->core.spin_lock, flags);
     return success;
 }