sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix errors that have crept into DM320 build

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1715 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-04-19 16:32:08 +00:00
parent c6940dd000
commit 0e018fde27
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/src/dm320/dm320_framebuffer.c
View File

@ -527,7 +527,7 @@ static FAR void *g_vid0base = 0;
static FAR void *g_vid0ppbase = 0; static FAR void *g_vid0ppbase = 0;
#endif #endif
static const struct fb_vtable_s g_vid0vtable = static struct fb_vtable_s g_vid0vtable =
{ {
.getvideoinfo = dm320_getvid0videoinfo, .getvideoinfo = dm320_getvid0videoinfo,
.getplaneinfo = dm320_getvid0planeinfo, .getplaneinfo = dm320_getvid0planeinfo,
@ -542,7 +542,7 @@ static const struct fb_vtable_s g_vid0vtable =
#ifndef CONFIG_DM320_VID1_DISABLE #ifndef CONFIG_DM320_VID1_DISABLE
static FAR void *g_vid1base = 0; static FAR void *g_vid1base = 0;
static const struct fb_vtable_s g_vid1vtable = static struct fb_vtable_s g_vid1vtable =
{ {
.getvideoinfo = dm320_getvid1videoinfo, .getvideoinfo = dm320_getvid1videoinfo,
.getplaneinfo = dm320_getvid1planeinfo, .getplaneinfo = dm320_getvid1planeinfo,
@ -555,7 +555,7 @@ static const struct fb_vtable_s g_vid1vtable =
#ifndef CONFIG_DM320_OSD0_DISABLE #ifndef CONFIG_DM320_OSD0_DISABLE
static FAR void *g_osd0base = 0; static FAR void *g_osd0base = 0;
static const struct fb_vtable_s g_osd0vtable = static struct fb_vtable_s g_osd0vtable =
{ {
.getvideoinfo = dm320_getosd0videoinfo, .getvideoinfo = dm320_getosd0videoinfo,
.getplaneinfo = dm320_getosd0planeinfo, .getplaneinfo = dm320_getosd0planeinfo,
@ -573,7 +573,7 @@ static const struct fb_vtable_s g_osd0vtable =
#ifndef CONFIG_DM320_OSD1_DISABLE #ifndef CONFIG_DM320_OSD1_DISABLE
static FAR void *g_osd1base = 0; static FAR void *g_osd1base = 0;
static const struct fb_vtable_s g_osd1vtable = static struct fb_vtable_s g_osd1vtable =
{ {
.getvideoinfo = dm320_getosd1videoinfo, .getvideoinfo = dm320_getosd1videoinfo,
.getplaneinfo = dm320_getosd1planeinfo, .getplaneinfo = dm320_getosd1planeinfo,
@ -1421,7 +1421,6 @@ FAR struct fb_vtable_s *up_fbgetvplane(int vplane)
} }
return NULL; return NULL;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: up_fbteardown * Name: up_fbteardown

4
arch/arm/src/dm320/dm320_memorymap.h
View File

@ -65,7 +65,7 @@
*/ */
#if CONFIG_DRAM_START != 0x01000000 #if CONFIG_DRAM_START != 0x01000000
# error "Invalid setting for CONFIG_DRAM_START # error "Invalid setting for CONFIG_DRAM_START"
#endif #endif
/* Section/Region Name Phys Address Size TLB Enty CW */ /* Section/Region Name Phys Address Size TLB Enty CW */
@ -119,7 +119,7 @@
/* DM320 Virtual Memory Map */ /* DM320 Virtual Memory Map */
#if CONFIG_DRAM_VSTART != 0x00000000 #if CONFIG_DRAM_VSTART != 0x00000000
# error "Invalid setting for CONFIG_DRAM_VSTART # error "Invalid setting for CONFIG_DRAM_VSTART"
#endif #endif
/* Section/Region Name Virt Address End Size CW */ /* Section/Region Name Virt Address End Size CW */

2
include/nuttx/nx.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* include/nuttx/nx.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

8
include/nuttx/nxglib.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* include/nuttx/nxglib.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -49,6 +49,12 @@
* Pre-processor definitions * Pre-processor definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_NX_NPLANES
# define CONFIG_NX_NPLANES 1 /* Max number of color planes supported */
#endif
/* Mnemonics for indices */ /* Mnemonics for indices */
#define NX_TOP_NDX (0) #define NX_TOP_NDX (0)