From 1e948460519194b69fbe6467af6306892879b725 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Mon, 3 Nov 2003 21:11:34 +0000 Subject: [PATCH] 2003-11-03 Marcel Telka MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * flash/jedec.c (jedec_detect): Fixed compile error - C++-style declaration (bug 828313, thanks to Márton Németh). git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@586 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- libbrux/ChangeLog | 4 ++++ libbrux/NEWS | 1 + libbrux/THANKS | 1 + libbrux/flash/jedec.c | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libbrux/ChangeLog b/libbrux/ChangeLog index f7f2e9a8..9d13948b 100644 --- a/libbrux/ChangeLog +++ b/libbrux/ChangeLog @@ -1,3 +1,7 @@ +2003-11-03 Marcel Telka + + * flash/jedec.c (jedec_detect): Fixed compile error - C++-style declaration (bug 828313, thanks to Márton Németh). + 2003-11-02 Marcel Telka * cmd/cmd_detectflash.c (cmd_detectflash_run, cmd_detectflash_help): Added new address parameter for 'detectflash' diff --git a/libbrux/NEWS b/libbrux/NEWS index 991b7b00..81ba362a 100644 --- a/libbrux/NEWS +++ b/libbrux/NEWS @@ -1,5 +1,6 @@ $Id$ +2003-11-03: Fixed compile error in jedec_detect (bug 828313, Márton Németh). 2003-11-02: Added support for detecting flashes (detectflash) in full address range. 2003-11-02: Added support for Intel flash located at any address. 2003-09-23: Added initial JEDEC detection for flash chips (Bradley D. LaRonde). diff --git a/libbrux/THANKS b/libbrux/THANKS index 3c2d9219..8f0dcfd1 100644 --- a/libbrux/THANKS +++ b/libbrux/THANKS @@ -3,4 +3,5 @@ $Id$ Bradley D. LaRonde Andreas Mohr Jani Monoses +Márton Németh Matan Ziv-Av diff --git a/libbrux/flash/jedec.c b/libbrux/flash/jedec.c index 62117751..735e82b6 100644 --- a/libbrux/flash/jedec.c +++ b/libbrux/flash/jedec.c @@ -37,6 +37,7 @@ jedec_detect( bus_t *bus, uint32_t adr, cfi_array_t **cfi_array ) { int mid; int did; + cfi_query_structure_t *cfi; /* Query flash. */ bus_write( bus, 0x0, 0xf0 ); @@ -55,7 +56,7 @@ jedec_detect( bus_t *bus, uint32_t adr, cfi_array_t **cfi_array ) if (!(*cfi_array)->cfi_chips[0]) return -2; /* out of memory */ - cfi_query_structure_t *cfi = &(*cfi_array)->cfi_chips[0]->cfi; + cfi = &(*cfi_array)->cfi_chips[0]->cfi; cfi->identification_string.pri_id_code = CFI_VENDOR_AMD_SCS; cfi->identification_string.pri_vendor_tbl = NULL;