diff --git a/jtag/ChangeLog b/jtag/ChangeLog index e4d657ab..94992f40 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,5 +1,8 @@ 2009-07-15 Arnim Laeuger + * src/flash/amd_flash.c: [ 2821629 ] Can't find flash_info : amd_flash.c + (MURANAKA Masaki) + * src/flash/flash.c, include/jtag.h: [ 2816643 ] Matching arguments of funcion flasherase() diff --git a/jtag/src/flash/amd_flash.c b/jtag/src/flash/amd_flash.c index 8217c0d9..489d6b49 100644 --- a/jtag/src/flash/amd_flash.c +++ b/jtag/src/flash/amd_flash.c @@ -1,5 +1,5 @@ /* - * $Id: amd_flash.c,v 1.0 20/09/2006 12:38:01 $ + * $Id$ * * AMD 8 bit flash driver for AM29F040B & AM29LV040B * Copyright (C) 2006 Kila Medical Systems. @@ -124,8 +124,8 @@ int amd_detect(bus_t *bus, uint32_t adr, cfi_array_t **cfi_array ) } (*cfi_array)->bus = bus; - (*cfi_array)->address = 0; - if (bus_area( bus, adr+0, &area ) != URJTAG_STATUS_OK) + (*cfi_array)->address = adr; + if (bus_area( bus, adr, &area ) != URJTAG_STATUS_OK) return -8; /* bus width detection failed */ unsigned int bw = area.width; int ba,i; diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 38a6276e..abe56208 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -1,5 +1,8 @@ 2009-07-15 Arnim Laeuger + * src/flash/amd_flash.c: [ 2821629 ] Can't find flash_info : amd_flash.c + (MURANAKA Masaki) + * src/flash/flash.c, include/urjtag/flash.h: [ 2816643 ] Matching arguments of funcion flasherase() diff --git a/urjtag/src/flash/amd_flash.c b/urjtag/src/flash/amd_flash.c index f38d39e3..e3696cc5 100644 --- a/urjtag/src/flash/amd_flash.c +++ b/urjtag/src/flash/amd_flash.c @@ -1,5 +1,5 @@ /* - * $Id: amd_flash.c,v 1.0 20/09/2006 12:38:01 $ + * $Id$ * * AMD 8 bit flash driver for AM29F040B & AM29LV040B * Copyright (C) 2006 Kila Medical Systems. @@ -130,8 +130,8 @@ urj_flash_amd_detect (urj_bus_t *bus, uint32_t adr, } (*cfi_array)->bus = bus; - (*cfi_array)->address = 0; - if (URJ_BUS_AREA (bus, adr + 0, &area) != URJ_STATUS_OK) + (*cfi_array)->address = adr; + if (URJ_BUS_AREA (bus, adr, &area) != URJ_STATUS_OK) // retain error status return URJ_STATUS_FAIL; /* bus width detection failed */ unsigned int bw = area.width;