header: move all user define to zio-user.h

Thanks to this patch all user-space applications depends only on the zio-user.h header Signed-off-by: Federico Vaga <federico.vaga@cern.ch> Acked-by: Alessandro Rubini <rubini@gnudd.com>

header: move all user define to zio-user.h
Thanks to this patch all user-space applications depends only on the zio-user.h header Signed-off-by: Federico Vaga <federico.vaga@cern.ch> Acked-by: Alessandro Rubini <rubini@gnudd.com>
5ec0db53 · Federico Vaga · 34adc3c3 · 5ec0db53 · 5ec0db53 · 5ec0db53
Commit 5ec0db53 authored May 05, 2014 by Federico Vaga
Showing with 12 additions and 14 deletions

zio-user.h include/linux/zio-user.h +11 -1

zio.h include/linux/zio.h +1 -10

test-dtc.c tools/test-dtc.c +0 -1

zio-cat-file.c tools/zio-cat-file.c +0 -1

zio-dump.c tools/zio-dump.c +0 -1

No files found.
--- a/include/linux/zio-user.h
+++ b/include/linux/zio-user.h
@@ -7,7 +7,17 @@
 */
 #ifndef __ZIO_USER_H__
 #define __ZIO_USER_H__
-#include <linux/zio.h>
+
+/* ZIO_VERSION: is a zio_class attribute to identify the framework version*/
+#define ZIO_MAJOR_VERSION 1
+#define ZIO_MINOR_VERSION 0
+
+/*
+ * ZIO_OBJ_NAME_LEN is the name's length used for registered objects
+ * (such as trigger_type, buffer_type and zio_device) and thus shown in
+ * the control structure.
+ */
+#define ZIO_OBJ_NAME_LEN 12

 /*
 * Maximum number of standard and extended attributes. These two values

--- a/include/linux/zio.h
+++ b/include/linux/zio.h
@@ -3,16 +3,7 @@
 #ifndef __ZIO_H__
 #define __ZIO_H__

-/* ZIO_VERSION: is a zio_class attribute to identify the framework version*/
-#define ZIO_MAJOR_VERSION 1
-#define ZIO_MINOR_VERSION 0
-
-/*
- * ZIO_OBJ_NAME_LEN is the name's length used for registered objects
- * (such as trigger_type, buffer_type and zio_device) and thus shown in
- * the control structure.
- */
-#define ZIO_OBJ_NAME_LEN 12
+#include <linux/zio-user.h>

 #ifdef __KERNEL__ /* Nothing more is for user space */


--- a/tools/test-dtc.c
+++ b/tools/test-dtc.c
@@ -13,7 +13,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#include <linux/zio.h>
 #include <linux/zio-user.h>

 #define FNAME "/dev/zdtc-0000-0-0-ctrl"

--- a/tools/zio-cat-file.c
+++ b/tools/zio-cat-file.c
@@ -15,7 +15,6 @@
 #include <sys/time.h>
 #include <sys/mman.h>

-#include <linux/zio.h>
 #include <linux/zio-user.h>

 #define VERBOSE 0

--- a/tools/zio-dump.c
+++ b/tools/zio-dump.c
@@ -13,7 +13,6 @@
 #include <sys/stat.h>
 #include <sys/select.h>

-#include <linux/zio.h>
 #include <linux/zio-user.h>

 unsigned char buf[1024*1024];