int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state)
{
- if (tap == NULL ){
+ if (tap == NULL) {
return ERROR_TARGET_INVALID;
}
str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t));
bank->driver_priv = str9xpec_info;
- /* find out jtag position of flash controller
- * it is always after the arm966 core */
-
+ /* REVISIT verify that the jtag position of flash controller is
+ * right after *THIS* core, which must be a STR9xx core ...
+ */
armv4_5 = bank->target->arch_info;
arm7_9 = armv4_5->arch_info;
jtag_info = &arm7_9->jtag_info;
- str9xpec_info->tap = jtag_tap_by_position(jtag_info->tap->abs_chain_position - 1);
+ str9xpec_info->tap = bank->target->tap;
str9xpec_info->isc_enable = 0;
str9xpec_build_block_list(bank);
tap = str9xpec_info->tap;
if (!str9xpec_info->isc_enable) {
- str9xpec_isc_enable(bank );
+ str9xpec_isc_enable(bank);
}
if (!str9xpec_info->isc_enable) {
tap = str9xpec_info->tap;
if (!str9xpec_info->isc_enable) {
- str9xpec_isc_enable(bank );
+ str9xpec_isc_enable(bank);
}
if (!str9xpec_info->isc_enable) {
tap = str9xpec_info->tap;
if (!str9xpec_info->isc_enable) {
- str9xpec_isc_enable(bank );
+ str9xpec_isc_enable(bank);
}
if (!str9xpec_info->isc_enable) {
/* last bank: 0xFF signals a full device protect */
if (last == 0xFF)
{
- if (set )
+ if (set)
{
status = str9xpec_lock_device(bank);
}
{
for (i = first; i <= last; i++)
{
- if (set )
+ if (set)
buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 1);
else
buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 0);
check_address = sec_end;
}
- if ((offset >= sec_start) && (offset < sec_end)){
+ if ((offset >= sec_start) && (offset < sec_end)) {
first_sector = i;
}
- if ((offset + count >= sec_start) && (offset + count < sec_end)){
+ if ((offset + count >= sec_start) && (offset + count < sec_end)) {
last_sector = i;
}
}
static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
{
- snprintf(buf, buf_size, "str9xpec flash driver info" );
+ snprintf(buf, buf_size, "str9xpec flash driver info");
return ERROR_OK;
}
tap = str9xpec_info->tap;
/* erase config options first */
- status = str9xpec_erase_area(bank, 0xFE, 0xFE );
+ status = str9xpec_erase_area(bank, 0xFE, 0xFE);
if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
return status;
if (!str9xpec_info->isc_enable) {
- str9xpec_isc_enable(bank );
+ str9xpec_isc_enable(bank);
}
if (!str9xpec_info->isc_enable) {
return ERROR_FAIL;
/* exit turbo mode via RESET */
- str9xpec_set_instr(tap, ISC_NOOP, TAP_RESET);
+ str9xpec_set_instr(tap, ISC_NOOP, TAP_IDLE);
+ jtag_add_tlr();
jtag_execute_queue();
/* restore previous scan chain */