r743 - in /gnumach/trunk/debian: changelog patches/40_iopl_mmap.patch

[sthibault]

Author: sthibault
Date: Tue Apr 27 16:15:18 2010
New Revision: 743

URL: http://svn.debian.org/wsvn/pkg-hurd/gnumach/?sc=1&rev=743
Log:
  * debian/patches/40_iopl_mmap.patch: Add a "mem" alias for the iopl device,
    since that is what upstream provides.

Modified:
    gnumach/trunk/debian/changelog
    gnumach/trunk/debian/patches/40_iopl_mmap.patch

Modified: gnumach/trunk/debian/changelog
URL: 
http://svn.debian.org/wsvn/pkg-hurd/gnumach/gnumach/trunk/debian/changelog?rev=743&op=diff
==============================================================================
--- gnumach/trunk/debian/changelog (original)
+++ gnumach/trunk/debian/changelog Tue Apr 27 16:15:18 2010
@@ -8,6 +8,8 @@
     - Add ${misc:Depends}.
   * debian/patches/40_iopl_mem.patch: Add patch, not enabled yet, to be used
     instead of 40_iopl_mmap.patch when a new snapshot is taken.
+  * debian/patches/40_iopl_mmap.patch: Add a "mem" alias for the iopl device,
+    since that is what upstream provides.
 
   [ Guillem Jover ]
   * Now using Standards-Version 3.8.4 (no changes needed).

Modified: gnumach/trunk/debian/patches/40_iopl_mmap.patch
URL: 
http://svn.debian.org/wsvn/pkg-hurd/gnumach/gnumach/trunk/debian/patches/40_iopl_mmap.patch?rev=743&op=diff
==============================================================================
--- gnumach/trunk/debian/patches/40_iopl_mmap.patch (original)
+++ gnumach/trunk/debian/patches/40_iopl_mmap.patch Tue Apr 27 16:15:18 2010
@@ -1,4 +1,6 @@
 Device for direct memory access (needed e.g. for Xorg).
+Upstream now has a mem device, so this patch should go away and be replaced by
+40_iopl_mem.patch when we upgrade the Debian snapshot.
 
 Index: b/i386/Makefrag.am
 ===================================================================
@@ -13,24 +15,29 @@
        i386/i386at/kd.h \
        i386/i386at/kd_event.c \
 Index: b/i386/i386at/conf.c
-===================================================================
 --- a/i386/i386at/conf.c
 +++ b/i386/i386at/conf.c
-@@ -58,6 +58,9 @@ extern int   kbdgetstat(), kbdsetstat();
+@@ -58,6 +58,10 @@ extern int  kbdgetstat(), kbdsetstat();
  extern int    mouseopen(), mouseclose(), mouseread(), mousegetstat();
  #define       mousename               "mouse"
  
 +extern vm_offset_t ioplmmap();
 +#define       ioplname                "iopl"
++#define       memname                 "mem"
 +
  extern int    kmsgopen(), kmsgclose(), kmsgread(), kmsggetstat();
  #define kmsgname              "kmsg"
  
-@@ -113,6 +116,11 @@ struct dev_ops    dev_name_list[] =
+@@ -113,6 +117,16 @@ struct dev_ops    dev_name_list[] =
          nodev,        nulldev,        nulldev,        0,
          nodev },
  
 +      { ioplname,     nulldev,        nulldev,        nodev,
++        nodev,        nodev,          nodev,          ioplmmap,
++        nodev,        nulldev,        nulldev,        0,
++        nodev },
++
++      { memname,      nulldev,        nulldev,        nodev,
 +        nodev,        nodev,          nodev,          ioplmmap,
 +        nodev,        nulldev,        nulldev,        0,
 +        nodev },