[BACK]Return to patch-aa CVS log [TXT] [DIR] Up to [DragonFly] / dfports / x11 / nvidia-driver / files

Diff for /dfports/x11/nvidia-driver/files/Attic/patch-aa between versions 1.1 and 1.2

version 1.1, 2003/10/14 00:01:45 version 1.2, 2004/01/14 02:57:54
Line 1 Line 1
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/module/Makefile ./module/Makefile  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/module/Makefile ./module/Makefile
 --- ../NVIDIA-FreeBSD-x86-1.0-4365/module/Makefile      Wed May 28 18:51:52 2003  --- ../NVIDIA-FreeBSD-x86-1.0-4365/module/Makefile      Wed May 28 16:51:52 2003
 +++ ./module/Makefile   Fri Oct 10 13:09:27 2003  +++ ./module/Makefile   Sun Jan 11 04:51:56 2004
 @@ -6,7 +6,7 @@  @@ -6,7 +6,7 @@
  KMOD=          nvidia   KMOD=          nvidia
  SRCS=          nvidia_ctl.c nvidia_dev.c nvidia_linux.c nvidia_os.c nvidia_os_pci.c nvidia_os_registry.c nvidia_pci.c nvidia_subr.c nvidia_sysctl.c    SRCS=          nvidia_ctl.c nvidia_dev.c nvidia_linux.c nvidia_os.c nvidia_os_pci.c nvidia_os_registry.c nvidia_pci.c nvidia_subr.c nvidia_sysctl.c 
Line 11  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 11  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
  OBJS+=         NVIDIA.o   OBJS+=         NVIDIA.o
  NOOBJ=         true   NOOBJ=         true
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nv-freebsd.h ./src/nv-freebsd.h  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nv-freebsd.h ./src/nv-freebsd.h
 --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nv-freebsd.h     Wed Oct  8 18:22:17 2003  --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nv-freebsd.h     Wed May 28 16:51:53 2003
 +++ ./src/nv-freebsd.h  Fri Oct 10 13:26:26 2003  +++ ./src/nv-freebsd.h  Sun Jan 11 04:52:47 2004
 @@ -75,12 +75,12 @@  @@ -20,6 +20,7 @@
    #endif
    
    #include <sys/param.h>
   +#include <stdarg.h>
    
    /*
     * This driver relies on a few changes to the FreeBSD kernel that are not
   @@ -75,12 +76,12 @@
  #include <vm/pmap.h>   #include <vm/pmap.h>
  #include <vm/vm_map.h>   #include <vm/vm_map.h>
     
Line 29  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 37  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
     
  #if __FreeBSD_version >= 500000   #if __FreeBSD_version >= 500000
  #include <sys/mutex.h>   #include <sys/mutex.h>
 @@ -102,8 +102,8 @@  @@ -102,8 +103,8 @@
     
  #else   #else
  #include <machine/smp.h>   #include <machine/smp.h>
Line 40  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 48  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
     
  #define vm_page_lock_queues()   #define vm_page_lock_queues()
  #define vm_page_unlock_queues()   #define vm_page_unlock_queues()
 @@ -116,8 +116,8 @@  @@ -116,8 +117,8 @@
   * on FreeBSD, due to its thread-aware reference counting.    * on FreeBSD, due to its thread-aware reference counting.
   */    */
     
Line 52  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 60  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
  #endif   #endif
     
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_ctl.c ./src/nvidia_ctl.c  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_ctl.c ./src/nvidia_ctl.c
 --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_ctl.c     Wed Oct  8 18:22:17 2003  --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_ctl.c     Wed May 28 16:51:52 2003
 +++ ./src/nvidia_ctl.c  Fri Oct 10 13:27:59 2003  +++ ./src/nvidia_ctl.c  Sun Jan 11 04:51:56 2004
 @@ -20,6 +20,12 @@  @@ -20,6 +20,12 @@
     
  static struct cdevsw nvidia_ctl_cdevsw = {   static struct cdevsw nvidia_ctl_cdevsw = {
Line 103  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 111  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
          destroy_dev(nvidia_ctl_cdev);           destroy_dev(nvidia_ctl_cdev);
      }       }
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_dev.c ./src/nvidia_dev.c  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_dev.c ./src/nvidia_dev.c
 --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_dev.c     Wed Oct  8 18:22:17 2003  --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_dev.c     Wed May 28 16:51:52 2003
 +++ ./src/nvidia_dev.c  Fri Oct 10 13:19:08 2003  +++ ./src/nvidia_dev.c  Sun Jan 11 04:51:56 2004
 @@ -21,6 +21,12 @@  @@ -21,6 +21,12 @@
     
  static struct cdevsw nvidia_dev_cdevsw = {   static struct cdevsw nvidia_dev_cdevsw = {
Line 136  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 144  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
      .d_open =      nvidia_dev_open,       .d_open =      nvidia_dev_open,
      .d_close =     nvidia_dev_close,       .d_close =     nvidia_dev_close,
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_linux.c ./src/nvidia_linux.c  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_linux.c ./src/nvidia_linux.c
 --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_linux.c   Wed May 28 18:51:52 2003  --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_linux.c   Wed May 28 16:51:52 2003
 +++ ./src/nvidia_linux.c        Fri Oct 10 13:19:26 2003  +++ ./src/nvidia_linux.c        Sun Jan 11 04:51:56 2004
 @@ -33,7 +33,7 @@  @@ -33,7 +33,7 @@
       * copy the user data in/out correctly.        * copy the user data in/out correctly.
       */        */
Line 148  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 156  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
     
  struct linux_ioctl_handler nvidia_handler = {   struct linux_ioctl_handler nvidia_handler = {
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_os.c ./src/nvidia_os.c  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_os.c ./src/nvidia_os.c
 --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_os.c      Wed Oct  8 18:22:17 2003  --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_os.c      Wed May 28 16:51:52 2003
 +++ ./src/nvidia_os.c   Fri Oct 10 13:22:20 2003  +++ ./src/nvidia_os.c   Sun Jan 11 04:51:56 2004
 @@ -164,11 +164,7 @@  @@ -164,11 +164,7 @@
     
  BOOL os_is_administrator(PHWINFO pDev)   BOOL os_is_administrator(PHWINFO pDev)
Line 163  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 171  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
     
  U008 os_io_read_byte(   U008 os_io_read_byte(
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_pci.c ./src/nvidia_pci.c  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_pci.c ./src/nvidia_pci.c
 --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_pci.c     Wed Oct  8 18:22:17 2003  --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_pci.c     Wed May 28 16:51:52 2003
 +++ ./src/nvidia_pci.c  Fri Oct 10 13:20:24 2003  +++ ./src/nvidia_pci.c  Sun Jan 11 04:51:56 2004
 @@ -96,7 +96,7 @@  @@ -96,7 +96,7 @@
      mtx_init(&sc->mtx_api, "dev.mtx_api", NULL, MTX_DEF);       mtx_init(&sc->mtx_api, "dev.mtx_api", NULL, MTX_DEF);
      mtx_init(&sc->mtx_rm,  "dev.mtx_rm",  NULL, MTX_SPIN);       mtx_init(&sc->mtx_rm,  "dev.mtx_rm",  NULL, MTX_SPIN);
Line 184  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365 Line 192  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365
     
      status = nvidia_detach(dev);       status = nvidia_detach(dev);
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_subr.c ./src/nvidia_subr.c  diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_subr.c ./src/nvidia_subr.c
 --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_subr.c    Wed Oct  8 18:22:17 2003  --- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_subr.c    Wed May 28 16:51:52 2003
 +++ ./src/nvidia_subr.c Fri Oct 10 13:27:19 2003  +++ ./src/nvidia_subr.c Sun Jan 11 04:51:56 2004
 @@ -297,7 +297,7 @@  @@ -297,7 +297,7 @@
      u_long cmd,       u_long cmd,
      caddr_t data,       caddr_t data,
Removed from v.1.1  
changed lines
  Added in v.1.2