Merge branch 'dfu_wait_no_serialport' into irq_management_revision

Former-commit-id: 068d62b

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
     }

cores/arduino/main.cpp

@@ -18,6 +18,7 @@ DriverVer   = 01/08/2022,10.55.00.000
 
 [Standard.NTamd64]
 %DeviceName%=USB_Install, USB\VID_2341&PID_0369&MI_00
+%DeviceNameDFUOnly%=USB_Install, USB\VID_2341&PID_0369
 
 ; ========== Class definition ===========
 
@@ -55,5 +56,6 @@ HKR,,DeviceInterfaceGUIDs,0x10000,"{51de5bfa-d59d-4f3e-9b36-0b4b210dd53f}"
 [Strings]
 ManufacturerName="Arduino"
 DeviceName="Arduino Santiago"
+DeviceNameDFUOnly="Arduino Santiago"
 ClassName="Universal Serial Bus devices"
 REG_MULTI_SZ = 0x00010000

cores/arduino/usb/SerialUSB.cpp

@@ -13,7 +13,6 @@
           "name": "Arduino Renesas Boards",
           "architecture": "renesas",
           "version": "%%VERSION%%",
-          "deprecated": true,
           "category": "Arduino",
           "url": "http://downloads.arduino.cc/cores/staging/%%FILENAME%%",
           "archiveFileName": "%%FILENAME%%",
@@ -43,7 +42,7 @@
             },
             {
               "packager": "arduino",
-              "version": "0.11.0-arduino1",
+              "version": "0.11.0-arduino3",
               "name": "dfu-util"
             }
           ]

drivers/santiago.cat

@@ -13,6 +13,8 @@
 
 #include "SPI.h"
 
+using namespace arduino;
+
 extern const spi_extended_cfg_t g_spi0_ext_cfg;
 extern const spi_extended_cfg_t g_spi1_ext_cfg;
 extern const sci_spi_extended_cfg_t g_spi2_cfg_extend;
@@ -71,13 +73,13 @@ void ArduinoSPI::begin()
     periphBusCfg = SPI_BUS;
   }
 #endif
-#if SERIAL_HOWMANY > 1
+#if SPI_HOWMANY > 1
   if (_channel == SPI1_CHANNEL) {
     isSPIObject = true;
     periphBusCfg = SPI1_BUS;
   }
 #endif
-#if SERIAL_HOWMANY > 2
+#if SPI_HOWMANY > 2
   if (_channel == SPI2_CHANNEL) {
     isSPIObject = true;
     periphBusCfg = SPI2_BUS;

drivers/santiago.inf

@@ -23,7 +23,9 @@
 //extern const spi_extended_cfg_t g_spi0_ext_cfg;
 //extern const sci_spi_extended_cfg_t g_spi1_cfg_extend;
 
-class ArduinoSPI : public arduino::SPIClass
+namespace arduino {
+
+class ArduinoSPI : public SPIClass
 {
 public:
     ArduinoSPI(spi_ctrl_t *g_spi_ctrl 
@@ -79,14 +81,16 @@ class ArduinoSPI : public arduino::SPIClass
     bool _is_sci;
 };
 
+}
+
 #if SPI_HOWMANY > 0
-extern ArduinoSPI SPI;
+extern arduino::ArduinoSPI SPI;
 #endif
 #if SPI_HOWMANY > 1
 #ifdef SPI1
 #undef SPI1
 #endif
-extern ArduinoSPI SPI1;
+extern arduino::ArduinoSPI SPI1;
 #endif
 
 #endif

extras/package_index.json.template

@@ -16,13 +16,13 @@ compiler.warning_flags.all=-Wall -Wextra
 
 compiler.path={build.compiler_path}
 compiler.c.cmd={build.crossprefix}gcc
-compiler.c.flags=-c {compiler.warning_flags} -Os -g3 --specs=nano.specs -nostdlib {build.defines} -MMD -std=gnu11 -mcpu={build.mcu} {build.float-abi} {build.fpu} -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections
+compiler.c.flags=-c {compiler.warning_flags} -Os -g3 --specs=nano.specs -nostdlib {build.defines} -MMD -std=gnu11 -mcpu={build.mcu} {build.float-abi} {build.fpu} -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fmessage-length=0 -fno-builtin
 compiler.c.elf.cmd={build.crossprefix}g++
-compiler.c.elf.flags=-Wl,--gc-sections --specs=nano.specs {compiler.warning_flags} -mcpu={build.mcu} {build.float-abi} {build.fpu} -fsigned-char -ffunction-sections -fdata-sections
+compiler.c.elf.flags=-Wl,--gc-sections --specs=nano.specs --specs=nosys.specs {compiler.warning_flags} -mcpu={build.mcu} {build.float-abi} {build.fpu}
 compiler.S.cmd={build.crossprefix}g++
 compiler.S.flags=-c -g -x assembler-with-cpp -Os -mcpu={build.mcu} {build.float-abi} {build.fpu} -fsigned-char -ffunction-sections -fdata-sections
 compiler.cpp.cmd={build.crossprefix}g++
-compiler.cpp.flags=-c {compiler.warning_flags}  -Os --specs=nano.specs -g3 -fno-use-cxa-atexit -fno-rtti -fno-exceptions -MMD -nostdlib {build.defines} -MMD -std=gnu++11 -mcpu={build.mcu} {build.float-abi} {build.fpu} -fsigned-char -ffunction-sections -fdata-sections
+compiler.cpp.flags=-c {compiler.warning_flags}  -Os --specs=nano.specs -g3 -fno-use-cxa-atexit -fno-rtti -fno-exceptions -MMD -nostdlib {build.defines} -MMD -std=gnu++11 -mcpu={build.mcu} {build.float-abi} {build.fpu} -fsigned-char -ffunction-sections -fdata-sections -fmessage-length=0 -fno-builtin
 compiler.ar.cmd={build.crossprefix}ar
 compiler.ar.flags=rcs
 compiler.ar.extra_flags=
@@ -73,7 +73,7 @@ recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -D
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {build.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" "-L{build.variant.path}" "-T{build.variant.path}/fsp.ld" {object_files} -Wl,--whole-archive "{build.path}/{archive_file}" {compiler.fsp} -Wl,--no-whole-archive -Wl,--start-group {compiler.fsp.extra_ldflags} {compiler.libraries.ldflags} -Wl,-Map,{build.path}/{build.project_name}.map -Wl,--end-group
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {build.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" "-L{build.variant.path}" "-T{build.variant.path}/fsp.ld" {object_files} -Wl,--start-group {compiler.fsp} "{build.path}/{archive_file}" {compiler.fsp.extra_ldflags} {compiler.libraries.ldflags} -Wl,--end-group -Wl,-Map,{build.path}/{build.project_name}.map
 
 ## Create output (bin file)
 recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.bin.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"
@@ -97,4 +97,4 @@ tools.dfu-util.path={runtime.tools.dfu-util.path}
 tools.dfu-util.cmd=dfu-util
 tools.dfu-util.upload.params.verbose=-d
 tools.dfu-util.upload.params.quiet=
-tools.dfu-util.upload.pattern="{path}/{cmd}" --device {upload.vid}:{upload.pid} -D "{build.path}/{build.project_name}.bin" -a{upload.interface} -R
+tools.dfu-util.upload.pattern="{path}/{cmd}" --device {upload.vid}:{upload.pid} -D "{build.path}/{build.project_name}.bin" -a{upload.interface} -R -w

extras/tinyusb

@@ -467,6 +467,7 @@ SECTIONS
     {
         . = ALIGN(8);
         __HeapBase = .;
+        end = .;
         /* Place the STD heap here. */
         KEEP(*(.heap))
         __HeapLimit = .;