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

build: cleanup src/pld directory 

Change-Id: I9edb027c76e5d7fe21d557a11e6a9691fa581e86
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/408
Tested-by: jenkins
This commit is contained in:
Spencer Oliver 2012-01-27 16:45:29 +00:00
parent 250dc58056
commit c4f2a018a5
6 changed files with 84 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/pld/pld.c
View File

@ -17,6 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -30,8 +31,7 @@
*/ */
extern struct pld_driver virtex2_pld; extern struct pld_driver virtex2_pld;
static struct pld_driver *pld_drivers[] = static struct pld_driver *pld_drivers[] = {
{
&virtex2_pld, &virtex2_pld,
NULL, NULL,
}; };
@ -43,13 +43,10 @@ struct pld_device *get_pld_device_by_num(int num)
struct pld_device *p; struct pld_device *p;
int i = 0; int i = 0;
for (p = pld_devices; p; p = p->next) for (p = pld_devices; p; p = p->next) {
{
if (i++ == num) if (i++ == num)
{
return p; return p;
} }
}
return NULL; return NULL;
} }
@ -62,14 +59,10 @@ COMMAND_HANDLER(handle_pld_device_command)
int found = 0; int found = 0;
if (CMD_ARGC < 1) if (CMD_ARGC < 1)
{
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
}
for (i = 0; pld_drivers[i]; i++) for (i = 0; pld_drivers[i]; i++) {
{ if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0) {
if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0)
{
struct pld_device *p, *c; struct pld_device *p, *c;
/* register pld specific commands */ /* register pld specific commands */
@ -77,8 +70,7 @@ COMMAND_HANDLER(handle_pld_device_command)
if (pld_drivers[i]->commands) { if (pld_drivers[i]->commands) {
retval = register_commands(CMD_CTX, NULL, retval = register_commands(CMD_CTX, NULL,
pld_drivers[i]->commands); pld_drivers[i]->commands);
if (ERROR_OK != retval) if (ERROR_OK != retval) {
{
LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]); LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -90,8 +82,7 @@ COMMAND_HANDLER(handle_pld_device_command)
retval = CALL_COMMAND_HANDLER( retval = CALL_COMMAND_HANDLER(
pld_drivers[i]->pld_device_command, c); pld_drivers[i]->pld_device_command, c);
if (ERROR_OK != retval) if (ERROR_OK != retval) {
{
LOG_ERROR("'%s' driver rejected pld device", LOG_ERROR("'%s' driver rejected pld device",
CMD_ARGV[0]); CMD_ARGV[0]);
free(c); free(c);
@ -99,25 +90,21 @@ COMMAND_HANDLER(handle_pld_device_command)
} }
/* put pld device in linked list */ /* put pld device in linked list */
if (pld_devices) if (pld_devices) {
{
/* find last pld device */ /* find last pld device */
for (p = pld_devices; p && p->next; p = p->next); for (p = pld_devices; p && p->next; p = p->next)
;
if (p) if (p)
p->next = c; p->next = c;
} } else
else
{
pld_devices = c; pld_devices = c;
}
found = 1; found = 1;
} }
} }
/* no matching pld driver found */ /* no matching pld driver found */
if (!found) if (!found) {
{
LOG_ERROR("pld driver '%s' not found", CMD_ARGV[0]); LOG_ERROR("pld driver '%s' not found", CMD_ARGV[0]);
exit(-1); exit(-1);
} }
@ -130,16 +117,13 @@ COMMAND_HANDLER(handle_pld_devices_command)
struct pld_device *p; struct pld_device *p;
int i = 0; int i = 0;
if (!pld_devices) if (!pld_devices) {
{
command_print(CMD_CTX, "no pld devices configured"); command_print(CMD_CTX, "no pld devices configured");
return ERROR_OK; return ERROR_OK;
} }
for (p = pld_devices; p; p = p->next) for (p = pld_devices; p; p = p->next)
{
command_print(CMD_CTX, "#%i: %s", i++, p->driver->name); command_print(CMD_CTX, "#%i: %s", i++, p->driver->name);
}
return ERROR_OK; return ERROR_OK;
} }
@ -153,30 +137,24 @@ COMMAND_HANDLER(handle_pld_load_command)
gettimeofday(&start, NULL); gettimeofday(&start, NULL);
if (CMD_ARGC < 2) if (CMD_ARGC < 2)
{
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
}
unsigned dev_id; unsigned dev_id;
COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id); COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
p = get_pld_device_by_num(dev_id); p = get_pld_device_by_num(dev_id);
if (!p) if (!p) {
{
command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]); command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
return ERROR_OK; return ERROR_OK;
} }
if ((retval = p->driver->load(p, CMD_ARGV[1])) != ERROR_OK) retval = p->driver->load(p, CMD_ARGV[1]);
{ if (retval != ERROR_OK) {
command_print(CMD_CTX, "failed loading file %s to pld device %u", command_print(CMD_CTX, "failed loading file %s to pld device %u",
CMD_ARGV[1], dev_id); CMD_ARGV[1], dev_id);
switch (retval) switch (retval) {
{
} }
return retval; return retval;
} } else {
else
{
gettimeofday(&end, NULL); gettimeofday(&end, NULL);
timeval_subtract(&duration, &end, &start); timeval_subtract(&duration, &end, &start);
@ -219,9 +197,8 @@ COMMAND_HANDLER(handle_pld_init_command)
if (CMD_ARGC != 0) if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
static bool pld_initialized = false; static bool pld_initialized;
if (pld_initialized) if (pld_initialized) {
{
LOG_INFO("'pld init' has already been called"); LOG_INFO("'pld init' has already been called");
return ERROR_OK; return ERROR_OK;
} }

10
src/pld/pld.h
View File

@ -17,6 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef PLD_H #ifndef PLD_H
#define PLD_H #define PLD_H
@ -27,18 +28,17 @@ struct pld_device;
#define __PLD_DEVICE_COMMAND(name) \ #define __PLD_DEVICE_COMMAND(name) \
COMMAND_HELPER(name, struct pld_device *pld) COMMAND_HELPER(name, struct pld_device *pld)
struct pld_driver struct pld_driver {
{
const char *name; const char *name;
__PLD_DEVICE_COMMAND((*pld_device_command)); __PLD_DEVICE_COMMAND((*pld_device_command));
const struct command_registration *commands; const struct command_registration *commands;
int (*load)(struct pld_device *pld_device, const char *filename); int (*load)(struct pld_device *pld_device, const char *filename);
}; };
#define PLD_DEVICE_COMMAND_HANDLER(name) static __PLD_DEVICE_COMMAND(name) #define PLD_DEVICE_COMMAND_HANDLER(name) \
static __PLD_DEVICE_COMMAND(name)
struct pld_device struct pld_device {
{
struct pld_driver *driver; struct pld_driver *driver;
void *driver_priv; void *driver_priv;
struct pld_device *next; struct pld_device *next;

26
src/pld/virtex2.c
View File

@ -17,6 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -25,18 +26,16 @@
#include "xilinx_bit.h" #include "xilinx_bit.h"
#include "pld.h" #include "pld.h"
static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr) static int virtex2_set_instr(struct jtag_tap *tap, uint32_t 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) {
{
struct scan_field field; struct scan_field field;
field.num_bits = tap->ir_length; field.num_bits = tap->ir_length;
void * t = calloc(DIV_ROUND_UP(field.num_bits, 8), 1); void *t = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
field.out_value = t; field.out_value = t;
buf_set_u32(t, 0, field.num_bits, new_instr); buf_set_u32(t, 0, field.num_bits, new_instr);
field.in_value = NULL; field.in_value = NULL;
@ -75,7 +74,7 @@ static int virtex2_send_32(struct pld_device *pld_device,
return ERROR_OK; return ERROR_OK;
} }
static __inline__ void virtexflip32(jtag_callback_data_t arg) static inline void virtexflip32(jtag_callback_data_t arg)
{ {
uint8_t *in = (uint8_t *)arg; uint8_t *in = (uint8_t *)arg;
*((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32); *((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32);
@ -93,15 +92,14 @@ static int virtex2_receive_32(struct pld_device *pld_device,
virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */ virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
while (num_words--) while (num_words--) {
{
scan_field.in_value = (uint8_t *)words; scan_field.in_value = (uint8_t *)words;
jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, TAP_DRPAUSE); jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, TAP_DRPAUSE);
jtag_add_callback(virtexflip32, (jtag_callback_data_t)words); jtag_add_callback(virtexflip32, (jtag_callback_data_t)words);
words++;; words++;
} }
return ERROR_OK; return ERROR_OK;
@ -139,7 +137,8 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename)
field.in_value = NULL; field.in_value = NULL;
if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK) retval = xilinx_read_bit_file(&bit_file, filename);
if (retval != ERROR_OK)
return retval; return retval;
virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */ virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */
@ -178,15 +177,12 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
uint32_t status; uint32_t status;
if (CMD_ARGC < 1) if (CMD_ARGC < 1)
{
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
}
unsigned dev_id; unsigned dev_id;
COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id); COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
device = get_pld_device_by_num(dev_id); device = get_pld_device_by_num(dev_id);
if (!device) if (!device) {
{
command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]); command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
return ERROR_OK; return ERROR_OK;
} }
@ -205,9 +201,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
struct virtex2_pld_device *virtex2_info; struct virtex2_pld_device *virtex2_info;
if (CMD_ARGC < 2) if (CMD_ARGC < 2)
{
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
}
tap = jtag_tap_by_string(CMD_ARGV[1]); tap = jtag_tap_by_string(CMD_ARGV[1]);
if (tap == NULL) { if (tap == NULL) {
@ -249,4 +243,4 @@ struct pld_driver virtex2_pld = {
.commands = virtex2_command_handler, .commands = virtex2_command_handler,
.pld_device_command = &virtex2_pld_device_command, .pld_device_command = &virtex2_pld_device_command,
.load = &virtex2_load, .load = &virtex2_load,
}; };

4
src/pld/virtex2.h
View File

@ -17,13 +17,13 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef VIRTEX2_H #ifndef VIRTEX2_H
#define VIRTEX2_H #define VIRTEX2_H
#include <jtag/jtag.h> #include <jtag/jtag.h>
struct virtex2_pld_device struct virtex2_pld_device {
{
struct jtag_tap *tap; struct jtag_tap *tap;
}; };

35
src/pld/xilinx_bit.c
View File

@ -17,6 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -36,26 +37,21 @@ static int read_section(FILE *input_file, int length_size, char section,
char section_char; char section_char;
int read_count; int read_count;
if ((length_size != 2) && (length_size != 4)) if ((length_size != 2) && (length_size != 4)) {
{
LOG_ERROR("BUG: length_size neither 2 nor 4"); LOG_ERROR("BUG: length_size neither 2 nor 4");
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
} }
if ((read_count = fread(&section_char, 1, 1, input_file)) != 1) read_count = fread(&section_char, 1, 1, input_file);
{ if (read_count != 1)
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
}
if (section_char != section) if (section_char != section)
{
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
}
if ((read_count = fread(length_buffer, 1, length_size, input_file)) != length_size) read_count = fread(length_buffer, 1, length_size, input_file);
{ if (read_count != length_size)
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
}
if (length_size == 4) if (length_size == 4)
length = be_to_h_u32(length_buffer); length = be_to_h_u32(length_buffer);
@ -67,10 +63,9 @@ static int read_section(FILE *input_file, int length_size, char section,
*buffer = malloc(length); *buffer = malloc(length);
if ((read_count = fread(*buffer, 1, length, input_file)) != length) read_count = fread(*buffer, 1, length, input_file);
{ if (read_count != length)
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
}
return ERROR_OK; return ERROR_OK;
} }
@ -84,14 +79,12 @@ int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename)
if (!filename || !bit_file) if (!filename || !bit_file)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
if (stat(filename, &input_stat) == -1) if (stat(filename, &input_stat) == -1) {
{
LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno)); LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
} }
if (S_ISDIR(input_stat.st_mode)) if (S_ISDIR(input_stat.st_mode)) {
{
LOG_ERROR("%s is a directory", filename); LOG_ERROR("%s is a directory", filename);
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
} }
@ -101,14 +94,14 @@ int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename)
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
} }
if (!(input_file = fopen(filename, "rb"))) input_file = fopen(filename, "rb");
{ if (input_file == NULL) {
LOG_ERROR("couldn't open %s: %s", filename, strerror(errno)); LOG_ERROR("couldn't open %s: %s", filename, strerror(errno));
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
} }
if ((read_count = fread(bit_file->unknown_header, 1, 13, input_file)) != 13) read_count = fread(bit_file->unknown_header, 1, 13, input_file);
{ if (read_count != 13) {
LOG_ERROR("couldn't read unknown_header from file '%s'", filename); LOG_ERROR("couldn't read unknown_header from file '%s'", filename);
return ERROR_PLD_FILE_LOAD_FAILED; return ERROR_PLD_FILE_LOAD_FAILED;
} }

4
src/pld/xilinx_bit.h
View File

@ -17,13 +17,13 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef XILINX_BIT_H #ifndef XILINX_BIT_H
#define XILINX_BIT_H #define XILINX_BIT_H
#include <helper/types.h> #include <helper/types.h>
struct xilinx_bit_file struct xilinx_bit_file {
{
uint8_t unknown_header[13]; uint8_t unknown_header[13];
uint8_t *source_file; uint8_t *source_file;
uint8_t *part_name; uint8_t *part_name;