Generalize graphics driver type

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2597 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 15 insertions, 16 deletions

diff --git a/nuttx/graphics/nxbe/Make.defs b/nuttx/graphics/nxbe/Make.defs
index 98aaf2097..2f9388fc0 100644
--- a/nuttx/graphics/nxbe/Make.defs
+++ b/nuttx/graphics/nxbe/Make.defs
@@ -34,7 +34,7 @@
 ############################################################################
 
 NXBE_ASRCS	=
-NXBE_CSRCS	= nxbe_fbconfigure.c nxbe_colormap.c nxbe_clipper.c \
+NXBE_CSRCS	= nxbe_configure.c nxbe_colormap.c nxbe_clipper.c \
 		  nxbe_closewindow.c \
 		  nxbe_setposition.c nxbe_setsize.c nxbe_raise.c nxbe_lower.c \
 		  nxbe_fill.c nxbe_filltrapezoid.c nxbe_move.c nxbe_bitmap.c \
diff --git a/nuttx/graphics/nxbe/nxbe.h b/nuttx/graphics/nxbe/nxbe.h
index f9b36c0a3..3dec64b02 100644
--- a/nuttx/graphics/nxbe/nxbe.h
+++ b/nuttx/graphics/nxbe/nxbe.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxbe/nxbe.h
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <nuttx/fb.h>
+
+#include <nuttx/nx.h>
 #include <nuttx/nxglib.h>
 
 /****************************************************************************
@@ -211,20 +212,20 @@ extern "C" {
  ****************************************************************************/
 
 #if CONFIG_FB_CMAP
-EXTERN int nxbe_colormap(FAR struct fb_vtable_s *fb);
+EXTERN int nxbe_colormap(FAR struct NX_DRIVERTYPE *dev);
 #endif
 
 /****************************************************************************
- * Name: nx_fbconfigure
+ * Name: nx_configure
  *
  * Description:
  *   Configure the back end state structure based on information from the
- *   framebuffer driver
+ *   framebuffer or LCD driver
  *
  ****************************************************************************/
 
-EXTERN int nxbe_fbconfigure(FAR struct fb_vtable_s *fb,
-                            FAR struct nxbe_state_s *be);
+EXTERN int nxbe_configure(FAR NX_DRIVERTYPE *dev,
+                          FAR struct nxbe_state_s *be);
 
 /****************************************************************************
  * Name: nxbe_closewindow
diff --git a/nuttx/graphics/nxbe/nxbe_colormap.c b/nuttx/graphics/nxbe/nxbe_colormap.c
index 25a493d1d..f35393b20 100644
--- a/nuttx/graphics/nxbe/nxbe_colormap.c
+++ b/nuttx/graphics/nxbe/nxbe_colormap.c
@@ -45,8 +45,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
-
 #include "nxbe.h"
 
 /****************************************************************************
@@ -82,7 +80,7 @@
  ****************************************************************************/
 
 #if CONFIG_FB_CMAP
-int nxbe_colormap(FAR struct fb_vtable_s *fb)
+int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
 {
   struct fb_cmap_s cmap;
   uint8_t *alloc;
@@ -143,7 +141,7 @@ int nxbe_colormap(FAR struct fb_vtable_s *fb)
 
   /* Then set the color map */
 
-  ret =fb->putcmap(fb, &cmap);
+  ret = dev->putcmap(dev, &cmap);
 
   free(alloc);
   return ret;
diff --git a/nuttx/graphics/nxbe/nxbe_fbconfigure.c b/nuttx/graphics/nxbe/nxbe_configure.c
index df6dbe0d9..0d5aeefdc 100644
--- a/nuttx/graphics/nxbe/nxbe_fbconfigure.c
+++ b/nuttx/graphics/nxbe/nxbe_configure.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * graphics/nxbe/nxbe_fbconfigure.c
+ * graphics/nxbe/nxbe_configure.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,7 +70,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nxbe_fbconfigure
+ * Name: nxbe_configure
  *
  * Description:
  *   Configure the back end state structure based on information from the
@@ -78,7 +78,7 @@
  *
  ****************************************************************************/
 
-int nxbe_fbconfigure(FAR struct fb_vtable_s *fb, FAR struct nxbe_state_s *be)
+int nxbe_configure(FAR struct fb_vtable_s *fb, FAR struct nxbe_state_s *be)
 {
   int ret;
   int i;