Date: Sun, 10 Aug 1997 19:40:27 -0400 From: John Capo <jc@irbs.com> To: "Jonathan A. Zdziarski" <jonz@netrail.net> Cc: dmaddox@scsn.net, ports@FreeBSD.ORG Subject: Re: SKIP Port Message-ID: <19970810194027.10114@irbs.com> In-Reply-To: <Pine.BSF.3.95q.970810182311.5489A-100000@netrail.net>; from Jonathan A. Zdziarski on Sun, Aug 10, 1997 at 06:23:21PM %2B0000 References: <19970810172907.52414@scsn.net> <Pine.BSF.3.95q.970810182311.5489A-100000@netrail.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--- /u2/skip-dist/skip/freebsd/skip_wrapper.c Fri Oct 25 16:12:43 1996
+++ src/skip/freebsd/skip_wrapper.c Sun Aug 10 19:35:21 1997
@@ -47,6 +47,15 @@
/*
* System includes
*/
+
+#include <osreldate.h>
+
+#if __FreeBSD_version > 220000
+#ifdef KERNEL
+#define ACTUALLY_LKM_NOT_KERNEL
+#endif
+#endif
+
#include <skip_os.h>
/*
#ifdef OPENPROMS
@@ -66,7 +75,6 @@
#include <skip_es.h>
#include <skip_if.h>
-
/*
* SunOS 4.1.x loadable driver wrapper for the SKIP module
*/
@@ -85,13 +93,17 @@
NULL, NULL, NULL, skip_ifselect, NULL, NULL
};
-MOD_DEV("skipmod", LM_DT_CHAR, -1, (void *)&skipdevsw)
+#if __FreeBSD_version < 220000
+MOD_DEV("skip", LM_DT_CHAR, -1, (void *)&skipdevsw)
+#else
+MOD_DEV(skip, LM_DT_CHAR, -1, &skipdevsw);
+#endif
extern int skip_init(), skip_uninit();
/*ARGSUSED*/
int
-skipmod_load(struct lkm_table *lkmtp, int cmd)
+skip_load(struct lkm_table *lkmtp, int cmd)
{
int rc;
@@ -103,7 +115,8 @@
return (0);
}
-skipmod_unload(struct lkm_table *lkmtp, int cmd)
+int
+skip_unload(struct lkm_table *lkmtp, int cmd)
{
int rc;
@@ -114,7 +127,21 @@
return (rc);
}
+#if __FreeBSD_version < 220000
+
+int
xxxinit(struct lkm_table *lkmtp, int cmd, int ver)
{
- DISPATCH(lkmtp, cmd, ver, skipmod_load, skipmod_unload, nosys);
+ DISPATCH(lkmtp, cmd, ver, skip_load, skip_unload, nosys);
+}
+
+#else
+
+int
+skip(struct lkm_table *lkmtp, int cmd, int ver)
+{
+#define _module skip_module
+ DISPATCH(lkmtp, cmd, ver, skip_load, skip_unload, lkm_nullcmd);
}
+
+#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19970810194027.10114>