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

remove rlink structure typedefs 

Remove useless typedefs from the rlink driver.  Improve whitespace.
This commit is contained in:
Zachary T Welch 2009-11-13 12:19:39 -08:00
parent 96b62996d2
commit d16968e24f
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jtag/rlink/rlink.c
View File

@ -576,8 +576,7 @@ dtc_run_download(
* The dtc reply queue is a singly linked list that describes what to do with the reply packet that comes from the DTC. Only SCAN_IN and SCAN_IO generate these entries. * The dtc reply queue is a singly linked list that describes what to do with the reply packet that comes from the DTC. Only SCAN_IN and SCAN_IO generate these entries.
*/ */
typedef struct dtc_reply_queue_entry {
struct dtc_reply_queue_entry_s {
struct dtc_reply_queue_entry_s *next; struct dtc_reply_queue_entry_s *next;
jtag_command_t *cmd; /* the command that resulted in this entry */ jtag_command_t *cmd; /* the command that resulted in this entry */
@ -588,7 +587,7 @@ struct dtc_reply_queue_entry_s {
int length; /* how many bits are processed in this operation? */ int length; /* how many bits are processed in this operation? */
enum scan_type type; /* SCAN_IN/SCAN_OUT/SCAN_IO */ enum scan_type type; /* SCAN_IN/SCAN_OUT/SCAN_IO */
} scan; } scan;
} dtc_reply_queue_entry_t; };
/* /*
@ -598,8 +597,8 @@ struct dtc_reply_queue_entry_s {
static static
struct { struct {
dtc_reply_queue_entry_t *rq_head; struct dtc_reply_queue_entry *rq_head;
dtc_reply_queue_entry_t *rq_tail; struct dtc_reply_queue_entry *rq_tail;
uint32_t cmd_index; uint32_t cmd_index;
uint32_t reply_index; uint32_t reply_index;
uint8_t cmd_buffer[USB_EP2BANK_SIZE]; uint8_t cmd_buffer[USB_EP2BANK_SIZE];
@ -631,7 +630,7 @@ dtc_queue_init(void) {
static static
inline inline
dtc_reply_queue_entry_t * struct dtc_reply_queue_entry *
dtc_queue_enqueue_reply( dtc_queue_enqueue_reply(
enum scan_type type, enum scan_type type,
uint8_t *buffer, uint8_t *buffer,
@ -640,9 +639,9 @@ dtc_queue_enqueue_reply(
int length, int length,
jtag_command_t *cmd jtag_command_t *cmd
) { ) {
dtc_reply_queue_entry_t *rq_entry; struct dtc_reply_queue_entry *rq_entry;
rq_entry = malloc(sizeof(dtc_reply_queue_entry_t)); rq_entry = malloc(sizeof(struct dtc_reply_queue_entry));
if (rq_entry != NULL) { if (rq_entry != NULL) {
rq_entry->scan.type = type; rq_entry->scan.type = type;
rq_entry->scan.buffer = buffer; rq_entry->scan.buffer = buffer;
@ -672,7 +671,7 @@ dtc_queue_enqueue_reply(
static static
int int
dtc_queue_run(void) { dtc_queue_run(void) {
dtc_reply_queue_entry_t *rq_p, *rq_next; struct dtc_reply_queue_entry *rq_p, *rq_next;
int retval; int retval;
int usb_err; int usb_err;
int bit_cnt; int bit_cnt;

7
src/jtag/rlink/rlink.h
View File

@ -20,13 +20,12 @@
#include "types.h" #include "types.h"
typedef struct rlink_speed_table {
struct rlink_speed_table_s {
uint8_t const *dtc; uint8_t const *dtc;
uint16_t dtc_size; uint16_t dtc_size;
uint16_t khz; uint16_t khz;
uint8_t prescaler; uint8_t prescaler;
} rlink_speed_table_t; };
extern const rlink_speed_table_t rlink_speed_table[]; extern const struct rlink_speed_table rlink_speed_table[];
extern const size_t rlink_speed_table_size; extern const size_t rlink_speed_table_size;

2
src/jtag/rlink/rlink_speed_table.c
View File

@ -87,7 +87,7 @@ static const uint8_t dtc_2[] = {
36, 139, 112, 193, 151, 96 36, 139, 112, 193, 151, 96
}; };
const rlink_speed_table_t rlink_speed_table[] = {{ const struct rlink_speed_table rlink_speed_table[] = {{
dtc_64, sizeof(dtc_64), (ST7_FOSC * 2) / (1000 * 64), 64 dtc_64, sizeof(dtc_64), (ST7_FOSC * 2) / (1000 * 64), 64
}, { }, {
dtc_11, sizeof(dtc_11), (ST7_FOSC * 2) / (1000 * 11), 11 dtc_11, sizeof(dtc_11), (ST7_FOSC * 2) / (1000 * 11), 11