ports/rp2: DMA support for Pi Pico.

nickovs · nickovs · commit 74683ed65ebc · 2021-08-11T20:07:01.000-06:00
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
@@ -100,6 +100,7 @@ set(MICROPY_SOURCE_PORT
     mpthreadport.c
     rp2_flash.c
     rp2_pio.c
+    rp2_dma.c
     tusb_port.c
     uart.c
 )
@@ -125,6 +126,7 @@ set(MICROPY_SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/modutime.c
     ${PROJECT_SOURCE_DIR}/rp2_flash.c
     ${PROJECT_SOURCE_DIR}/rp2_pio.c
+    ${PROJECT_SOURCE_DIR}/rp2_dma.c
 )
 
 set(PICO_SDK_COMPONENTS
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
@@ -106,6 +106,7 @@ int main(int argc, char **argv) {
         readline_init0();
         machine_pin_init();
         rp2_pio_init();
+        rp2_dma_init();
 
         // Execute _boot.py to set up the filesystem.
         pyexec_frozen_module("_boot.py");
@@ -136,6 +137,7 @@ int main(int argc, char **argv) {
 
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        rp2_dma_deinit();
         rp2_pio_deinit();
         machine_pin_deinit();
         #if MICROPY_PY_THREAD
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
@@ -32,6 +32,9 @@ STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&rp2_flash_type) },
     { MP_ROM_QSTR(MP_QSTR_PIO),                 MP_ROM_PTR(&rp2_pio_type) },
     { MP_ROM_QSTR(MP_QSTR_StateMachine),        MP_ROM_PTR(&rp2_state_machine_type) },
+    { MP_ROM_QSTR(MP_QSTR_DMA),                 MP_ROM_PTR(&rp2_dma_type) },
+    { MP_ROM_QSTR(MP_QSTR_DMAConfig),           MP_ROM_PTR(&rp2_dma_config_type) },
+    { MP_ROM_QSTR(MP_QSTR_buffer_address),      MP_ROM_PTR(&rp2_dma_buffer_address_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(rp2_module_globals, rp2_module_globals_table);
 
diff --git a/ports/rp2/modrp2.h b/ports/rp2/modrp2.h
@@ -31,8 +31,16 @@
 extern const mp_obj_type_t rp2_flash_type;
 extern const mp_obj_type_t rp2_pio_type;
 extern const mp_obj_type_t rp2_state_machine_type;
+extern const mp_obj_type_t rp2_dma_type;
+extern const mp_obj_type_t rp2_dma_config_type;
+
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_dma_buffer_address_obj);
+
 
 void rp2_pio_init(void);
 void rp2_pio_deinit(void);
 
+void rp2_dma_init(void);
+void rp2_dma_deinit(void);
+
 #endif // MICROPY_INCLUDED_RP2_MODRP2_H
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
@@ -177,6 +177,7 @@ extern const struct _mp_obj_module_t mp_module_utime;
     void *rp2_state_machine_irq_obj[8]; \
     void *rp2_uart_rx_buffer[2]; \
     void *rp2_uart_tx_buffer[2]; \
+    void *rp2_dma_irq_obj[NUM_DMA_CHANNELS]; \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ set(MICROPY_SOURCE_PORT`
`100`	`100`	`mpthreadport.c`
`101`	`101`	`rp2_flash.c`
`102`	`102`	`rp2_pio.c`
	`103`	`+ rp2_dma.c`
`103`	`104`	`tusb_port.c`
`104`	`105`	`uart.c`
`105`	`106`	`)`
`@@ -125,6 +126,7 @@ set(MICROPY_SOURCE_QSTR`
`125`	`126`	`${PROJECT_SOURCE_DIR}/modutime.c`
`126`	`127`	`${PROJECT_SOURCE_DIR}/rp2_flash.c`
`127`	`128`	`${PROJECT_SOURCE_DIR}/rp2_pio.c`
	`129`	`+ ${PROJECT_SOURCE_DIR}/rp2_dma.c`
`128`	`130`	`)`
`129`	`131`
`130`	`132`	`set(PICO_SDK_COMPONENTS`