[svn-commits] fjoe: freebsd/trunk r9115 - in /freebsd/trunk: drivers/dahdi/ include/dahdi/c...

[SVN commits to the Digium repositories]

Author: fjoe
Date: Mon Aug  9 05:44:14 2010
New Revision: 9115

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9115
Log:
Fix build on FreeBSD 9.

Modified:
    freebsd/trunk/drivers/dahdi/dahdi-base.c
    freebsd/trunk/include/dahdi/compat/bsd.h

Modified: freebsd/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9115&r1=9114&r2=9115
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi-base.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi-base.c Mon Aug  9 05:44:14 2010
@@ -9051,7 +9051,11 @@
 }
 
 static int
+#if D_VERSION_LINEAR >= 0x20091217
+dahdi_device_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr)
+#else
 dahdi_device_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
+#endif
 {
 	int res;
 	struct file file;

Modified: freebsd/trunk/include/dahdi/compat/bsd.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/dahdi/compat/bsd.h?view=diff&rev=9115&r1=9114&r2=9115
==============================================================================
--- freebsd/trunk/include/dahdi/compat/bsd.h (original)
+++ freebsd/trunk/include/dahdi/compat/bsd.h Mon Aug  9 05:44:14 2010
@@ -1,7 +1,9 @@
 #ifndef _DAHDI_COMPAT_BSD_H_
 #define _DAHDI_COMPAT_BSD_H_
 
+#include <sys/param.h>
 #include <sys/callout.h>
+#include <sys/conf.h>		/* D_VERSION */
 #include <sys/condvar.h>
 #include <sys/endian.h>
 #include <sys/lock.h>
@@ -13,6 +15,8 @@
 #include <sys/taskqueue.h>
 #include <machine/atomic.h>
 #include <machine/bus.h>
+
+#define D_VERSION_LINEAR	((D_VERSION & 0xffff) | ((D_VERSION >> 16) & 0xff) | ((D_VERSION >> 24) & 0xff))
 
 #define LINUX_VERSION_CODE	KERNEL_VERSION(2, 6, 32)
 #define KERNEL_VERSION(x, y, z)	(((x) << 16) + ((y) << 8) + (z))
@@ -515,7 +519,11 @@
 };
 
 struct vm_area_struct {
+#if D_VERSION_LINEAR >= 0x20091217
+	vm_ooffset_t offset;
+#else
 	vm_offset_t offset;
+#endif
 	vm_paddr_t *paddr;
 	int nprot;
 };