summaryrefslogtreecommitdiffstatshomepage
path: root/stmhal/dma.h
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2017-08-13 21:33:40 +1000
committerDamien George <damien.p.george@gmail.com>2017-08-13 21:33:40 +1000
commite52758da223e57b6cd9458f039f8ccc50ee76ddb (patch)
tree2d5218ad0e1f30c686f51f5807b5676fe0007fe5 /stmhal/dma.h
parentbe2387885bf251fb44b6b64aeadff147a4ae7266 (diff)
parent9b39263b118a4be65c58bf9c396203fa535bebe1 (diff)
downloadmicropython-e52758da223e57b6cd9458f039f8ccc50ee76ddb.tar.gz
micropython-e52758da223e57b6cd9458f039f8ccc50ee76ddb.zip
Merge tag 'v1.8.1' into parse-bytecode
Many ESP8266 improvements, enhanced WebREPL, and support for STM32L4 MCUs This release brings general improvements and bug fixes, and some new features. There is now a uerror module for consistent errno handling across ports, as well as textual names of OS errors that are printed when an OSError is raised. There is support for frozen packages, via both frozen scripts and frozen bytecode. WebREPL on the ESP8266 is greatly improved with many bug fixes and now supports an unlimited (or very large) number of reconnects. The os module on the ESP8266 now has rename, chdir, getcwd and stat. The unix port now includes the ussl module by default. The stmhal port has support for STM32L4 MCUs including the STM32L476 Discovery board and the LimiFrog board. README: - add explicit note that subdirs contain more READMEs - add "make deplibs" to quick build section - "quick build": Use "make axtls" after all CODECONVENTIONS.md: - describe git commit messages conventions py core: - obj: add warning note about get_array return value and GC blocks - objstr: binary type of str/bytes for buffer protocol is 'B' - runtime: properly handle passing user mappings to ** keyword args - repl: if there're no better alternatives, try to complete "import" - mpz: fix bug with overflowing C-shift in division routine - mpz: do Python style division/modulo within bignum divmod routine - mpz: fix mpn_div so that it doesn't modify memory of denominator - vstr: vstr_null_terminated_str(): Extend string by at most one byte - vstr: change allocation policy, +16 to requested size, instead of *2 - add mperrno.h file with uPy defined errno constants - add uerrno module, with errno constants and dict - parse: add uerrno to list of modules to look for constants in - mperrno: add EAFNOSUPPORT definition - repl: fix handling of backslash in quotes when checking continuation - gc: gc_dump_alloc_table(): Show byte/str and (byte)array objects - gc: make (byte)array type dumping conditional on these types being enabled - gc: use '=' char for tail blocks when dumping heap - mperrno: add some more MP_Exxx constants, related to networking - moduerrno: add more constants to the errno module - add mp_errno_to_str() and use it to provide nicer OSError msgs - objfloat, py/modmath: ensure M_PI and M_E defined - emitglue: fix build on AArch64 (ARMv8, etc.) related to loading .mpy files - objexcept: don't convert errno to str in constructor, do it in print - moduerrno: add EACCES, pretty common error on Unix - gc: gc_dump_alloc_table(): dump heap offset instead of actual address - objstr: make dedicated splitlines function, supporting diff newlines - objstringio: add TODO comment about avoiding copying on .getvalue() - modstruct: raise ValueError on unsupported format char - stream: support both "exact size" and "one underlying call" operations - declare constant data as properly constant - stream: add mp_stream_close() helper function - mphal.h: provide default prototypes for mp_hal_delay_us/mp_hal_ticks_us - rework frozen modules support to support packages - objstr: implement str.center() - allow to stat and import frozen mpy files using new frozen "VFS" - makeqstrdata.py: allow to have double-quote characters in qstrs - objnamedtuple: allow passing field names as a tuple - moduerrno: add EEXIST, EISDIR, ECONNREFUSED - modstruct: allow to have "0s" in struct format extmod: - modlwip: convert errno's to use MP_Exxx symbols - modlwip: rework how Python accept callback is called - when including extmod headers, prefix path with extmod/ - modwebsocket: add close() method - modwebrepl: add close() method - moduos_dupterm: dumpterm subsystem is responsible for closing stream - modussl: make more compatible with non-default obj representations - machine_i2c: redo mp_hal_pin macros to use open_drain and od_low - virtpin: initial implementation of open-ended C-level Pin interface - vfs_fat: replace text error messages by POSIX error numbers - vfs_fat: add chdir() method - vfs_fat: add getcwd() method - vfs_fat: add vfs.stat() method - add machine time_pulse_us function (at C and Python level) - machine: add MICROPY_PY_MACHINE_PULSE config for time_pulse_us lib: - timeutils/timeutils: timeutils_mktime may accept negative time values drivers: - cc3000: rename timeval to cc3000_timeval, to avoid clash - add C-level function to read DHT11 and DHT22 devices - display/ssd1306: update SSD1306_SPI to work with new API tools: - make-frozen.py: properly escape hex chars when making C strings - make-frozen.py: quick fix to support package-modules - mpy-tool.py: add checks for critical configuration vars - make-frozen.py: update for latest changes in frozen modules support - mpy-tool.py: include .py extension in frozen filename - mpy-tool.py: don't strip directories from the frozen source name - upgrade upip to 0.7: SSL cert warning, use uerrno, better usage message tests: - run-tests: factor out list of supported external boards - disable memoryview tests that overflow int conversion - basics/string_splitlines: reinstate feature test for splitlines - struct1: add testcase for an unknown type char - add testcase for str.center() - extmod/vfs_fat_ramdisk: add testcases for chdir(), getcwd() - misc/recursive_iternext.py: increase depth N from 1000 to 2000 - misc/recursive_iternext.py: provide more fine-grained selection of N - pyb/rtc: make RTC test on pyboard more reliable by calling init() mpy-cross: - add -s option to specify the embedded source filename unix port: - mphalport: add mp_hal_delay_us() for consistency with other ports - enable uerrno module - add ability to include frozen bytecode in the build - mpconfigport_coverage.h: add dedicated config file for coverage build - unix_mphal: implement mp_hal_ticks_us() - support frozen packages - Makefile: nanbox build is not compatible with modussl, disable - enable "ussl" module - mpconfigport.mk: document MICROPY_STANDALONE make-level option - Makefile: "make axtls": automatically fetch submodules if missing windows port: - enable multi-processor compilation for msvc stmhal port: - l4: adapt DMA to be able to support STM32L4 MCU series - l4: adapt startup code, clock configuration and interrupts - l4: make CCM/DTCM RAM start-up conditional on MCU type - l4: add support for machine.sleep on STM32L4 MCUs - dma: make DAC DMA descriptors conditional on having a DAC - add board files for LIMIFROG board - for LIMIFROG board, add early-init function to get to DFU mode - dma: fix builds for boards with an F4 or F7 but no DAC - sdcard: fix initialisation of DMA TX so that writes work - can: allow to get existing CAN obj if constructed without args - fix clock configuration for STM32L476-discovery; also add I2C2 - convert to use internal errno symbols; enable uerrno module - for network drivers, convert to use MP_Exxx errno symbols - led: allow LEDs to be in PWM mode with TIM1 and channels 1-4 - i2c: expose I2CHandle3 for use by custom C code - sdcard: allow to do unaligned read-from/write-to SD card - support frozen packages using .mpy files - moduos: getcwd(): use mp_obj_new_exception_arg1() - dac: add DAC deinit() method - uart: fix wrong baudrate calculation for stm32l4 series esp8266 port: - scripts/: remove use of pin.PULL_NONE - scripts/inisetup: don't start WebREPL on boot in master branch - scripts/: add fill() to NeoPixel - scripts/webrepl: add optional password argument to webrepl.start() - scripts/webrepl: add start_foreground() method - main: bump heap size to 28K - mpconfigport: reduce various parser-related allocation params - help: add "sta_if.active(True)" command - convert to use new MP_Exxx errno symbols - enable uerrno module, weak linked also as errno - change to use internal errno's - moduos.c: addition of the rename method to module uos - scripts/port_diag: add network diagnostic output - scripts/webrepl_setup: show password placeholder char - scripts/webrepl_setup: add max password length check - README: add a very first start section - add APA102 serial individually controllable LEDs support - enable collections.OrderedDict - main: update _boot module loading for recent frozen modules refactors - scripts/port_diag: dump network interface IP settings - esp_mphal: fix NLR buffer leak in call_dupterm_read() - esp_mphal: handle Ctrl+C from dupterm (e.g. WebREPL) - esp_mphal: mp_uos_dupterm_deactivate() may raise exception - add mp_hal_pin_input() and mp_hal_pin_output() functions - modpybspi: configure pins when initialising an SPI object - xtirq: add xtirq.h for controlling xtensa irqs - ets_alt_task: don't run ets_loop_iter if irqs are disabled - modmachine: add disable_irq and enable_irq functions - enable DHT C-level driver - add dht.py script for high-level control of DHT11/DHT22 sensor - Makefile: document "disable" value for UART_OS - modnetwork: scan() is only supported by STA when it's enabled - modnetwork: protect scan() callback against memory errors - modnetwork: allow to press ctrl-C while scan() is running - uart: properly initialise UART0 RXD pin in uart_config - moduos: add chdir() and getcwd() functions - scripts/ntptime: allow to override NTP server - modmachine: add machine.time_pulse_us function - enable MICROPY_PY_IO_FILEIO to get compliant text/binary streams - moduos.c: add stat() to the module uos of esp8266 - rtc: set RTC user memory length to 0 on first boot - provide a dedicated variable to disable ets_loop_iter - modpybrtc: handle RTC overflow docs: - machine.UART: filter out unimplemented UART methods from esp8266 docs - esp8266/quickref: new way to get MAC address - esp8266/quickstart: remove i2c examples with stop=False - ustruct: describe supported type codes - ussl: add basic description of axTLS-based modussl - esp8266: Include ussl module in the docs - machine: make disable_irq and enable_irq docs available for all - library/machine: add documentation for machine.time_pulse_us - math, cmath: add port availability information - library/index: add intro paragraph regarding availability of modules - README: add some hints for PDF docs generation - wipy/tutorial: add note about screen key bindings on OS X - esp8266/quickref: update WebREPL section for 1.8.1 release - esp8266: fix ESP8266 Network tutorial - esp8266/quickref: use local image of Adafruit Huzzah board - esp8266/general: add note about RTC overflow travis: - install gcc-arm-none-eabi with --force-yes for now
Diffstat (limited to 'stmhal/dma.h')
-rw-r--r--stmhal/dma.h138
1 files changed, 58 insertions, 80 deletions
diff --git a/stmhal/dma.h b/stmhal/dma.h
index 9561d1b529..5880029f3d 100644
--- a/stmhal/dma.h
+++ b/stmhal/dma.h
@@ -24,82 +24,58 @@
* THE SOFTWARE.
*/
-// These are ordered by DMAx_Stream number, and within a stream by channel
-// number. The duplicate streams are ok as long as they aren't used at the
-// same time.
-//
-// Currently I2C and SPI are synchronous and they call dma_init/dma_deinit
-// around each transfer.
-
-// DMA1 streams
-
-#define DMA_STREAM_I2C1_RX DMA1_Stream0
-#define DMA_CHANNEL_I2C1_RX DMA_CHANNEL_1
-
-#define DMA_STREAM_SPI3_RX DMA1_Stream2
-#define DMA_CHANNEL_SPI3_RX DMA_CHANNEL_0
-
-#define DMA_STREAM_I2C3_RX DMA1_Stream2
-#define DMA_CHANNEL_I2C3_RX DMA_CHANNEL_3
-
-#define DMA_STREAM_I2C2_RX DMA1_Stream2
-#define DMA_CHANNEL_I2C2_RX DMA_CHANNEL_7
-
-#define DMA_STREAM_SPI2_RX DMA1_Stream3
-#define DMA_CHANNEL_SPI2_RX DMA_CHANNEL_0
-
-#define DMA_STREAM_SPI2_TX DMA1_Stream4
-#define DMA_CHANNEL_SPI2_TX DMA_CHANNEL_0
-
-#define DMA_STREAM_I2C3_TX DMA1_Stream4
-#define DMA_CHANNEL_I2C3_TX DMA_CHANNEL_3
-
-#define DMA_STREAM_DAC1 DMA1_Stream5
-#define DMA_CHANNEL_DAC1 DMA_CHANNEL_7
-
-#define DMA_STREAM_DAC2 DMA1_Stream6
-#define DMA_CHANNEL_DAC2 DMA_CHANNEL_7
-
-#define DMA_STREAM_SPI3_TX DMA1_Stream7
-#define DMA_CHANNEL_SPI3_TX DMA_CHANNEL_0
-
-#define DMA_STREAM_I2C1_TX DMA1_Stream7
-#define DMA_CHANNEL_I2C1_TX DMA_CHANNEL_1
-
-#define DMA_STREAM_I2C2_TX DMA1_Stream7
-#define DMA_CHANNEL_I2C2_TX DMA_CHANNEL_7
-
-// DMA2 streams
-
-#define DMA_STREAM_SPI1_RX DMA2_Stream2
-#define DMA_CHANNEL_SPI1_RX DMA_CHANNEL_3
-
-#define DMA_STREAM_SPI5_RX DMA2_Stream3
-#define DMA_CHANNEL_SPI5_RX DMA_CHANNEL_2
-
-#define DMA_STREAM_SDIO_RX DMA2_Stream3
-#define DMA_CHANNEL_SDIO_RX DMA_CHANNEL_4
-
-#define DMA_STREAM_SPI4_RX DMA2_Stream3
-#define DMA_CHANNEL_SPI4_RX DMA_CHANNEL_5
-
-#define DMA_STREAM_SPI5_TX DMA2_Stream4
-#define DMA_CHANNEL_SPI5_TX DMA_CHANNEL_2
-
-#define DMA_STREAM_SPI4_TX DMA2_Stream4
-#define DMA_CHANNEL_SPI4_TX DMA_CHANNEL_5
-
-#define DMA_STREAM_SPI6_TX DMA2_Stream5
-#define DMA_CHANNEL_SPI6_TX DMA_CHANNEL_1
-
-#define DMA_STREAM_SPI1_TX DMA2_Stream5
-#define DMA_CHANNEL_SPI1_TX DMA_CHANNEL_3
-
-#define DMA_STREAM_SPI6_RX DMA2_Stream6
-#define DMA_CHANNEL_SPI6_RX DMA_CHANNEL_1
-
-#define DMA_STREAM_SDIO_TX DMA2_Stream6
-#define DMA_CHANNEL_SDIO_TX DMA_CHANNEL_4
+#ifndef __MICROPY_INCLUDED_STMHAL_DMA_H__
+#define __MICROPY_INCLUDED_STMHAL_DMA_H__
+
+typedef struct _dma_descr_t dma_descr_t;
+
+#if defined(MCU_SERIES_F4) || defined(MCU_SERIES_F7)
+
+extern const dma_descr_t dma_I2C_1_RX;
+extern const dma_descr_t dma_SPI_3_RX;
+extern const dma_descr_t dma_I2C_3_RX;
+extern const dma_descr_t dma_I2C_2_RX;
+extern const dma_descr_t dma_SPI_2_RX;
+extern const dma_descr_t dma_SPI_2_TX;
+extern const dma_descr_t dma_I2C_3_TX;
+extern const dma_descr_t dma_DAC_1_TX;
+extern const dma_descr_t dma_DAC_2_TX;
+extern const dma_descr_t dma_SPI_3_TX;
+extern const dma_descr_t dma_I2C_1_TX;
+extern const dma_descr_t dma_I2C_2_TX;
+extern const dma_descr_t dma_SPI_1_RX;
+extern const dma_descr_t dma_SPI_5_RX;
+extern const dma_descr_t dma_SDIO_0_RX;
+extern const dma_descr_t dma_SPI_4_RX;
+extern const dma_descr_t dma_SPI_5_TX;
+extern const dma_descr_t dma_SPI_4_TX;
+extern const dma_descr_t dma_SPI_6_TX;
+extern const dma_descr_t dma_SPI_1_TX;
+extern const dma_descr_t dma_SPI_6_RX;
+extern const dma_descr_t dma_SDIO_0_TX;
+
+#elif defined(MCU_SERIES_L4)
+
+extern const dma_descr_t dma_ADC_1_RX;
+extern const dma_descr_t dma_ADC_2_RX;
+extern const dma_descr_t dma_SPI_1_RX;
+extern const dma_descr_t dma_I2C_3_TX;
+extern const dma_descr_t dma_ADC_3_RX;
+extern const dma_descr_t dma_SPI_1_TX;
+extern const dma_descr_t dma_I2C_3_RX;
+extern const dma_descr_t dma_DAC_1_TX;
+extern const dma_descr_t dma_SPI_2_RX;
+extern const dma_descr_t dma_I2C_2_TX;
+extern const dma_descr_t dma_DAC_2_TX;
+extern const dma_descr_t dma_SPI_2_TX;
+extern const dma_descr_t dma_I2C_2_RX;
+extern const dma_descr_t dma_I2C_1_TX;
+extern const dma_descr_t dma_I2C_1_RX;
+extern const dma_descr_t dma_SPI_3_RX;
+extern const dma_descr_t dma_SPI_3_TX;
+extern const dma_descr_t dma_SDIO_1_TX;
+
+#endif
typedef union {
uint16_t enabled; // Used to test if both counters are == 0
@@ -113,9 +89,11 @@ extern volatile dma_idle_count_t dma_idle;
#define DMA_IDLE_TICK_MAX (8) // 128 msec
#define DMA_IDLE_TICK(tick) (((tick) & DMA_SYSTICK_MASK) == 0)
-extern const DMA_InitTypeDef dma_init_struct_spi_i2c;
-void dma_init(DMA_HandleTypeDef *dma, DMA_Stream_TypeDef *dma_stream, const DMA_InitTypeDef *dma_init, uint32_t dma_channel, uint32_t direction, void *data);
-void dma_deinit(DMA_HandleTypeDef *dma);
-void dma_invalidate_channel(DMA_Stream_TypeDef *dma_stream, uint32_t dma_channel);
+void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, void *data);
+void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, void *data);
+void dma_deinit(const dma_descr_t *dma_descr);
+void dma_invalidate_channel(const dma_descr_t *dma_descr);
void dma_idle_handler(int controller);
+
+#endif //__MICROPY_INCLUDED_STMHAL_DMA_H__