diff options
author | Nicolas Reinecke <nr@das-labor.org> | 2016-05-01 01:38:31 +0200 |
---|---|---|
committer | Nicolas Reinecke <nr@das-labor.org> | 2016-05-01 03:28:30 +0200 |
commit | 367bc6bcce15d90b49b040d865c3a8f69321b80e (patch) | |
tree | 2e148b46b925b84387c4d2101e80b34e906150f5 /testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h | |
parent | 1a6aba5009bf8ba1672adddb5b24fd7fe1f2c973 (diff) | |
download | ChibiOS-Contrib-367bc6bcce15d90b49b040d865c3a8f69321b80e.tar.gz ChibiOS-Contrib-367bc6bcce15d90b49b040d865c3a8f69321b80e.tar.bz2 ChibiOS-Contrib-367bc6bcce15d90b49b040d865c3a8f69321b80e.zip |
update stm32 demo and testhal projects to upstream chibios
Diffstat (limited to 'testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h')
-rw-r--r-- | testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h b/testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h index 01cc4a0..1065821 100644 --- a/testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h +++ b/testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ * @{ */ -#ifndef _CHCONF_H_ -#define _CHCONF_H_ +#ifndef CHCONF_H +#define CHCONF_H #define _CHIBIOS_RT_CONF_ @@ -351,17 +351,16 @@ /** * @brief Debug option, trace buffer. - * @details If enabled then the context switch circular trace buffer is - * activated. + * @details If enabled then the trace buffer is activated. * - * @note The default is @p CH_DBG_TRACE_MASK_NONE. + * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. */ -#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_NONE +#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED /** * @brief Trace buffer entries. * @note The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is - * different from @p CH_DBG_TRACE_MASK_NONE. + * different from @p CH_DBG_TRACE_MASK_DISABLED. */ #define CH_DBG_TRACE_BUFFER_SIZE 128 @@ -498,7 +497,7 @@ * the system is halted. */ #define CH_CFG_SYSTEM_HALT_HOOK(reason) { \ - /* Halt code here.*/ \ + /* System halt code here.*/ \ } /** @@ -516,6 +515,6 @@ /* Port-specific settings (override port settings defaulted in chcore.h). */ /*===========================================================================*/ -#endif /* _CHCONF_H_ */ +#endif /* CHCONF_H */ /** @} */ |