From 43935f865a5f23262f107eda1f4be59476397c51 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 19 Apr 2009 16:32:08 +0000
Subject: Fix errors that have crept into DM320 build

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1715 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/arch/arm/src/dm320/dm320_framebuffer.c | 9 ++++-----
 nuttx/arch/arm/src/dm320/dm320_memorymap.h   | 4 ++--
 nuttx/include/nuttx/nx.h                     | 2 +-
 nuttx/include/nuttx/nxglib.h                 | 8 +++++++-
 4 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'nuttx')

diff --git a/nuttx/arch/arm/src/dm320/dm320_framebuffer.c b/nuttx/arch/arm/src/dm320/dm320_framebuffer.c
index 3cd890e5d..04cee0f96 100644
--- a/nuttx/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/nuttx/arch/arm/src/dm320/dm320_framebuffer.c
@@ -527,7 +527,7 @@ static FAR void *g_vid0base = 0;
 static FAR void *g_vid0ppbase = 0;
 #endif
 
-static const struct fb_vtable_s g_vid0vtable =
+static struct fb_vtable_s g_vid0vtable =
 {
   .getvideoinfo = dm320_getvid0videoinfo,
   .getplaneinfo = dm320_getvid0planeinfo,
@@ -542,7 +542,7 @@ static const struct fb_vtable_s g_vid0vtable =
 #ifndef CONFIG_DM320_VID1_DISABLE
 static FAR void *g_vid1base = 0;
 
-static const struct fb_vtable_s g_vid1vtable =
+static struct fb_vtable_s g_vid1vtable =
 {
   .getvideoinfo = dm320_getvid1videoinfo,
   .getplaneinfo = dm320_getvid1planeinfo,
@@ -555,7 +555,7 @@ static const struct fb_vtable_s g_vid1vtable =
 
 #ifndef CONFIG_DM320_OSD0_DISABLE
 static FAR void *g_osd0base = 0;
-static const struct fb_vtable_s g_osd0vtable =
+static struct fb_vtable_s g_osd0vtable =
 {
   .getvideoinfo = dm320_getosd0videoinfo,
   .getplaneinfo = dm320_getosd0planeinfo,
@@ -573,7 +573,7 @@ static const struct fb_vtable_s g_osd0vtable =
 
 #ifndef CONFIG_DM320_OSD1_DISABLE
 static FAR void *g_osd1base = 0;
-static const struct fb_vtable_s g_osd1vtable =
+static struct fb_vtable_s g_osd1vtable =
 {
   .getvideoinfo = dm320_getosd1videoinfo,
   .getplaneinfo = dm320_getosd1planeinfo,
@@ -1421,7 +1421,6 @@ FAR struct fb_vtable_s *up_fbgetvplane(int vplane)
     }
   return NULL;
 }
-#endif
 
 /****************************************************************************
  * Name: up_fbteardown
diff --git a/nuttx/arch/arm/src/dm320/dm320_memorymap.h b/nuttx/arch/arm/src/dm320/dm320_memorymap.h
index d53de2f96..7e7247b53 100644
--- a/nuttx/arch/arm/src/dm320/dm320_memorymap.h
+++ b/nuttx/arch/arm/src/dm320/dm320_memorymap.h
@@ -65,7 +65,7 @@
  */
 
 #if CONFIG_DRAM_START != 0x01000000
-# error "Invalid setting for CONFIG_DRAM_START
+# error "Invalid setting for CONFIG_DRAM_START"
 #endif
 
 /* Section/Region Name             Phys Address    Size  TLB Enty        CW */
@@ -119,7 +119,7 @@
 /* DM320 Virtual Memory Map */
 
 #if CONFIG_DRAM_VSTART != 0x00000000
-# error "Invalid setting for CONFIG_DRAM_VSTART
+# error "Invalid setting for CONFIG_DRAM_VSTART"
 #endif
 
 /* Section/Region Name               Virt Address  End        Size  CW */
diff --git a/nuttx/include/nuttx/nx.h b/nuttx/include/nuttx/nx.h
index cb5ac07e3..3b7f2940d 100644
--- a/nuttx/include/nuttx/nx.h
+++ b/nuttx/include/nuttx/nx.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/nuttx/nx.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/include/nuttx/nxglib.h b/nuttx/include/nuttx/nxglib.h
index 89585cf50..97e58f033 100644
--- a/nuttx/include/nuttx/nxglib.h
+++ b/nuttx/include/nuttx/nxglib.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/nuttx/nxglib.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,12 @@
  * Pre-processor definitions
  ****************************************************************************/
 
+/* Configuration ************************************************************/
+
+#ifndef CONFIG_NX_NPLANES
+#  define CONFIG_NX_NPLANES  1  /* Max number of color planes supported */
+#endif
+
 /* Mnemonics for indices */
 
 #define NX_TOP_NDX           (0)
-- 
cgit v1.2.3