Re-add video and PDM libraries on Portenta H7

Author: multiplemonomials

.gitignore

@@ -3,4 +3,7 @@ cores/arduino/api*
 **/.vscode/
 **/.development
 .DS_Store
+
+# CLion
 cmake-build-*/
+.idea/runConfigurations

libraries/Arduino_H7_Video/CMakeLists.txt

@@ -11,6 +11,6 @@ add_library(arduino-Arduino_H7_Video STATIC ${ARDUINO_H7_VIDEO_SOURCES})
 target_link_libraries(arduino-Arduino_H7_Video PUBLIC arduino-core arduino-Portenta_SDRAM)
 target_include_directories(arduino-Arduino_H7_Video PUBLIC src)
 
-build_arduino_examples(Arduino_H7_Video examples)
-
+# For this library, we cannot build the examples as part of Mbed CE, because they rely on driver libraries
+# which are maintained outside this repo.
 install(DIRECTORY . DESTINATION libraries/Arduino_H7_Video)

libraries/CMakeLists.txt

@@ -64,20 +64,19 @@ if("ARDUINO_PORTENTA_H7" IN_LIST MBED_TARGET_LABELS)
 	add_subdirectory(Arduino_CAN)
 	add_subdirectory(GSM)
 	add_subdirectory(GPS)
+	add_subdirectory(Portenta_SDCARD)
+	add_subdirectory(PDM)
+	add_subdirectory(Portenta_Audio)
+	add_subdirectory(Arduino_H7_Video)
+	add_subdirectory(Camera)
+	add_subdirectory(Himax_HM01B0)
+	add_subdirectory(Himax_HM0360)
+
 	# TODO add missing libraries for Portenta
-#   add_subdirectory(PDM)
-#	add_subdirectory(Arduino_H7_Video)
-#	add_subdirectory(Himax_HM01B0)
-#	add_subdirectory(Himax_HM0360)
-#	add_subdirectory(Portenta_Audio)
 #	add_subdirectory(RPC)
-#	add_subdirectory(Portenta_lvgl)
-#	add_subdirectory(Camera)
 #	add_subdirectory(rpclib)
 #	add_subdirectory(USBHOST)
 #	add_subdirectory(mbed-memory-status)
-#	add_subdirectory(Portenta_SDCARD)
-#	add_subdirectory(GPS)
 #	add_subdirectory(MCUboot)
 #
 endif()

libraries/Camera/CMakeLists.txt

@@ -0,0 +1,18 @@
+set(CAMERA_SOURCES
+    src/camera.cpp)
+
+add_library(arduino-Camera STATIC ${CAMERA_SOURCES})
+target_link_libraries(arduino-Camera PUBLIC arduino-core arduino-Wire)
+target_include_directories(arduino-Camera PUBLIC src)
+
+set(EXAMPLES_TO_SKIP GigaCameraDisplay)
+if(NOT "ARDUINO_NICLA_VISION" IN_LIST MBED_TARGET_LABELS)
+    list(APPEND EXAMPLES_TO_SKIP CameraCaptureZoomPan)
+endif()
+
+build_arduino_examples(Camera examples ${EXAMPLES_TO_SKIP})
+
+if("ARDUINO_PORTENTA_H7" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(Camera-example-CameraCaptureRawBytes arduino-Himax_HM0360)
+    target_link_libraries(Camera-example-CameraMotionDetect arduino-Himax_HM0360)
+endif()

libraries/Camera/src/camera.cpp

@@ -20,6 +20,7 @@
 #include "camera.h"
 #include "Wire.h"
 #include "stm32h7xx_hal_dcmi.h"
+#include "stm_dma_utils.h"
 
 // Workaround for the broken UNUSED macro.
 #undef UNUSED
@@ -73,10 +74,11 @@ arduino::MbedI2C CameraWire(I2C_SDA1, I2C_SCL1);
 
 #define DCMI_IRQ_PRI                NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 2, 0)
 
-#define DCMI_DMA_CLK_ENABLE()       __HAL_RCC_DMA2_CLK_ENABLE()
-#define DCMI_DMA_STREAM             DMA2_Stream3
-#define DCMI_DMA_IRQ                DMA2_Stream3_IRQn
-#define DCMI_DMA_IRQ_PRI            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 3, 0)
+const static DMALinkInfo dcmiDMALink{
+    .dmaIdx = 2,
+    .channelIdx = 3,
+    .sourceNumber = DMA_REQUEST_DCMI
+};
 
 // DCMI GPIO pins struct
 static const struct { GPIO_TypeDef *port; uint16_t pin; } dcmi_pins[] = {
@@ -121,7 +123,6 @@ static const struct { GPIO_TypeDef *port; uint16_t pin; } dcmi_pins[] = {
 #define NUM_DCMI_PINS   (sizeof(dcmi_pins)/sizeof(dcmi_pins[0]))
 
 static TIM_HandleTypeDef  htim  = {0};
-static DMA_HandleTypeDef  hdma  = {0};
 static DCMI_HandleTypeDef hdcmi = {0};
 
 /// Table to store the amount of bytes per pixel for each pixel format
@@ -207,8 +208,7 @@ void HAL_DCMI_MspDeInit(DCMI_HandleTypeDef* hdcmi)
     // Disable DCMI IRQs.
     HAL_NVIC_DisableIRQ(DCMI_IRQn);
 
-    // Disable DMA IRQs.
-    HAL_NVIC_DisableIRQ(DCMI_DMA_IRQ);
+    stm_free_dma_link(&dcmiDMALink);
 
     // Deinit the DMA stream.
     if (hdcmi->DMA_Handle != NULL) {
@@ -270,29 +270,7 @@ __weak int camera_extclk_config(int frequency)
 uint8_t camera_dcmi_config(bool bsm_skip)
 {
     // DMA Stream configuration
-    hdma.Instance                 = DCMI_DMA_STREAM;
-    hdma.Init.Request             = DMA_REQUEST_DCMI;
-    hdma.Init.Direction           = DMA_PERIPH_TO_MEMORY;
-    hdma.Init.MemInc              = DMA_MINC_ENABLE;
-    hdma.Init.PeriphInc           = DMA_PINC_DISABLE;
-    hdma.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
-    hdma.Init.MemDataAlignment    = DMA_MDATAALIGN_WORD;
-    hdma.Init.Mode                = DMA_NORMAL;
-    hdma.Init.Priority            = DMA_PRIORITY_HIGH;
-    hdma.Init.FIFOMode            = DMA_FIFOMODE_DISABLE;
-    hdma.Init.FIFOThreshold       = DMA_FIFO_THRESHOLD_FULL;
-    hdma.Init.MemBurst            = DMA_MBURST_INC4;
-    hdma.Init.PeriphBurst         = DMA_PBURST_SINGLE;
-
-    // Enable DMA clock
-    DCMI_DMA_CLK_ENABLE();
-
-    // Initialize the DMA stream
-    HAL_DMA_Init(&hdma);
-
-    // Configure and enable DMA IRQ Channel
-    NVIC_SetPriority(DCMI_DMA_IRQ, DCMI_DMA_IRQ_PRI);
-    HAL_NVIC_EnableIRQ(DCMI_DMA_IRQ);
+    DMA_HandleTypeDef * handle = stm_init_dma_link(&dcmiDMALink, DMA_PERIPH_TO_MEMORY, false, true, 4, 4, DMA_NORMAL);
 
     // Configure the DCMI interface.
     hdcmi.Instance              = DCMI;
@@ -309,7 +287,7 @@ uint8_t camera_dcmi_config(bool bsm_skip)
     hdcmi.Init.LineSelectStart  = DCMI_OELS_ODD;    // Ignored, unless LSM != ALL
 
     // Link the DMA handle to the DCMI handle.
-    __HAL_LINKDMA(&hdcmi, DMA_Handle, hdma);
+    __HAL_LINKDMA(&hdcmi, DMA_Handle, *handle);
 
     // Initialize the DCMI
     HAL_DCMI_Init(&hdcmi);
@@ -325,12 +303,6 @@ void DCMI_IRQHandler(void)
 {
     HAL_DCMI_IRQHandler(&hdcmi);
 }
-
-void DMA2_Stream3_IRQHandler(void)
-{
-    HAL_DMA_IRQHandler(&hdma);
-}
-
 } // extern "C"
 
 FrameBuffer::FrameBuffer(int32_t x, int32_t y, int32_t bpp) : 

libraries/Himax_HM01B0/CMakeLists.txt

@@ -2,7 +2,7 @@ set(HIMAX_HM01B0_SOURCES
 	himax.cpp)
 
 add_library(arduino-Himax_HM01B0 STATIC ${HIMAX_HM01B0_SOURCES})
-target_link_libraries(arduino-Himax_HM01B0 PUBLIC arduino-core arduino-Wire)
+target_link_libraries(arduino-Himax_HM01B0 PUBLIC arduino-core arduino-Wire arduino-Camera)
 target_include_directories(arduino-Himax_HM01B0 PUBLIC .)
 
 install(DIRECTORY . DESTINATION libraries/Himax_HM01B0)

libraries/Himax_HM0360/CMakeLists.txt

@@ -2,7 +2,7 @@ set(HIMAX_HM0360_SOURCES
 	hm0360.cpp)
 
 add_library(arduino-Himax_HM0360 STATIC ${HIMAX_HM0360_SOURCES})
-target_link_libraries(arduino-Himax_HM0360 PUBLIC arduino-core arduino-Wire)
+target_link_libraries(arduino-Himax_HM0360 PUBLIC arduino-core arduino-Wire arduino-Camera)
 target_include_directories(arduino-Himax_HM0360 PUBLIC .)
 
 install(DIRECTORY . DESTINATION libraries/Himax_HM0360)

libraries/PDM/CMakeLists.txt

@@ -19,6 +19,11 @@ endif()
 
 add_library(arduino-PDM STATIC ${PDM_SOURCES})
 target_link_libraries(arduino-PDM PUBLIC arduino-core)
+
+if("ARDUINO_PORTENTA_H7" IN_LIST MBED_TARGET_LABELS)
+	target_link_libraries(arduino-PDM PUBLIC arduino-Portenta_Audio)
+endif()
+
 target_include_directories(arduino-PDM PUBLIC src)
 
 build_arduino_examples(PDM examples)

libraries/PDM/src/STM32H747_SAI/PDM.cpp

@@ -20,7 +20,7 @@
   Boston, MA  02111-1307  USA
 */
 
-#ifdef TARGET_PORTENTA_H7
+#ifdef TARGET_ARDUINO_PORTENTA_H7
 
 #include "PDM.h"
 #include "mbed.h"

libraries/PDM/src/STM32H747_SAI/audio.c

@@ -49,8 +49,10 @@ static volatile uint32_t xfer_status = 0;
 //int8_t* PDM_BUFFER = (uint16_t*)0x38000000;
 uint8_t PDM_BUFFER[PDM_BUFFER_SIZE] __attribute__ ((section(".pdm_buffer")));
 
+// Defined in PDM.cpp
 void PDMIrqHandler(bool halftranfer);
 void PDMsetBufferSize(int size);
+size_t PDMgetBufferSize();
 
 void AUDIO_SAI_DMA_IRQHandler(void)
 {