X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fbcm2835gpio.c;h=f547d93a4c49036f302af0753ffd609e52fea076;hb=49232a80d2cb1a2e188a037cad94fd760ae64808;hp=edec4beffd5661420d768c67d22d9591060f26db;hpb=6cb5ba6f1136df2986850f5c176cb38e34ca1795;p=openocd.git

diff --git a/src/jtag/drivers/bcm2835gpio.c b/src/jtag/drivers/bcm2835gpio.c
index edec4beffd..f547d93a4c 100644
--- a/src/jtag/drivers/bcm2835gpio.c
+++ b/src/jtag/drivers/bcm2835gpio.c
@@ -51,7 +51,6 @@ static volatile uint32_t *pio_base;
 
 static bb_value_t bcm2835gpio_read(void);
 static int bcm2835gpio_write(int tck, int tms, int tdi);
-static int bcm2835gpio_reset(int trst, int srst);
 
 static int bcm2835_swdio_read(void);
 static void bcm2835_swdio_drive(bool is_output);
@@ -62,7 +61,6 @@ static int bcm2835gpio_quit(void);
 static struct bitbang_interface bcm2835gpio_bitbang = {
 	.read = bcm2835gpio_read,
 	.write = bcm2835gpio_write,
-	.reset = bcm2835gpio_reset,
 	.swdio_read = bcm2835_swdio_read,
 	.swdio_drive = bcm2835_swdio_drive,
 	.blink = NULL
@@ -301,7 +299,7 @@ COMMAND_HANDLER(bcm2835gpio_handle_speed_coeffs)
 		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], speed_offset);
 	}
 
-	command_print(CMD_CTX, "BCM2835 GPIO: speed_coeffs = %d, speed_offset = %d",
+	command_print(CMD, "BCM2835 GPIO: speed_coeffs = %d, speed_offset = %d",
 				  speed_coeff, speed_offset);
 	return ERROR_OK;
 }
@@ -311,7 +309,7 @@ COMMAND_HANDLER(bcm2835gpio_handle_peripheral_base)
 	if (CMD_ARGC == 1)
 		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bcm2835_peri_base);
 
-	command_print(CMD_CTX, "BCM2835 GPIO: peripheral_base = 0x%08x",
+	command_print(CMD, "BCM2835 GPIO: peripheral_base = 0x%08x",
 				  bcm2835_peri_base);
 	return ERROR_OK;
 }
@@ -407,18 +405,25 @@ static const struct command_registration bcm2835gpio_command_handlers[] = {
 
 static const char * const bcm2835_transports[] = { "jtag", "swd", NULL };
 
-struct jtag_interface bcm2835gpio_interface = {
-	.name = "bcm2835gpio",
+static struct jtag_interface bcm2835gpio_interface = {
 	.supported = DEBUG_CAP_TMS_SEQ,
 	.execute_queue = bitbang_execute_queue,
+};
+
+struct adapter_driver bcm2835gpio_adapter_driver = {
+	.name = "bcm2835gpio",
 	.transports = bcm2835_transports,
-	.swd = &bitbang_swd,
-	.speed = bcm2835gpio_speed,
-	.khz = bcm2835gpio_khz,
-	.speed_div = bcm2835gpio_speed_div,
 	.commands = bcm2835gpio_command_handlers,
+
 	.init = bcm2835gpio_init,
 	.quit = bcm2835gpio_quit,
+	.reset = bcm2835gpio_reset,
+	.speed = bcm2835gpio_speed,
+	.khz = bcm2835gpio_khz,
+	.speed_div = bcm2835gpio_speed_div,
+
+	.jtag_ops = &bcm2835gpio_interface,
+	.swd_ops = &bitbang_swd,
 };
 
 static bool bcm2835gpio_jtag_mode_possible(void)
@@ -461,7 +466,11 @@ static int bcm2835gpio_init(void)
 		return ERROR_JTAG_INIT_FAILED;
 	}
 
-	dev_mem_fd = open("/dev/mem", O_RDWR | O_SYNC);
+	dev_mem_fd = open("/dev/gpiomem", O_RDWR | O_SYNC);
+	if (dev_mem_fd < 0) {
+		LOG_DEBUG("Cannot open /dev/gpiomem, fallback to /dev/mem");
+		dev_mem_fd = open("/dev/mem", O_RDWR | O_SYNC);
+	}
 	if (dev_mem_fd < 0) {
 		perror("open");
 		return ERROR_JTAG_INIT_FAILED;
@@ -526,7 +535,6 @@ static int bcm2835gpio_init(void)
 
 	if (swd_mode) {
 		bcm2835gpio_bitbang.write = bcm2835gpio_swd_write;
-		bitbang_switch_to_swd();
 	}
 
 	return ERROR_OK;