Update of /cvsroot/alsa/alsa-driver/acore
In directory sc8-pr-cvs1:/tmp/cvs-serv21586
Modified Files:
.cvsignore Makefile
Added Files:
memalloc.inc memalloc.inc1 memalloc.patch
Removed Files:
memalloc.c
Log Message:
2.5 cleanups
--- NEW FILE: memalloc.inc ---
#include <linux/config.h>
#include <linux/version.h>
#if defined(CONFIG_MODVERSIONS) && !defined(__GENKSYMS__) && !defined(__DEPEND__)
#define MODVERSIONS
#include <linux/modversions.h>
#include "sndversions.h"
#endif
#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
--- NEW FILE: memalloc.inc1 ---
/* compatible functions */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) && defined(CONFIG_PCI)
EXPORT_SYMBOL(snd_pci_compat_match_device);
EXPORT_SYMBOL(snd_pci_compat_register_driver);
EXPORT_SYMBOL(snd_pci_compat_unregister_driver);
EXPORT_SYMBOL(snd_pci_compat_get_size);
EXPORT_SYMBOL(snd_pci_compat_get_flags);
EXPORT_SYMBOL(snd_pci_compat_set_power_state);
EXPORT_SYMBOL(snd_pci_compat_enable_device);
EXPORT_SYMBOL(snd_pci_compat_find_capability);
EXPORT_SYMBOL(snd_pci_compat_alloc_consistent);
EXPORT_SYMBOL(snd_pci_compat_free_consistent);
EXPORT_SYMBOL(snd_pci_compat_dma_supported);
EXPORT_SYMBOL(snd_pci_compat_get_dma_mask);
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
#ifndef CONFIG_HAVE_VMALLOC_TO_PAGE
EXPORT_SYMBOL(snd_compat_vmalloc_to_page);
#endif
--- NEW FILE: memalloc.patch ---
--- memalloc.c 2003-05-30 16:09:27.000000000 +0200
+++ memalloc.c.old 2003-05-31 13:05:06.000000000 +0200
@@ -1,3 +1,4 @@
+#include "memalloc.inc"
/*
* Copyright (c) by Jaroslav Kysela <[EMAIL PROTECTED]>
* Takashi Iwai <[EMAIL PROTECTED]>
@@ -80,6 +81,7 @@
#define snd_assert(expr, args...) /**/
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
#ifdef CONFIG_PCI
#if defined(__i386__) || defined(__ppc__) || defined(__x86_64__)
#define HACK_PCI_ALLOC_CONSISTENT
@@ -132,6 +134,7 @@
#endif /* arch */
#endif /* CONFIG_PCI */
+#endif /* LINUX >= 2.4.0 */
/*
@@ -623,7 +626,7 @@
}
-#if defined(__i386__)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(__i386__)
/*
* on ix86, we allocate a page with GFP_KERNEL to assure the
* allocation. the code is almost same with kernel/i386/pci-dma.c but
@@ -935,3 +938,5 @@
EXPORT_SYMBOL(snd_malloc_sbus_pages_fallback);
EXPORT_SYMBOL(snd_free_sbus_pages);
#endif
+
+#include "memalloc.inc1"
Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 May 2003 13:37:40 -0000 1.2
+++ .cvsignore 31 May 2003 11:09:05 -0000 1.3
@@ -7,3 +7,4 @@
timer.c
pcm_native.c
info.c
+memalloc.c
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile 30 May 2003 14:07:47 -0000 1.23
+++ Makefile 31 May 2003 11:09:05 -0000 1.24
@@ -26,3 +26,4 @@
rawmidi.c: rawmidi.patch $(TOPDIR)/alsa-kernel/core/rawmidi.c
sound.c: sound.patch $(TOPDIR)/alsa-kernel/core/sound.c
timer.c: timer.patch $(TOPDIR)/alsa-kernel/core/timer.c
+memalloc.c: memalloc.patch memalloc.inc memalloc.inc1
$(TOPDIR)/alsa-kernel/core/memalloc.c
--- memalloc.c DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
