fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 04:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add logic so that a RAM log can be used in place of a console device

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4380 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-02-11 03:50:52 +00:00
parent ddd6b7d383
commit f03655f43a
85 changed files with 732 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/arch/avr/src/at32uc3/at32uc3_config.h
+21 -7
View File
@@ -146,13 +146,27 @@
/* Determine which (if any) console driver to use */
#if CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE) || !defined(HAVE_RS232_DEVICE)
# undef CONFIG_USE_SERIALDRIVER
# undef CONFIG_USE_EARLYSERIALINIT
#elif defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0
# define CONFIG_USE_SERIALDRIVER 1
# define CONFIG_USE_EARLYSERIALINIT 1
#endif
#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# elif defined(CONFIG_DEV_LOWCONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# elif defined(HAVE_RS232_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# endif
#endig
/* If GPIO IRQ support is defined, then a set of GPIOs must all be included */
nuttx/arch/avr/src/at32uc3/at32uc3_lowconsole.c
+3 -3
View File
@@ -1,8 +1,8 @@
/******************************************************************************
* arch/avr/src/at32uc3/at32uc3_lowconsole.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -362,7 +362,7 @@ void up_consoleinit(void)
* by up_earlyserialinit()).
*/
#if defined(HAVE_SERIAL_CONSOLE) && !defined(CONFIG_USE_EARLYSERIALINIT)
#if defined(HAVE_SERIAL_CONSOLE) && !defined(USE_EARLYSERIALINIT)
usart_configure(AVR32_CONSOLE_BASE, AVR32_CONSOLE_BAUD, AVR32_CONSOLE_PARITY,
AVR32_CONSOLE_BITS, (bool)AVR32_CONSOLE_2STOP);
#endif
nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************
* arch/avr/src/at32uc3/at32uc3_lowinit.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -95,7 +95,7 @@ void up_lowinit(void)
* available as soon as possible).
*/
#ifdef CONFIG_USE_EARLYSERIALINIT
#ifdef USE_EARLYSERIALINIT
up_earlyserialinit();
#endif
nuttx/arch/avr/src/at32uc3/at32uc3_serial.c
+5 -5
View File
@@ -1,8 +1,8 @@
/****************************************************************************
* arch/avr/src/at32uc3/at32uc3_serial.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -78,7 +78,7 @@
* provide some minimal implementation of up_putc.
*/
#ifdef CONFIG_USE_SERIALDRIVER
#ifdef USE_SERIALDRIVER
/* Which USART with be tty0/console and which tty1? */
@@ -808,7 +808,7 @@ int up_putc(int ch)
return ch;
}
#else /* CONFIG_USE_SERIALDRIVER */
#else /* USE_SERIALDRIVER */
/****************************************************************************
* Name: up_putc
@@ -835,5 +835,5 @@ int up_putc(int ch)
return ch;
}
#endif /* CONFIG_USE_SERIALDRIVER */
#endif /* USE_SERIALDRIVER */
nuttx/arch/avr/src/at90usb/at90usb_config.h
+23 -9
View File
@@ -1,8 +1,8 @@
/************************************************************************************
* arch/avr/src/at90usb/at90usb_config.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -65,13 +65,27 @@
/* Determine which (if any) console driver to use */
#if CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE) || !defined(HAVE_USART_DEVICE)
# undef CONFIG_USE_SERIALDRIVER
# undef CONFIG_USE_EARLYSERIALINIT
#elif defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0
# define CONFIG_USE_SERIALDRIVER 1
# define CONFIG_USE_EARLYSERIALINIT 1
#endif
#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# elif defined(CONFIG_DEV_LOWCONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# elif defined(HAVE_USART_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# endif
#endig
/************************************************************************************
* Public Types
nuttx/arch/avr/src/at90usb/at90usb_lowinit.c
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************
* arch/avr/src/at90usb/at90usb_lowinit.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -142,7 +142,7 @@ void up_lowinit(void)
* available as soon as possible).
*/
#ifdef CONFIG_USE_EARLYSERIALINIT
#ifdef USE_EARLYSERIALINIT
up_earlyserialinit();
#endif
nuttx/arch/avr/src/at90usb/at90usb_serial.c
+5 -5
View File
@@ -1,8 +1,8 @@
/****************************************************************************
* arch/avr/src/at90usb/at90usb_serial.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -77,7 +77,7 @@
* provide some minimal implementation of up_putc.
*/
#ifdef CONFIG_USE_SERIALDRIVER
#ifdef USE_SERIALDRIVER
/****************************************************************************
* Private Types
@@ -588,7 +588,7 @@ int up_putc(int ch)
return ch;
}
#else /* CONFIG_USE_SERIALDRIVER */
#else /* USE_SERIALDRIVER */
/****************************************************************************
* Name: up_putc
@@ -615,5 +615,5 @@ int up_putc(int ch)
return ch;
}
#endif /* CONFIG_USE_SERIALDRIVER */
#endif /* USE_SERIALDRIVER */
nuttx/arch/avr/src/atmega/atmega_config.h
+23 -9
View File
@@ -1,8 +1,8 @@
/************************************************************************************
* arch/avr/src/atmega/atmega_config.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -70,13 +70,27 @@
/* Determine which (if any) console driver to use */
#if CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE) || !defined(HAVE_USART_DEVICE)
# undef CONFIG_USE_SERIALDRIVER
# undef CONFIG_USE_EARLYSERIALINIT
#elif defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0
# define CONFIG_USE_SERIALDRIVER 1
# define CONFIG_USE_EARLYSERIALINIT 1
#endif
#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# elif defined(CONFIG_DEV_LOWCONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# elif defined(HAVE_USART_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# endif
#endig
/************************************************************************************
* Public Types
nuttx/arch/avr/src/atmega/atmega_lowinit.c
+3 -3
View File
@@ -1,8 +1,8 @@
/**************************************************************************
* arch/avr/src/atmega/atmega_lowinit.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -142,7 +142,7 @@ void up_lowinit(void)
* available as soon as possible).
*/
#ifdef CONFIG_USE_EARLYSERIALINIT
#ifdef USE_EARLYSERIALINIT
up_earlyserialinit();
#endif
nuttx/arch/avr/src/atmega/atmega_serial.c
+5 -5
View File
@@ -1,8 +1,8 @@
/****************************************************************************
* arch/avr/src/atmega/atmega_serial.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -77,7 +77,7 @@
* provide some minimal implementation of up_putc.
*/
#ifdef CONFIG_USE_SERIALDRIVER
#ifdef USE_SERIALDRIVER
/* Which USART with be tty0/console and which tty1? */
@@ -982,7 +982,7 @@ int up_putc(int ch)
return ch;
}
#else /* CONFIG_USE_SERIALDRIVER */
#else /* USE_SERIALDRIVER */
/****************************************************************************
* Name: up_putc
@@ -1009,5 +1009,5 @@ int up_putc(int ch)
return ch;
}
#endif /* CONFIG_USE_SERIALDRIVER */
#endif /* USE_SERIALDRIVER */
nuttx/arch/avr/src/common/up_initialize.c
+24 -11
View File
@@ -1,8 +1,8 @@
/****************************************************************************
* arch/avr/src/common/up_initialize.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -57,13 +57,24 @@
* This will probably have to be revisited someday.
*/
#if CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE)
# undef CONFIG_USE_SERIALDRIVER
# undef CONFIG_USE_EARLYSERIALINIT
#elif defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0
# define CONFIG_USE_SERIALDRIVER 1
# define CONFIG_USE_EARLYSERIALINIT 1
#endif
#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# elif defined(CONFIG_DEV_LOWCONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endig
/****************************************************************************
* Private Types
@@ -162,12 +173,14 @@ void up_initialize(void)
devnull_register(); /* Standard /dev/null */
#endif
/* Initialize the serial device driver */
/* Initialize the console device driver */
#ifdef CONFIG_USE_SERIALDRIVER
#if defined(USE_SERIALDRIVER)
up_serialinit();
#elif defined(CONFIG_DEV_LOWCONSOLE)
lowconsole_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
#endif
/* Initialize the netwok */
nuttx/arch/avr/src/common/up_internal.h
+8
View File
@@ -172,6 +172,14 @@ extern void lowconsole_init(void);
# define lowconsole_init()
#endif
/* Defined in drivers/ramlog.c */
#ifdef CONFIG_RAMLOG_CONSOLE
extern void ramlog_consoleinit(void);
#else
# define ramlog_consoleinit()
#endif
/* Defined in chip/xxx_timerisr.c */
extern void up_timerinit(void);