[svn-commits] fjoe: freebsd/trunk r10677 - in /freebsd/trunk: bsd-kmod/dahdi/ include/dahdi/

[SVN commits to the Digium repositories]

Author: fjoe
Date: Wed Apr 25 10:53:32 2012
New Revision: 10677

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10677
Log:
Make userland headers to not require Linux headers.

Modified:
    freebsd/trunk/bsd-kmod/dahdi/Makefile
    freebsd/trunk/include/dahdi/user.h
    freebsd/trunk/include/dahdi/wctdm_user.h

Modified: freebsd/trunk/bsd-kmod/dahdi/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/bsd-kmod/dahdi/Makefile?view=diff&rev=10677&r1=10676&r2=10677
==============================================================================
--- freebsd/trunk/bsd-kmod/dahdi/Makefile (original)
+++ freebsd/trunk/bsd-kmod/dahdi/Makefile Wed Apr 25 10:53:32 2012
@@ -10,7 +10,6 @@
 CLEANFILES=	version.h dahdi
 CFLAGS+=	-I${.CURDIR}
 DAHDI_INCS=	dahdi_config.h user.h wctdm_user.h
-LINUX_INCS=	ioctl.h types.h
 
 DAHDIVERSION!=	${.CURDIR}/../../build_tools/make_version ${.CURDIR}/../.. dahdi/freebsd
 version.h::
@@ -24,12 +23,9 @@
 .endif
 
 install-headers:
-	${MKDIR} ${PREFIX}/include/dahdi/compat/linux
+	${MKDIR} ${PREFIX}/include/dahdi
 .for _h in ${DAHDI_INCS}
 	${INSTALL_DATA} ${INCLUDEDIR}/dahdi/${_h} ${PREFIX}/include/dahdi/${_h:H}
-.endfor
-.for _h in ${LINUX_INCS}
-	${INSTALL_DATA} ${INCLUDEDIR}/linux/${_h} ${PREFIX}/include/dahdi/compat/linux/${_h:H}
 .endfor
 
 .include <bsd.kmod.mk>

Modified: freebsd/trunk/include/dahdi/user.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/dahdi/user.h?view=diff&rev=10677&r1=10676&r2=10677
==============================================================================
--- freebsd/trunk/include/dahdi/user.h (original)
+++ freebsd/trunk/include/dahdi/user.h Wed Apr 25 10:53:32 2012
@@ -35,8 +35,16 @@
 #ifndef _DAHDI_USER_H
 #define _DAHDI_USER_H
 
+#if defined(__FreeBSD__) && !defined(_KERNEL)
+#include <sys/ioccom.h>
+#include <sys/types.h>
+
+typedef uint32_t __u32;
+typedef int32_t __s32;
+#else
 #include <linux/types.h>
 #include <linux/ioctl.h>
+#endif
 #include <dahdi/dahdi_config.h>
 
 #if !defined(__FreeBSD__) && !defined(ELAST)

Modified: freebsd/trunk/include/dahdi/wctdm_user.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/dahdi/wctdm_user.h?view=diff&rev=10677&r1=10676&r2=10677
==============================================================================
--- freebsd/trunk/include/dahdi/wctdm_user.h (original)
+++ freebsd/trunk/include/dahdi/wctdm_user.h Wed Apr 25 10:53:32 2012
@@ -25,7 +25,11 @@
 #ifndef _WCTDM_H
 #define _WCTDM_H
 
+#if defined(__FreeBSD__) && !defined(_KERNEL)
+#include <sys/ioccom.h>
+#else
 #include <linux/ioctl.h>
+#endif
 
 #define NUM_REGS	  109
 #define NUM_INDIRECT_REGS 105