mirror of https://github.com/rusefi/ChibiOS.git
STM32WB patches all merged.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13944 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio
parent
524ff1654c
commit
7bfba6ae7e
|
|
@ -29,7 +29,7 @@
|
|||
#define CHCONF_H
|
||||
|
||||
#define _CHIBIOS_RT_CONF_
|
||||
#define _CHIBIOS_RT_CONF_VER_6_1_
|
||||
#define _CHIBIOS_RT_CONF_VER_7_0_
|
||||
|
||||
/*===========================================================================*/
|
||||
/**
|
||||
|
|
@ -160,6 +160,17 @@
|
|||
#define CH_CFG_USE_TM TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Time Stamps APIs.
|
||||
* @details If enabled then the time time stamps APIs are included in
|
||||
* the kernel.
|
||||
*
|
||||
* @note The default is @p TRUE.
|
||||
*/
|
||||
#if !defined(CH_CFG_USE_TIMESTAMP)
|
||||
#define CH_CFG_USE_TIMESTAMP TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Threads registry APIs.
|
||||
* @details If enabled then the registry APIs are included in the kernel.
|
||||
|
|
@ -630,16 +641,18 @@
|
|||
* @brief System structure extension.
|
||||
* @details User fields added to the end of the @p ch_system_t structure.
|
||||
*/
|
||||
#define CH_CFG_SYSTEM_EXTRA_FIELDS \
|
||||
#define CH_CFG_OS_INSTANCE_EXTRA_FIELDS \
|
||||
/* Add threads custom fields here.*/
|
||||
|
||||
/**
|
||||
* @brief System initialization hook.
|
||||
* @brief OS instance initialization hook.
|
||||
* @details User initialization code added to the @p chSysInit() function
|
||||
* just before interrupts are enabled globally.
|
||||
*
|
||||
* @param[in] oip pointer to the @p os_instance_t structure
|
||||
*/
|
||||
#define CH_CFG_SYSTEM_INIT_HOOK() { \
|
||||
/* Add threads initialization code here.*/ \
|
||||
#define CH_CFG_OS_INSTANCE_INIT_HOOK(oip) { \
|
||||
/* Add system instance initialization code here.*/ \
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -655,6 +668,8 @@
|
|||
*
|
||||
* @note It is invoked from within @p _thread_init() and implicitly from all
|
||||
* the threads creation APIs.
|
||||
*
|
||||
* @param[in] tp pointer to the @p thread_t structure
|
||||
*/
|
||||
#define CH_CFG_THREAD_INIT_HOOK(tp) { \
|
||||
/* Add threads initialization code here.*/ \
|
||||
|
|
@ -663,6 +678,8 @@
|
|||
/**
|
||||
* @brief Threads finalization hook.
|
||||
* @details User finalization code added to the @p chThdExit() API.
|
||||
*
|
||||
* @param[in] tp pointer to the @p thread_t structure
|
||||
*/
|
||||
#define CH_CFG_THREAD_EXIT_HOOK(tp) { \
|
||||
/* Add threads finalization code here.*/ \
|
||||
|
|
@ -671,6 +688,9 @@
|
|||
/**
|
||||
* @brief Context switch hook.
|
||||
* @details This hook is invoked just before switching between threads.
|
||||
*
|
||||
* @param[in] ntp thread being switched in
|
||||
* @param[in] otp thread being switched out
|
||||
*/
|
||||
#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \
|
||||
/* Context switch code here.*/ \
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
#define STM32_IRQ_EXTI19_PRIORITY 6
|
||||
#define STM32_IRQ_EXTI20_21_PRIORITY 6
|
||||
|
||||
#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7
|
||||
#define STM32_IRQ_TIM1_BRK_PRIORITY 7
|
||||
#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7
|
||||
#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7
|
||||
#define STM32_IRQ_TIM1_CC_PRIORITY 7
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
ChibiOS - Copyright (C) 2006..2018 Ilya Kharin
|
||||
ChibiOS - Copyright (C) 2006..2020 Ilya Kharin
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
#define CHCONF_H
|
||||
|
||||
#define _CHIBIOS_RT_CONF_
|
||||
#define _CHIBIOS_RT_CONF_VER_6_1_
|
||||
#define _CHIBIOS_RT_CONF_VER_7_0_
|
||||
|
||||
/*===========================================================================*/
|
||||
/**
|
||||
|
|
@ -160,6 +160,17 @@
|
|||
#define CH_CFG_USE_TM TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Time Stamps APIs.
|
||||
* @details If enabled then the time time stamps APIs are included in
|
||||
* the kernel.
|
||||
*
|
||||
* @note The default is @p TRUE.
|
||||
*/
|
||||
#if !defined(CH_CFG_USE_TIMESTAMP)
|
||||
#define CH_CFG_USE_TIMESTAMP TRUE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Threads registry APIs.
|
||||
* @details If enabled then the registry APIs are included in the kernel.
|
||||
|
|
@ -630,16 +641,18 @@
|
|||
* @brief System structure extension.
|
||||
* @details User fields added to the end of the @p ch_system_t structure.
|
||||
*/
|
||||
#define CH_CFG_SYSTEM_EXTRA_FIELDS \
|
||||
#define CH_CFG_OS_INSTANCE_EXTRA_FIELDS \
|
||||
/* Add threads custom fields here.*/
|
||||
|
||||
/**
|
||||
* @brief System initialization hook.
|
||||
* @brief OS instance initialization hook.
|
||||
* @details User initialization code added to the @p chSysInit() function
|
||||
* just before interrupts are enabled globally.
|
||||
*
|
||||
* @param[in] oip pointer to the @p os_instance_t structure
|
||||
*/
|
||||
#define CH_CFG_SYSTEM_INIT_HOOK() { \
|
||||
/* Add threads initialization code here.*/ \
|
||||
#define CH_CFG_OS_INSTANCE_INIT_HOOK(oip) { \
|
||||
/* Add system instance initialization code here.*/ \
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -655,6 +668,8 @@
|
|||
*
|
||||
* @note It is invoked from within @p _thread_init() and implicitly from all
|
||||
* the threads creation APIs.
|
||||
*
|
||||
* @param[in] tp pointer to the @p thread_t structure
|
||||
*/
|
||||
#define CH_CFG_THREAD_INIT_HOOK(tp) { \
|
||||
/* Add threads initialization code here.*/ \
|
||||
|
|
@ -663,6 +678,8 @@
|
|||
/**
|
||||
* @brief Threads finalization hook.
|
||||
* @details User finalization code added to the @p chThdExit() API.
|
||||
*
|
||||
* @param[in] tp pointer to the @p thread_t structure
|
||||
*/
|
||||
#define CH_CFG_THREAD_EXIT_HOOK(tp) { \
|
||||
/* Add threads finalization code here.*/ \
|
||||
|
|
@ -671,6 +688,9 @@
|
|||
/**
|
||||
* @brief Context switch hook.
|
||||
* @details This hook is invoked just before switching between threads.
|
||||
*
|
||||
* @param[in] ntp thread being switched in
|
||||
* @param[in] otp thread being switched out
|
||||
*/
|
||||
#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \
|
||||
/* Context switch code here.*/ \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
ChibiOS - Copyright (C) 2006..2018 Ilya Kharin
|
||||
ChibiOS - Copyright (C) 2006..2020 Ilya Kharin
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ MEMORY
|
|||
flash5 (rx) : org = 0x00000000, len = 0
|
||||
flash6 (rx) : org = 0x00000000, len = 0
|
||||
flash7 (rx) : org = 0x00000000, len = 0
|
||||
ram0 (wx) : org = 0x20000000, len = 192k
|
||||
ram1 (wx) : org = 0x00000000, len = 0
|
||||
ram0 (wx) : org = 0x20000000, len = 192k /* SRAM1 */
|
||||
ram1 (wx) : org = 0x20030000, len = 10k /* Shared part of SRAM2a */
|
||||
ram2 (wx) : org = 0x00000000, len = 0
|
||||
ram3 (wx) : org = 0x00000000, len = 0
|
||||
ram4 (wx) : org = 0x10000000, len = 64k /* This memory also mapped at address 0x20030000 */
|
||||
ram4 (wx) : org = 0x00000000, len = 0
|
||||
ram5 (wx) : org = 0x00000000, len = 0
|
||||
ram6 (wx) : org = 0x00000000, len = 0
|
||||
ram7 (wx) : org = 0x00000000, len = 0
|
||||
|
|
|
|||
|
|
@ -505,21 +505,21 @@
|
|||
*
|
||||
* @api
|
||||
*/
|
||||
#define rccEnableRNG(lp) rccEnableAHB2(RCC_AHB2ENR_RNGEN, lp)
|
||||
#define rccEnableRNG(lp) rccEnableAHB3(RCC_AHB3ENR_RNGEN, lp)
|
||||
|
||||
/**
|
||||
* @brief Disables the RNG peripheral clock.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
#define rccDisableRNG() rccDisableAHB2(RCC_AHB2ENR_RNGEN)
|
||||
#define rccDisableRNG() rccDisableAHB3(RCC_AHB3ENR_RNGEN)
|
||||
|
||||
/**
|
||||
* @brief Resets the RNG peripheral.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
#define rccResetRNG() rccResetAHB2(RCC_AHB2RSTR_RNGRST)
|
||||
#define rccResetRNG() rccResetAHB3(RCC_AHB3RSTR_RNGRST)
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@ all:
|
|||
+@make --no-print-directory -f ./make/stm32l4r5zi_nucleo144.make all
|
||||
@echo ====================================================================
|
||||
@echo
|
||||
@echo === Building for STM32WB55RG_Nucleo64 =============================
|
||||
+@make --no-print-directory -f ./make/stm32wb55rg_nucleo64.make all
|
||||
@echo ====================================================================
|
||||
@echo
|
||||
|
||||
clean:
|
||||
@echo
|
||||
|
|
@ -43,6 +47,8 @@ clean:
|
|||
@echo
|
||||
+@make --no-print-directory -f ./make/stm32l4r5zi_nucleo144.make clean
|
||||
@echo
|
||||
+@make --no-print-directory -f ./make/stm32wb55rg_nucleo64.make clean
|
||||
@echo
|
||||
|
||||
#
|
||||
##############################################################################
|
||||
|
|
|
|||
|
|
@ -36,6 +36,10 @@ all:
|
|||
+@make --no-print-directory -f ./make/stm32g071_nucleo64.make all
|
||||
@echo ====================================================================
|
||||
@echo
|
||||
@echo === Building for STM32WB55-Nucleo64 ===============================
|
||||
+@make --no-print-directory -f ./make/stm32wb55rg_nucleo64.make all
|
||||
@echo ====================================================================
|
||||
@echo
|
||||
|
||||
clean:
|
||||
@echo
|
||||
|
|
@ -55,6 +59,8 @@ clean:
|
|||
@echo
|
||||
+@make --no-print-directory -f ./make/stm32g071_nucleo64.make clean
|
||||
@echo
|
||||
+@make --no-print-directory -f ./make/stm32wb55rg_nucleo64.make clean
|
||||
@echo
|
||||
|
||||
#
|
||||
##############################################################################
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ all:
|
|||
+@make --no-print-directory -f ./make/stm32l4r5zi_nucleo144.make all
|
||||
@echo ====================================================================
|
||||
@echo
|
||||
@echo === Building for STM32WB55RG-Nucleo64 ==============================
|
||||
+@make --no-print-directory -f ./make/stm32wb55rg_nucleo64.make all
|
||||
@echo ====================================================================
|
||||
@echo
|
||||
|
||||
clean:
|
||||
@echo
|
||||
|
|
@ -19,6 +23,8 @@ clean:
|
|||
@echo
|
||||
+@make --no-print-directory -f ./make/stm32l4r5zi_nucleo144.make clean
|
||||
@echo
|
||||
+@make --no-print-directory -f ./make/stm32wb55rg_nucleo64.make clean
|
||||
@echo
|
||||
|
||||
#
|
||||
##############################################################################
|
||||
|
|
|
|||
Loading…
Reference in New Issue