Move serial header files to include/nuttx/serial

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4500 7fd9a85b-ad96-42d3-883c-3090e2eb8679

nuttx/ChangeLog

@@ -1532,8 +1532,8 @@
 	  (and others).  Contributed by Uros Platise.
 	* examples/nsh and tools/mkromfsimg.sh: Add support for platform-specific
 	  ROMFS-based NSH start-up scripts.
-	* drivers/uart_16550.c and include/nuttx/uart_16550.h: Support for a generic
+	* drivers/serial/uart_16550.c and include/nuttx/serial/uart_16550.h: Support
-	  16550 UART.
+	  for a generic 16550 UART.
 	* configure/qemu-i486/nsh: QEMU NSH example.
 	* ../apps: The apps directory add-on was created by Uros Platise.  It
 	  supports a set of end-user applications than can be executed on top of
@@ -2581,3 +2581,5 @@
 	  device is, however, still non-functional when debug is OFF.
 	* include/nuttx/fs: Move all file-system related files from include/nuttx to
 	  include/nuttx/fs.
+	* include/nuttx/serial: Move all serial-driver related files from include/nuttx to
+	  include/nuttx/serial.

nuttx/Documentation/NuttxPortingGuide.html

@@ -2542,7 +2542,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-    <b><code>include/nuttx/serial.h</code></b>.
+    <b><code>include/nuttx/serial/serial.h</code></b>.
     All structures and APIs needed to work with serial drivers are provided in this header file.
     </p>
   </li>

nuttx/arch/arm/src/c5471/c5471_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"

nuttx/arch/arm/src/dm320/dm320_serial.c

@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 #include <arch/board/board.h>
 

nuttx/arch/arm/src/imx/imx_serial.c

@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 #include <arch/board/board.h>
 

nuttx/arch/arm/src/kinetis/kinetis_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/board/board.h>
 

nuttx/arch/arm/src/lm3s/lm3s_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/serial.h>
 #include <arch/board/board.h>

nuttx/arch/arm/src/lpc17xx/lpc17_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/serial.h>
 #include <arch/board/board.h>

nuttx/arch/arm/src/lpc214x/lpc214x_serial.c

@@ -49,7 +49,7 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"

nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c

@@ -54,7 +54,7 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"

nuttx/arch/arm/src/lpc31xx/lpc31_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "up_arch.h"

nuttx/arch/arm/src/sam3u/sam3u_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/serial.h>
 #include <arch/board/board.h>

nuttx/arch/arm/src/stm32/stm32_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/serial.h>
 #include <arch/board/board.h>

nuttx/arch/arm/src/str71x/str71x_serial.c

@@ -49,7 +49,7 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"

nuttx/arch/avr/src/at32uc3/at32uc3_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/board/board.h>
 

nuttx/arch/avr/src/at90usb/at90usb_serial.c

@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <avr/io.h>
 
 #include <arch/board/board.h>

nuttx/arch/avr/src/atmega/atmega_serial.c

@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <avr/io.h>
 
 #include <arch/board/board.h>

nuttx/arch/mips/src/pic32mx/pic32mx-serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <arch/board/board.h>
 

nuttx/arch/rgmp/src/x86/com.c

@@ -51,7 +51,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <nuttx/kmalloc.h>
 
 #include <arch/com.h>

nuttx/arch/sh/src/m16c/m16c_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"

nuttx/arch/sh/src/sh1/sh1_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip.h"

nuttx/arch/x86/src/qemu/qemu_serial.c

@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/uart_16550.h>
+#include <nuttx/serial/uart_16550.h>
 
 #include <arch/io.h>
 

nuttx/arch/z16/src/z16f/z16f_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip/chip.h"

nuttx/arch/z80/src/ez80/ez80_serial.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 #include <arch/io.h>
 

nuttx/arch/z80/src/z8/z8_serial.c

@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "chip/chip.h"

nuttx/configs/xtrs/src/xtr_serial.c

@@ -53,7 +53,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "up_arch.h"

nuttx/configs/z80sim/src/z80_serial.c

@@ -49,7 +49,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <arch/serial.h>
 
 #include "up_arch.h"

nuttx/drivers/README.txt

@@ -106,7 +106,7 @@ sensors/
 serial/
 	Front-end character drivers for chip-specific UARTs.  This provide
 	some TTY-like functionality and are commonly used (but not required for)
-	the NuttX system console.  See also include/nuttx/serial.h
+	the NuttX system console.  See also include/nuttx/serial/serial.h
 
 usbdev/
 	USB device drivers.  See also include/nuttx/usb/usbdev.h

nuttx/drivers/serial/serial.c

@@ -53,7 +53,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 /************************************************************************************
  * Definitions

nuttx/drivers/serial/serialirq.c

@@ -43,7 +43,7 @@
 #include <stdint.h>
 #include <semaphore.h>
 #include <debug.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 /************************************************************************************
  * Pre-processor Definitions

nuttx/drivers/serial/uart_16550.c

@@ -51,9 +51,9 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/uart_16550.h>
+#include <nuttx/serial/uart_16550.h>
 
 #include <arch/board/board.h>
 

nuttx/drivers/usbdev/cdcacm.c

@@ -53,7 +53,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/cdc.h>

nuttx/drivers/usbdev/pl2303.c

@@ -55,7 +55,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/serial.h>
+#include <nuttx/serial/serial.h>
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>

nuttx/include/nuttx/fs/ioctl.h

@@ -82,7 +82,7 @@
 
 /* Terminal I/O IOCTL definitions are retained in tioctl.h */
 
-#include <nuttx/tioctl.h>
+#include <nuttx/serial/tioctl.h>
 
 /* Watchdog driver ioctl commands *******************************************/
 

nuttx/include/nuttx/serial/serial.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * include/nuttx/serial.h
+ * include/nuttx/serial/serial.h
  *
  *   Copyright (C) 2007-2008, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_SERIAL_H
+#ifndef __INCLUDE_NUTTX_SERIAL_SERIAL_H
-#define __INCLUDE_NUTTX_SERIAL_H
+#define __INCLUDE_NUTTX_SERIAL_SERIAL_H
 
 /************************************************************************************
  * Included Files
@@ -299,4 +299,4 @@ EXTERN void uart_datasent(FAR uart_dev_t *dev);
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_SERIAL_H */
+#endif /* __INCLUDE_NUTTX_SERIAL_SERIAL_H */

nuttx/include/nuttx/serial/tioctl.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * include/nuttx/tioctl.h
+ * include/nuttx/serial/tioctl.h
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -36,8 +36,8 @@
  * via include/nuttx/fs/ioctl.h.
  */
 
-#ifndef __INCLUDE_NUTTX_TIOCTL_H
+#ifndef __INCLUDE_NUTTX_SERIAL_TIOCTL_H
-#define __INCLUDE_NUTTX_TIOCTL_H
+#define __INCLUDE_NUTTX_SERIAL_TIOCTL_H
 
 /********************************************************************************************
  * Included Files
@@ -194,4 +194,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_TIOCTL_H */
+#endif /* __INCLUDE_NUTTX_SERIAL_TIOCTL_H */

nuttx/include/nuttx/serial/uart_16550.h

@@ -1,9 +1,9 @@
 /************************************************************************************
- * include/nuttx/uart_16550.h
+ * include/nuttx/serial/uart_16550.h
  * Serial driver for 16550 UART
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   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
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_UART_16550_H
+#ifndef __INCLUDE_NUTTX_SERIAL_UART_16550_H
-#define __INCLUDE_NUTTX_UART_16550_H
+#define __INCLUDE_NUTTX_SERIAL_UART_16550_H
 
 /************************************************************************************
  * Included Files
@@ -348,4 +348,4 @@ extern uart_datawidth_t uart_getreg(uart_addrwidth_t base, unsigned int offset);
 extern void uart_putreg(uart_addrwidth_t base, unsigned int offset, uart_datawidth_t value);
 
 #endif /* CONFIG_UART_16550 */
-#endif /* __INCLUDE_NUTTX_UART_16550_H */
+#endif /* __INCLUDE_NUTTX_SERIAL_UART_16550_H */

nuttx/include/nuttx/usb/cdcacm.h

@@ -222,7 +222,7 @@
 
 /* IOCTL Commands ***********************************************************/
 /* The USB serial driver will support a subset of the TIOC IOCTL commands
- * defined in include/nuttx/tioctl.h.  This subset includes:
+ * defined in include/nuttx/serial/tioctl.h.  This subset includes:
  *
  * CAICO_REGISTERCB
  *   Register a callback for serial event notification. Argument:

nuttx/lib/termios/lib_tcgetattr.c

@@ -44,7 +44,7 @@
 #include <termios.h>
 #include <errno.h>
 
-#include <nuttx/tioctl.h>
+#include <nuttx/serial/tioctl.h>
 
 /****************************************************************************
  * Pre-processor Definitions

nuttx/lib/termios/lib_tcsetattr.c

@@ -44,7 +44,7 @@
 #include <termios.h>
 #include <errno.h>
 
-#include <nuttx/tioctl.h>
+#include <nuttx/serial/tioctl.h>
 
 /****************************************************************************
  * Pre-processor Definitions