Merge pull request #687 from FujiNetWIFI/dma_latch

Combine PIOs and use DMA to tighten up Floppy-DCD state switching
FujiNetWIFI · Nov 23, 2023 · f130fd9 · f130fd9
2 parents 9b33f60 + 9707fa0
commit f130fd9
Show file tree

Hide file tree

Showing 9 changed files with 252 additions and 228 deletions.
diff --git a/pico/mac/CMakeLists.txt b/pico/mac/CMakeLists.txt
@@ -31,17 +31,15 @@ pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/commands.pio)
 pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/echo.pio)
 pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/latch.pio)
 pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/mux.pio)
-pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/dcd_latch.pio)
 pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/dcd_commands.pio)
-pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/dcd_mux.pio)
 pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/dcd_read.pio)
 pico_generate_pio_header(commands ${CMAKE_CURRENT_LIST_DIR}/dcd_write.pio)
 # however, alternatively you can choose to generate it somewhere else (in this case in the source tree for check in)
 #pico_generate_pio_header(pio_and ${CMAKE_CURRENT_LIST_DIR}/blink.pio OUTPUT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # target_sources(pio_and PRIVATE pio_and.c)
 
-target_link_libraries(commands pico_stdlib hardware_pio)
+target_link_libraries(commands pico_stdlib hardware_pio hardware_dma)
 
 # Add the standard include files to the build
 target_include_directories(commands PRIVATE