interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

David Brownell <david-b@pacbell.net>: 

Clean up the PLD files:

 - Get rid of some extraneous whitespace
 - Make various functions static
 - Wrap overlong lines


git-svn-id: svn://svn.berlios.de/openocd/trunk@2272 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-18 00:29:45 +00:00
parent 6f4d876c88
commit 1642dd2ea0
3 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pld/pld.c
View File

@ -30,18 +30,21 @@
*/ */
extern pld_driver_t virtex2_pld; extern pld_driver_t virtex2_pld;
pld_driver_t *pld_drivers[] = static pld_driver_t *pld_drivers[] =
{ {
&virtex2_pld, &virtex2_pld,
NULL, NULL,
}; };
pld_device_t *pld_devices; static pld_device_t *pld_devices;
static command_t *pld_cmd; static command_t *pld_cmd;
int handle_pld_devices_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_pld_devices_command(struct command_context_s *cmd_ctx,
int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); char *cmd, char **args, int argc);
int handle_pld_load_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_pld_device_command(struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc);
static int handle_pld_load_command(struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc);
int pld_init(struct command_context_s *cmd_ctx) int pld_init(struct command_context_s *cmd_ctx)
{ {
@ -74,14 +77,15 @@ pld_device_t *get_pld_device_by_num(int num)
/* pld device <driver> [driver_options ...] /* pld device <driver> [driver_options ...]
*/ */
int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_pld_device_command(struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc)
{ {
int i; int i;
int found = 0; int found = 0;
if (argc < 1) if (argc < 1)
{ {
LOG_WARNING("incomplete 'pld bank' configuration"); LOG_WARNING("incomplete 'pld device' command");
return ERROR_OK; return ERROR_OK;
} }
@ -136,7 +140,8 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
return ERROR_OK; return ERROR_OK;
} }
int handle_pld_devices_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_pld_devices_command(struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc)
{ {
pld_device_t *p; pld_device_t *p;
int i = 0; int i = 0;
@ -155,7 +160,8 @@ int handle_pld_devices_command(struct command_context_s *cmd_ctx, char *cmd, cha
return ERROR_OK; return ERROR_OK;
} }
int handle_pld_load_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_pld_load_command(struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc)
{ {
int retval; int retval;
struct timeval start, end, duration; struct timeval start, end, duration;

45
src/pld/virtex2.c
View File

@ -26,9 +26,9 @@
#include "pld.h" #include "pld.h"
int virtex2_register_commands(struct command_context_s *cmd_ctx); static int virtex2_register_commands(struct command_context_s *cmd_ctx);
int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device); static int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device);
int virtex2_load(struct pld_device_s *pld_device, char *filename); static int virtex2_load(struct pld_device_s *pld_device, char *filename);
pld_driver_t virtex2_pld = pld_driver_t virtex2_pld =
{ {
@ -38,9 +38,9 @@ pld_driver_t virtex2_pld =
.load = virtex2_load, .load = virtex2_load,
}; };
int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr) static int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
{ {
if (tap==NULL) if (tap == NULL)
return ERROR_FAIL; return ERROR_FAIL;
if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
@ -51,13 +51,8 @@ int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
field.num_bits = tap->ir_length; field.num_bits = tap->ir_length;
field.out_value = calloc(CEIL(field.num_bits, 8), 1); field.out_value = calloc(CEIL(field.num_bits, 8), 1);
buf_set_u32(field.out_value, 0, field.num_bits, new_instr); buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
field.in_value = NULL; field.in_value = NULL;
jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE)); jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE));
free(field.out_value); free(field.out_value);
@ -66,7 +61,8 @@ int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
return ERROR_OK; return ERROR_OK;
} }
int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words) static int virtex2_send_32(struct pld_device_s *pld_device,
int num_words, u32 *words)
{ {
virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
scan_field_t scan_field; scan_field_t scan_field;
@ -94,10 +90,11 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words)
static __inline__ void virtexflip32(u8 *in) static __inline__ void virtexflip32(u8 *in)
{ {
*((u32 *)in)=flip_u32(le_to_h_u32(in), 32); *((u32 *)in) = flip_u32(le_to_h_u32(in), 32);
} }
int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *words) static int virtex2_receive_32(struct pld_device_s *pld_device,
int num_words, u32 *words)
{ {
virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
scan_field_t scan_field; scan_field_t scan_field;
@ -123,7 +120,7 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word
return ERROR_OK; return ERROR_OK;
} }
int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status) static int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
{ {
u32 data[5]; u32 data[5];
@ -145,23 +142,17 @@ int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
return ERROR_OK; return ERROR_OK;
} }
int virtex2_load(struct pld_device_s *pld_device, char *filename) static int virtex2_load(struct pld_device_s *pld_device, char *filename)
{ {
virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
xilinx_bit_file_t bit_file; xilinx_bit_file_t bit_file;
int retval; int retval;
unsigned int i; unsigned int i;
scan_field_t field; scan_field_t field;
field.tap = virtex2_info->tap; field.tap = virtex2_info->tap;
field.in_value = NULL; field.in_value = NULL;
if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK) if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)
return retval; return retval;
@ -197,7 +188,8 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename)
return ERROR_OK; return ERROR_OK;
} }
int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc)
{ {
pld_device_t *device; pld_device_t *device;
virtex2_pld_device_t *virtex2_info; virtex2_pld_device_t *virtex2_info;
@ -225,7 +217,7 @@ int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cm
return ERROR_OK; return ERROR_OK;
} }
int virtex2_register_commands(struct command_context_s *cmd_ctx) static int virtex2_register_commands(struct command_context_s *cmd_ctx)
{ {
command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", NULL, COMMAND_ANY, "virtex2 specific commands"); command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", NULL, COMMAND_ANY, "virtex2 specific commands");
@ -235,7 +227,8 @@ int virtex2_register_commands(struct command_context_s *cmd_ctx)
return ERROR_OK; return ERROR_OK;
} }
int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device) static int virtex2_pld_device_command(struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc, struct pld_device_s *pld_device)
{ {
jtag_tap_t *tap; jtag_tap_t *tap;
@ -247,8 +240,8 @@ int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, cha
return ERROR_PLD_DEVICE_INVALID; return ERROR_PLD_DEVICE_INVALID;
} }
tap = jtag_tap_by_string( args[1] ); tap = jtag_tap_by_string(args[1]);
if( tap == NULL ){ if (tap == NULL) {
command_print( cmd_ctx, "Tap: %s does not exist", args[1] ); command_print( cmd_ctx, "Tap: %s does not exist", args[1] );
return ERROR_OK; return ERROR_OK;
} }

3
src/pld/xilinx_bit.c
View File

@ -28,7 +28,8 @@
#include <sys/stat.h> #include <sys/stat.h>
int read_section(FILE *input_file, int length_size, char section, u32 *buffer_length, u8 **buffer) static int read_section(FILE *input_file, int length_size, char section,
u32 *buffer_length, u8 **buffer)
{ {
u8 length_buffer[4]; u8 length_buffer[4];
int length; int length;