Remove sdp_internal.h

3 files changed, 45 insertions, 94 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 4ac8aada..5710846d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -8,8 +8,6 @@ include_HEADERS = \
 	bluetooth.h hci.h hci_lib.h hci_uart.h hci_vhci.h \
 	l2cap.h sco.h rfcomm.h sdp.h sdp_lib.h bnep.h cmtp.h hidp.h
 
-noinst_HEADERS = sdp_internal.h
-
 MAINTAINERCLEANFILES = Makefile.in
 
 all-local:
diff --git a/include/sdp_internal.h b/include/sdp_internal.h
deleted file mode 100644
index 2e0e343b..00000000
--- a/include/sdp_internal.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2001-2002  Nokia Corporation
- *  Copyright (C) 2002-2003  Maxim Krasnyansky <maxk@qualcomm.com>
- *  Copyright (C) 2002-2004  Marcel Holtmann <marcel@holtmann.org>
- *  Copyright (C) 2002-2003  Stephen Crane <steve.crane@rococosoft.com>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation;
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
- *  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
- *  CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *  ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
- *  COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
- *  SOFTWARE IS DISCLAIMED.
- *
- *
- *  $Id$
- */
-
-#ifndef __SDP_INTERNAL_H
-#define __SDP_INTERNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <syslog.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <bluetooth/bluetooth.h>
-
-#define SDPINF(fmt, arg...) syslog(LOG_INFO, fmt "\n", ## arg)
-#define SDPERR(fmt, arg...) syslog(LOG_ERR, "%s: " fmt "\n", __func__ , ## arg)
-
-#ifdef SDP_DEBUG
-#define SDPDBG(fmt, arg...) syslog(LOG_DEBUG, "%s: " fmt "\n", __func__ , ## arg)
-#else
-#define SDPDBG(fmt...)
-#endif
-
-#define SDP_BASIC_ATTR_PDUFORM_SIZE 32
-#define SDP_SEQ_PDUFORM_SIZE 128
-#define SDP_UUID_SEQ_SIZE 256
-#define SDP_MAX_ATTR_LEN 65535
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define ntoh64(x) x
-static inline void ntoh128(uint128_t *src, uint128_t *dst)
-{
-	int i;
-	for (i = 0; i < 16; i++)
-		dst->data[i] = src->data[i];
-}
-#else
-static inline uint64_t ntoh64(uint64_t n)
-{
-	uint64_t h;
-	uint64_t tmp = ntohl(n & 0x00000000ffffffff);
-	h = ntohl(n >> 32);
-	h |= tmp << 32;
-	return h;
-}
-
-static inline void ntoh128(uint128_t *src, uint128_t *dst)
-{
-	int i;
-	for (i = 0; i < 16; i++)
-		dst->data[15 - i] = src->data[i];
-}
-#endif
-
-#define hton64(x) ntoh64(x)
-#define hton128(x,y) ntoh128(x,y)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SDP_INTERNAL_H */
diff --git a/src/sdp.c b/src/sdp.c
index 6230edfe..6f8ce14b 100644
--- a/src/sdp.c
+++ b/src/sdp.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <malloc.h>
+#include <syslog.h>
 #include <sys/un.h>
 #include <sys/socket.h>
 
@@ -47,12 +48,55 @@
 #include <bluetooth/l2cap.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/sdp_internal.h>
+
+#include <netinet/in.h>
+
+#define SDPINF(fmt, arg...) syslog(LOG_INFO, fmt "\n", ## arg)
+#define SDPERR(fmt, arg...) syslog(LOG_ERR, "%s: " fmt "\n", __func__ , ## arg)
+
+#ifdef SDP_DEBUG
+#define SDPDBG(fmt, arg...) syslog(LOG_DEBUG, "%s: " fmt "\n", __func__ , ## arg)
+#else
+#define SDPDBG(fmt...)
+#endif
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define ntoh64(x) (x)
+static inline void ntoh128(uint128_t *src, uint128_t *dst)
+{
+	int i;
+	for (i = 0; i < 16; i++)
+		dst->data[i] = src->data[i];
+}
+#else
+static inline uint64_t ntoh64(uint64_t n)
+{
+	uint64_t h;
+	uint64_t tmp = ntohl(n & 0x00000000ffffffff);
+	h = ntohl(n >> 32);
+	h |= tmp << 32;
+	return h;
+}
+static inline void ntoh128(uint128_t *src, uint128_t *dst)
+{
+	int i;
+	for (i = 0; i < 16; i++)
+		dst->data[15 - i] = src->data[i];
+}
+#endif
+
+#define hton64(x)     ntoh64(x)
+#define hton128(x, y) ntoh128(x, y)
 
 #define BASE_UUID "00000000-0000-1000-8000-00805F9B34FB"
 
 static uint128_t *bluetooth_base_uuid = NULL;
 
+#define SDP_BASIC_ATTR_PDUFORM_SIZE 32
+#define SDP_SEQ_PDUFORM_SIZE 128
+#define SDP_UUID_SEQ_SIZE 256
+#define SDP_MAX_ATTR_LEN 65535
+
 /* Message structure. */
 struct tupla {
 	int index;