Since the mbed UART initialisation routines overwrite all of our settings we need to reinit the UART with our parameters if we want to use it for debugging.

Author: aentinger

cores/arduino/mbed/mbed.h

@@ -17,7 +17,6 @@
 #define MBED_H
 
 #include "platform/mbed_version.h"
-#include "mbed_config.h"
 
 #if MBED_CONF_RTOS_API_PRESENT
 #include "rtos/rtos.h"
@@ -64,7 +63,7 @@
 #include "drivers/AnalogOut.h"
 #include "drivers/PwmOut.h"
 #include "drivers/Serial.h"
-#include "drivers/SPIMaster.h"
+#include "drivers/SPI.h"
 #include "drivers/SPISlave.h"
 #include "drivers/I2C.h"
 #include "drivers/I2CSlave.h"

libraries/MRI/examples/MRI/MRI.ino

@@ -1,12 +1,13 @@
 /* This example demonstrates how to include the MRI library which
-   allows to debug the Nano 33 BLE Cortex-M4 core with GDB via a
+   allows to debug the Portenta H7 Cortex-M7 core with GDB via a
    serial interface.
 */
 
 #include <MRI.h>
 
 void setup() {
-
+  Serial1.begin(115200); /* Initialize Serial1 via mbed ... should actually be done within MRI library to have the configuration we need */
+  __mriInit(0);
 }
 
 void loop() {

libraries/MRI/src/architectures/armv7-m/armv7-m_asm.S

@@ -359,44 +359,44 @@ mriClearFaultStatusBitsAndReturn:
     bx      lr
 
 
-    .global HardFault_Handler
-    .type HardFault_Handler, function
-    .thumb_func
+//    .global HardFault_Handler
+//    .type HardFault_Handler, function
+//    .thumb_func
     /* extern "C" void HardFault_Handler(void);
        Override Hard Faults and send to MriExceptionHandler.
     */
-HardFault_Handler:
-    b       mriFaultHandler
+//HardFault_Handler:
+//    b       mriFaultHandler
     
  
-    .global MemManage_Handler
-    .type MemManage_Handler, function
-    .thumb_func
+//    .global MemManage_Handler
+//    .type MemManage_Handler, function
+//    .thumb_func
     /* extern "C" void MemManage_Handler(void);
        Override MPU Memory Faults and send to MriExceptionHandler.
     */
-MemManage_Handler:
-    b       mriFaultHandler
+//MemManage_Handler:
+//    b       mriFaultHandler
     
 
-    .global BusFault_Handler
-    .type BusFault_Handler, function
-    .thumb_func
+//    .global BusFault_Handler
+//    .type BusFault_Handler, function
+//    .thumb_func
     /* extern "C" void BusFault_Handler(void);
        Override Bus Faults and send to MriExceptionHandler.
     */
-BusFault_Handler:
-    b       mriFaultHandler
+//BusFault_Handler:
+//    b       mriFaultHandler
     
 
-    .global UsageFault_Handler
-    .type UsageFault_Handler, function
-    .thumb_func
+//    .global UsageFault_Handler
+//    .type UsageFault_Handler, function
+//    .thumb_func
     /* extern "C" void UsageFault_Handler(void);
        Override Instruction Usage Faults and send to MriExceptionHandler.
     */
-UsageFault_Handler:
-    b       __mriExceptionHandler
+//UsageFault_Handler:
+//    b       __mriExceptionHandler
     
 
     .global DebugMon_Handler

libraries/MRI/src/devices/stm32f429xx/stm32f429xx_asm.S

@@ -20,7 +20,7 @@
 #include "../../architectures/armv7-m/armv7-m.h"
 #include "../../architectures/armv7-m/debug_cm3.h"
 
-
+/* Attention - This memory map is still from STM32F429 and NOT FROM STM32H747XI */
 static const char g_memoryMapXml[] = "<?xml version=\"1.0\"?>"
                                      "<!DOCTYPE memory-map PUBLIC \"+//IDN gnu.org//DTD GDB Memory Map V1.0//EN\" \"http://sourceware.org/gdb/gdb-memory-map.dtd\">"
                                      "<memory-map>"
@@ -34,20 +34,11 @@ static const char g_memoryMapXml[] = "<?xml version=\"1.0\"?>"
                                      "<memory type=\"ram\" start=\"0x2001C000\" length=\"0x4000\"> </memory>"
                                      "<memory type=\"ram\" start=\"0x20020000\" length=\"0x10000\"> </memory>"
                                      "</memory-map>";
-//Stm32f429xxState __mriStm32f429xxState;
-
-
-/* Reference this handler in the ASM module to make sure that it gets linked in. */
-void USART1_IRQHandler(void);
 
 
 static void defaultExternalInterruptsToPriority1(void);
 void __mriStm32f429xx_Init(Token* pParameterTokens)
 {
-    /* Reference handler in ASM module to make sure that is gets linked in. */
-    void (* volatile dummyReference)(void) = USART1_IRQHandler;
-    (void)dummyReference;
-
     __try
         __mriCortexMInit(pParameterTokens);
     __catch

libraries/MRI/src/devices/stm32f429xx/stm32f429xx_init.c

@@ -21,21 +21,6 @@
 #include "core/token.h"
 #include "stm32f429xx_usart.h"
 
-/* Flags that can be set in Stm32f429xxState::flags */
-#define STM32F429XX_UART_FLAGS_SHARE        1
-#define STM32F429XX_UART_FLAGS_MANUAL_BAUD  2
-
-/* Flag to indicate whether context will contain FPU registers or not. */
-#define MRI_DEVICE_HAS_FPU 1
-
-// typedef struct
-// {
-//     const UartConfiguration*  pCurrentUart;
-//     uint32_t                  flags;
-// } Stm32f429xxState;
-
-// extern Stm32f429xxState __mriStm32f429xxState;
-
 void __mriStm32f429xx_Init(Token* pParameterTokens);
 
 #endif /* _STM32F429XX_H_ */