From e282aad9037088827aa19dd99af2160f38b397c2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 10 Dec 2013 09:23:54 -0600
Subject: [PATCH] Move include/nuttx/fb.h to include/nuttx/video/fb.h

---
 ChangeLog                                 | 4 +++-
 Documentation/NXGraphicsSubsystem.html    | 4 ++--
 Documentation/NuttxPortingGuide.html      | 6 +++---
 arch/arm/src/dm320/dm320_framebuffer.c    | 2 +-
 arch/arm/src/lpc17xx/lpc17_lcd.c          | 2 +-
 arch/arm/src/lpc17xx/lpc17_lcd.h          | 2 +-
 arch/arm/src/sama5/sam_lcd.c              | 2 +-
 arch/arm/src/sama5/sam_lcd.h              | 2 +-
 arch/arm/src/stm32/stm32_ltdc.c           | 2 +-
 arch/arm/src/stm32/stm32_ltdc.h           | 2 +-
 arch/sim/src/up_framebuffer.c             | 2 +-
 configs/README.txt                        | 2 +-
 configs/compal_e99/src/ssd1783.c          | 2 +-
 configs/sama5d3x-ek/src/sam_ov2640.c      | 2 +-
 configs/sim/src/up_touchscreen.c          | 2 +-
 drivers/lcd/README.txt                    | 2 +-
 graphics/Kconfig                          | 2 +-
 graphics/nxglib/fb/nxglib_copyrectangle.c | 2 +-
 graphics/nxglib/fb/nxglib_fillrectangle.c | 2 +-
 graphics/nxglib/fb/nxglib_filltrapezoid.c | 2 +-
 graphics/nxglib/fb/nxglib_getrectangle.c  | 2 +-
 graphics/nxglib/fb/nxglib_moverectangle.c | 2 +-
 graphics/nxglib/fb/nxglib_setpixel.c      | 2 +-
 include/nuttx/lcd/lcd.h                   | 2 +-
 include/nuttx/nx/nxglib.h                 | 2 +-
 include/nuttx/{ => video}/fb.h            | 8 ++++----
 26 files changed, 34 insertions(+), 32 deletions(-)
 rename include/nuttx/{ => video}/fb.h (99%)

diff --git a/ChangeLog b/ChangeLog
index 174876fc22..c6c3819a4a 100644
--- a/ChangeLog
+++ b/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).
 
diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html
index 4f7833acdb..7da1c86f77 100644
--- a/Documentation/NXGraphicsSubsystem.html
+++ b/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>
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 89f9ff35f4..55b6978ff0 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/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>
diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index 8b5aec444b..0b118e4df4 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/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>
 
diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.c b/arch/arm/src/lpc17xx/lpc17_lcd.c
index d022390ed1..36c6dfdbea 100644
--- a/arch/arm/src/lpc17xx/lpc17_lcd.c
+++ b/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"
diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.h b/arch/arm/src/lpc17xx/lpc17_lcd.h
index 2b560bb47b..99daa20069 100644
--- a/arch/arm/src/lpc17xx/lpc17_lcd.h
+++ b/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.
  */
 
 /************************************************************************************
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index 166239cc54..d2c2cf92f2 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/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>
diff --git a/arch/arm/src/sama5/sam_lcd.h b/arch/arm/src/sama5/sam_lcd.h
index 58e49fd2a8..d16a2ec6f8 100644
--- a/arch/arm/src/sama5/sam_lcd.h
+++ b/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.
  */
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c
index 879ff18a22..d9cf1f7f47 100644
--- a/arch/arm/src/stm32/stm32_ltdc.c
+++ b/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>
diff --git a/arch/arm/src/stm32/stm32_ltdc.h b/arch/arm/src/stm32/stm32_ltdc.h
index ab70b779b2..007f03b521 100644
--- a/arch/arm/src/stm32/stm32_ltdc.h
+++ b/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.
  */
 
 /************************************************************************************
diff --git a/arch/sim/src/up_framebuffer.c b/arch/sim/src/up_framebuffer.c
index 35329b9d88..bf80e99a11 100644
--- a/arch/sim/src/up_framebuffer.c
+++ b/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"
 
 /****************************************************************************
diff --git a/configs/README.txt b/configs/README.txt
index 2867cb3363..559bfcd666 100644
--- a/configs/README.txt
+++ b/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.
diff --git a/configs/compal_e99/src/ssd1783.c b/configs/compal_e99/src/ssd1783.c
index 41bbe11f54..f5029caa1c 100644
--- a/configs/compal_e99/src/ssd1783.c
+++ b/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>
diff --git a/configs/sama5d3x-ek/src/sam_ov2640.c b/configs/sama5d3x-ek/src/sam_ov2640.c
index 4a5cc2c788..579a6a9e26 100644
--- a/configs/sama5d3x-ek/src/sam_ov2640.c
+++ b/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"
diff --git a/configs/sim/src/up_touchscreen.c b/configs/sim/src/up_touchscreen.c
index c951c5c690..0c102f2122 100644
--- a/configs/sim/src/up_touchscreen.c
+++ b/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>
diff --git a/drivers/lcd/README.txt b/drivers/lcd/README.txt
index d45f72b0e2..cde6eff8a6 100644
--- a/drivers/lcd/README.txt
+++ b/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
 
diff --git a/graphics/Kconfig b/graphics/Kconfig
index 64e3481759..7d34b872db 100644
--- a/graphics/Kconfig
+++ b/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.
 
diff --git a/graphics/nxglib/fb/nxglib_copyrectangle.c b/graphics/nxglib/fb/nxglib_copyrectangle.c
index bf9812ac37..52b16eaa25 100644
--- a/graphics/nxglib/fb/nxglib_copyrectangle.c
+++ b/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"
diff --git a/graphics/nxglib/fb/nxglib_fillrectangle.c b/graphics/nxglib/fb/nxglib_fillrectangle.c
index 777a906a4f..9e6a61afb7 100644
--- a/graphics/nxglib/fb/nxglib_fillrectangle.c
+++ b/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"
diff --git a/graphics/nxglib/fb/nxglib_filltrapezoid.c b/graphics/nxglib/fb/nxglib_filltrapezoid.c
index f183ac54a8..cf2dafe22e 100644
--- a/graphics/nxglib/fb/nxglib_filltrapezoid.c
+++ b/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"
diff --git a/graphics/nxglib/fb/nxglib_getrectangle.c b/graphics/nxglib/fb/nxglib_getrectangle.c
index 82e541ec54..1edf8f1e5b 100644
--- a/graphics/nxglib/fb/nxglib_getrectangle.c
+++ b/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"
diff --git a/graphics/nxglib/fb/nxglib_moverectangle.c b/graphics/nxglib/fb/nxglib_moverectangle.c
index d8e52250ce..7b64e13040 100644
--- a/graphics/nxglib/fb/nxglib_moverectangle.c
+++ b/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"
diff --git a/graphics/nxglib/fb/nxglib_setpixel.c b/graphics/nxglib/fb/nxglib_setpixel.c
index 7079b7e573..c83953e678 100644
--- a/graphics/nxglib/fb/nxglib_setpixel.c
+++ b/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"
diff --git a/include/nuttx/lcd/lcd.h b/include/nuttx/lcd/lcd.h
index 45eb03b0df..6cf614bad4 100644
--- a/include/nuttx/lcd/lcd.h
+++ b/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
diff --git a/include/nuttx/nx/nxglib.h b/include/nuttx/nx/nxglib.h
index 4dec400705..77d5af71bb 100644
--- a/include/nuttx/nx/nxglib.h
+++ b/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
 
 /****************************************************************************
diff --git a/include/nuttx/fb.h b/include/nuttx/video/fb.h
similarity index 99%
rename from include/nuttx/fb.h
rename to include/nuttx/video/fb.h
index 4c38c8d64d..5cd0065469 100644
--- a/include/nuttx/fb.h
+++ b/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
-#define _INCLUDE_NUTTX_FB_H
+#ifndef _INCLUDE_NUTTX_VIDEO_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 */