[alsa-cvslog] CVS: alsa-driver/acore memalloc.c,1.3,1.4 memory_wrapper.c,1.3,1.4 misc.c,1.17,1.18 pci_compat_22.c,1.2,1.3 sgbuf.c,1.3,1.4

[Takashi Iwai]

Update of /cvsroot/alsa/alsa-driver/acore
In directory sc8-pr-cvs1:/tmp/cvs-serv26067

Modified Files:
        memalloc.c memory_wrapper.c misc.c pci_compat_22.c sgbuf.c 
Log Message:
fixes for 2.2 kernels.



Index: memalloc.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/memalloc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- memalloc.c  3 Mar 2003 11:30:42 -0000       1.3
+++ memalloc.c  5 Mar 2003 11:36:38 -0000       1.4
@@ -10,6 +10,21 @@
 #include "config.h"
 #include "adriver.h"
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) && defined(CONFIG_PROC_FS)
+#include <linux/proc_fs.h>
+static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
+       mode_t mode, struct proc_dir_entry *base, 
+       read_proc_t *read_proc, void * data)
+{
+       struct proc_dir_entry *res=create_proc_entry(name,mode,base);
+       if (res) {
+               res->read_proc=read_proc;
+               res->data=data;
+       }
+       return res;
+}
+#endif
+
 #include "../alsa-kernel/core/memalloc.c"
 
 /* compatible functions */
@@ -29,6 +44,7 @@
 EXPORT_SYMBOL(snd_pci_compat_set_dma_mask);
 EXPORT_SYMBOL(snd_pci_compat_get_driver_data);
 EXPORT_SYMBOL(snd_pci_compat_set_driver_data);
+EXPORT_SYMBOL(snd_pci_compat_get_pci_driver);
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 19)

Index: memory_wrapper.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/memory_wrapper.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- memory_wrapper.c    3 Mar 2003 11:30:42 -0000       1.3
+++ memory_wrapper.c    5 Mar 2003 11:36:38 -0000       1.4
@@ -14,6 +14,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
 #include "../alsa-kernel/core/memory_wrapper.c"
 #else
+#include <sound/memalloc.h>
 #include "pci_compat_22.c"
 #endif
 

Index: misc.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/misc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- misc.c      28 Feb 2003 14:32:10 -0000      1.17
+++ misc.c      5 Mar 2003 11:36:39 -0000       1.18
@@ -91,16 +91,16 @@
        switch (rqst) {
        case PM_SUSPEND:
                pci_for_each_dev(dev) {
-                       struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
-                       if (map && map->drv && map->drv->suspend)
-                               map->drv->suspend(dev);
+                       struct pci_driver *drv = snd_pci_compat_get_pci_driver(dev);
+                       if (drv && drv->suspend)
+                               drv->suspend(dev);
                }
                break;
        case PM_RESUME:
                pci_for_each_dev(dev) {
-                       struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
-                       if (map && map->drv && map->drv->resume)
-                               map->drv->resume(dev);
+                       struct pci_driver *drv = snd_pci_compat_get_pci_driver(dev);
+                       if (drv && drv->resume)
+                               drv->resume(dev);
                }
                break;
        }       

Index: pci_compat_22.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/pci_compat_22.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pci_compat_22.c     3 Mar 2003 11:30:42 -0000       1.2
+++ pci_compat_22.c     5 Mar 2003 11:36:39 -0000       1.3
@@ -25,6 +25,14 @@
        return NULL;
 }
 
+struct pci_driver *snd_pci_compat_get_pci_driver(struct pci_dev *dev)
+{
+       struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
+       if (map)
+               return map->drv;
+       return NULL;
+}
+
 void * snd_pci_compat_get_driver_data (struct pci_dev *dev)
 {
        struct pci_driver_mapping *map = get_pci_driver_mapping(dev);

Index: sgbuf.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/sgbuf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sgbuf.c     3 Mar 2003 11:30:43 -0000       1.3
+++ sgbuf.c     5 Mar 2003 11:36:39 -0000       1.4
@@ -21,6 +21,7 @@
 
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/pagemap.h>
 #include <linux/vmalloc.h>
 #include <asm/io.h>
 #include <sound/memalloc.h>



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog