Merge pull request #850 from Daft-Freak/pico-driver-subdir

pico: move drivers into subdirs
32blit · Jul 1, 2024 · f14350f · f14350f
2 parents 6023468 + 83540db
commit f14350f
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 5 deletions.
diff --git a/32blit-pico/CMakeLists.txt b/32blit-pico/CMakeLists.txt
@@ -157,11 +157,11 @@ endif()
 
 # driver sources
 target_sources(BlitHalPico INTERFACE
-    ${CMAKE_CURRENT_LIST_DIR}/audio_${BLIT_AUDIO_DRIVER}.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/display_${BLIT_DISPLAY_DRIVER}.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/input_${BLIT_INPUT_DRIVER}.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/storage_${BLIT_STORAGE_DRIVER}.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/usb_${BLIT_USB_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/audio/${BLIT_AUDIO_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/display/${BLIT_DISPLAY_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/input/${BLIT_INPUT_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/storage/${BLIT_STORAGE_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/usb/${BLIT_USB_DRIVER}.cpp
 )
 
 if(BLIT_ENABLE_CORE1)

diff --git a/32blit-pico/audio_beep.cpp → 32blit-pico/audio/beep.cpp b/32blit-pico/audio_beep.cpp → 32blit-pico/audio/beep.cpp
diff --git a/32blit-pico/audio_i2s.cpp → 32blit-pico/audio/i2s.cpp b/32blit-pico/audio_i2s.cpp → 32blit-pico/audio/i2s.cpp
diff --git a/32blit-pico/audio_none.cpp → 32blit-pico/audio/none.cpp b/32blit-pico/audio_none.cpp → 32blit-pico/audio/none.cpp
diff --git a/32blit-pico/audio_pwm.cpp → 32blit-pico/audio/pwm.cpp b/32blit-pico/audio_pwm.cpp → 32blit-pico/audio/pwm.cpp
diff --git a/32blit-pico/display_none.cpp → 32blit-pico/display/none.cpp b/32blit-pico/display_none.cpp → 32blit-pico/display/none.cpp
diff --git a/32blit-pico/display_picovision.cpp → 32blit-pico/display/picovision.cpp b/32blit-pico/display_picovision.cpp → 32blit-pico/display/picovision.cpp
diff --git a/32blit-pico/display_scanvideo.cpp → 32blit-pico/display/scanvideo.cpp b/32blit-pico/display_scanvideo.cpp → 32blit-pico/display/scanvideo.cpp
diff --git a/32blit-pico/display_st7789.cpp → 32blit-pico/display/st7789.cpp b/32blit-pico/display_st7789.cpp → 32blit-pico/display/st7789.cpp
diff --git a/32blit-pico/input_gpio.cpp → 32blit-pico/input/gpio.cpp b/32blit-pico/input_gpio.cpp → 32blit-pico/input/gpio.cpp
diff --git a/32blit-pico/input_none.cpp → 32blit-pico/input/none.cpp b/32blit-pico/input_none.cpp → 32blit-pico/input/none.cpp
diff --git a/32blit-pico/input_usb_hid.cpp → 32blit-pico/input/usb_hid.cpp b/32blit-pico/input_usb_hid.cpp → 32blit-pico/input/usb_hid.cpp
diff --git a/32blit-pico/storage_flash.cpp → 32blit-pico/storage/flash.cpp b/32blit-pico/storage_flash.cpp → 32blit-pico/storage/flash.cpp
diff --git a/32blit-pico/storage_sd_spi.cpp → 32blit-pico/storage/sd_spi.cpp b/32blit-pico/storage_sd_spi.cpp → 32blit-pico/storage/sd_spi.cpp
diff --git a/32blit-pico/usb_device.cpp → 32blit-pico/usb/device.cpp b/32blit-pico/usb_device.cpp → 32blit-pico/usb/device.cpp
diff --git a/32blit-pico/usb_host.cpp → 32blit-pico/usb/host.cpp b/32blit-pico/usb_host.cpp → 32blit-pico/usb/host.cpp