stlink: support of ST-LINK TCP server using stlink-dap and hla

[openocd.git] / src / jtag / hla / hla_layout.c

diff --git a/src/jtag/hla/hla_layout.c b/src/jtag/hla/hla_layout.c
index 54c531401f281a5c01fc5e5bf9dd21de0f22e8d8..cf51a671330889a8274e72c19344393ba5056c75 100644 (file)
--- a/src/jtag/hla/hla_layout.c
+++ b/src/jtag/hla/hla_layout.c
@@ -16,9 +16,7 @@
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -41,21 +39,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 +57,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 */ },
 };