Move to linux-tizen-modules-headers

Change-Id: I8a981836b29ddf2c1935a7b8a2b650a71db7ab96

diff --git a/include/dlog_ioctl.h b/include/dlog_ioctl.h
deleted file mode 100644 (file)
index 1e42787..0000000
--- a/include/dlog_ioctl.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _DLOG_IOCTL_H_
-#define _DLOG_IOCTL_H_
-
-#include <sys/ioctl.h>
-#include <stdint.h>
-
-// These are taken from the kernel: ./drivers/staging/android/logger.h
-#define __LOGGERIO     0xAE
-#define LOGGER_GET_LOG_BUF_SIZE        _IO(__LOGGERIO, 1) /* size of log */
-#define LOGGER_GET_LOG_LEN             _IO(__LOGGERIO, 2) /* used log len */
-#define LOGGER_GET_NEXT_ENTRY_LEN      _IO(__LOGGERIO, 3) /* next entry len */
-#define LOGGER_FLUSH_LOG               _IO(__LOGGERIO, 4) /* flush log */
-#define LOGGER_GET_VERSION             _IO(__LOGGERIO, 5) /* get abi version */
-#define LOGGER_SET_VERSION             _IO(__LOGGERIO, 6) /* set abi version */
-#define LOGGER_SET_TAG                 _IO(__LOGGERIO, 7) /* set flow mode tag */
-#define LOGGER_SET_PRIO                _IO(__LOGGERIO, 8) /* set flow mode prio */
-
-/**
- * struct logger_set_tag
- * @len:       Length of a NULL-terminated tag including '\0'
- * @msg:       Pointer to a user buffer containing the tag
- */
-struct logger_set_tag {
-       uint64_t len;
-       uint64_t ptr;
-};
-
-#endif

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index db2e72e..c766091 100644 (file)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -22,6 +22,7 @@ BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: pkgconfig(capi-base-common)
 BuildRequires: pkgconfig(libtzplatform-config)
+BuildRequires: linux-tizen-modules-headers
 %if 0%{?gcov:1}
 BuildRequires: lcov
 BuildRequires: zip

diff --git a/src/libdlogutil/fdi_logger.c b/src/libdlogutil/fdi_logger.c
index 7e41b6a..57dd2ad 100644 (file)
--- a/src/libdlogutil/fdi_logger.c
+++ b/src/libdlogutil/fdi_logger.c
@@ -29,7 +29,7 @@
 
 // DLog
 #include <backend_androidlogger.h>
-#include <dlog_ioctl.h>
+#include <linux/logger.h>
 #include <logconfig.h>
 #include <queued_entry_timestamp.h>
 

diff --git a/src/log-redirect-stdout/internal.c b/src/log-redirect-stdout/internal.c
index 203b7d1..3810662 100644 (file)
--- a/src/log-redirect-stdout/internal.c
+++ b/src/log-redirect-stdout/internal.c
@@ -23,7 +23,8 @@
 #include "internal.h"
 
 #include <backend_androidlogger.h>
-#include <dlog_ioctl.h>
+#include <sys/ioctl.h>
+#include <linux/logger.h>
 #include <logconfig.h>
 #include <logpipe.h>
 

diff --git a/src/shared/backend_androidlogger.c b/src/shared/backend_androidlogger.c
index f9b534d..7b5b871 100644 (file)
--- a/src/shared/backend_androidlogger.c
+++ b/src/shared/backend_androidlogger.c
@@ -33,7 +33,7 @@
 // DLog
 #include <backend_androidlogger.h>
 #include <dlog.h>
-#include <dlog_ioctl.h>
+#include <linux/logger.h>
 #include <logcommon.h>
 #include <logconfig.h>
 

diff --git a/src/shared/logcommon.c b/src/shared/logcommon.c
index 298bcd6..df5a277 100644 (file)
--- a/src/shared/logcommon.c
+++ b/src/shared/logcommon.c
@@ -34,7 +34,7 @@
 #include <logpipe.h>
 #include <assert.h>
 #include <ctype.h>
-#include <dlog_ioctl.h>
+#include <linux/logger.h>
 
 /**
  * @addtogroup SHARED_FUNCTIONS

diff --git a/src/tests/fdi_logger_wrap.c b/src/tests/fdi_logger_wrap.c
index 253f48e..e30d4dd 100644 (file)
--- a/src/tests/fdi_logger_wrap.c
+++ b/src/tests/fdi_logger_wrap.c
@@ -18,7 +18,7 @@
 #include <assert.h>
 
 // DLog
-#include <dlog_ioctl.h>
+#include <linux/logger.h>
 #include "../libdlogutil/fdi_logger.h"
 
 static int open_buf_ret;

diff --git a/src/tests/libdlogutil_neg.c b/src/tests/libdlogutil_neg.c
index ba03cd3..d6c31fa 100644 (file)
--- a/src/tests/libdlogutil_neg.c
+++ b/src/tests/libdlogutil_neg.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <logcommon.h>
-#include <dlog_ioctl.h>
+#include <linux/logger.h>
 #include "../libdlogutil/logretrieve.h"
 
 void negative_main(void)
@@ -128,4 +128,4 @@ int main(int argc, char **argv)
 {
        negative_main();
        return 0;
-}
\ No newline at end of file
+}

diff --git a/tests/test_libdlogutil.c b/tests/test_libdlogutil.c
index 3d7c3a0..545e258 100644 (file)
--- a/tests/test_libdlogutil.c
+++ b/tests/test_libdlogutil.c
@@ -21,7 +21,8 @@
 #include <unistd.h>
 #include <stdbool.h>
 #include <logcommon.h>
-#include <dlog_ioctl.h>
+#include <sys/ioctl.h>
+#include <linux/logger.h>
 
 enum test_mode {
        MODE_DUMP,
@@ -577,4 +578,4 @@ int main(int argc, char **argv)
        }
 
        return EXIT_SUCCESS;
-}
\ No newline at end of file
+}