From 13691d8e0c115e1cfe755067c51ca2305e26730d Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 8 Oct 2017 13:05:00 +0000 Subject: [PATCH] Fixed bug #895. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10797 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- .../chconf.h | 14 +-- ...-FATFS-USB (OpenOCD, Flash and Run).launch | 104 +++++++++--------- .../main.c | 7 +- os/rt/include/chtrace.h | 3 + os/rt/src/chtrace.c | 2 +- readme.txt | 2 + 6 files changed, 69 insertions(+), 63 deletions(-) diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/chconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/chconf.h index 0a4ea73a6..f7cde392a 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/chconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/chconf.h @@ -379,7 +379,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_STATISTICS FALSE +#define CH_DBG_STATISTICS TRUE /** * @brief Debug option, system state check. @@ -388,7 +388,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_SYSTEM_STATE_CHECK FALSE +#define CH_DBG_SYSTEM_STATE_CHECK TRUE /** * @brief Debug option, parameters checks. @@ -397,7 +397,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_ENABLE_CHECKS FALSE +#define CH_DBG_ENABLE_CHECKS TRUE /** * @brief Debug option, consistency checks. @@ -407,7 +407,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_ENABLE_ASSERTS FALSE +#define CH_DBG_ENABLE_ASSERTS TRUE /** * @brief Debug option, trace buffer. @@ -415,7 +415,7 @@ * * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. */ -#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED +#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_ALL /** * @brief Trace buffer entries. @@ -434,7 +434,7 @@ * @note The default failure mode is to halt the system with the global * @p panic_msg variable set to @p NULL. */ -#define CH_DBG_ENABLE_STACK_CHECK FALSE +#define CH_DBG_ENABLE_STACK_CHECK TRUE /** * @brief Debug option, stacks initialization. @@ -444,7 +444,7 @@ * * @note The default is @p FALSE. */ -#define CH_DBG_FILL_THREADS FALSE +#define CH_DBG_FILL_THREADS TRUE /** * @brief Debug option, threads profiling. diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/debug/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/debug/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB (OpenOCD, Flash and Run).launch index 4902172f9..d64a4e470 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/debug/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/debug/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB (OpenOCD, Flash and Run).launch @@ -1,52 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c index 7d7e32850..2e8286383 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c +++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/main.c @@ -25,7 +25,7 @@ #include "shell.h" #include "lwipthread.h" -#include "web/web.h" +#include "httpd.h" #include "ff.h" @@ -324,8 +324,9 @@ int main(void) { /* * Creates the HTTP thread (it changes priority internally). */ - chThdCreateStatic(wa_http_server, sizeof(wa_http_server), NORMALPRIO + 1, - http_server, NULL); +// chThdCreateStatic(wa_http_server, sizeof(wa_http_server), NORMALPRIO + 1, +// http_server, NULL); + httpd_init(); /* * Normal main() thread activity, handling SD card events and shell diff --git a/os/rt/include/chtrace.h b/os/rt/include/chtrace.h index 185ddfe46..591a42fa7 100644 --- a/os/rt/include/chtrace.h +++ b/os/rt/include/chtrace.h @@ -54,6 +54,9 @@ #define CH_DBG_TRACE_MASK_ISR 2U #define CH_DBG_TRACE_MASK_HALT 4U #define CH_DBG_TRACE_MASK_USER 8U +#define CH_DBG_TRACE_MASK_SLOW (CH_DBG_TRACE_MASK_SWITCH | \ + CH_DBG_TRACE_MASK_HALT | \ + CH_DBG_TRACE_MASK_USER) #define CH_DBG_TRACE_MASK_ALL (CH_DBG_TRACE_MASK_SWITCH | \ CH_DBG_TRACE_MASK_ISR | \ CH_DBG_TRACE_MASK_HALT | \ diff --git a/os/rt/src/chtrace.c b/os/rt/src/chtrace.c index 97e265588..c9b9f39b8 100644 --- a/os/rt/src/chtrace.c +++ b/os/rt/src/chtrace.c @@ -85,7 +85,7 @@ static NOINLINE void trace_next(void) { void _trace_init(void) { unsigned i; - ch.dbg.trace_buffer.suspended = (uint16_t)CH_DBG_TRACE_MASK; + ch.dbg.trace_buffer.suspended = (uint16_t)~CH_DBG_TRACE_MASK; ch.dbg.trace_buffer.size = CH_DBG_TRACE_BUFFER_SIZE; ch.dbg.trace_buffer.ptr = &ch.dbg.trace_buffer.buffer[0]; for (i = 0U; i < (unsigned)CH_DBG_TRACE_BUFFER_SIZE; i++) { diff --git a/readme.txt b/readme.txt index 8aaf58b0a..d1a8d6830 100644 --- a/readme.txt +++ b/readme.txt @@ -134,6 +134,8 @@ dependencies and configuration directories. This makes possible to have multiple non-conflicting makefiles in the same project. Updated the various platform.mk implementing "smart build" mode. +- RT: Fixed trace Buffer activation bits state reversed in chconf.h + (bug #895)(backported to 17.6.3). - BLD: Fixed USE_OPT not passed to assembler in rules.mk (bug #892)(backported to 17.6.3 and 16.1.10). - HAL: Fixed IRQ sharing issue in STM32 DMAv1 driver (bug #891)(backported