diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-04-19 16:32:08 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-04-19 16:32:08 +0000 |
| commit | 43935f865a5f23262f107eda1f4be59476397c51 (patch) | |
| tree | ef8d6d1ca412a87d651cae9b5dd1d13e04ec65bd /nuttx/arch | |
| parent | b009f2c6363cd14c79c3a343a9b488c7309a0b67 (diff) | |
| download | px4-nuttx-43935f865a5f23262f107eda1f4be59476397c51.tar.gz px4-nuttx-43935f865a5f23262f107eda1f4be59476397c51.tar.bz2 px4-nuttx-43935f865a5f23262f107eda1f4be59476397c51.zip | |
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
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_framebuffer.c | 9 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_memorymap.h | 4 |
2 files changed, 6 insertions, 7 deletions
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 */ |