Move include/nuttx/fb.h to include/nuttx/video/fb.h

ChangeLog

@@ -1465,7 +1465,7 @@
 	  Dean Camera.
 	* examples/nsh: Correct an usage of getopt(): If you stop calling getopt()
 	  before all parameters are parsed, you can leave getopt() in a strange state.
-	* include/nuttx/fb.h: Restore missing RGB type that was accidentally removed
+	* include/nuttx/video/fb.h: Restore missing RGB type that was accidentally removed
 	  when Nokia 6100 support was added.
 	* Rename arch/pjrc-8051 to arch/8051
 	* configs/ne64badge: Add a configuration for the Future Electronics Group
@@ -6185,4 +6185,6 @@
 	  ISI peripheral usign the OV2640 camera (2013-12-9).
 	* arch/arm/src/a1x/chip/a1x_uart.h:  A10 UART register definition
 	  header file (2013-12-9).
+	* include/nuttx/video/fb.h:  Move fb.h to include/nuttx/video/
+	  (2013-12-10).
 

Documentation/NXGraphicsSubsystem.html

@@ -282,7 +282,7 @@
     <ul>
       <li>
         Any device with random accesss video memory using the NuttX framebuffer driver interface
-        (see <code>include/nuttx/fb.h</code>).
+        (see <code>include/nuttx/video/fb.h</code>).
       </li>
       <li>
         Any LCD-like device than can accept raster line <i>runs</i> through a parallel or serial interface
@@ -3235,7 +3235,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
       <dd>If a pixel depth of less than 8-bits is used, then NX needs
       to know if the pixels pack from the MS to LS or from LS to MS
     <dt><code>CONFIG_NX_LCDDRIVER</code>:
-      <dd>By default, NX builds to use a framebuffer driver (see <code>include/nuttx/fb.h</code>).
+      <dd>By default, NX builds to use a framebuffer driver (see <code>include/nuttx/video/fb.h</code>).
       If this option is defined, NX will build to use an LCD driver (see <code>include/nuttx/lcd/lcd.h</code>).
   </li>
   </dl>

Documentation/NuttxPortingGuide.html

@@ -3085,7 +3085,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-      <b><code>include/nuttx/fb.h</code></b>.
+      <b><code>include/nuttx/video/fb.h</code></b>.
       All structures and APIs needed to work with frame buffer drivers are provided in this header file.
     </p>
   </li>
@@ -3147,7 +3147,7 @@ extern void up_ledoff(int led);
     <p>
       <b><code>include/nuttx/lcd/lcd.h</code></b>.
       Structures and APIs needed to work with LCD drivers are provided in this header file.
-      This header file also depends on some of the same definitions used for the frame buffer driver as privided in <code>include/nuttx/fb.h</code>.
+      This header file also depends on some of the same definitions used for the frame buffer driver as privided in <code>include/nuttx/video/fb.h</code>.
     </p>
   </li>
   <li>
@@ -6550,7 +6550,7 @@ int ret = sigaction(SIGCHLD, &sa, NULL);
   </li>
   <li>
     <code>CONFIG_NX_LCDDRIVER</code>:
-    By default, NX builds to use a framebuffer driver (see <code>include/nuttx/fb.h</code>).
+    By default, NX builds to use a framebuffer driver (see <code>include/nuttx/video/fb.h</code>).
     If this option is defined, NX will build to use an LCD driver (see <code>include/nuttx/lcd/lcd.h</code>).
   </li>
   <li>

arch/arm/src/dm320/dm320_framebuffer.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/nx/nxglib.h>
 

arch/arm/src/lpc17xx/lpc17_lcd.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"

arch/arm/src/lpc17xx/lpc17_lcd.h

@@ -163,7 +163,7 @@
  * Public Functions
  ************************************************************************************/
 /* The LPC17 LCD driver uses the common framebuffer interfaces declared in
- * include/nuttx/fb.h.
+ * include/nuttx/video/fb.h.
  */
 
 /************************************************************************************

arch/arm/src/sama5/sam_lcd.c

@@ -53,7 +53,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/kmalloc.h>
 
 #include <arch/board/board.h>

arch/arm/src/sama5/sam_lcd.h

@@ -80,7 +80,7 @@
  * Public Functions
  ************************************************************************************/
 /* The SAMA5 LCD driver uses the common framebuffer interfaces declared in
- * include/nuttx/fb.h.
+ * include/nuttx/video/fb.h.
  */
 
 /************************************************************************************

arch/arm/src/stm32/stm32_ltdc.c

@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/kmalloc.h>
 
 #include <arch/board/board.h>

arch/arm/src/stm32/stm32_ltdc.h

@@ -66,7 +66,7 @@
  * Public Functions
  ************************************************************************************/
 /* The STM32 LTDC driver uses the common framebuffer interfaces declared in
- * include/nuttx/fb.h.
+ * include/nuttx/video/fb.h.
  */
 
 /************************************************************************************

arch/sim/src/up_framebuffer.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include "up_internal.h"
 
 /****************************************************************************

configs/README.txt

@@ -1589,7 +1589,7 @@ architecture/board-specific settings).
       to know if the pixels pack from the MS to LS or from LS to MS
     CONFIG_NX_LCDDRIVER
       By default, NX builds to use a framebuffer driver (see
-      include/nuttx/fb.h). If this option is defined, NX will
+      include/nuttx/video/fb.h). If this option is defined, NX will
       build to use an LCD driver (see include/nuttx/lcd/lcd.h).
     CONFIG_LCD_MAXPOWER - The full-on power setting for an LCD
       device.

configs/compal_e99/src/ssd1783.c

@@ -41,7 +41,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 
 #include <sys/types.h>
 #include <assert.h>

configs/sama5d3x-ek/src/sam_ov2640.c

@@ -43,7 +43,7 @@
 #include <debug.h>
 
 #include <nuttx/i2c.h>
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/video/ov2640.h>
 
 #include "up_arch.h"

configs/sim/src/up_touchscreen.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxglib.h>

drivers/lcd/README.txt

@@ -22,7 +22,7 @@ LCD Header files
       Structures and APIs needed to work with LCD drivers are provided in
       this header file.  This header file also depends on some of the same
       definitions used for the frame buffer driver as privided in
-      include/nuttx/fb.h.
+      include/nuttx/video/fb.h.
 
   struct lcd_dev_s
 

graphics/Kconfig

@@ -17,7 +17,7 @@ config NX_LCDDRIVER
 	depends on LCD
 	---help---
 		By default, the NX graphics system uses the frame buffer driver interface
-		defined in include/nuttx/fb.h.  However, if LCD is support is enabled,
+		defined in include/nuttx/video/fb.h.  However, if LCD is support is enabled,
 		this this option is provide to select, instead, the LCD driver interface
 		defined in include/nuttx/lcd/lcd.h.
 

graphics/nxglib/fb/nxglib_copyrectangle.c

@@ -41,7 +41,7 @@
 
 #include <stdint.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"

graphics/nxglib/fb/nxglib_fillrectangle.c

@@ -41,7 +41,7 @@
 
 #include <stdint.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"

graphics/nxglib/fb/nxglib_filltrapezoid.c

@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <fixedmath.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"

graphics/nxglib/fb/nxglib_getrectangle.c

@@ -41,7 +41,7 @@
 
 #include <stdint.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"

graphics/nxglib/fb/nxglib_moverectangle.c

@@ -41,7 +41,7 @@
 
 #include <stdint.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"

graphics/nxglib/fb/nxglib_setpixel.c

@@ -41,7 +41,7 @@
 
 #include <stdint.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"

include/nuttx/lcd/lcd.h

@@ -42,7 +42,7 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 
 /****************************************************************************
  * Pre-processor Definitions

include/nuttx/nx/nxglib.h

@@ -49,7 +49,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 /****************************************************************************

include/nuttx/video/fb.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/fb.h
+ * include/nuttx/video/fb.h
  *
  *   Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_FB_H
+#ifndef _INCLUDE_NUTTX_VIDEO_FB_H
-#define _INCLUDE_NUTTX_FB_H
+#define _INCLUDE_NUTTX_VIDEO_FB_H
 
 /****************************************************************************
  * Included Files
@@ -356,4 +356,4 @@ void fb_uninitialize(void);
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_FB_H */
+#endif /* _INCLUDE_NUTTX_VIDEO_FB_H */