Update files from mbgtools-nbsd-20110328.tgzmbgtools-nbsd-20110328

Provided by Frank Kardel

4 files changed, 66 insertions, 10 deletions

diff --git a/src/external/bsd/meinberg/dist/mbglib/common/pcpsdev.h b/src/external/bsd/meinberg/dist/mbglib/common/pcpsdev.h
index f8cf9e8..a9a617e 100755
--- a/src/external/bsd/meinberg/dist/mbglib/common/pcpsdev.h
+++ b/src/external/bsd/meinberg/dist/mbglib/common/pcpsdev.h
@@ -539,7 +539,7 @@ void mbg_get_pc_cycles( MBG_PC_CYCLES *p )
     #define MBG_PC_CYCLES_SUPPORTED  1
 
 #elif defined( MBG_TGT_NETBSD ) && defined ( MBG_TGT_KERNEL )
-      *p = cpu_counter_serializing();
+      *p = cpu_counter();
 
     #define MBG_PC_CYCLES_SUPPORTED  1
 
diff --git a/src/external/bsd/meinberg/mbgclock/Makefile.kmod b/src/external/bsd/meinberg/mbgclock/Makefile.kmod
index 1912e2d..ab1d577 100644
--- a/src/external/bsd/meinberg/mbgclock/Makefile.kmod
+++ b/src/external/bsd/meinberg/mbgclock/Makefile.kmod
@@ -4,12 +4,16 @@
 
 .PATH: ${MBG_LIB_COMMON} ${MBG_LIB_BSD}
 
-.include "../../../../sys/modules/Makefile.inc"
+MKMAN=no
 
 KMOD=	mbgclock
-SRCS=	mbgclock.c
+SRCS=	mbgclockdrvr.c
 SRCS+=  pcpsdrvr.c
 SRCS+=  identdec.c
 SRCS+=	rsrc_bsd.c
 
+.if defined(MKMODULAR) && (${MKMODULAR}!="no")
 .include <bsd.kmodule.mk>
+.else
+.include <bsd.kmod.mk>
+.endif
diff --git a/src/external/bsd/meinberg/mbgclock/files.mbgclock b/src/external/bsd/meinberg/mbgclock/files.mbgclock
index 9a1676a..3a9f782 100644
--- a/src/external/bsd/meinberg/mbgclock/files.mbgclock
+++ b/src/external/bsd/meinberg/mbgclock/files.mbgclock
@@ -5,7 +5,7 @@ attach	mbgclock at pci
 file	external/bsd/meinberg/dist/mbglib/bsd/rsrc_bsd.c	mbgclock
 file	external/bsd/meinberg/dist/mbglib/common/identdec.c	mbgclock
 file	external/bsd/meinberg/dist/mbglib/common/pcpsdrvr.c	mbgclock
-file	external/bsd/meinberg/mbgclock/mbgclock.c		mbgclock
+file	external/bsd/meinberg/mbgclock/mbgclockdrvr.c		mbgclock
 
 makeoptions	mbgclock CPPFLAGS+="-I$S/external/bsd/meinberg/dist/mbglib/common"
 makeoptions	mbgclock CPPFLAGS+="-I$S/external/bsd/meinberg/dist/mbglib/bsd"
diff --git a/src/external/bsd/meinberg/mbgclock/mbgclockdrvr.c b/src/external/bsd/meinberg/mbgclock/mbgclockdrvr.c
index 2899933..8ffeb31 100644
--- a/src/external/bsd/meinberg/mbgclock/mbgclockdrvr.c
+++ b/src/external/bsd/meinberg/mbgclock/mbgclockdrvr.c
@@ -18,6 +18,10 @@
 #include <pcpsdrvr.h>
 #include <mbgddmsg.h>
 
+#ifndef PCI_BAR
+#define PCI_BAR(__n)            (0x10 + 4 * (__n))
+#endif
+
 #define REV_NUM          0x100
 #define REV_NUM_STR      "1.00"
 #define MBG_COPYRIGHT    "(c) Meinberg 2011"
@@ -67,6 +71,7 @@ const struct cdevsw mbgclock_cdevsw = {
 	D_OTHER|D_MPSAFE
 };
 
+#ifdef CFATTACH_DECL3_NEW
 CFATTACH_DECL3_NEW(mbgclock,
 		   sizeof(struct mbgclock_softc),
 		   mbgclock_match,
@@ -76,6 +81,16 @@ CFATTACH_DECL3_NEW(mbgclock,
 		   NULL,
 		   NULL,
 		   DVF_DETACH_SHUTDOWN);
+#else
+CFATTACH_DECL2_NEW(mbgclock,
+		   sizeof(struct mbgclock_softc),
+		   mbgclock_match,
+		   mbgclock_attach,
+		   mbgclock_detach,
+		   NULL,
+		   NULL,
+		   NULL);
+#endif
 
 extern struct cfdriver mbgclock_cd;
 
@@ -93,12 +108,9 @@ static int mbgclockdebug = ~0;
 #define DPRINTF(_X_, _Y_) /* empty */
 #endif
 
-/*----- module -----*/
-#ifdef _MODULE
-
-#include <sys/module.h>
+/*----- loadables -----*/
+#if defined (_LKM) || defined(_MODULE)
 
-MODULE(MODULE_CLASS_DRIVER, mbgclock, NULL);
 CFDRIVER_DECL(mbgclock, DV_DULL, NULL);
 
 static int mbgclock_loc[] = { -1, -1 };
@@ -120,6 +132,14 @@ static struct cfdata mbgclock_cfdata[] = {
 	{ NULL }
 };
 
+#endif
+
+/*----- module -----*/
+#ifdef _MODULE
+
+#include <sys/module.h>
+
+MODULE(MODULE_CLASS_DRIVER, mbgclock, NULL);
 static int
 mbgclock_modcmd(modcmd_t cmd, void *arg)
 {
@@ -184,6 +204,38 @@ mbgclock_modcmd(modcmd_t cmd, void *arg)
 }
 #endif
 
+/*------ LKM -----*/
+#if defined(_LKM) && !defined(_MODULE)
+
+#include <sys/lkm.h>
+
+int mbgclock_lkmentry(struct lkm_table *, int, int);
+
+static struct cfdriver *mbgclock_cfdrivers[] = {
+        &mbgclock_cd,
+        NULL
+};
+static struct cfattach *mbgclock_cfattachs[] = {
+        &mbgclock_ca,
+        NULL
+};
+static const struct cfattachlkminit mbgclock_cfattachinit[] = {
+        { "mbgclock", mbgclock_cfattachs },
+        { NULL }
+};
+
+MOD_DRV("mbgclock",
+        mbgclock_cfdrivers,
+        mbgclock_cfattachinit,
+        mbgclock_cfdata);
+
+int
+mbgclock_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
+{
+        DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc);
+}
+#endif
+
 /*----- autoconf -----*/
 
 /* PCI Support Functions */
@@ -278,7 +330,7 @@ mbg_alloc_rsrcs( device_t device )
 	  case PCI_MAPREG_MEM_TYPE_64BIT:
 #if __LP64__
 		  /* XXX */
-		  aprint_error_dev(self,
+		  aprint_error_dev(device,
 				   "WARNING: ignoring 64-bit BAR @ 0x%02x\n", reg);
 		  continue;
 #else