diff --git a/src/daemon.c b/src/daemon.c index 245d34181..a88dcf6a7 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -65,7 +65,7 @@ #endif #ifdef HAVE_TRANSPORT_H4 -#include "hci_transport_h4.h" +#include "hci_transport.h" #endif #ifdef HAVE_TRANSPORT_USB diff --git a/src/hci_dump.c b/src/hci_dump.c index 3daec6fa1..93d84856c 100644 --- a/src/hci_dump.c +++ b/src/hci_dump.c @@ -43,7 +43,7 @@ #include "hci_dump.h" #include "hci.h" -#include "hci_transport_h4.h" +#include "hci_transport.h" #include // open #include // hton.. diff --git a/src/hci_transport.h b/src/hci_transport.h index acd9444cc..fb4fd9708 100644 --- a/src/hci_transport.h +++ b/src/hci_transport.h @@ -62,3 +62,8 @@ typedef struct { typedef struct { // unique usb device identifier } hci_libusb_config_t; + +// inline hci_transport_h4.h +extern hci_transport_t * hci_transport_h4_instance(); + + diff --git a/src/hci_transport_h4.c b/src/hci_transport_h4.c index c6144985b..c51e54ee0 100644 --- a/src/hci_transport_h4.c +++ b/src/hci_transport_h4.c @@ -43,7 +43,7 @@ #include #include "hci.h" -#include "hci_transport_h4.h" +#include "hci_transport.h" #include "hci_dump.h" typedef enum { diff --git a/src/hci_transport_h4.h b/src/hci_transport_h4.h deleted file mode 100644 index 63dab74c5..000000000 --- a/src/hci_transport_h4.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2009 by Matthias Ringwald - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY MATTHIAS RINGWALD AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS - * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF - * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -/* - * hci_h4_transport.h - * - * Created by Matthias Ringwald on 4/29/09. - * - */ -#pragma once - -#include "hci_transport.h" - -extern hci_transport_t * hci_transport_h4_instance();