drivers/bcm2835gpio: Add support for activity LED

[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 c5e35182d5ea54003aae553d960adff61c9eaebb..aa0041b31c0aa4b452f05555bf955921c07349ce 100644 (file)
--- a/src/jtag/hla/hla_layout.c
+++ b/src/jtag/hla/hla_layout.c
@@ -1,22 +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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -57,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 */ },
 };
 
@@ -82,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;
        }