Merge branch 'dfu_wait_no_serialport' into irq_management_revision

Author: facchinm

boards.txt

@@ -41,7 +41,7 @@ portenta_h33.upload.pid=0x0368
 portenta_h33.upload.address=0x00010000
 portenta_h33.upload.interface=0
 portenta_h33.upload.use_1200bps_touch=true
-portenta_h33.upload.wait_for_upload_port=true
+portenta_h33.upload.wait_for_upload_port=false
 portenta_h33.upload.native_usb=true
 portenta_h33.upload.maximum_size=2097152
 portenta_h33.upload.maximum_data_size=523624
@@ -89,7 +89,7 @@ santiago.upload.pid=0x0369
 santiago.upload.address=0x00010000
 santiago.upload.interface=0
 santiago.upload.use_1200bps_touch=true
-santiago.upload.wait_for_upload_port=true
+santiago.upload.wait_for_upload_port=false
 santiago.upload.native_usb=true
 santiago.upload.maximum_size=262144
 santiago.upload.maximum_data_size=32768

bootloaders/SANTIAGO/dfu.elf

@@ -11,12 +11,14 @@
 
 
 #if defined(__cplusplus)
+
+using namespace arduino;
+
 #include "usb/SerialUSB.h"
 #include "pwm.h"
 #include "Serial.h"
 #endif
 
-
 #if defined(__cplusplus)
 
 #undef F
@@ -40,6 +42,7 @@ void analogWriteResolution(int bits);
 int getAnalogWriteResolution();
 ioport_peripheral_t getPinConfig(bsp_io_port_pin_t pin);
 
+#if defined(__cplusplus)
 using rtc_simple_cbk_t = void (*)();
 bool openRtc();
 bool setRtcTime(rtc_time_t time);
@@ -50,7 +53,7 @@ bool setRtcAlarm(rtc_alarm_time_t alarm_time);
 bool isRtcRunning();
 void setRtcPeriodicClbk(rtc_simple_cbk_t f);
 void setRtcAlarmClbk(rtc_simple_cbk_t f);
-
+#endif
 
 // Definitions for PWM channels
 typedef enum _EPWMChannel
@@ -164,6 +167,14 @@ extern sciTable_t SciTable[];
 #define digitalPinToPwmPin(P)       (g_APinDescription[P].PWMChannel)
 #define digitalPinToPwmObj(P)       (pwmTable[digitalPinToPwmPin(P)].pwm)
 
+#define IOPORT_PRV_PORT_ADDRESS(port_number)    ((uint32_t) (R_PORT1 - R_PORT0) * (port_number) + R_PORT0)
+
+#define digitalPinToPort(P)		      (digitalPinToBspPin(P) >> 8)
+#define digitalPinToBitMask(P)      (1 << (digitalPinToBspPin(P) & 0xFF))
+#define portOutputRegister(port)    &(((R_PORT0_Type *)IOPORT_PRV_PORT_ADDRESS(port))->PODR)
+#define portInputRegister(port)     &(((R_PORT0_Type *)IOPORT_PRV_PORT_ADDRESS(port))->PIDR)
+#define portModeRegister(port)      &(((R_PORT0_Type *)IOPORT_PRV_PORT_ADDRESS(port))->PDR)
+
 void pinPeripheral(bsp_io_port_pin_t bspPin, uint32_t bspPeripheral);
 #if defined(__cplusplus)
 void pinPeripheral(uint32_t pinNumber, uint32_t bspPeripheral);

bootloaders/SANTIAGO/dfu.hex

@@ -298,25 +298,4 @@ int UART::read() {
 void UART::flush() {
 /* -------------------------------------------------------------------------- */  
   while (tx_st == TX_STARTED){};
-}
-
-
-#if SERIAL_HOWMANY > 0
-UART _UART1_(UART1_CHANNEL);
-#endif
-
-#if SERIAL_HOWMANY > 1
-UART _UART2_(UART2_CHANNEL);
-#endif
-
-#if SERIAL_HOWMANY > 2
-UART _UART3_(UART3_CHANNEL);
-#endif
-
-#if SERIAL_HOWMANY > 3
-UART _UART4_(UART4_CHANNEL);
-#endif
-
-#if SERIAL_HOWMANY > 4
-UART _UART5_(UART5_CHANNEL);
-#endif
+}

cores/arduino/Arduino.h

@@ -0,0 +1,21 @@
+#include "Serial.h"
+
+#if SERIAL_HOWMANY > 0
+UART _UART1_(UART1_CHANNEL);
+#endif
+
+#if SERIAL_HOWMANY > 1
+UART _UART2_(UART2_CHANNEL);
+#endif
+
+#if SERIAL_HOWMANY > 2
+UART _UART3_(UART3_CHANNEL);
+#endif
+
+#if SERIAL_HOWMANY > 3
+UART _UART4_(UART4_CHANNEL);
+#endif
+
+#if SERIAL_HOWMANY > 4
+UART _UART5_(UART5_CHANNEL);
+#endif

cores/arduino/Serial.cpp

@@ -0,0 +1,25 @@
+#include "Arduino.h"
+
+#if 0
+
+// TODO: check if gdb is able to unwind the call stack even without this
+
+/* 
+test code:
+
+int illegal_instruction_execution(void) {
+  int (*bad_instruction)(void) = (int (*)())0xE0000000;
+  return bad_instruction();
+}
+*/
+
+/* On hard fault, copy HARDFAULT_PSP to the sp reg so gdb can give a trace */
+void **HARDFAULT_PSP;
+register void *stack_pointer asm("sp");
+void HardFault_Handler(void) {
+    asm("mrs %0, psp" : "=r"(HARDFAULT_PSP) : :);
+    stack_pointer = HARDFAULT_PSP;
+    while(1);
+}
+
+#endif

cores/arduino/SerialObjs.cpp

@@ -37,6 +37,7 @@ void arduino_main(void)
    _init();
    initVariant();
    __USBStart();
+   Serial.begin(115200);
    startAgt();
    setup();
    while (1)
@@ -57,7 +58,4 @@ extern "C" {
       arduino_main();
    }
 }
-#endif
-
-extern "C" void __cxa_pure_virtual() { while(1); }
-extern "C" void __cxa_deleted_virtual() { while(1); }
+#endif

cores/arduino/cortex_handlers.c

@@ -138,6 +138,7 @@ static void CheckSerialReset() {
         R_SYSTEM->PRCR = (uint16_t) BSP_PRV_PRCR_PRC1_UNLOCK;
         BOOT_DOUBLE_TAP_DATA = DOUBLE_TAP_MAGIC;
         R_SYSTEM->PRCR = (uint16_t) BSP_PRV_PRCR_LOCK;
+        ((R_USB_FS0_Type*)R_USB_FS0_BASE)->SYSCFG_b.DPRPU = 0;
         NVIC_SystemReset();
         while (1); // WDT will fire here
     }