X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fhla%2Fhla_layout.c;h=a760f0b3ccae7d6307c5c77072bda8b052c783b8;hb=382148e4dd437978997d668f6ec715ddcec1c46e;hp=54c531401f281a5c01fc5e5bf9dd21de0f22e8d8;hpb=adb8ec32dc7439aa3e34ab19f026e390ec129c10;p=fw%2Fopenocd

diff --git a/src/jtag/hla/hla_layout.c b/src/jtag/hla/hla_layout.c
index 54c531401..a760f0b3c 100644
--- a/src/jtag/hla/hla_layout.c
+++ b/src/jtag/hla/hla_layout.c
@@ -1,24 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2011 by Mathias Kuester                                 *
  *   Mathias Kuester <kesmtp@freenet.de>                                   *
  *                                                                         *
  *   Copyright (C) 2012 by Spencer Oliver                                  *
  *   spen@spen-soft.co.uk                                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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.             *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -41,21 +28,15 @@ static int hl_layout_open(struct hl_interface_s *adapter)
 
 	LOG_DEBUG("hl_layout_open");
 
-	adapter->fd = NULL;
+	adapter->handle = NULL;
 
-	res = adapter->layout->api->open(&adapter->param, &adapter->fd);
+	res = adapter->layout->api->open(&adapter->param, &adapter->handle);
 
 	if (res != ERROR_OK) {
 		LOG_DEBUG("failed");
 		return res;
 	}
 
-	/* make sure adapter has set the buffer size */
-	if (!adapter->param.max_buffer) {
-		LOG_ERROR("buffer size not set");
-		return ERROR_FAIL;
-	}
-
 	return ERROR_OK;
 }
 
@@ -65,18 +46,30 @@ static int hl_layout_close(struct hl_interface_s *adapter)
 }
 
 static const struct hl_layout hl_layouts[] = {
+#if BUILD_HLADAPTER_STLINK
 	{
 	 .name = "stlink",
 	 .open = hl_layout_open,
 	 .close = hl_layout_close,
 	 .api = &stlink_usb_layout_api,
 	 },
+#endif
+#if BUILD_HLADAPTER_ICDI
 	{
 	 .name = "ti-icdi",
 	 .open = hl_layout_open,
 	 .close = hl_layout_close,
 	 .api = &icdi_usb_layout_api,
 	},
+#endif
+#if BUILD_HLADAPTER_NULINK
+	{
+	 .name = "nulink",
+	 .open = hl_layout_open,
+	 .close = hl_layout_close,
+	 .api = &nulink_usb_layout_api,
+	},
+#endif
 	{.name = NULL, /* END OF TABLE */ },
 };
 
@@ -90,7 +83,7 @@ int hl_layout_init(struct hl_interface_s *adapter)
 {
 	LOG_DEBUG("hl_layout_init");
 
-	if (adapter->layout == NULL) {
+	if (!adapter->layout) {
 		LOG_ERROR("no layout specified");
 		return ERROR_FAIL;
 	}