projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
J-Link serial number config option
[fw/openocd]
/
src
/
jtag
/
drivers
/
at91rm9200.c
diff --git
a/src/jtag/drivers/at91rm9200.c
b/src/jtag/drivers/at91rm9200.c
index 6d0dface23a81abe5fa44fb17e29707fa28d471e..d7e11df24f833dc35cb4a3ce775a04104426e698 100644
(file)
--- a/
src/jtag/drivers/at91rm9200.c
+++ b/
src/jtag/drivers/at91rm9200.c
@@
-15,8
+15,9
@@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
***************************************************************************/
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@
-26,7
+27,6
@@
#include <sys/mman.h>
#include <sys/mman.h>
-
/* AT91RM9200 */
#define AT91C_BASE_SYS (0xfffff000)
/* AT91RM9200 */
#define AT91C_BASE_SYS (0xfffff000)
@@
-78,9
+78,8
@@
#define P30 (1 << 30)
#define P31 (1 << 31)
#define P30 (1 << 30)
#define P31 (1 << 31)
-struct device_t
-{
- char* name;
+struct device_t {
+ const char *name;
int TDO_PIO; /* PIO holding TDO */
uint32_t TDO_MASK; /* TDO bitmask */
int TRST_PIO; /* PIO holding TRST */
int TDO_PIO; /* PIO holding TDO */
uint32_t TDO_MASK; /* TDO bitmask */
int TRST_PIO; /* PIO holding TRST */
@@
-95,21
+94,20
@@
struct device_t
uint32_t SRST_MASK; /* SRST bitmask */
};
uint32_t SRST_MASK; /* SRST bitmask */
};
-static struct device_t devices[] =
-{
+static const struct device_t devices[] = {
{ "rea_ecr", PIOD, P27, PIOA, NC, PIOD, P23, PIOD, P24, PIOD, P26, PIOC, P5 },
{ .name = NULL },
};
/* configuration */
{ "rea_ecr", PIOD, P27, PIOA, NC, PIOD, P23, PIOD, P24, PIOD, P26, PIOC, P5 },
{ .name = NULL },
};
/* configuration */
-static char
*
at91rm9200_device;
+static char
*
at91rm9200_device;
/* interface variables
*/
/* interface variables
*/
-static
struct device_t*
device;
+static
const struct device_t *
device;
static int dev_mem_fd;
static void *sys_controller;
static int dev_mem_fd;
static void *sys_controller;
-static uint32_t
*
pio_base;
+static uint32_t
*
pio_base;
/* low level command set
*/
/* low level command set
*/
@@
-117,12
+115,10
@@
static int at91rm9200_read(void);
static void at91rm9200_write(int tck, int tms, int tdi);
static void at91rm9200_reset(int trst, int srst);
static void at91rm9200_write(int tck, int tms, int tdi);
static void at91rm9200_reset(int trst, int srst);
-static int at91rm9200_speed(int speed);
static int at91rm9200_init(void);
static int at91rm9200_quit(void);
static int at91rm9200_init(void);
static int at91rm9200_quit(void);
-static struct bitbang_interface at91rm9200_bitbang =
-{
+static struct bitbang_interface at91rm9200_bitbang = {
.read = at91rm9200_read,
.write = at91rm9200_write,
.reset = at91rm9200_reset,
.read = at91rm9200_read,
.write = at91rm9200_write,
.reset = at91rm9200_reset,
@@
-166,20
+162,13
@@
static void at91rm9200_reset(int trst, int srst)
pio_base[device->SRST_PIO + PIO_CODR] = device->SRST_MASK;
}
pio_base[device->SRST_PIO + PIO_CODR] = device->SRST_MASK;
}
-static int at91rm9200_speed(int speed)
-{
-
- return ERROR_OK;
-}
-
COMMAND_HANDLER(at91rm9200_handle_device_command)
{
if (CMD_ARGC == 0)
return ERROR_COMMAND_SYNTAX_ERROR;
/* only if the device name wasn't overwritten by cmdline */
COMMAND_HANDLER(at91rm9200_handle_device_command)
{
if (CMD_ARGC == 0)
return ERROR_COMMAND_SYNTAX_ERROR;
/* only if the device name wasn't overwritten by cmdline */
- if (at91rm9200_device == 0)
- {
+ if (at91rm9200_device == 0) {
at91rm9200_device = malloc(strlen(CMD_ARGV[0]) + sizeof(char));
strcpy(at91rm9200_device, CMD_ARGV[0]);
}
at91rm9200_device = malloc(strlen(CMD_ARGV[0]) + sizeof(char));
strcpy(at91rm9200_device, CMD_ARGV[0]);
}
@@
-197,13
+186,9
@@
static const struct command_registration at91rm9200_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
COMMAND_REGISTRATION_DONE
};
-struct jtag_interface at91rm9200_interface =
-{
+struct jtag_interface at91rm9200_interface = {
.name = "at91rm9200",
.name = "at91rm9200",
-
.execute_queue = bitbang_execute_queue,
.execute_queue = bitbang_execute_queue,
-
- .speed = at91rm9200_speed,
.commands = at91rm9200_command_handlers,
.init = at91rm9200_init,
.quit = at91rm9200_quit,
.commands = at91rm9200_command_handlers,
.init = at91rm9200_init,
.quit = at91rm9200_quit,
@@
-211,28
+196,24
@@
struct jtag_interface at91rm9200_interface =
static int at91rm9200_init(void)
{
static int at91rm9200_init(void)
{
- struct device_t *cur_device;
+
const
struct device_t *cur_device;
cur_device = devices;
cur_device = devices;
- if (at91rm9200_device == NULL || at91rm9200_device[0] == 0)
- {
+ if (at91rm9200_device == NULL || at91rm9200_device[0] == 0) {
at91rm9200_device = "rea_ecr";
LOG_WARNING("No at91rm9200 device specified, using default 'rea_ecr'");
}
at91rm9200_device = "rea_ecr";
LOG_WARNING("No at91rm9200 device specified, using default 'rea_ecr'");
}
- while (cur_device->name)
- {
- if (strcmp(cur_device->name, at91rm9200_device) == 0)
- {
+ while (cur_device->name) {
+ if (strcmp(cur_device->name, at91rm9200_device) == 0) {
device = cur_device;
break;
}
cur_device++;
}
device = cur_device;
break;
}
cur_device++;
}
- if (!device)
- {
+ if (!device) {
LOG_ERROR("No matching device found for %s", at91rm9200_device);
return ERROR_JTAG_INIT_FAILED;
}
LOG_ERROR("No matching device found for %s", at91rm9200_device);
return ERROR_JTAG_INIT_FAILED;
}
@@
-252,7
+233,7
@@
static int at91rm9200_init(void)
close(dev_mem_fd);
return ERROR_JTAG_INIT_FAILED;
}
close(dev_mem_fd);
return ERROR_JTAG_INIT_FAILED;
}
- pio_base = (uint32_t*)sys_controller + 0x100;
+ pio_base = (uint32_t
*)sys_controller + 0x100;
/*
* Configure TDO as an input, and TDI, TCK, TMS, TRST, SRST
/*
* Configure TDO as an input, and TDI, TCK, TMS, TRST, SRST