X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fat91rm9200.c;h=0015da06b0f9273f75d280c7db5eafa002103aec;hb=55abb63752196de5a2e79fc4944a6af24e6414f6;hp=ff9f7a4126046863c2747b391a9321b2db6431e9;hpb=865efd828a267992db0f2a92a731c5ce23a34236;p=openocd.git
diff --git a/src/jtag/drivers/at91rm9200.c b/src/jtag/drivers/at91rm9200.c
index ff9f7a4126..0015da06b0 100644
--- a/src/jtag/drivers/at91rm9200.c
+++ b/src/jtag/drivers/at91rm9200.c
@@ -13,20 +13,18 @@
* GNU General Public License for more details. *
* *
* 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., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see . *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "interface.h"
+#include
#include "bitbang.h"
#include
-
/* AT91RM9200 */
#define AT91C_BASE_SYS (0xfffff000)
@@ -78,9 +76,8 @@
#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 */
@@ -95,59 +92,43 @@ struct device_t
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 */
-static char* at91rm9200_device;
+static char *at91rm9200_device;
/* interface variables
*/
-static struct device_t* device;
+static const struct device_t *device;
static int dev_mem_fd;
static void *sys_controller;
-static uint32_t* pio_base;
+static uint32_t *pio_base;
/* low level command set
*/
-static int at91rm9200_read(void);
-static void at91rm9200_write(int tck, int tms, int tdi);
-static void at91rm9200_reset(int trst, int srst);
+static bb_value_t at91rm9200_read(void);
+static int at91rm9200_write(int tck, int tms, int tdi);
+static int at91rm9200_reset(int trst, int srst);
-static int at91rm9200_speed(int speed);
-static int at91rm9200_register_commands(struct command_context *cmd_ctx);
static int at91rm9200_init(void);
static int at91rm9200_quit(void);
-struct jtag_interface at91rm9200_interface =
-{
- .name = "at91rm9200",
-
- .execute_queue = bitbang_execute_queue,
-
- .speed = at91rm9200_speed,
- .register_commands = at91rm9200_register_commands,
- .init = at91rm9200_init,
- .quit = at91rm9200_quit,
-};
-
-static struct bitbang_interface at91rm9200_bitbang =
-{
+static struct bitbang_interface at91rm9200_bitbang = {
.read = at91rm9200_read,
.write = at91rm9200_write,
.reset = at91rm9200_reset,
.blink = 0
};
-static int at91rm9200_read(void)
+static bb_value_t at91rm9200_read(void)
{
- return (pio_base[device->TDO_PIO + PIO_PDSR] & device->TDO_MASK) != 0;
+ return (pio_base[device->TDO_PIO + PIO_PDSR] & device->TDO_MASK) ? BB_HIGH : BB_LOW;
}
-static void at91rm9200_write(int tck, int tms, int tdi)
+static int at91rm9200_write(int tck, int tms, int tdi)
{
if (tck)
pio_base[device->TCK_PIO + PIO_SODR] = device->TCK_MASK;
@@ -163,10 +144,12 @@ static void at91rm9200_write(int tck, int tms, int tdi)
pio_base[device->TDI_PIO + PIO_SODR] = device->TDI_MASK;
else
pio_base[device->TDI_PIO + PIO_CODR] = device->TDI_MASK;
+
+ return ERROR_OK;
}
/* (1) assert or (0) deassert reset lines */
-static void at91rm9200_reset(int trst, int srst)
+static int at91rm9200_reset(int trst, int srst)
{
if (trst == 0)
pio_base[device->TRST_PIO + PIO_SODR] = device->TRST_MASK;
@@ -177,22 +160,17 @@ static void at91rm9200_reset(int trst, int srst)
pio_base[device->SRST_PIO + PIO_SODR] = device->SRST_MASK;
else if (srst == 1)
pio_base[device->SRST_PIO + PIO_CODR] = device->SRST_MASK;
-}
-
-static int at91rm9200_speed(int speed)
-{
return ERROR_OK;
}
-static int at91rm9200_handle_device_command(struct command_context *cmd_ctx, char *cmd, char **CMD_ARGV, int argc)
+COMMAND_HANDLER(at91rm9200_handle_device_command)
{
if (CMD_ARGC == 0)
- return ERROR_OK;
+ 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]);
}
@@ -207,37 +185,37 @@ static const struct command_registration at91rm9200_command_handlers[] = {
.mode = COMMAND_CONFIG,
.help = "query armjtagew info",
},
+ COMMAND_REGISTRATION_DONE
};
-static int at91rm9200_register_commands(struct command_context *cmd_ctx)
-{
- return register_commands(cmd_ctx, NULL, at91rm9200_command_handlers);
-}
+struct jtag_interface at91rm9200_interface = {
+ .name = "at91rm9200",
+ .execute_queue = bitbang_execute_queue,
+ .commands = at91rm9200_command_handlers,
+ .init = at91rm9200_init,
+ .quit = at91rm9200_quit,
+};
static int at91rm9200_init(void)
{
- struct device_t *cur_device;
+ const struct device_t *cur_device;
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'");
}
- 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++;
}
- if (!device)
- {
+ if (!device) {
LOG_ERROR("No matching device found for %s", at91rm9200_device);
return ERROR_JTAG_INIT_FAILED;
}
@@ -257,7 +235,7 @@ static int at91rm9200_init(void)
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