Changeset 94

Timestamp:

May 5, 2007, 6:58:41 AM (18 years ago)

Author:

Brendan Oakley

Message:

Partial merge of driver.h from beta10 to beta11.

File:

• GPL/branches/alsa-resync1/alsa-kernel/include/sound/driver.h (modified) (9 diffs)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/driver.h

@@ -1 @@
-#ifndef __DRIVER_H
-#define __DRIVER_H
+#ifndef __SOUND_DRIVER_H
+#define __SOUND_DRIVER_H
 
 /*
@@ -19 +19 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -27 +27 @@
 #endif
 
+#include <linux/config.h>
+#include <linux/version.h>
+
 #define SNDRV_CARDS             8       /* number of supported soundcards - don't change - minor numbers */
 
@@ -36 +39 @@
 #undef CONFIG_SND_DEBUG_MEMORY
 #endif
+
+#ifdef ALSA_BUILD
+#include "adriver.h"
+#endif
+
+#include <linux/module.h>
 
 #ifndef __iomem
@@ -51 +60 @@
 #endif
 
-/*
- *  ==========================================================================
- */
-
-#ifdef ALSA_BUILD
-#undef MODULE
-#define MODULE
-#endif
-
-#include <linux/config.h>
-#include <linux/version.h>
-
 #define IRQ_NONE      (0)  /*void*/
 #define IRQ_HANDLED   (1)  /*void*/
 #define IRQ_RETVAL(x) ((x) != 0)  /*void*/
 typedef int irqreturn_t;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 3)
-#error "This driver requires Linux 2.2.3 and higher."
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 2, 0)
-#define LINUX_2_2
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 1)
-#define LINUX_2_3
-#endif
-#if defined(LINUX_2_3) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
-#error "This code requires Linux 2.4.0-test1 and higher."
-#endif
-
-#ifdef ALSA_BUILD
-#if defined(CONFIG_MODVERSIONS) && !defined(__GENKSYMS__) && !defined(__DEPEND__)
-#define MODVERSIONS
-#include <linux/modversions.h>
-#include "sndversions.h"
-#endif
-#ifdef SNDRV_NO_MODVERS
-#undef MODVERSIONS
-#undef _set_ver
-#endif
-#endif /* ALSA_BUILD */
-
-#ifndef SNDRV_MAIN_OBJECT_FILE
-#define __NO_VERSION__
-#endif
-#include <linux/module.h>
-
-#include <linux/utsname.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/bitops.h>
-
-#include <linux/ioport.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/dma.h>
-#include <asm/segment.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/string.h>
-
-#ifdef CONFIG_PCI
-#include <linux/pci.h>
-#endif
-#include <linux/interrupt.h>
-#include <linux/pagemap.h>
-#include <linux/fs.h>
-#include <linux/fcntl.h>
-#include <linux/vmalloc.h>
-#include <linux/proc_fs.h>
-#include <linux/poll.h>
-#include <linux/reboot.h>
-
-#ifdef LINUX_2_2
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 2, 18)
-#include <linux/init.h>
-#endif
-#include "compat_22.h"
-#endif /* LINUX_2_2 */
-
-#ifdef LINUX_2_3
-#include <linux/init.h>
-#include <linux/pm.h>
-#define PCI_GET_DRIVER_DATA(pci) pci->driver_data
-#define PCI_SET_DRIVER_DATA(pci, data) pci->driver_data = data
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 3)
-#define pci_set_dma_mask(pci, mask) pci->dma_mask = mask
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 7)
-#define PCI_NEW_SUSPEND
-#endif
-#ifndef virt_to_page
-#define virt_to_page(x) (&mem_map[MAP_NR(x)])
-#endif
-#define snd_request_region request_region
-#ifndef rwlock_init
-#define rwlock_init(x) do { *(x) = RW_LOCK_UNLOCKED; } while(0)
-#endif
-#define snd_kill_fasync(fp, sig, band) kill_fasync(fp, sig, band)
-#if defined(__i386__) || defined(__ppc__)
-/*
- * Here a dirty hack for 2.4 kernels.. See kernel/memory.c.
- */
-#define HACK_PCI_ALLOC_CONSISTENT
-void *snd_pci_hack_alloc_consistent(struct pci_dev *hwdev, size_t size,
-                                    dma_addr_t *dma_handle);
-#undef pci_alloc_consistent
-#define pci_alloc_consistent snd_pci_hack_alloc_consistent
-#endif /* i386 or ppc */
-#ifndef list_for_each_safe
-#define list_for_each_safe(pos, n, head) \
-        for (pos = (head)->next, n = pos->next; pos != (head); pos = n, n = pos->next)
-#endif
-#endif
-
-#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
-#if (defined(CONFIG_ISAPNP_KERNEL) && defined(ALSA_BUILD)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 30) && !defined(ALSA_BUILD))
-#include <linux/isapnp.h>
-#define isapnp_dev pci_dev
-#define isapnp_card pci_bus
-#else
-#include "isapnp.h"
-#endif
-#undef __ISAPNP__
-#define __ISAPNP__
-#endif
-
-#ifndef MODULE_LICENSE
-#define MODULE_LICENSE(license)
 #ifndef PCI_D0
 #define PCI_D0     0
@@ -192 +72 @@
 #define pci_choose_state(pci,state)     ((state) ? PCI_D3hot : PCI_D0)
 #endif
-
-
-#include <sound/asound.h>
-#include <sound/asoundef.h>
 
 /* wrapper for getnstimeofday()
@@ -231 +107 @@
 #define schedule_work(w) snd_compat_schedule_work(w)
 
-/* Typedef's */
-typedef struct timeval snd_timestamp_t;
-#ifndef TARGET_OS2
-typedef enum sndrv_card_type snd_card_type;
-#endif
-typedef union sndrv_pcm_sync_id snd_pcm_sync_id_t;
-#ifndef TARGET_OS2
-typedef enum sndrv_pcm_start snd_pcm_start_t;
-typedef enum sndrv_pcm_xrun snd_pcm_xrun_t;
-#endif
-#ifdef TARGET_OS2
-typedef struct snd_pcm_volume snd_pcm_volume_t;
-#else
-typedef enum sndrv_timer_global snd_timer_global_t;
-#endif
+/*
+ *  ==========================================================================
+ */
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
+#if defined(__i386__) || defined(__ppc__)
+/*
+ * Here a dirty hack for 2.4 kernels.. See kernel/memory.c.
+ */
+#define HACK_PCI_ALLOC_CONSISTENT
+#include <linux/pci.h>
+void *snd_pci_hack_alloc_consistent(struct pci_dev *hwdev, size_t size,
+                                    dma_addr_t *dma_handle);
+#undef pci_alloc_consistent
+#define pci_alloc_consistent snd_pci_hack_alloc_consistent
+#endif /* i386 or ppc */
+#endif /* 2.4.0 */
 
 #ifdef CONFIG_SND_DEBUG_MEMORY
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
 void *snd_wrapper_kmalloc(size_t, int);
 #undef kmalloc
@@ -257 +137 @@
 #undef vfree
 #endif
+#ifdef TARGET_OS2
+typedef struct snd_pcm_volume snd_pcm_volume_t;
+#endif
+
+#include "sndmagic.h"
 
 #ifdef TARGET_OS2
@@ -262 +147 @@
 #define snd_leave_user(a)
 #define dec_mod_count(a)        (*(unsigned long *)a)--
-
-#else
-static inline mm_segment_t snd_enter_user(void)
-{
-        mm_segment_t fs = get_fs();
-        set_fs(get_ds());
-        return fs;
-}
-static inline void snd_leave_user(mm_segment_t fs)
-{
-        set_fs(fs);
-}
-static inline void dec_mod_count(struct module *module)
-{
-        if (module)
-                __MOD_DEC_USE_COUNT(module);
-}
-#endif
-
-#if defined(__alpha__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 14)
-#undef writeb
-#define writeb(v, a) do { __writeb((v),(a)); mb(); } while(0)
-#undef writew
-#define writew(v, a) do {__writew((v),(a)); mb(); } while(0)
-#undef writel
-#define writel(v, a) do {__writel((v),(a)); mb(); } while(0)
-#undef writeq
-#define writeq(v, a) do {__writeq((v),(a)); mb(); } while(0)
-#endif
-
-/* do we have virt_to_bus? */
-#if defined(CONFIG_SPARC64)
-#undef HAVE_VIRT_TO_BUS
-#else
-#define HAVE_VIRT_TO_BUS  1
 #endif