Move include/nuttx/fb.h to include/nuttx/video/fb.h
This commit is contained in:
parent
a88b64db7a
commit
bae04a9413
@ -54,7 +54,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <nuttx/arch.h>
|
#include <nuttx/arch.h>
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nx_internal.h"
|
#include "nx_internal.h"
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <nuttx/arch.h>
|
#include <nuttx/arch.h>
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nxcon_internal.h"
|
#include "nxcon_internal.h"
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <nuttx/arch.h>
|
#include <nuttx/arch.h>
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <nuttx/arch.h>
|
#include <nuttx/arch.h>
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <nuttx/arch.h>
|
#include <nuttx/arch.h>
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <nuttx/arch.h>
|
#include <nuttx/arch.h>
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
#ifdef CONFIG_NX_LCDDRIVER
|
#ifdef CONFIG_NX_LCDDRIVER
|
||||||
# include <nuttx/lcd/lcd.h>
|
# include <nuttx/lcd/lcd.h>
|
||||||
#else
|
#else
|
||||||
# include <nuttx/fb.h>
|
# include <nuttx/video/fb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nxtext_internal.h"
|
#include "nxtext_internal.h"
|
||||||
|
@ -28,7 +28,7 @@ config SCREENSHOT_FORMAT
|
|||||||
int "Screenshot color format"
|
int "Screenshot color format"
|
||||||
default 9
|
default 9
|
||||||
---help---
|
---help---
|
||||||
See inlcude/nuttx/fb.h for a list of color formats. The default
|
See inlcude/nuttx/video/fb.h for a list of color formats. The default
|
||||||
value of 9 corresponds to FB_FMT_RGB16_565
|
value of 9 corresponds to FB_FMT_RGB16_565
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -298,7 +298,7 @@ struct tiff_info_s
|
|||||||
*
|
*
|
||||||
* colorfmt - Specifies the form of the color data that will be provided
|
* colorfmt - Specifies the form of the color data that will be provided
|
||||||
* in the strip data. These are the FB_FMT_* definitions
|
* in the strip data. These are the FB_FMT_* definitions
|
||||||
* provided in include/nuttx/fb.h. Only the following values
|
* provided in include/nuttx/video/fb.h. Only the following values
|
||||||
* are supported:
|
* are supported:
|
||||||
*
|
*
|
||||||
* FB_FMT_Y1 BPP=1, monochrome, 0=black
|
* FB_FMT_Y1 BPP=1, monochrome, 0=black
|
||||||
@ -316,7 +316,7 @@ struct tiff_info_s
|
|||||||
FAR const char *tmpfile1; /* Full path to first temporary file */
|
FAR const char *tmpfile1; /* Full path to first temporary file */
|
||||||
FAR const char *tmpfile2; /* Full path to second temporary file */
|
FAR const char *tmpfile2; /* Full path to second temporary file */
|
||||||
|
|
||||||
uint8_t colorfmt; /* See FB_FMT_* definitions in include/nuttx/fb.h */
|
uint8_t colorfmt; /* See FB_FMT_* definitions in include/nuttx/video/fb.h */
|
||||||
nxgl_coord_t rps; /* TIFF RowsPerStrip */
|
nxgl_coord_t rps; /* TIFF RowsPerStrip */
|
||||||
nxgl_coord_t imgwidth; /* TIFF ImageWidth, Number of columns in the image */
|
nxgl_coord_t imgwidth; /* TIFF ImageWidth, Number of columns in the image */
|
||||||
nxgl_coord_t imgheight; /* TIFF ImageLength, Number of rows in the image */
|
nxgl_coord_t imgheight; /* TIFF ImageLength, Number of rows in the image */
|
||||||
|
Loading…
Reference in New Issue
Block a user