X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fsysfsgpio.c;h=799141c6ce38705447418e78b9a9342b6a32e5ee;hb=e68f4b77f90b24b554e639a152c4d0fdb62236a9;hp=1cad268936547566f126cfa6ce2938fbcfecec80;hpb=c06af3af918b9b8d68fd16ac91eb2ca5cc0a7610;p=openocd.git

diff --git a/src/jtag/drivers/sysfsgpio.c b/src/jtag/drivers/sysfsgpio.c
index 1cad268936..799141c6ce 100644
--- a/src/jtag/drivers/sysfsgpio.c
+++ b/src/jtag/drivers/sysfsgpio.c
@@ -14,7 +14,7 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 /**
  * @file
@@ -258,28 +258,6 @@ static void sysfsgpio_reset(int trst, int srst)
 	}
 }
 
-/* No speed control is implemented yet */
-static int sysfsgpio_speed(int speed)
-{
-	return ERROR_OK;
-}
-
-static int sysfsgpio_khz(int khz, int *jtag_speed)
-{
-	/* no adaptive clocking */
-	if (khz == 0)
-		return ERROR_FAIL;
-
-	*jtag_speed = 0;
-	return ERROR_OK;
-}
-
-static int sysfsgpio_speed_div(int speed, int *khz)
-{
-	*khz = 1;
-	return ERROR_OK;
-}
-
 /* gpio numbers for each gpio. Negative values are invalid */
 static int tck_gpio = -1;
 static int tms_gpio = -1;
@@ -415,9 +393,6 @@ struct jtag_interface sysfsgpio_interface = {
 	.supported = DEBUG_CAP_TMS_SEQ,
 	.execute_queue = bitbang_execute_queue,
 	.transports = jtag_only,
-	.speed = sysfsgpio_speed,
-	.khz = sysfsgpio_khz,
-	.speed_div = sysfsgpio_speed_div,
 	.commands = sysfsgpio_command_handlers,
 	.init = sysfsgpio_init,
 	.quit = sysfsgpio_quit,
@@ -500,14 +475,18 @@ static int sysfsgpio_init(void)
 		goto out_error;
 
 	/* assume active low*/
-	trst_fd = setup_sysfs_gpio(trst_gpio, 1, 1);
-	if (trst_gpio > 0 && trst_fd < 0)
-		goto out_error;
+	if (trst_gpio > 0) {
+		trst_fd = setup_sysfs_gpio(trst_gpio, 1, 1);
+		if (trst_fd < 0)
+			goto out_error;
+	}
 
 	/* assume active low*/
-	srst_fd = setup_sysfs_gpio(srst_gpio, 1, 1);
-	if (srst_gpio > 0 && srst_fd < 0)
-		goto out_error;
+	if (srst_gpio > 0) {
+		srst_fd = setup_sysfs_gpio(srst_gpio, 1, 1);
+		if (srst_fd < 0)
+			goto out_error;
+	}
 
 	return ERROR_OK;