Subject: Re: X woes ?
To: None <current-users@NetBSD.ORG, port-i386@NetBSD.ORG>
From: Matthieu Herrb <matthieu@laas.fr>
List: current-users
Date: 04/27/1995 09:44:35
Charles M. Hannum  wrote (in his message from Wed 26)
 > 
 > Are the people having trouble with X using the `aperture driver'?  If
 > so, did you recompile it?  The format of the device switch table has
 > changed slightly, and no doubt that `driver' is out of date.  Notably,
 > the mmap pointer is in a different position.

Here's a patch to the aperture driver version 1.2 (the one distributed
with XFree86 3.1.1). The full updated version is available on
ftp.laas.fr:/pub/ii/NetBSD/XFree86-3.1.1/apNetBSD-1.3.tar.gz


diff -c -r ../aperture-1.2/Makefile ./Makefile
*** ../aperture-1.2/Makefile	Wed Apr 26 22:05:24 1995
--- ./Makefile	Wed Apr 26 21:51:17 1995
***************
*** 8,14 ****
  KERNDIR = /usr/X11R6/lib/X11/kernel
  
  # You can add -DAP_DEBUG to CFLAGS to add debugging prints
! CFLAGS = -O -DKERNEL -I/sys -I/sys/arch
  
  MODULE = ap
  POSTINSTALL = apinstall
--- 8,14 ----
  KERNDIR = /usr/X11R6/lib/X11/kernel
  
  # You can add -DAP_DEBUG to CFLAGS to add debugging prints
! CFLAGS = -O -DKERNEL -D_KERNEL -I/usr/include -I/sys
  
  MODULE = ap
  POSTINSTALL = apinstall
diff -c -r ../aperture-1.2/aperture.c ./aperture.c
*** ../aperture-1.2/aperture.c	Wed Apr 26 22:05:24 1995
--- ./aperture.c	Wed Apr 26 21:52:51 1995
***************
*** 8,15 ****
  
  #include <sys/param.h>
  #include <sys/systm.h>
- #include <sys/errno.h>
  #include <sys/proc.h>
  
  #define VGA_START 0xA0000
  #define VGA_END   0xBFFFF
--- 8,15 ----
  
  #include <sys/param.h>
  #include <sys/systm.h>
  #include <sys/proc.h>
+ #include <sys/errno.h>
  
  #define VGA_START 0xA0000
  #define VGA_END   0xBFFFF
diff -c -r ../aperture-1.2/lkm.c ./lkm.c
*** ../aperture-1.2/lkm.c	Wed Apr 26 22:05:24 1995
--- ./lkm.c	Wed Apr 26 21:59:35 1995
***************
*** 35,41 ****
      (dev_type_read((*))) enodev, (dev_type_write((*))) enodev,
      (dev_type_ioctl((*))) enodev, 
      (dev_type_stop((*))) enodev,
!     (dev_type_reset((*))) nullop, (struct tty **) 0,
      seltrue, (dev_type_mmap((*))) apmmap, 0};
  
  MOD_DEV("ap", LM_DT_CHAR, -1, &newdev)
--- 35,41 ----
      (dev_type_read((*))) enodev, (dev_type_write((*))) enodev,
      (dev_type_ioctl((*))) enodev, 
      (dev_type_stop((*))) enodev,
!     0,
      seltrue, (dev_type_mmap((*))) apmmap, 0};
  
  MOD_DEV("ap", LM_DT_CHAR, -1, &newdev)
diff -c -r ../aperture-1.2/version.c ./version.c
*** ../aperture-1.2/version.c	Wed Apr 26 22:05:24 1995
--- ./version.c	Wed Apr 26 22:06:13 1995
***************
*** 4,7 ****
   * Copyright (c) 1994 The XFree86 Project Inc.
   */
  char *ap_major_version = "1";
! char *ap_minor_version = "2";
--- 4,7 ----
   * Copyright (c) 1994 The XFree86 Project Inc.
   */
  char *ap_major_version = "1";
! char *ap_minor_version = "3";

					Matthieu