From bd846c2e72611141840884a701ce1585cca35a47 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 17 Mar 2016 17:00:59 -0600 Subject: [PATCH] All architectures: Register the schedule note driver if enabled --- arch/arm/src/common/up_initialize.c | 10 +++++++++- arch/avr/src/common/up_initialize.c | 15 ++++++++++----- arch/hc/src/common/up_initialize.c | 18 +++++++++--------- arch/mips/src/common/up_initialize.c | 18 +++++++++--------- arch/sh/src/common/up_initialize.c | 14 +++++++++----- arch/sim/src/up_initialize.c | 2 +- arch/x86/src/common/up_initialize.c | 18 +++++++++--------- arch/z16/src/common/up_initialize.c | 22 +++++++++------------- arch/z80/src/common/up_initialize.c | 18 +++++++++--------- 9 files changed, 74 insertions(+), 61 deletions(-) diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index 15f86eb4400..511138e4f51 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/common/up_initialize.c * - * Copyright (C) 2007-2010, 2012-2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2010, 2012-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -75,11 +76,13 @@ static void up_calibratedelay(void) { int i; + lldbg("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } + lldbg("End 100s delay\n"); } #else @@ -202,6 +205,11 @@ void up_initialize(void) #endif #endif /* CONFIG_NFILE_DESCRIPTORS */ +#if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \ + defined(CONFIG_DRIVER_NOTE) + note_register(); /* Non-standard /dev/note */ +#endif + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index e188587dcaa..5c36cd08144 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/avr/src/common/up_initialize.c * - * Copyright (C) 2010, 2012-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2012-2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -58,6 +59,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Determine which (if any) console driver to use. This will probably cause * up_serialinit to be incorrectly called if there is no USART configured to * be an RS-232 device (see as an example arch/avr/src/at32uc23/at32uc3_config.h) @@ -104,10 +106,6 @@ # undef CONFIG_RAMLOG_SYSLOG #endif -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -126,11 +124,13 @@ static void up_calibratedelay(void) { int i; + lldbg("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } + lldbg("End 100s delay\n"); } #else @@ -242,6 +242,11 @@ void up_initialize(void) #endif #endif /* CONFIG_NFILE_DESCRIPTORS */ +#if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \ + defined(CONFIG_DRIVER_NOTE) + note_register(); /* Non-standard /dev/note */ +#endif + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index 872d902ef4d..30daa39ea29 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/hc/src/common/up_initialize.c * - * Copyright (C) 2009-2010, 2012-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2010, 2012-2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -54,14 +55,6 @@ #include "up_arch.h" #include "up_internal.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -80,11 +73,13 @@ static void up_calibratedelay(void) { int i; + lldbg("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } + lldbg("End 100s delay\n"); } #else @@ -166,6 +161,11 @@ void up_initialize(void) #endif #endif /* CONFIG_NFILE_DESCRIPTORS */ +#if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \ + defined(CONFIG_DRIVER_NOTE) + note_register(); /* Non-standard /dev/note */ +#endif + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index 6c9e6997873..b7df229f2f0 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/arch/mips/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/mips/src/common/up_initialize.c * - * Copyright (C) 2011-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -56,14 +57,6 @@ #include "up_arch.h" #include "up_internal.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -82,11 +75,13 @@ static void up_calibratedelay(void) { int i; + lldbg("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } + lldbg("End 100s delay\n"); } #else @@ -168,6 +163,11 @@ void up_initialize(void) #endif #endif /* CONFIG_NFILE_DESCRIPTORS */ +#if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \ + defined(CONFIG_DRIVER_NOTE) + note_register(); /* Non-standard /dev/note */ +#endif + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c index d8a00546c79..98c6bf273d8 100644 --- a/arch/sh/src/common/up_initialize.c +++ b/arch/sh/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/sh/src/common/up_initialize.c * - * Copyright (C) 2008-2010, 2012-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010, 2012-2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -62,10 +63,6 @@ #undef CONFIG_ARCH_CALIBRATION -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -84,11 +81,13 @@ static void up_calibratedelay(void) { int i; + slldbg("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } + slldbg("End 100s delay\n"); } #else @@ -153,6 +152,11 @@ void up_initialize(void) #endif #endif /* CONFIG_NFILE_DESCRIPTORS */ +#if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \ + defined(CONFIG_DRIVER_NOTE) + note_register(); /* Non-standard /dev/note */ +#endif + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c index f30dc271f38..7efcfb23738 100644 --- a/arch/sim/src/up_initialize.c +++ b/arch/sim/src/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/sim/src/up_initialize.c * - * Copyright (C) 2007-2009, 2011-2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index e464973c4d8..07697ea078c 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/x86/src/common/up_initialize.c * - * Copyright (C) 2011-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -56,14 +57,6 @@ #include "up_arch.h" #include "up_internal.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -82,11 +75,13 @@ static void up_calibratedelay(void) { int i; + lldbg("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } + lldbg("End 100s delay\n"); } #else @@ -168,6 +163,11 @@ void up_initialize(void) #endif #endif /* CONFIG_NFILE_DESCRIPTORS */ +#if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \ + defined(CONFIG_DRIVER_NOTE) + note_register(); /* Non-standard /dev/note */ +#endif + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index e40e4fea77f..50b287d08a6 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/arch/z16/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/z16/src/common/up_initialize.c * - * Copyright (C) 2008-2009, 2011-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011-2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -56,10 +57,6 @@ #include "up_arch.h" #include "up_internal.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - /**************************************************************************** * Public Data ****************************************************************************/ @@ -71,14 +68,6 @@ volatile FAR chipreg_t *g_current_regs; -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -97,11 +86,13 @@ volatile FAR chipreg_t *g_current_regs; static void up_calibratedelay(void) { int i; + lldbg("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } + lldbg("End 100s delay\n"); } #else @@ -172,6 +163,11 @@ void up_initialize(void) #endif #endif /* CONFIG_NFILE_DESCRIPTORS */ +#if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \ + defined(CONFIG_DRIVER_NOTE) + note_register(); /* Non-standard /dev/note */ +#endif + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index 64343c89847..218a7823266 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/z80/src/common/up_initialize.c * - * Copyright (C) 2007-2009, 2012-2013, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2012-2013, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -55,14 +56,6 @@ #include "up_arch.h" #include "up_internal.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -81,11 +74,13 @@ static void up_calibratedelay(void) { int i; + lldbg("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } + lldbg("End 100s delay\n"); } #else @@ -164,6 +159,11 @@ void up_initialize(void) #endif #endif /* CONFIG_NFILE_DESCRIPTORS */ +#if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \ + defined(CONFIG_DRIVER_NOTE) + note_register(); /* Non-standard /dev/note */ +#endif + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER