Menu
▾
▴
[Openocd-svn] r2002 - in trunk/src: jtag target
|
From: oharboe at B. <oh...@ma...> - 2009-06-02 12:09:54
|
Author: oharboe
Date: 2009-06-02 12:09:53 +0200 (Tue, 02 Jun 2009)
New Revision: 2002
Modified:
trunk/src/jtag/jtag.h
trunk/src/jtag/jtag_driver.c
trunk/src/jtag/zy1000.c
trunk/src/target/embeddedice.c
Log:
some trivial minidriver fixes
Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h 2009-06-02 10:07:47 UTC (rev 2001)
+++ trunk/src/jtag/jtag.h 2009-06-02 10:09:53 UTC (rev 2002)
@@ -890,9 +890,7 @@
#ifdef HAVE_JTAG_MINIDRIVER_H
/* Here a #define MINIDRIVER() and an inline version of hw fifo interface_jtag_add_dr_out can be defined */
#include "jtag_minidriver.h"
-#define MINIDRIVER(a) notused ## a
#else
-#define MINIDRIVER(a) a
extern void interface_jtag_add_dr_out(jtag_tap_t* tap, int num_fields, const int* num_bits, const u32* value,
tap_state_t end_state);
Modified: trunk/src/jtag/jtag_driver.c
===================================================================
--- trunk/src/jtag/jtag_driver.c 2009-06-02 10:07:47 UTC (rev 2001)
+++ trunk/src/jtag/jtag_driver.c 2009-06-02 10:09:53 UTC (rev 2002)
@@ -36,6 +36,7 @@
#include "jtag.h"
#include "command.h"
+#ifndef HAVE_JTAG_MINIDRIVER_H
struct jtag_callback_entry
{
struct jtag_callback_entry *next;
@@ -69,11 +70,12 @@
dst->in_value = src->in_value;
}
+
/**
* see jtag_add_ir_scan()
*
*/
-int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
+int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{
size_t num_taps = jtag_NumEnabledTaps();
@@ -147,7 +149,7 @@
* see jtag_add_plain_ir_scan()
*
*/
-int MINIDRIVER(interface_jtag_add_plain_ir_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
+int interface_jtag_add_plain_ir_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -176,7 +178,7 @@
* see jtag_add_dr_scan()
*
*/
-int MINIDRIVER(interface_jtag_add_dr_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
+int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{
/* count devices in bypass */
@@ -261,7 +263,7 @@
* The bypass status of TAPs is set by jtag_add_ir_scan().
*
*/
-void MINIDRIVER(interface_jtag_add_dr_out)(jtag_tap_t *target_tap,
+void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
int in_num_fields,
const int *num_bits,
const u32 *value,
@@ -344,7 +346,7 @@
* see jtag_add_plain_dr_scan()
*
*/
-int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
+int interface_jtag_add_plain_dr_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
@@ -366,7 +368,7 @@
return ERROR_OK;
}
-int MINIDRIVER(interface_jtag_add_tlr)(void)
+int interface_jtag_add_tlr(void)
{
tap_state_t state = TAP_RESET;
@@ -383,7 +385,7 @@
return ERROR_OK;
}
-int MINIDRIVER(interface_jtag_add_pathmove)(int num_states, const tap_state_t *path)
+int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
{
/* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -402,7 +404,7 @@
return ERROR_OK;
}
-int MINIDRIVER(interface_jtag_add_runtest)(int num_cycles, tap_state_t state)
+int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
{
/* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -418,7 +420,7 @@
return ERROR_OK;
}
-int MINIDRIVER(interface_jtag_add_clocks)( int num_cycles )
+int interface_jtag_add_clocks( int num_cycles )
{
/* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -433,7 +435,7 @@
return ERROR_OK;
}
-int MINIDRIVER(interface_jtag_add_reset)(int req_trst, int req_srst)
+int interface_jtag_add_reset(int req_trst, int req_srst)
{
/* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -449,7 +451,7 @@
return ERROR_OK;
}
-int MINIDRIVER(interface_jtag_add_sleep)(u32 us)
+int interface_jtag_add_sleep(u32 us)
{
/* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -487,18 +489,6 @@
}
}
-
-static int jtag_convert_to_callback4(u8 *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
-{
- ((jtag_callback1_t)data1)(in);
- return ERROR_OK;
-}
-
-void jtag_add_callback(jtag_callback1_t callback, u8 *in)
-{
- jtag_add_callback4(jtag_convert_to_callback4, in, (jtag_callback_data_t)callback, 0, 0);
-}
-
void interface_jtag_add_scan_check_alloc(scan_field_t *field)
{
unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
@@ -529,3 +519,17 @@
{
field->in_value=(u8 *)cmd_queue_alloc(4);
}
+
+static int jtag_convert_to_callback4(u8 *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
+{
+ ((jtag_callback1_t)data1)(in);
+ return ERROR_OK;
+}
+
+void jtag_add_callback(jtag_callback1_t callback, u8 *in)
+{
+ jtag_add_callback4(jtag_convert_to_callback4, in, (jtag_callback_data_t)callback, 0, 0);
+}
+
+#endif
+
Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c 2009-06-02 10:07:47 UTC (rev 2001)
+++ trunk/src/jtag/zy1000.c 2009-06-02 10:09:53 UTC (rev 2002)
@@ -535,7 +535,7 @@
}
-int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
{
int j;
@@ -596,7 +596,7 @@
-int interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
{
scanFields(num_fields, fields, TAP_IRSHIFT, cmd_queue_end_state);
@@ -605,7 +605,7 @@
/*extern jtag_command_t **jtag_get_last_command_p(void);*/
-int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
{
int j;
@@ -649,7 +649,7 @@
return ERROR_OK;
}
-int interface_jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_plain_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
{
scanFields(num_fields, fields, TAP_DRSHIFT, cmd_queue_end_state);
return ERROR_OK;
@@ -732,7 +732,7 @@
return ERROR_OK;
}
-int interface_jtag_add_pathmove(int num_states, tap_state_t *path)
+int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
{
int state_count;
int tms = 0;
Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c 2009-06-02 10:07:47 UTC (rev 2001)
+++ trunk/src/target/embeddedice.c 2009-06-02 10:09:53 UTC (rev 2002)
@@ -489,8 +489,9 @@
return ERROR_TARGET_TIMEOUT;
}
+#ifndef HAVE_JTAG_MINIDRIVER_H
/* this is the inner loop of the open loop DCC write of data to target */
-void MINIDRIVER(embeddedice_write_dcc)(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count)
+void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count)
{
int i;
for (i = 0; i < count; i++)
@@ -499,3 +500,6 @@
buffer += 4;
}
}
+#else
+/* provided by minidriver */
+#endif
|
