Sample initial set of kld-ified modules. Not all have been completely

converted yet.  These are more of a starting point.  This is NOT connected
to the parent Makefile.

OK'ed by jkh (who is ever so patiently waiting)

2 files changed, 25 insertions, 21 deletions

diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index 9136c6316106..3f42872ab072 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.16 1998/02/04 21:56:35 eivind Exp $
+#	$Id: Makefile,v 1.17 1998/02/06 23:54:20 eivind Exp $
 
-.PATH:	${.CURDIR}/../../sys/i386/ibcs2
-KMOD=	ibcs2_mod
+.PATH:	${.CURDIR}/../../i386/ibcs2
+KMOD=	ibcs2
 SRCS=	ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
 	ibcs2_fcntl.c ibcs2_signal.c ibcs2_sysent.c ibcs2_ioctl.c \
 	ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \
@@ -10,7 +10,7 @@ SRCS=	ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
 	vnode_if.h opt_spx_hack.h
 MAN8=	ibcs2.8
 
-CFLAGS+= -DLKM -DCOMPAT_IBCS2
+CFLAGS+= -DCOMPAT_IBCS2
 CLEANFILES+= vnode_if.h vnode_if.c opt_spx_hack.h
 EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
 
diff --git a/sys/modules/ibcs2/ibcs2.c b/sys/modules/ibcs2/ibcs2.c
index edc712e2d3d0..2bd5fb62ec8f 100644
--- a/sys/modules/ibcs2/ibcs2.c
+++ b/sys/modules/ibcs2/ibcs2.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2.c,v 1.10 1997/04/06 10:47:52 dufault Exp $
+ *	$Id: ibcs2.c,v 1.11 1997/05/01 06:09:01 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -36,25 +36,29 @@
 #include <sys/sysent.h>
 #include <sys/lkm.h>
 
-MOD_MISC(ibcs2);
+#include <sys/kernel.h>
+#include <sys/module.h>
 
 static int
-ibcs2_load(struct lkm_table *lkmtp, int cmd)
+ibcs2_modevent(module_t mod, modeventtype_t type, void *unused)
 {
-	/* uprintf("ibcs2 emulator installed\n"); XXX - shut up, you! */
-	return 0;
+    switch (type) {
+    case MOD_LOAD:
+	printf("ibcs2 module loaded\n");
+	break;
+    case MOD_UNLOAD:
+	printf("ibcs2 module unloaded\n");
+	break;
+    default:
+	printf("ibcs2 module unknown event: 0x%x\n", type);
+    }
+    return 0;
 }
 
-static int
-ibcs2_unload(struct lkm_table *lkmtp, int cmd)
-{
-	uprintf("ibcs2 emulator removed\n");
-	return 0;
-}
+moduledata_t ibcs2mod = {
+    "ibcs2",
+    ibcs2_modevent,
+    0
+};
 
-int
-ibcs2_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	MOD_DISPATCH(ibcs2, lkmtp, cmd, ver,
-		ibcs2_load, ibcs2_unload, lkm_nullcmd);
-}
+DECLARE_MODULE(ibcs2, ibcs2mod, SI_SUB_PSEUDO, SI_ORDER_ANY);