From 0ddf9be1f0723916ebd4feb7313d64dffab0c2bb Mon Sep 17 00:00:00 2001
From: Peter Dufault <dufault@FreeBSD.org>
Date: Sun, 6 Apr 1997 11:14:13 +0000
Subject: Make MOD_* macros almost consistent:

Use the name argument almost the same in all LKM types.  Maintain
the current behavior for the external (e.g., modstat) name for DEV,
EXEC, and MISC types being #name ## "_mod" and SYCALL and VFS only
#name.  This is a candidate for change and I vote just the name without
the "_mod".

Change the DISPATCH macro to MOD_DISPATCH for consistency with the
other macros.

Add an LKM_ANON #define to eliminate the magic -1 and associated
signed/unsigned warnings.

Add MOD_PRIVATE to support wcd.c's poking around in the lkm structure.

Change source in tree to use the new interface.

Reviewed by:	Bruce Evans
---
 sys/dev/joy/joy.c                 | 12 +++++++-----
 sys/dev/syscons/star/star_saver.c |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 5f6ca2ebfa6b..9675e79b6bb4 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -259,7 +259,7 @@ MOD_DEV (joy, LM_DT_CHAR, CDEV_MAJOR, &joy_cdevsw);
 
 static struct isa_device dev = {0, &joydriver, IO_GAME, 0, -1, (caddr_t) 0, 0, 0, 0, 0, 0, 0, 0,  0, 1, 0, 0};
 
-int 
+static int 
 joy_load (struct lkm_table *lkmtp, int cmd)
 {
     if (joyprobe (&dev)) {
@@ -273,22 +273,24 @@ joy_load (struct lkm_table *lkmtp, int cmd)
     }
 }
 
-int
+static int
 joy_unload (struct lkm_table *lkmtp, int cmd)
 {
     uprintf ("Joystick driver unloaded\n");
     return 0;
 }
-int
+
+static int
 joy_stat (struct lkm_table *lkmtp, int cmd)
 {
     return 0;
 }
+
 int
 joy_mod (struct lkm_table *lkmtp, int cmd, int ver)
 {
-#define _module joy_module
-    DISPATCH(lkmtp, cmd, ver, joy_load, joy_unload, joy_stat);
+    MOD_DISPATCH(joy, lkmtp, cmd, ver,
+	joy_load, joy_unload, joy_stat);
 }
 
 #endif /* JOY_MODULE */
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 0ff3117cb339..465c493a3dcf 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.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$
+ *	$Id: star_saver.c,v 1.10 1997/02/22 12:49:22 peter Exp $
  */
 
 #include <sys/param.h>
@@ -112,6 +112,6 @@ star_saver_unload(struct lkm_table *lkmtp, int cmd)
 int
 star_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, star_saver_load, star_saver_unload,
-		 lkm_nullcmd);
+	MOD_DISPATCH(star_saver, lkmtp, cmd, ver,
+		star_saver_load, star_saver_unload, lkm_nullcmd);
 }
-- 
cgit v1.3