From 9ca4906c4cbd671bcb861059bcf342208e22f250 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 9 Sep 2020 08:53:11 -0400 Subject: [PATCH] Hellen says merge #1772 more ports --- firmware/hw_layer/{ => ports/stm32}/backup_ram.cpp | 4 ++++ .../{ => ports/stm32}/serial_over_usb/usbcfg.c | 0 .../{ => ports/stm32}/serial_over_usb/usbcfg.h | 0 .../{ => ports/stm32}/serial_over_usb/usbconsole.c | 0 .../{ => ports/stm32}/serial_over_usb/usbconsole.h | 0 firmware/hw_layer/ports/stm32/stm32f0/hw_ports.mk | 6 ++++-- firmware/hw_layer/ports/stm32/stm32f1/hw_ports.mk | 6 +++++- firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk | 10 +++++++--- firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk | 10 +++++++--- 9 files changed, 27 insertions(+), 9 deletions(-) rename firmware/hw_layer/{ => ports/stm32}/backup_ram.cpp (93%) rename firmware/hw_layer/{ => ports/stm32}/serial_over_usb/usbcfg.c (100%) rename firmware/hw_layer/{ => ports/stm32}/serial_over_usb/usbcfg.h (100%) rename firmware/hw_layer/{ => ports/stm32}/serial_over_usb/usbconsole.c (100%) rename firmware/hw_layer/{ => ports/stm32}/serial_over_usb/usbconsole.h (100%) diff --git a/firmware/hw_layer/backup_ram.cpp b/firmware/hw_layer/ports/stm32/backup_ram.cpp similarity index 93% rename from firmware/hw_layer/backup_ram.cpp rename to firmware/hw_layer/ports/stm32/backup_ram.cpp index 717dca1bb0..ac333fd3e9 100644 --- a/firmware/hw_layer/backup_ram.cpp +++ b/firmware/hw_layer/ports/stm32/backup_ram.cpp @@ -54,3 +54,7 @@ void backupRamSave(backup_ram_e idx, uint32_t value) { } #endif /* HAL_USE_RTC */ } + +void backupRamFlush(void) { + // nothing to do here, in STM32 all data is saved instantaneously +} diff --git a/firmware/hw_layer/serial_over_usb/usbcfg.c b/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.c similarity index 100% rename from firmware/hw_layer/serial_over_usb/usbcfg.c rename to firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.c diff --git a/firmware/hw_layer/serial_over_usb/usbcfg.h b/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.h similarity index 100% rename from firmware/hw_layer/serial_over_usb/usbcfg.h rename to firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.h diff --git a/firmware/hw_layer/serial_over_usb/usbconsole.c b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.c similarity index 100% rename from firmware/hw_layer/serial_over_usb/usbconsole.c rename to firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.c diff --git a/firmware/hw_layer/serial_over_usb/usbconsole.h b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.h similarity index 100% rename from firmware/hw_layer/serial_over_usb/usbconsole.h rename to firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.h diff --git a/firmware/hw_layer/ports/stm32/stm32f0/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f0/hw_ports.mk index bd24e2a080..e0505f9903 100644 --- a/firmware/hw_layer/ports/stm32/stm32f0/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f0/hw_ports.mk @@ -1,4 +1,6 @@ +HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbcfg.c \ + $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbconsole.c - -HW_STM32_SRC_CPP = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f0/mpu_util.cpp +HW_STM32_SRC_CPP = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f0/mpu_util.cpp \ + $(PROJECT_DIR)/hw_layer/ports/stm32/backup_ram.cpp \ No newline at end of file diff --git a/firmware/hw_layer/ports/stm32/stm32f1/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f1/hw_ports.mk index fb4278b501..f701b1bb74 100644 --- a/firmware/hw_layer/ports/stm32/stm32f1/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f1/hw_ports.mk @@ -1,5 +1,9 @@ +HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbcfg.c \ + $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbconsole.c + HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/flash.c HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f1/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_pins.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp + $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp \ + $(PROJECT_DIR)/hw_layer/ports/stm32/backup_ram.cpp diff --git a/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk index 554bf86c1c..05a8cbd8b3 100644 --- a/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk @@ -1,11 +1,15 @@ +HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbcfg.c \ + $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbconsole.c + HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/flash.c \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash.c \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash_ex.c HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_pins.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp - + $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp \ + $(PROJECT_DIR)/hw_layer/ports/stm32/backup_ram.cpp + RUSEFIASM = $(PROJECT_DIR)/hw_layer/ports/stm32/rusEfiStartup.S -HW_INC += $(PROJECT_DIR)/hw_layer/ports/stm32 +HW_INC += $(PROJECT_DIR)/hw_layer/ports/stm32 $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb diff --git a/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk index 05c5bb2ab5..a3f466a7d1 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk @@ -1,12 +1,16 @@ +HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbcfg.c \ + $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbconsole.c + HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/flash.c \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash.c \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash_ex.c HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_pins.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp - + $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp \ + $(PROJECT_DIR)/hw_layer/ports/stm32/backup_ram.cpp + RUSEFIASM = $(PROJECT_DIR)/hw_layer/ports/stm32/rusEfiStartup.S -HW_INC += $(PROJECT_DIR)/hw_layer/ports/stm32 +HW_INC += $(PROJECT_DIR)/hw_layer/ports/stm32 $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb \ No newline at end of file