diff options
| author | Martin Burnicki <martin.burnicki@meinberg.de> | 2017-09-04 12:01:00 +0200 |
|---|---|---|
| committer | Martin Burnicki <martin.burnicki@meinberg.de> | 2017-09-04 12:01:00 +0200 |
| commit | 189c0ac39d486ff33cc70efa91e2ed68413a2145 (patch) | |
| tree | ca04614866b1063723b5c699cf8920698712a461 | |
| parent | f17a858507f59c68eaff942e9dda9d37906e5d4b (diff) | |
| download | mbgtools-nbsd-189c0ac39d486ff33cc70efa91e2ed68413a2145.tar.gz mbgtools-nbsd-189c0ac39d486ff33cc70efa91e2ed68413a2145.zip | |
Kernel driver patch by Frank KardelHEADmbgtools-nbsd-dev-2017-09-04master
| -rwxr-xr-x | mbgclock/Makefile | 6 | ||||
| -rwxr-xr-x | mbgclock/mbgclock_main.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/mbgclock/Makefile b/mbgclock/Makefile index 32fce7d..7d56fb5 100755 --- a/mbgclock/Makefile +++ b/mbgclock/Makefile @@ -1,20 +1,20 @@ ######################################################################### # -# $Id: Makefile 1.1.1.2 2017/08/10 15:10:19 martin TEST $ +# $Id: Makefile 1.1.1.3 2017/09/07 08:06:01 martin TEST $ # # Description: # Makefile for NetBSD kernel driver mbgclock. # # ----------------------------------------------------------------------- # $Log: Makefile $ +# Revision 1.1.1.3 2017/09/07 08:06:01 martin +# Removed obsolete code. # Revision 1.1.1.2 2017/08/10 15:10:19 martin # *** empty log message *** # ######################################################################### -# CPPFLAGS += -D_HAVE_PPS_REF_EVENT -DPPS_SYNC - KMOD = mbgclock SRCS = mbgclock_main.c diff --git a/mbgclock/mbgclock_main.c b/mbgclock/mbgclock_main.c index cd4adc4..110dc84 100755 --- a/mbgclock/mbgclock_main.c +++ b/mbgclock/mbgclock_main.c @@ -1,7 +1,7 @@ /************************************************************************** * - * $Id: mbgclock_main.c 1.3.1.1 2017/08/11 10:18:36 martin TEST $ + * $Id: mbgclock_main.c 1.3.1.2 2017/09/07 08:05:31 martin TEST $ * * Description: * Main file for for mbgclock driver to support Meinberg bus level @@ -37,6 +37,8 @@ * * ----------------------------------------------------------------------- * $Log: mbgclock_main.c $ + * Revision 1.3.1.2 2017/09/07 08:05:31 martin + * Patch by Frank Kardel. * Revision 1.3.1.1 2017/08/11 10:18:36 martin * Re-added LKM support. * Removed obsolete debug stuff. @@ -69,6 +71,10 @@ #include <pcpsdrvr.h> #include <mbgddmsg.h> +#if __NetBSD_Prereq__(6, 99, 22) +#define _HAVE_PPS_REF_EVENT +#endif + #ifndef PCI_BAR #define PCI_BAR(__n) (0x10 + 4 * (__n)) #endif @@ -853,7 +859,7 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) case PPS_IOC_SETPARAMS: case PPS_IOC_GETCAP: case PPS_IOC_FETCH: -#ifdef PPS_SYNC +#ifdef PPS_IOC_KCBIND case PPS_IOC_KCBIND: #endif mutex_spin_enter(&timecounter_lock); @@ -1005,7 +1011,7 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) } } - DPRINTF(DB_FOLLOW, ("mbgclockioctl(0x%"PRIx64", 0x%lx, %p, 0x%x, %p) return rc=\n", + DPRINTF(DB_FOLLOW, ("mbgclockioctl(0x%"PRIx64", 0x%lx, %p, 0x%x, %p) return rc=%d\n", dev, cmd, data, flag, l->l_proc, rc)); return rc; |