Mercurial > ecos-v3_0-branch

changeset 2719:2874c52f5581

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build problem with current toolchains.
author bartv
date Sat, 24 Jan 2009 10:54:14 +0000
parents 8891f4f46137
children 7fec0d64790f
files packages/hal/arm/xscale/picasso/current/ChangeLog packages/hal/arm/xscale/picasso/current/src/vga_support.c packages/hal/arm/xscale/uE250/current/ChangeLog packages/hal/arm/xscale/uE250/current/src/vga_support.c
diffstat 4 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/arm/xscale/picasso/current/ChangeLog
+++ b/packages/hal/arm/xscale/picasso/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-24  Bart Veer  <bartv@ecoscentric.com>
+
+	* src/vga_support.c: fix build problem with latest toolchains.
+
 2003-09-21  Gary Thomas  <gary@mlbassoc.com>
 
 	* misc/redboot_RAM.ecm: 
--- a/packages/hal/arm/xscale/picasso/current/src/vga_support.c
+++ b/packages/hal/arm/xscale/picasso/current/src/vga_support.c
@@ -147,7 +147,8 @@ vga_init(cyg_uint32 *addr)
 {
     volatile struct VGA_ctlr *ctlr;
 
-    vga.ctlr = (struct VGA_ctlr *)ctlr = (struct VGA_ctlr *)addr;
+    ctlr = (volatile struct VGA_ctlr *)addr;
+    vga.ctlr = (void*)ctlr;
     vga.fb = ctlr->fb;
     vga.bpp = VGA_DEPTH;
     vga.height = VGA_HEIGHT;
--- a/packages/hal/arm/xscale/uE250/current/ChangeLog
+++ b/packages/hal/arm/xscale/uE250/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-24  Bart Veer  <bartv@ecoscentric.com>
+
+	* src/vga_support.c: fix build problem with latest toolchains.
+
 2003-09-21  Gary Thomas  <gary@mlbassoc.com>
 
 	* misc/redboot_RAM.ecm: 
--- a/packages/hal/arm/xscale/uE250/current/src/vga_support.c
+++ b/packages/hal/arm/xscale/uE250/current/src/vga_support.c
@@ -147,7 +147,8 @@ vga_init(cyg_uint32 *addr)
 {
     volatile struct VGA_ctlr *ctlr;
 
-    vga.ctlr = (struct VGA_ctlr *)ctlr = (struct VGA_ctlr *)addr;
+    ctlr = (volatile struct VGA_ctlr *)addr;
+    vga.ctlr = (void*) ctlr;
     vga.fb = ctlr->fb;
     vga.bpp = VGA_DEPTH;
     vga.height = VGA_HEIGHT;