diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 28243a87..46952232 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,7 @@ +2003-06-03 Marcel Telka + + * src/readmem.c (detectflash): Function extracted to module libbrux, file flash/detectflash.c. + 2003-06-03 Marcel Telka * include/jtag.h (detectflash, flashmem, flashmsbin): Declarations moved to include module, diff --git a/jtag/src/readmem.c b/jtag/src/readmem.c index d1052eb8..53c57649 100644 --- a/jtag/src/readmem.c +++ b/jtag/src/readmem.c @@ -36,160 +36,10 @@ #include #include -#include "cfi.h" #include "bus.h" #include "flash.h" #include "jtag.h" -void -detectflash( bus_t *bus ) -{ - cfi_array_t *cfi_array = NULL; - cfi_query_structure_t *cfi; - char *s; - - if (!bus) { - printf( _("Error: Missing bus driver!\n") ); - return; - } - - bus_prepare( bus ); - - if (detect_cfi( bus, 0, &cfi_array )) { - cfi_array_free( cfi_array ); - printf( _("Flash not found!\n") ); - return; - } - - cfi = &cfi_array->cfi_chips[0]->cfi; - - /* detect CFI capable devices */ - /* TODO: Low chip only */ - /* see 4.3.2 in [1] */ - printf( _("Query identification string:\n") ); - /* see section 2 in [2] */ - switch (cfi->identification_string.pri_id_code) { - case CFI_VENDOR_NULL: - s = _("null"); - break; - case CFI_VENDOR_INTEL_ECS: - s = _("Intel/Sharp Extended Command Set"); - break; - case CFI_VENDOR_AMD_SCS: - s = _("AMD/Fujitsu Standard Commanf Set"); - break; - case CFI_VENDOR_INTEL_SCS: - s = _("Intel Standard Command Set"); - break; - case CFI_VENDOR_AMD_ECS: - s = _("AMD/Fujitsu Extended Command Set"); - break; - case CFI_VENDOR_MITSUBISHI_SCS: - s = _("Mitsubishi Standard Command Set"); - break; - case CFI_VENDOR_MITSUBISHI_ECS: - s = _("Mitsubishi Extended Command Set"); - break; - case CFI_VENDOR_SST_PWCS: - s = _("Page Write Command Set"); - break; - default: - s = _("unknown!!!"); - break; - } - printf( _("\tPrimary Algorithm Command Set and Control Interface ID Code: 0x%04X (%s)\n"), cfi->identification_string.pri_id_code, s ); - switch (cfi->identification_string.alt_id_code) { - case CFI_VENDOR_NULL: - s = _("null"); - break; - case CFI_VENDOR_INTEL_ECS: - s = _("Intel/Sharp Extended Command Set"); - break; - case CFI_VENDOR_AMD_SCS: - s = _("AMD/Fujitsu Standard Commanf Set"); - break; - case CFI_VENDOR_INTEL_SCS: - s = _("Intel Standard Command Set"); - break; - case CFI_VENDOR_AMD_ECS: - s = _("AMD/Fujitsu Extended Command Set"); - break; - case CFI_VENDOR_MITSUBISHI_SCS: - s = _("Mitsubishi Standard Command Set"); - break; - case CFI_VENDOR_MITSUBISHI_ECS: - s = _("Mitsubishi Extended Command Set"); - break; - case CFI_VENDOR_SST_PWCS: - s = _("Page Write Command Set"); - break; - default: - s = _("unknown!!!"); - break; - } - printf( _("\tAlternate Algorithm Command Set and Control Interface ID Code: 0x%04X (%s)\n"), cfi->identification_string.alt_id_code, s ); - - /* see 4.3.3 in [1] */ - printf( _("Query system interface information:\n") ); - printf( _("\tVcc Logic Supply Minimum Write/Erase or Write voltage: %d mV\n"), cfi->system_interface_info.vcc_min_wev ); - printf( _("\tVcc Logic Supply Maximum Write/Erase or Write voltage: %d mV\n"), cfi->system_interface_info.vcc_max_wev ); - printf( _("\tVpp [Programming] Supply Minimum Write/Erase voltage: %d mV\n"), cfi->system_interface_info.vpp_min_wev ); - printf( _("\tVpp [Programming] Supply Maximum Write/Erase voltage: %d mV\n"), cfi->system_interface_info.vpp_max_wev ); - printf( _("\tTypical timeout per single byte/word program: %d us\n"), cfi->system_interface_info.typ_single_write_timeout ); - printf( _("\tTypical timeout for maximum-size multi-byte program: %d us\n"), cfi->system_interface_info.typ_buffer_write_timeout ); - printf( _("\tTypical timeout per individual block erase: %d ms\n"), cfi->system_interface_info.typ_block_erase_timeout ); - printf( _("\tTypical timeout for full chip erase: %d ms\n"), cfi->system_interface_info.typ_chip_erase_timeout ); - printf( _("\tMaximum timeout for byte/word program: %d us\n"), cfi->system_interface_info.max_single_write_timeout ); - printf( _("\tMaximum timeout for multi-byte program: %d us\n"), cfi->system_interface_info.max_buffer_write_timeout ); - printf( _("\tMaximum timeout per individual block erase: %d ms\n"), cfi->system_interface_info.max_block_erase_timeout ); - printf( _("\tMaximum timeout for chip erase: %d ms\n"), cfi->system_interface_info.max_chip_erase_timeout ); - - /* see 4.3.4 in [1] */ - printf( _("Device geometry definition:\n") ); - printf( _("\tDevice Size: %d B (%d KiB, %d MiB)\n"), - cfi->device_geometry.device_size, - cfi->device_geometry.device_size / 1024, - cfi->device_geometry.device_size / (1024 * 1024) ); - /* see section 4 in [2] */ - switch (cfi->device_geometry.device_interface) { - case CFI_INTERFACE_X8: - s = _("x8"); - break; - case CFI_INTERFACE_X16: - s = _("x16"); - break; - case CFI_INTERFACE_X8_X16: - s = _("x8/x16"); - break; - case CFI_INTERFACE_X32: - s = _("x32"); - break; - case CFI_INTERFACE_X16_X32: - s = _("x16/x32"); - break; - default: - s = _("unknown!!!"); - break; - } - printf( _("\tFlash Device Interface Code description: 0x%04X (%s)\n"), cfi->device_geometry.device_interface, s ); - printf( _("\tMaximum number of bytes in multi-byte program: %d\n"), cfi->device_geometry.max_bytes_write ); - printf( _("\tNumber of Erase Block Regions within device: %d\n"), cfi->device_geometry.number_of_erase_regions ); - printf( _("\tErase Block Region Information:\n") ); - { - int i; - - for (i = 0; i < cfi->device_geometry.number_of_erase_regions; i++) { - printf( _("\t\tRegion %d:\n"), i ); - printf( _("\t\t\tErase Block Size: %d B (%d KiB)\n"), - cfi->device_geometry.erase_block_regions[i].erase_block_size, - cfi->device_geometry.erase_block_regions[i].erase_block_size / 1024 ); - printf( _("\t\t\tNumber of Erase Blocks: %d\n"), cfi->device_geometry.erase_block_regions[i].number_of_erase_blocks ); - } - } - - cfi_array_free( cfi_array ); -} - void readmem( bus_t *bus, FILE *f, uint32_t addr, uint32_t len ) {