drivers/at91rm9200: fix help and usage to command "at91rm9200_device"

[openocd.git] / src / jtag / drivers / at91rm9200.c

diff --git a/src/jtag/drivers/at91rm9200.c b/src/jtag/drivers/at91rm9200.c
index 6d0dface23a81abe5fa44fb17e29707fa28d471e..0360ec5deb453ceacd5eca25feafbb3ebc1c2c55 100644 (file)
--- a/src/jtag/drivers/at91rm9200.c
+++ b/src/jtag/drivers/at91rm9200.c
@@ -13,10 +13,9 @@
  *   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 <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -26,7 +25,6 @@
 
 #include <sys/mman.h>
 
-
 /* 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,46 +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_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,
        .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;
@@ -150,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;
@@ -164,10 +160,6 @@ 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;
 }
@@ -178,8 +170,7 @@ COMMAND_HANDLER(at91rm9200_handle_device_command)
                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]);
        }
@@ -192,18 +183,15 @@ static const struct command_registration at91rm9200_command_handlers[] = {
                .name = "at91rm9200_device",
                .handler = &at91rm9200_handle_device_command,
                .mode = COMMAND_CONFIG,
-               .help = "query armjtagew info",
+               .help = "Set at91rm9200 device [default \"rea_ecr\"]",
+               .usage = "<device>",
        },
        COMMAND_REGISTRATION_DONE
 };
 
-struct jtag_interface at91rm9200_interface =
-{
+struct jtag_interface at91rm9200_interface = {
        .name = "at91rm9200",
-
        .execute_queue = bitbang_execute_queue,
-
-       .speed = at91rm9200_speed,
        .commands = at91rm9200_command_handlers,
        .init = at91rm9200_init,
        .quit = at91rm9200_quit,
@@ -211,28 +199,24 @@ struct jtag_interface at91rm9200_interface =
 
 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;
        }
@@ -252,7 +236,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