interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

David Brownell <david-b@pacbell.net> whitespace fixes. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@1690 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-05-10 19:02:07 +00:00
parent 64e5467ca7
commit 90465379e5
11 changed files with 95 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/target/arm720t.c
View File

@ -114,7 +114,6 @@ int arm720t_scan_cp15(target_t *target, u32 out, u32 *in, int instruction, int c
fields[0].out_value = &instruction_buf; fields[0].out_value = &instruction_buf;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 32; fields[1].num_bits = 32;
fields[1].out_value = out_buf; fields[1].out_value = out_buf;

7
src/target/arm7tdmi.c
View File

@ -116,13 +116,11 @@ int arm7tdmi_examine_debug_reason(target_t *target)
fields[0].out_value = NULL; fields[0].out_value = NULL;
fields[0].in_value = &breakpoint; fields[0].in_value = &breakpoint;
fields[1].tap = arm7_9->jtag_info.tap; fields[1].tap = arm7_9->jtag_info.tap;
fields[1].num_bits = 32; fields[1].num_bits = 32;
fields[1].out_value = NULL; fields[1].out_value = NULL;
fields[1].in_value = databus; fields[1].in_value = databus;
if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK) if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
{ {
return retval; return retval;
@ -195,15 +193,12 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
fields[0].out_value = NULL; fields[0].out_value = NULL;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 32; fields[1].num_bits = 32;
fields[1].out_value = NULL; fields[1].out_value = NULL;
u8 tmp[4]; u8 tmp[4];
fields[1].in_value = tmp; fields[1].in_value = tmp;
jtag_add_dr_scan_now(2, fields, TAP_INVALID); jtag_add_dr_scan_now(2, fields, TAP_INVALID);
if (jtag_error==ERROR_OK) if (jtag_error==ERROR_OK)
@ -287,14 +282,12 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
fields[0].out_value = NULL; fields[0].out_value = NULL;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 32; fields[1].num_bits = 32;
fields[1].out_value = NULL; fields[1].out_value = NULL;
u8 tmp[4]; u8 tmp[4];
fields[1].in_value = tmp; fields[1].in_value = tmp;
jtag_add_dr_scan_now(2, fields, TAP_INVALID); jtag_add_dr_scan_now(2, fields, TAP_INVALID);
arm_endianness(tmp, in, size, be, 1); arm_endianness(tmp, in, size, be, 1);

44
src/target/arm920t.c
View File

@ -115,25 +115,21 @@ int arm920t_read_cp15_physical(target_t *target, int reg_addr, u32 *value)
fields[0].out_value = &access_type_buf; fields[0].out_value = &access_type_buf;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 32; fields[1].num_bits = 32;
fields[1].out_value = NULL; fields[1].out_value = NULL;
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 6; fields[2].num_bits = 6;
fields[2].out_value = &reg_addr_buf; fields[2].out_value = &reg_addr_buf;
fields[2].in_value = NULL; fields[2].in_value = NULL;
fields[3].tap = jtag_info->tap; fields[3].tap = jtag_info->tap;
fields[3].num_bits = 1; fields[3].num_bits = 1;
fields[3].out_value = &nr_w_buf; fields[3].out_value = &nr_w_buf;
fields[3].in_value = NULL; fields[3].in_value = NULL;
jtag_add_dr_scan(4, fields, TAP_INVALID); jtag_add_dr_scan(4, fields, TAP_INVALID);
u8 tmp[4]; u8 tmp[4];
@ -171,43 +167,23 @@ int arm920t_write_cp15_physical(target_t *target, int reg_addr, u32 value)
fields[0].tap = jtag_info->tap; fields[0].tap = jtag_info->tap;
fields[0].num_bits = 1; fields[0].num_bits = 1;
fields[0].out_value = &access_type_buf; fields[0].out_value = &access_type_buf;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 32; fields[1].num_bits = 32;
fields[1].out_value = value_buf; fields[1].out_value = value_buf;
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 6; fields[2].num_bits = 6;
fields[2].out_value = &reg_addr_buf; fields[2].out_value = &reg_addr_buf;
fields[2].in_value = NULL; fields[2].in_value = NULL;
fields[3].tap = jtag_info->tap; fields[3].tap = jtag_info->tap;
fields[3].num_bits = 1; fields[3].num_bits = 1;
fields[3].out_value = &nr_w_buf; fields[3].out_value = &nr_w_buf;
fields[3].in_value = NULL; fields[3].in_value = NULL;
jtag_add_dr_scan(4, fields, TAP_INVALID); jtag_add_dr_scan(4, fields, TAP_INVALID);
#ifdef _DEBUG_INSTRUCTION_EXECUTION_ #ifdef _DEBUG_INSTRUCTION_EXECUTION_
@ -238,43 +214,23 @@ int arm920t_execute_cp15(target_t *target, u32 cp15_opcode, u32 arm_opcode)
fields[0].tap = jtag_info->tap; fields[0].tap = jtag_info->tap;
fields[0].num_bits = 1; fields[0].num_bits = 1;
fields[0].out_value = &access_type_buf; fields[0].out_value = &access_type_buf;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 32; fields[1].num_bits = 32;
fields[1].out_value = cp15_opcode_buf; fields[1].out_value = cp15_opcode_buf;
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 6; fields[2].num_bits = 6;
fields[2].out_value = &reg_addr_buf; fields[2].out_value = &reg_addr_buf;
fields[2].in_value = NULL; fields[2].in_value = NULL;
fields[3].tap = jtag_info->tap; fields[3].tap = jtag_info->tap;
fields[3].num_bits = 1; fields[3].num_bits = 1;
fields[3].out_value = &nr_w_buf; fields[3].out_value = &nr_w_buf;
fields[3].in_value = NULL; fields[3].in_value = NULL;
jtag_add_dr_scan(4, fields, TAP_INVALID); jtag_add_dr_scan(4, fields, TAP_INVALID);
arm9tdmi_clock_out(jtag_info, arm_opcode, 0, NULL, 0); arm9tdmi_clock_out(jtag_info, arm_opcode, 0, NULL, 0);

24
src/target/arm926ejs.c
View File

@ -151,20 +151,16 @@ int arm926ejs_cp15_read(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u3
fields[1].out_value = &access; fields[1].out_value = &access;
fields[1].in_value = &access; fields[1].in_value = &access;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 14; fields[2].num_bits = 14;
fields[2].out_value = address_buf; fields[2].out_value = address_buf;
fields[2].in_value = NULL; fields[2].in_value = NULL;
fields[3].tap = jtag_info->tap; fields[3].tap = jtag_info->tap;
fields[3].num_bits = 1; fields[3].num_bits = 1;
fields[3].out_value = &nr_w_buf; fields[3].out_value = &nr_w_buf;
fields[3].in_value = NULL; fields[3].in_value = NULL;
jtag_add_dr_scan(4, fields, TAP_INVALID); jtag_add_dr_scan(4, fields, TAP_INVALID);
/*TODO: add timeout*/ /*TODO: add timeout*/
@ -218,43 +214,23 @@ int arm926ejs_cp15_write(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u
fields[0].tap = jtag_info->tap; fields[0].tap = jtag_info->tap;
fields[0].num_bits = 32; fields[0].num_bits = 32;
fields[0].out_value = value_buf; fields[0].out_value = value_buf;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 1; fields[1].num_bits = 1;
fields[1].out_value = &access; fields[1].out_value = &access;
fields[1].in_value = &access; fields[1].in_value = &access;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 14; fields[2].num_bits = 14;
fields[2].out_value = address_buf; fields[2].out_value = address_buf;
fields[2].in_value = NULL; fields[2].in_value = NULL;
fields[3].tap = jtag_info->tap; fields[3].tap = jtag_info->tap;
fields[3].num_bits = 1; fields[3].num_bits = 1;
fields[3].out_value = &nr_w_buf; fields[3].out_value = &nr_w_buf;
fields[3].in_value = NULL; fields[3].in_value = NULL;
jtag_add_dr_scan(4, fields, TAP_INVALID); jtag_add_dr_scan(4, fields, TAP_INVALID);
/*TODO: add timeout*/ /*TODO: add timeout*/
do do

25
src/target/arm9tdmi.c
View File

@ -128,33 +128,18 @@ int arm9tdmi_examine_debug_reason(target_t *target)
fields[0].tap = arm7_9->jtag_info.tap; fields[0].tap = arm7_9->jtag_info.tap;
fields[0].num_bits = 32; fields[0].num_bits = 32;
fields[0].out_value = NULL; fields[0].out_value = NULL;
fields[0].in_value = databus; fields[0].in_value = databus;
fields[1].tap = arm7_9->jtag_info.tap; fields[1].tap = arm7_9->jtag_info.tap;
fields[1].num_bits = 3; fields[1].num_bits = 3;
fields[1].out_value = NULL; fields[1].out_value = NULL;
fields[1].in_value = &debug_reason; fields[1].in_value = &debug_reason;
fields[2].tap = arm7_9->jtag_info.tap; fields[2].tap = arm7_9->jtag_info.tap;
fields[2].num_bits = 32; fields[2].num_bits = 32;
fields[2].out_value = NULL; fields[2].out_value = NULL;
fields[2].in_value = instructionbus; fields[2].in_value = instructionbus;
if ((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK) if ((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
{ {
return retval; return retval;
@ -218,20 +203,16 @@ int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int s
fields[0].out_value = out_buf; fields[0].out_value = out_buf;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 3; fields[1].num_bits = 3;
fields[1].out_value = &sysspeed_buf; fields[1].out_value = &sysspeed_buf;
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 32; fields[2].num_bits = 32;
fields[2].out_value = instr_buf; fields[2].out_value = instr_buf;
fields[2].in_value = NULL; fields[2].in_value = NULL;
if (in) if (in)
{ {
u8 tmp[4]; u8 tmp[4];
@ -286,19 +267,16 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
u8 tmp[4]; u8 tmp[4];
fields[0].in_value = tmp; fields[0].in_value = tmp;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 3; fields[1].num_bits = 3;
fields[1].out_value = NULL; fields[1].out_value = NULL;
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 32; fields[2].num_bits = 32;
fields[2].out_value = NULL; fields[2].out_value = NULL;
fields[2].in_value = NULL; fields[2].in_value = NULL;
jtag_add_dr_scan_now(3, fields, TAP_INVALID); jtag_add_dr_scan_now(3, fields, TAP_INVALID);
*in=le_to_h_u32(tmp); *in=le_to_h_u32(tmp);
@ -351,19 +329,16 @@ int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
u8 tmp[4]; u8 tmp[4];
fields[0].in_value = tmp; fields[0].in_value = tmp;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 3; fields[1].num_bits = 3;
fields[1].out_value = NULL; fields[1].out_value = NULL;
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 32; fields[2].num_bits = 32;
fields[2].out_value = NULL; fields[2].out_value = NULL;
fields[2].in_value = NULL; fields[2].in_value = NULL;
jtag_add_dr_scan_now(3, fields, TAP_INVALID); jtag_add_dr_scan_now(3, fields, TAP_INVALID);
arm_endianness(tmp, in, size, be, 0); arm_endianness(tmp, in, size, be, 0);