Subject: Re: LKM module for aperture (was no subjects))
To: MAEKAWA Masahide <bishop@rr.iij4u.or.jp>
From: Mihai Chelaru <kefren@netbastards.org>
List: current-users
Date: 09/08/2002 13:21:42
Same issue for vmware-module package. This patch corrects the problem:

*** work/source/vmnet/if_hubmod.c.old   Sun Sep  8 13:10:48 2002
--- work/source/vmnet/if_hubmod.c       Sun Sep  8 13:12:02 2002
***************
*** 128,134 ****
--- 128,138 ----
  static struct hubdev_softc *hub_scs[MAXHUBDEVS];


+ #if __NetBSD_Version__ >= 106080000
+ MOD_DEV("vmnet", "vmnet", NULL, -1, &hub_dev, -1)
+ #else
  MOD_DEV("vmnet", LM_DT_CHAR, -1, &hub_dev)
+ #endif

  int
  if_hub_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
*** work/source/vmmon/netbsd/drv.c.old  Sun Sep  8 13:14:23 2002
--- work/source/vmmon/netbsd/drv.c      Sun Sep  8 13:14:53 2002
***************
*** 121,127 ****
--- 121,131 ----
  static int vmmon_debug = 0;


+ #if __NetBSD_Version__ >= 106080000
+ MOD_DEV("vmmon", "vmmon", NULL, -1, &vmmon_dev, -1)
+ #else
  MOD_DEV("vmmon", LM_DT_CHAR, -1, &vmmon_dev)
+ #endif

  int
  vmmon_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
*** work/source/linuxrtc/rtc.c.old      Sun Sep  8 13:12:48 2002
--- work/source/linuxrtc/rtc.c  Sun Sep  8 13:13:31 2002
***************
*** 86,93 ****
        rtc_poll, (dev_type_mmap((*))) enodev, 0
  };

!
  MOD_DEV("linuxrtc", LM_DT_CHAR, -1, &rtc_dev)

  int
  rtc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
--- 86,96 ----
        rtc_poll, (dev_type_mmap((*))) enodev, 0
  };

! #if __NetBSD_Version__ >= 106080000
! MOD_DEV("linuxrtc", "linuxrtc", NULL, -1, &rtc_dev, -1)
! #else
  MOD_DEV("linuxrtc", LM_DT_CHAR, -1, &rtc_dev)
+ #endif

  int
  rtc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)


Regards,
M

On Sunday 08 September 2002 11:03, MAEKAWA Masahide wrote:
> Sean Davis <dive-nb@endersgame.net> wrote:
> >Since the devsw stuff was merged, X no longer works for me. I am pretty
> > sure the problem is in the aperture module, because trying to build it
> > now gives me this:
> >(in pkgsrc/sysutils/aperture)
>
> How about this?
>
> --- xf86_mod.c.orig	Sun Sep  8 16:46:28 2002
> +++ xf86_mod.c	Sun Sep  8 16:58:16 2002
> @@ -31,7 +31,11 @@
>  	0,
>  	seltrue, xf86mmap, 0};
>
> +#if __NetBSD_Version__ >= 106080000
> +MOD_DEV("xf86", "xf86", NULL, -1, &newdev, -1)
> +#else
>  MOD_DEV("xf86", LM_DT_CHAR, -1, &newdev)
> +#endif
>
>  char *xf86_major_version = "2";
>  char *xf86_minor_version = "0";