openocd: fix SPDX tag format for files .c

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

diff --git a/src/jtag/hla/hla_layout.c b/src/jtag/hla/hla_layout.c
index 1d22fe13e1d18ec5dd0d1b3cb357628ae15e7d63..a760f0b3ccae7d6307c5c77072bda8b052c783b8 100644 (file)
--- 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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -41,9 +28,9 @@ 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");
@@ -59,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 */ },
 };
 
@@ -84,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;
        }