Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
helper/command: change prototype of command_print/command_print_sameline
[openocd.git] / src / jtag / drivers / imx_gpio.c
diff --git a/src/jtag/drivers/imx_gpio.c b/src/jtag/drivers/imx_gpio.c
index f33d10976246f1352131df3d630ae653190cb620..196d0e4a1a0af609d03fef82423a45fc5d9303fd 100644 (file)
--- a/src/jtag/drivers/imx_gpio.c
+++ b/src/jtag/drivers/imx_gpio.c
@@ -82,9 +82,9 @@ static inline bool gpio_level(int g)
        return pio_base[g / 32].dr >> (g & 0x1F) & 1;
 }
 
-static int imx_gpio_read(void);
-static void imx_gpio_write(int tck, int tms, int tdi);
-static void imx_gpio_reset(int trst, int srst);
+static bb_value_t imx_gpio_read(void);
+static int imx_gpio_write(int tck, int tms, int tdi);
+static int imx_gpio_reset(int trst, int srst);
 
 static int imx_gpio_swdio_read(void);
 static void imx_gpio_swdio_drive(bool is_output);
@@ -128,12 +128,12 @@ static int speed_coeff = 50000;
 static int speed_offset = 100;
 static unsigned int jtag_delay;
 
-static int imx_gpio_read(void)
+static bb_value_t imx_gpio_read(void)
 {
-       return gpio_level(tdo_gpio);
+       return gpio_level(tdo_gpio) ? BB_HIGH : BB_LOW;
 }
 
-static void imx_gpio_write(int tck, int tms, int tdi)
+static int imx_gpio_write(int tck, int tms, int tdi)
 {
        tms ? gpio_set(tms_gpio) : gpio_clear(tms_gpio);
        tdi ? gpio_set(tdi_gpio) : gpio_clear(tdi_gpio);
@@ -141,25 +141,31 @@ static void imx_gpio_write(int tck, int tms, int tdi)
 
        for (unsigned int i = 0; i < jtag_delay; i++)
                asm volatile ("");
+
+       return ERROR_OK;
 }
 
-static void imx_gpio_swd_write(int tck, int tms, int tdi)
+static int imx_gpio_swd_write(int tck, int tms, int tdi)
 {
        tdi ? gpio_set(swdio_gpio) : gpio_clear(swdio_gpio);
        tck ? gpio_set(swclk_gpio) : gpio_clear(swclk_gpio);
 
        for (unsigned int i = 0; i < jtag_delay; i++)
                asm volatile ("");
+
+       return ERROR_OK;
 }
 
 /* (1) assert or (0) deassert reset lines */
-static void imx_gpio_reset(int trst, int srst)
+static int imx_gpio_reset(int trst, int srst)
 {
        if (trst_gpio != -1)
-               trst ? gpio_set(trst_gpio) : gpio_clear(trst_gpio);
+               trst ? gpio_clear(trst_gpio) : gpio_set(trst_gpio);
 
        if (srst_gpio != -1)
-               srst ? gpio_set(srst_gpio) : gpio_clear(srst_gpio);
+               srst ? gpio_clear(srst_gpio) : gpio_set(srst_gpio);
+
+       return ERROR_OK;
 }
 
 static void imx_gpio_swdio_drive(bool is_output)
@@ -215,7 +221,7 @@ COMMAND_HANDLER(imx_gpio_handle_jtag_gpionums)
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       command_print(CMD_CTX,
+       command_print(CMD,
                        "imx_gpio GPIO config: tck = %d, tms = %d, tdi = %d, tdo = %d",
                        tck_gpio, tms_gpio, tdi_gpio, tdo_gpio);
 
@@ -227,7 +233,7 @@ COMMAND_HANDLER(imx_gpio_handle_jtag_gpionum_tck)
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tck_gpio);
 
-       command_print(CMD_CTX, "imx_gpio GPIO config: tck = %d", tck_gpio);
+       command_print(CMD, "imx_gpio GPIO config: tck = %d", tck_gpio);
        return ERROR_OK;
 }
 
@@ -236,7 +242,7 @@ COMMAND_HANDLER(imx_gpio_handle_jtag_gpionum_tms)
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tms_gpio);
 
-       command_print(CMD_CTX, "imx_gpio GPIO config: tms = %d", tms_gpio);
+       command_print(CMD, "imx_gpio GPIO config: tms = %d", tms_gpio);
        return ERROR_OK;
 }
 
@@ -245,7 +251,7 @@ COMMAND_HANDLER(imx_gpio_handle_jtag_gpionum_tdo)
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tdo_gpio);
 
-       command_print(CMD_CTX, "imx_gpio GPIO config: tdo = %d", tdo_gpio);
+       command_print(CMD, "imx_gpio GPIO config: tdo = %d", tdo_gpio);
        return ERROR_OK;
 }
 
@@ -254,7 +260,7 @@ COMMAND_HANDLER(imx_gpio_handle_jtag_gpionum_tdi)
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], tdi_gpio);
 
-       command_print(CMD_CTX, "imx_gpio GPIO config: tdi = %d", tdi_gpio);
+       command_print(CMD, "imx_gpio GPIO config: tdi = %d", tdi_gpio);
        return ERROR_OK;
 }
 
@@ -263,7 +269,7 @@ COMMAND_HANDLER(imx_gpio_handle_jtag_gpionum_srst)
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], srst_gpio);
 
-       command_print(CMD_CTX, "imx_gpio GPIO config: srst = %d", srst_gpio);
+       command_print(CMD, "imx_gpio GPIO config: srst = %d", srst_gpio);
        return ERROR_OK;
 }
 
@@ -272,7 +278,7 @@ COMMAND_HANDLER(imx_gpio_handle_jtag_gpionum_trst)
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], trst_gpio);
 
-       command_print(CMD_CTX, "imx_gpio GPIO config: trst = %d", trst_gpio);
+       command_print(CMD, "imx_gpio GPIO config: trst = %d", trst_gpio);
        return ERROR_OK;
 }
 
@@ -285,7 +291,7 @@ COMMAND_HANDLER(imx_gpio_handle_swd_gpionums)
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       command_print(CMD_CTX,
+       command_print(CMD,
                        "imx_gpio GPIO nums: swclk = %d, swdio = %d",
                        swclk_gpio, swdio_gpio);
 
@@ -297,7 +303,7 @@ COMMAND_HANDLER(imx_gpio_handle_swd_gpionum_swclk)
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swclk_gpio);
 
-       command_print(CMD_CTX, "imx_gpio num: swclk = %d", swclk_gpio);
+       command_print(CMD, "imx_gpio num: swclk = %d", swclk_gpio);
        return ERROR_OK;
 }
 
@@ -306,7 +312,7 @@ COMMAND_HANDLER(imx_gpio_handle_swd_gpionum_swdio)
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swdio_gpio);
 
-       command_print(CMD_CTX, "imx_gpio num: swdio = %d", swdio_gpio);
+       command_print(CMD, "imx_gpio num: swdio = %d", swdio_gpio);
        return ERROR_OK;
 }
 
@@ -316,6 +322,9 @@ COMMAND_HANDLER(imx_gpio_handle_speed_coeffs)
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], speed_coeff);
                COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], speed_offset);
        }
+
+       command_print(CMD_CTX, "imx_gpio: speed_coeffs = %d, speed_offset = %d",
+                                 speed_coeff, speed_offset);
        return ERROR_OK;
 }
 
@@ -323,6 +332,9 @@ COMMAND_HANDLER(imx_gpio_handle_peripheral_base)
 {
        if (CMD_ARGC == 1)
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], imx_gpio_peri_base);
+
+       command_print(CMD_CTX, "imx_gpio: peripheral_base = 0x%08x",
+                                 imx_gpio_peri_base);
        return ERROR_OK;
 }
 
@@ -332,74 +344,84 @@ static const struct command_registration imx_gpio_command_handlers[] = {
                .handler = &imx_gpio_handle_jtag_gpionums,
                .mode = COMMAND_CONFIG,
                .help = "gpio numbers for tck, tms, tdi, tdo. (in that order)",
-               .usage = "(tck tms tdi tdo)* ",
+               .usage = "[tck tms tdi tdo]",
        },
        {
                .name = "imx_gpio_tck_num",
                .handler = &imx_gpio_handle_jtag_gpionum_tck,
                .mode = COMMAND_CONFIG,
                .help = "gpio number for tck.",
+               .usage = "[tck]",
        },
        {
                .name = "imx_gpio_tms_num",
                .handler = &imx_gpio_handle_jtag_gpionum_tms,
                .mode = COMMAND_CONFIG,
                .help = "gpio number for tms.",
+               .usage = "[tms]",
        },
        {
                .name = "imx_gpio_tdo_num",
                .handler = &imx_gpio_handle_jtag_gpionum_tdo,
                .mode = COMMAND_CONFIG,
                .help = "gpio number for tdo.",
+               .usage = "[tdo]",
        },
        {
                .name = "imx_gpio_tdi_num",
                .handler = &imx_gpio_handle_jtag_gpionum_tdi,
                .mode = COMMAND_CONFIG,
                .help = "gpio number for tdi.",
+               .usage = "[tdi]",
        },
        {
                .name = "imx_gpio_swd_nums",
                .handler = &imx_gpio_handle_swd_gpionums,
                .mode = COMMAND_CONFIG,
                .help = "gpio numbers for swclk, swdio. (in that order)",
-               .usage = "(swclk swdio)* ",
+               .usage = "[swclk swdio]",
        },
        {
                .name = "imx_gpio_swclk_num",
                .handler = &imx_gpio_handle_swd_gpionum_swclk,
                .mode = COMMAND_CONFIG,
                .help = "gpio number for swclk.",
+               .usage = "[swclk]",
        },
        {
                .name = "imx_gpio_swdio_num",
                .handler = &imx_gpio_handle_swd_gpionum_swdio,
                .mode = COMMAND_CONFIG,
                .help = "gpio number for swdio.",
+               .usage = "[swdio]",
        },
        {
                .name = "imx_gpio_srst_num",
                .handler = &imx_gpio_handle_jtag_gpionum_srst,
                .mode = COMMAND_CONFIG,
                .help = "gpio number for srst.",
+               .usage = "[srst]",
        },
        {
                .name = "imx_gpio_trst_num",
                .handler = &imx_gpio_handle_jtag_gpionum_trst,
                .mode = COMMAND_CONFIG,
                .help = "gpio number for trst.",
+               .usage = "[trst]",
        },
        {
                .name = "imx_gpio_speed_coeffs",
                .handler = &imx_gpio_handle_speed_coeffs,
                .mode = COMMAND_CONFIG,
                .help = "SPEED_COEFF and SPEED_OFFSET for delay calculations.",
+               .usage = "[SPEED_COEFF SPEED_OFFSET]",
        },
        {
                .name = "imx_gpio_peripheral_base",
                .handler = &imx_gpio_handle_peripheral_base,
                .mode = COMMAND_CONFIG,
                .help = "peripheral base to access GPIOs (0x0209c000 for most IMX).",
+               .usage = "[base]",
        },
 
        COMMAND_REGISTRATION_DONE
@@ -469,7 +491,7 @@ static int imx_gpio_init(void)
 
 
        LOG_INFO("imx_gpio mmap: pagesize: %u, regionsize: %u",
-                       sysconf(_SC_PAGE_SIZE), IMX_GPIO_REGS_COUNT * IMX_GPIO_SIZE);
+                       (unsigned int) sysconf(_SC_PAGE_SIZE), IMX_GPIO_REGS_COUNT * IMX_GPIO_SIZE);
        pio_base = mmap(NULL, IMX_GPIO_REGS_COUNT * IMX_GPIO_SIZE,
                                PROT_READ | PROT_WRITE,
                                MAP_SHARED, dev_mem_fd, imx_gpio_peri_base);
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)