static int swclk_gpio_mode;
static int swdio_gpio = -1;
static int swdio_gpio_mode;
+static int swdio_dir_gpio = -1;
+static int swdio_dir_gpio_mode;
/* Transition delay coefficients */
static int speed_coeff = 113714;
static int speed_offset = 28;
static unsigned int jtag_delay;
+static int is_gpio_valid(int gpio)
+{
+ return gpio >= 0 && gpio <= 31;
+}
+
static bb_value_t bcm2835gpio_read(void)
{
return (GPIO_LEV & 1<<tdo_gpio) ? BB_HIGH : BB_LOW;
uint32_t set = 0;
uint32_t clear = 0;
- if (trst_gpio > 0) {
+ if (is_gpio_valid(trst_gpio)) {
set |= !trst<<trst_gpio;
clear |= trst<<trst_gpio;
}
- if (srst_gpio > 0) {
+ if (is_gpio_valid(srst_gpio)) {
set |= !srst<<srst_gpio;
clear |= srst<<srst_gpio;
}
static void bcm2835_swdio_drive(bool is_output)
{
- if (is_output)
- OUT_GPIO(swdio_gpio);
- else
- INP_GPIO(swdio_gpio);
+ if (is_gpio_valid(swdio_dir_gpio)) {
+ if (is_output) {
+ GPIO_SET = 1 << swdio_dir_gpio;
+ OUT_GPIO(swdio_gpio);
+ } else {
+ INP_GPIO(swdio_gpio);
+ GPIO_CLR = 1 << swdio_dir_gpio;
+ }
+ } else {
+ if (is_output)
+ OUT_GPIO(swdio_gpio);
+ else
+ INP_GPIO(swdio_gpio);
+ }
}
static int bcm2835_swdio_read(void)
return ERROR_OK;
}
-static int is_gpio_valid(int gpio)
-{
- return gpio >= 0 && gpio <= 53;
-}
-
COMMAND_HANDLER(bcm2835gpio_handle_jtag_gpionums)
{
if (CMD_ARGC == 4) {
return ERROR_OK;
}
+COMMAND_HANDLER(bcm2835gpio_handle_swd_dir_gpionum_swdio)
+{
+ if (CMD_ARGC == 1)
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swdio_dir_gpio);
+
+ command_print(CMD, "BCM2835 num: swdio_dir = %d", swdio_dir_gpio);
+ return ERROR_OK;
+}
+
COMMAND_HANDLER(bcm2835gpio_handle_speed_coeffs)
{
if (CMD_ARGC == 2) {
return ERROR_OK;
}
-static const struct command_registration bcm2835gpio_command_handlers[] = {
+static const struct command_registration bcm2835gpio_subcommand_handlers[] = {
{
- .name = "bcm2835gpio_jtag_nums",
+ .name = "jtag_nums",
.handler = &bcm2835gpio_handle_jtag_gpionums,
.mode = COMMAND_CONFIG,
.help = "gpio numbers for tck, tms, tdi, tdo. (in that order)",
.usage = "[tck tms tdi tdo]",
},
{
- .name = "bcm2835gpio_tck_num",
+ .name = "tck_num",
.handler = &bcm2835gpio_handle_jtag_gpionum_tck,
.mode = COMMAND_CONFIG,
.help = "gpio number for tck.",
.usage = "[tck]",
},
{
- .name = "bcm2835gpio_tms_num",
+ .name = "tms_num",
.handler = &bcm2835gpio_handle_jtag_gpionum_tms,
.mode = COMMAND_CONFIG,
.help = "gpio number for tms.",
.usage = "[tms]",
},
{
- .name = "bcm2835gpio_tdo_num",
+ .name = "tdo_num",
.handler = &bcm2835gpio_handle_jtag_gpionum_tdo,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdo.",
.usage = "[tdo]",
},
{
- .name = "bcm2835gpio_tdi_num",
+ .name = "tdi_num",
.handler = &bcm2835gpio_handle_jtag_gpionum_tdi,
.mode = COMMAND_CONFIG,
.help = "gpio number for tdi.",
.usage = "[tdi]",
},
{
- .name = "bcm2835gpio_swd_nums",
+ .name = "swd_nums",
.handler = &bcm2835gpio_handle_swd_gpionums,
.mode = COMMAND_CONFIG,
.help = "gpio numbers for swclk, swdio. (in that order)",
.usage = "[swclk swdio]",
},
{
- .name = "bcm2835gpio_swclk_num",
+ .name = "swclk_num",
.handler = &bcm2835gpio_handle_swd_gpionum_swclk,
.mode = COMMAND_CONFIG,
.help = "gpio number for swclk.",
.usage = "[swclk]",
},
{
- .name = "bcm2835gpio_swdio_num",
+ .name = "swdio_num",
.handler = &bcm2835gpio_handle_swd_gpionum_swdio,
.mode = COMMAND_CONFIG,
.help = "gpio number for swdio.",
.usage = "[swdio]",
},
{
- .name = "bcm2835gpio_srst_num",
+ .name = "swdio_dir_num",
+ .handler = &bcm2835gpio_handle_swd_dir_gpionum_swdio,
+ .mode = COMMAND_CONFIG,
+ .help = "gpio number for swdio direction control pin (set=output mode, clear=input mode)",
+ .usage = "[swdio_dir]",
+ },
+ {
+ .name = "srst_num",
.handler = &bcm2835gpio_handle_jtag_gpionum_srst,
.mode = COMMAND_CONFIG,
.help = "gpio number for srst.",
.usage = "[srst]",
},
{
- .name = "bcm2835gpio_trst_num",
+ .name = "trst_num",
.handler = &bcm2835gpio_handle_jtag_gpionum_trst,
.mode = COMMAND_CONFIG,
.help = "gpio number for trst.",
.usage = "[trst]",
},
{
- .name = "bcm2835gpio_speed_coeffs",
+ .name = "speed_coeffs",
.handler = &bcm2835gpio_handle_speed_coeffs,
.mode = COMMAND_CONFIG,
.help = "SPEED_COEFF and SPEED_OFFSET for delay calculations.",
.usage = "[SPEED_COEFF SPEED_OFFSET]",
},
{
- .name = "bcm2835gpio_peripheral_base",
+ .name = "peripheral_base",
.handler = &bcm2835gpio_handle_peripheral_base,
.mode = COMMAND_CONFIG,
.help = "peripheral base to access GPIOs (RPi1 0x20000000, RPi2 0x3F000000).",
COMMAND_REGISTRATION_DONE
};
+static const struct command_registration bcm2835gpio_command_handlers[] = {
+ {
+ .name = "bcm2835gpio",
+ .mode = COMMAND_ANY,
+ .help = "perform bcm2835gpio management",
+ .chain = bcm2835gpio_subcommand_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
static const char * const bcm2835_transports[] = { "jtag", "swd", NULL };
static struct jtag_interface bcm2835gpio_interface = {
OUT_GPIO(tck_gpio);
OUT_GPIO(tms_gpio);
- if (trst_gpio != -1) {
+ if (is_gpio_valid(trst_gpio)) {
trst_gpio_mode = MODE_GPIO(trst_gpio);
GPIO_SET = 1 << trst_gpio;
OUT_GPIO(trst_gpio);
}
if (transport_is_swd()) {
+ /* Make buffer an output before the GPIO connected to it */
+ if (is_gpio_valid(swdio_dir_gpio)) {
+ swdio_dir_gpio_mode = MODE_GPIO(swdio_dir_gpio);
+ GPIO_SET = 1 << swdio_dir_gpio;
+ OUT_GPIO(swdio_dir_gpio);
+ }
+
swclk_gpio_mode = MODE_GPIO(swclk_gpio);
swdio_gpio_mode = MODE_GPIO(swdio_gpio);
OUT_GPIO(swdio_gpio);
}
- if (srst_gpio != -1) {
+ if (is_gpio_valid(srst_gpio)) {
srst_gpio_mode = MODE_GPIO(srst_gpio);
GPIO_SET = 1 << srst_gpio;
OUT_GPIO(srst_gpio);
SET_MODE_GPIO(tdi_gpio, tdi_gpio_mode);
SET_MODE_GPIO(tck_gpio, tck_gpio_mode);
SET_MODE_GPIO(tms_gpio, tms_gpio_mode);
- if (trst_gpio != -1)
+ if (is_gpio_valid(trst_gpio))
SET_MODE_GPIO(trst_gpio, trst_gpio_mode);
}
SET_MODE_GPIO(swdio_gpio, swdio_gpio_mode);
}
- if (srst_gpio != -1)
+ if (is_gpio_valid(srst_gpio))
SET_MODE_GPIO(srst_gpio, srst_gpio_mode);
+ if (is_gpio_valid(swdio_dir_gpio))
+ SET_MODE_GPIO(swdio_dir_gpio, swdio_dir_gpio_mode);
+
return ERROR_OK;
}