diff --git a/arch/arm/src/common/arm_initialize.c b/arch/arm/src/common/arm_initialize.c index 95b8b9261d..e73e3e9281 100644 --- a/arch/arm/src/common/arm_initialize.c +++ b/arch/arm/src/common/arm_initialize.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 99c82cc20b..e3dd4825b0 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index 2e2ceb4766..0343ad2ff3 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/mips/src/common/mips_initialize.c b/arch/mips/src/common/mips_initialize.c index 087e554717..60d80011bf 100644 --- a/arch/mips/src/common/mips_initialize.c +++ b/arch/mips/src/common/mips_initialize.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c index 78ae0e4568..8547b4d5ee 100644 --- a/arch/or1k/src/common/up_initialize.c +++ b/arch/or1k/src/common/up_initialize.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c index af4c66d51e..eb5b57f570 100644 --- a/arch/renesas/src/common/up_initialize.c +++ b/arch/renesas/src/common/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/risc-v/src/common/riscv_initialize.c b/arch/risc-v/src/common/riscv_initialize.c index 0028036ca5..aefee0cf9a 100644 --- a/arch/risc-v/src/common/riscv_initialize.c +++ b/arch/risc-v/src/common/riscv_initialize.c @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/sim/src/sim/up_initialize.c b/arch/sim/src/sim/up_initialize.c index a512ce17b3..c226bffd2c 100644 --- a/arch/sim/src/sim/up_initialize.c +++ b/arch/sim/src/sim/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index c1de39f76f..0c2ace6583 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86_64/src/common/up_initialize.c b/arch/x86_64/src/common/up_initialize.c index e4968b6a27..6e0759cf17 100644 --- a/arch/x86_64/src/common/up_initialize.c +++ b/arch/x86_64/src/common/up_initialize.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c index bfac801f23..edf474db76 100644 --- a/arch/xtensa/src/common/xtensa_initialize.c +++ b/arch/xtensa/src/common/xtensa_initialize.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/z16/src/common/z16_initialize.c b/arch/z16/src/common/z16_initialize.c index 2e6a0e1848..08406f4e79 100644 --- a/arch/z16/src/common/z16_initialize.c +++ b/arch/z16/src/common/z16_initialize.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/z80/src/common/z80_initialize.c b/arch/z80/src/common/z80_initialize.c index 692bde18b2..ba560d9c44 100644 --- a/arch/z80/src/common/z80_initialize.c +++ b/arch/z80/src/common/z80_initialize.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/Kconfig b/drivers/Kconfig index 5ddf385834..f5a057d36d 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -96,6 +96,7 @@ source drivers/modem/Kconfig source drivers/mtd/Kconfig source drivers/eeprom/Kconfig source drivers/net/Kconfig +source drivers/note/Kconfig source drivers/pipes/Kconfig source drivers/power/Kconfig source drivers/rptun/Kconfig diff --git a/drivers/Makefile b/drivers/Makefile index dd695b82af..15fdaa26aa 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -56,6 +56,7 @@ include modem/Make.defs include mtd/Make.defs include eeprom/Make.defs include net/Make.defs +include note/Make.defs include pipes/Make.defs include power/Make.defs include rptun/Make.defs diff --git a/drivers/note/Kconfig b/drivers/note/Kconfig new file mode 100644 index 0000000000..6865682faf --- /dev/null +++ b/drivers/note/Kconfig @@ -0,0 +1,17 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +menu "Note Driver Support" + +config DRIVER_NOTE + bool "Scheduler instrumentation driver" + default n + depends on SCHED_INSTRUMENTATION_BUFFER && SCHED_NOTE_GET + ---help--- + Enable building a serial driver that can be used by an application + to read data from the in-memory, scheduler instrumentation "note" + buffer. + +endmenu diff --git a/drivers/note/Make.defs b/drivers/note/Make.defs new file mode 100644 index 0000000000..91c0dc358d --- /dev/null +++ b/drivers/note/Make.defs @@ -0,0 +1,26 @@ +############################################################################ +# drivers/note/Make.defs +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +ifeq ($(CONFIG_DRIVER_NOTE),y) + CSRCS += note_driver.c +endif + +DEPPATH += --dep-path note +VPATH += :note diff --git a/drivers/syslog/note_driver.c b/drivers/note/note_driver.c similarity index 99% rename from drivers/syslog/note_driver.c rename to drivers/note/note_driver.c index bade29ab76..afd37c2881 100644 --- a/drivers/syslog/note_driver.c +++ b/drivers/note/note_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/syslog/note_driver.c + * drivers/note/note_driver.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig index b502261695..b79fdd3106 100644 --- a/drivers/syslog/Kconfig +++ b/drivers/syslog/Kconfig @@ -68,15 +68,6 @@ config RAMLOG_OVERWRITE endif -config DRIVER_NOTE - bool "Scheduler instrumentation driver" - default n - depends on SCHED_INSTRUMENTATION_BUFFER && SCHED_NOTE_GET - ---help--- - Enable building a serial driver that can be used by an application - to read data from the in-memory, scheduler instrumentation "note" - buffer. - config SYSLOG_BUFFER bool "Use buffered output" default n diff --git a/drivers/syslog/Make.defs b/drivers/syslog/Make.defs index c34a3f245c..d4678c018b 100644 --- a/drivers/syslog/Make.defs +++ b/drivers/syslog/Make.defs @@ -48,13 +48,6 @@ ifneq ($(CONFIG_ARCH_SYSLOG),y) CSRCS += syslog_initialize.c endif -# The note driver is hosted in this directory, but is not associated with -# SYSLOGging - -ifeq ($(CONFIG_DRIVER_NOTE),y) - CSRCS += note_driver.c -endif - # The RAMLOG device is usable as a system logging device or standalone ifeq ($(CONFIG_RAMLOG),y) diff --git a/include/nuttx/syslog/note_driver.h b/include/nuttx/note/note_driver.h similarity index 93% rename from include/nuttx/syslog/note_driver.h rename to include/nuttx/note/note_driver.h index 49b30752b8..62df063715 100644 --- a/include/nuttx/syslog/note_driver.h +++ b/include/nuttx/note/note_driver.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/syslog/note_driver.h + * include/nuttx/note/note_driver.h * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SYSLOG_NOTE_DRIVER_H -#define __INCLUDE_NUTTX_SYSLOG_NOTE_DRIVER_H +#ifndef __INCLUDE_NUTTX_NOTE_NOTE_DRIVER_H +#define __INCLUDE_NUTTX_NOTE_NOTE_DRIVER_H /**************************************************************************** * Included Files @@ -66,4 +66,4 @@ int note_register(void); #endif /* CONFIG_SCHED_INSTRUMENTATION */ -#endif /* __INCLUDE_NUTTX_SYSLOG_NOTE_DRIVER_H */ +#endif /* __INCLUDE_NUTTX_NOTE_NOTE_DRIVER_H */