michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ext: debug: segger: Fix SEGGER header inclusion

Browse source 
Fix issue caused by 3fc497ac9a

This change removes `rtt` and `systemview` from header includes
as these are already placed in the path.

Also `SEGGER_SYSVIEW_ConfDefaults.h` header included from
`SEGGER_SYSVIEW_Int.h` is placed higher to make sure `INLINE`
definition is properly visible.

Signed-off-by: Pawel Dunaj <pawel.dunaj@nordicsemi.no>
This commit is contained in:
Pawel Dunaj 2018-12-05 10:28:48 +01:00 • committed by Carles Cufí
commit e344e5752c
10 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/console/rtt_console.c
View file

@ -13,7 +13,7 @@
#include <misc/printk.h> #include <misc/printk.h>
#include <device.h> #include <device.h>
#include <init.h> #include <init.h>
#include <rtt/SEGGER_RTT.h> #include <SEGGER_RTT.h>
extern void __printk_hook_install(int (*fn)(int)); extern void __printk_hook_install(int (*fn)(int));
extern void __stdout_hook_install(int (*fn)(int)); extern void __stdout_hook_install(int (*fn)(int));

2
ext/debug/segger/systemview/SEGGER_SYSVIEW.c
View file

@ -146,7 +146,7 @@ Additional information:
*/ */
#include "SEGGER_SYSVIEW_Int.h" #include "SEGGER_SYSVIEW_Int.h"
#include "rtt/SEGGER_RTT.h" #include "SEGGER_RTT.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>

2
ext/debug/segger/systemview/SEGGER_SYSVIEW_ConfDefaults.h
View file

@ -73,7 +73,7 @@ Revision: $Rev: 3734 $
*/ */
#include "SEGGER_SYSVIEW_Conf.h" #include "SEGGER_SYSVIEW_Conf.h"
#include "rtt/SEGGER_RTT_Conf.h" #include "SEGGER_RTT_Conf.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
ext/debug/segger/systemview/SEGGER_SYSVIEW_Int.h
View file

@ -71,9 +71,9 @@ Revision: $Rev: 5626 $
********************************************************************** **********************************************************************
*/ */
#include "SEGGER_SYSVIEW_ConfDefaults.h"
#include "SEGGER_SYSVIEW.h" #include "SEGGER_SYSVIEW.h"
#include "SEGGER_SYSVIEW_Conf.h" #include "SEGGER_SYSVIEW_Conf.h"
#include "SEGGER_SYSVIEW_ConfDefaults.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
subsys/debug/tracing/include/SEGGER_SYSVIEW_Zephyr.h
View file

@ -7,7 +7,7 @@
#ifndef SYSVIEW_ZEPHYR_H #ifndef SYSVIEW_ZEPHYR_H
#define SYSVIEW_ZEPHYR_H #define SYSVIEW_ZEPHYR_H
#include <systemview/SEGGER_SYSVIEW.h> #include <SEGGER_SYSVIEW.h>
/* Services provided to SYSVIEW by Zephyr */ /* Services provided to SYSVIEW by Zephyr */
extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI; extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI;

4
subsys/debug/tracing/include/tracing_sysview.h
View file

@ -8,8 +8,8 @@
#include <kernel.h> #include <kernel.h>
#include <init.h> #include <init.h>
#include <systemview/SEGGER_SYSVIEW.h> #include <SEGGER_SYSVIEW.h>
#include <systemview/Global.h> #include <Global.h>
#include "SEGGER_SYSVIEW_Zephyr.h" #include "SEGGER_SYSVIEW_Zephyr.h"
#ifndef CONFIG_SMP #ifndef CONFIG_SMP

4
subsys/debug/tracing/sysview.c
View file

@ -3,8 +3,8 @@
#include <kernel_structs.h> #include <kernel_structs.h>
#include <init.h> #include <init.h>
#include <systemview/SEGGER_SYSVIEW.h> #include <SEGGER_SYSVIEW.h>
#include <systemview/Global.h> #include <Global.h>
#include "SEGGER_SYSVIEW_Zephyr.h" #include "SEGGER_SYSVIEW_Zephyr.h"
static u32_t interrupt; static u32_t interrupt;

2
subsys/debug/tracing/sysview_config.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include <systemview/SEGGER_SYSVIEW.h> #include <SEGGER_SYSVIEW.h>
#include "SEGGER_SYSVIEW_Zephyr.h" #include "SEGGER_SYSVIEW_Zephyr.h"
static void _cbSendSystemDesc(void) static void _cbSendSystemDesc(void)

2
subsys/logging/log_backend_rtt.c
View file

@ -8,7 +8,7 @@
#include <logging/log_core.h> #include <logging/log_core.h>
#include <logging/log_msg.h> #include <logging/log_msg.h>
#include <logging/log_output.h> #include <logging/log_output.h>
#include <rtt/SEGGER_RTT.h> #include <SEGGER_RTT.h>
#define DROP_MAX 99 #define DROP_MAX 99

2
subsys/shell/shell_rtt.c
View file

@ -6,7 +6,7 @@
#include <shell/shell_rtt.h> #include <shell/shell_rtt.h>
#include <init.h> #include <init.h>
#include <rtt/SEGGER_RTT.h> #include <SEGGER_RTT.h>
#include <logging/log.h> #include <logging/log.h>
SHELL_RTT_DEFINE(shell_transport_rtt); SHELL_RTT_DEFINE(shell_transport_rtt);