diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 4805d99d..fefaecc1 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,8 @@ +2003-05-15 Marcel Telka + + * include/cfi.h (detect_cfi): Added new parameter `adr'. + All relevant functions and callers updated. + 2003-05-15 Marcel Telka * configure.ac (CPPFLAGS): Added path to the openwince include arm directory. diff --git a/jtag/include/cfi.h b/jtag/include/cfi.h index 893d6774..bb355859 100644 --- a/jtag/include/cfi.h +++ b/jtag/include/cfi.h @@ -25,10 +25,11 @@ #ifndef CFI_H #define CFI_H +#include #include #include "bus.h" -cfi_query_structure_t *detect_cfi( bus_t *bus ); +cfi_query_structure_t *detect_cfi( bus_t *bus, uint32_t adr ); #endif /* CFI_H */ diff --git a/jtag/src/flash.c b/jtag/src/flash.c index 65394d5e..f2a76e1f 100644 --- a/jtag/src/flash.c +++ b/jtag/src/flash.c @@ -98,7 +98,7 @@ flashcheck( bus_t *bus, cfi_query_structure_t **cfi ) return; } - *cfi = detect_cfi( bus ); + *cfi = detect_cfi( bus, 0 ); if (!*cfi) { printf( "Flash not found!\n" ); return; diff --git a/jtag/src/flash/cfi.c b/jtag/src/flash/cfi.c index bd68eef0..859ce9eb 100644 --- a/jtag/src/flash/cfi.c +++ b/jtag/src/flash/cfi.c @@ -49,7 +49,7 @@ read2( bus_t *bus, uint32_t adr, int o ) } cfi_query_structure_t * -detect_cfi( bus_t *bus ) +detect_cfi( bus_t *bus, uint32_t adr ) { cfi_query_structure_t *cfi; int o = 2; diff --git a/jtag/src/readmem.c b/jtag/src/readmem.c index ff1f8df6..fd48bc1e 100644 --- a/jtag/src/readmem.c +++ b/jtag/src/readmem.c @@ -72,7 +72,7 @@ detectflash( bus_t *bus ) return; } - cfi = detect_cfi( bus ); + cfi = detect_cfi( bus, 0 ); if (!cfi) { printf( "Flash not found!\n" ); return;