Ignore:
Timestamp:
Jan 23, 2008, 7:05:10 AM (18 years ago)
Author:
Brendan Oakley
Message:

Merged to ALSA 1.0.1

Location:
GPL/branches/alsa-resync1/alsa-kernel/include/sound
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/adriver.h

    r262 r281  
    241241#define schedule_work(w) snd_compat_schedule_work(w)
    242242
     243/* 2.5 new modules */
     244#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
     245#define try_module_get(x) try_inc_mod_count(x)
     246static inline void module_put(struct module *module)
     247{
     248        if (module)
     249                __MOD_DEC_USE_COUNT(module);
     250}
     251#endif /* 2.5.0 */
     252
     253/* gameport - 2.4 has different defines */
     254#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
     255#ifdef CONFIG_INPUT_GAMEPORT
     256#define CONFIG_GAMEPORT
     257#endif
     258#ifdef CONFIG_INPUT_GAMEPORT_MODULE
     259#define CONFIG_GAMEPORT_MODULE
     260#endif
     261#endif /* 2.5.0 */
     262
     263/* vmalloc_to_page wrapper */
     264#ifndef CONFIG_HAVE_VMALLOC_TO_PAGE
     265struct page *snd_compat_vmalloc_to_page(void *addr);
     266#define vmalloc_to_page(addr) snd_compat_vmalloc_to_page(addr)
     267#endif
     268
     269#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 69)
     270#include <linux/vmalloc.h>
     271static inline void *snd_compat_vmap(struct page **pages, unsigned int count, unsigned long flags, pgprot_t prot)
     272{
     273        return vmap(pages, count);
     274}
     275#undef vmap
     276#define vmap snd_compat_vmap
     277#endif
     278
     279#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0) /* correct version? */
     280#define EXPORT_NO_SYMBOLS
     281#endif
     282
     283/* MODULE_ALIAS & co. */
     284#ifndef MODULE_ALIAS
     285#define MODULE_ALIAS(x)
     286#define MODULE_ALIAS_CHARDEV_MAJOR(x)
     287#endif
     288
     289#ifndef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
     290#define pci_set_consistent_dma_mask(p,x) pci_set_dma_mask(p,x)
     291#endif
     292
    243293#ifndef CONFIG_HAVE_MSLEEP_INTERRUPTIBLE
    244294#include <linux/delay.h>

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/asequencer.h

    r96 r281  
    11/*
    22 *  Main header file for the ALSA sequencer
    3  *  Copyright (c) 1998-1999 by Frank van de Pol <fvdpol@home.nl>
     3 *  Copyright (c) 1998-1999 by Frank van de Pol <fvdpol@coil.demon.nl>
    44 *            (c) 1998-1999 by Jaroslav Kysela <perex@suse.cz>
    55 *

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/asound.h

    r224 r281  
    277277#define SNDRV_PCM_INFO_JOINT_DUPLEX     0x00200000      /* playback and capture stream are somewhat correlated */
    278278#define SNDRV_PCM_INFO_SYNC_START       0x00400000      /* pcm support some kind of sync go */
     279#define SNDRV_PCM_INFO_NONATOMIC_OPS    0x00800000      /* non-atomic prepare callback */
    279280
    280281typedef int __bitwise snd_pcm_state_t;

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/compat_22.h

    r262 r281  
    163163#endif
    164164
    165 #define try_module_get(x) try_inc_mod_count(x)
    166 
    167 static inline void module_put(struct module *module)
    168 {
    169     if (module)
    170         do {} while(0);
    171 }
    172 
    173 #define MODULE_GENERIC_TABLE(gtype,name)       
    174 #define MODULE_DEVICE_TABLE(type,name)         
     165#define MODULE_GENERIC_TABLE(gtype,name)        \
     166static const unsigned long __module_##gtype##_size \
     167  __attribute__ ((unused)) = sizeof(struct gtype##_id); \
     168static const struct gtype##_id * __module_##gtype##_table \
     169  __attribute__ ((unused)) = name
     170#define MODULE_DEVICE_TABLE(type,name)          \
     171  MODULE_GENERIC_TABLE(type##_device,name)
    175172
    176173/**
    … …  
    240237#undef pci_enable_device
    241238#define pci_enable_device snd_pci_compat_enable_device
     239#define pci_disable_device snd_pci_compat_disable_device
    242240#define pci_register_driver snd_pci_compat_register_driver
    243241#define pci_unregister_driver snd_pci_compat_unregister_driver
    … …  
    273271#define pci_resource_flags(dev,bar) (snd_pci_compat_get_flags((dev),(bar)))
    274272
     273#define pci_request_region(dev,bar,name) snd_pci_compat_request_region(dev,bar,name)
     274#define pci_release_region(dev,bar) snd_pci_compat_release_region(dev,bar)
     275#define pci_request_regions(dev,name) snd_pci_compat_request_regions(dev,name)
     276#define pci_release_regions(dev) snd_pci_compat_release_regions(dev)
     277
    275278struct pci_device_id {
    276279        unsigned int vendor, device;            /* Vendor and device ID or PCI_ANY_ID */
    … …  
    303306int snd_pci_compat_set_power_state(struct pci_dev *dev, int new_state);
    304307int snd_pci_compat_enable_device(struct pci_dev *dev);
     308void snd_pci_compat_disable_device(struct pci_dev *dev);
    305309int snd_pci_compat_find_capability(struct pci_dev *dev, int cap);
    306310void *snd_pci_compat_alloc_consistent(struct pci_dev *, long, dma_addr_t *);
    … …  
    311315void * snd_pci_compat_get_driver_data (struct pci_dev *dev);
    312316void snd_pci_compat_set_driver_data (struct pci_dev *dev, void *driver_data);
     317int snd_pci_compat_request_region(struct pci_dev *pdev, int bar, char *res_name);
     318void snd_pci_compat_release_region(struct pci_dev *pdev, int bar);
     319int snd_pci_compat_request_regions(struct pci_dev *pdev, char *res_name);
     320void snd_pci_compat_release_regions(struct pci_dev *pdev);
     321
    313322static inline int pci_module_init(struct pci_driver *drv)
    314323{

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/config.h

    r256 r281  
    156156#define try_inc_mod_count(x)            ++(*(unsigned long *)x)
    157157#define try_module_get(x) try_inc_mod_count(x)
    158 static inline void module_put(struct module *module)
    159 {
    160     if (module)
    161         do {} while(0);
    162 }
    163158
    164159#define rwlock_init(x) *(x) = RW_LOCK_UNLOCKED;

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/hdsp.h

    r262 r281  
    2626        Multiface,
    2727        H9652,
     28        H9632,
    2829        Undefined,
    2930} HDSP_IO_Type;
    … …  
    3233
    3334struct _snd_hdsp_peak_rms {
     35        unsigned int input_peaks[26];
    3436        unsigned int playback_peaks[26];
    35         unsigned int input_peaks[26];
    3637        unsigned int output_peaks[28];
     38        unsigned long long input_rms[26];
    3739        unsigned long long playback_rms[26];
    38         unsigned long long input_rms[26];
     40        /* These are only used for H96xx cards */
     41        unsigned long long output_rms[26];
    3942};
    4043
    … …  
    6265        unsigned char line_out;
    6366        unsigned char passthru;
     67        unsigned char da_gain;
     68        unsigned char ad_gain;
     69        unsigned char phone_gain;
     70        unsigned char xlr_breakout_cable;
     71        unsigned char analog_extension_board;
    6472};
    6573
    … …  
    9199#define SNDRV_HDSP_IOCTL_GET_MIXER _IOR('H', 0x44, hdsp_mixer_t)
    92100
     101typedef struct _snd_hdsp_9632_aeb hdsp_9632_aeb_t;
     102
     103struct _snd_hdsp_9632_aeb {
     104        int aebi;
     105        int aebo;
     106};
     107
     108#define SNDRV_HDSP_IOCTL_GET_9632_AEB _IOR('H', 0x45, hdsp_9632_aeb_t)
     109
    93110#endif /* __SOUND_HDSP_H */

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/i2c.h

    r96 r281  
    4444        char name[32];          /* some useful label */
    4545
    46         spinlock_t lock;
     46        struct semaphore lock_mutex;
    4747
    4848        struct list_head devices; /* attached devices */

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/initval.h

    r277 r281  
    4040#define MODULE_DEVICES(val) MODULE_GENERIC_STRING(info_devices, val)
    4141#define MODULE_PARM_SYNTAX(id, val) MODULE_GENERIC_STRING(info_parm_##id, val)
    42 
    43 #define SNDRV_MODULE_TYPE_int   "i"
    44 #define SNDRV_MODULE_TYPE_bool  "i"
    45 #define SNDRV_MODULE_TYPE_uint  "i"
    46 #define SNDRV_MODULE_TYPE_charp "s"
    47 #define SNDRV_MODULE_TYPE_long  "l"
    48 #define module_param_array(name, type, nump, perm) \
    49         MODULE_PARM(name, "1-" __MODULE_STRING(SNDRV_CARDS) SNDRV_MODULE_TYPE_##type)
    50 #define module_param(name, type, perm) \
    51         MODULE_PARM(name, SNDRV_MODULE_TYPE_##type)
    52 
    5342#endif
    5443
    55 #define SNDRV_AUTO_PORT         0xffff
     44#define SNDRV_AUTO_PORT         1
    5645#define SNDRV_AUTO_IRQ          0xffff
    5746#define SNDRV_AUTO_DMA          0xffff
    … …  
    9281#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
    9382#endif
    94 #define SNDRV_DEFAULT_PORT      { SNDRV_AUTO_PORT, [1 ... (SNDRV_CARDS-1)] = -1 }
     83#define SNDRV_DEFAULT_PORT      { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_PORT }
    9584#define SNDRV_DEFAULT_IRQ       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_IRQ }
    9685#define SNDRV_DEFAULT_DMA       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA }
    … …  
    171160#include <linux/ctype.h>
    172161#include <linux/init.h>
     162#include <linux/bootmem.h>
    173163static int __init get_id(char **str, char **dst)
    174164{
    175         char *s, *d;
     165        char *s;
    176166
    177167        if (!(*str) || !(**str))
    … …  
    179169        for (s = *str; isalpha(*s) || isdigit(*s) || *s == '_'; s++);
    180170        if (s != *str) {
    181                 *dst = (char *)kmalloc((s - *str) + 1, GFP_KERNEL);
    182                 s = *str; d = *dst;
    183                 while (isalpha(*s) || isdigit(*s) || *s == '_') {
    184                         if (d != NULL)
    185                                 *d++ = *s;
    186                         s++;
     171                int len = s - *str;
     172                char *d = (char *)alloc_bootmem(len + 1);
     173                if (d != NULL) {
     174                        memcpy(*dst = d, *str, len);
     175                        d[len] = '\0';
    187176                }
    188                 if (d != NULL)
    189                         *d = '\0';
     177        }
     178        if (*s == ',') {
     179                *str = s + 1;
     180                return 2;
    190181        }
    191182        *str = s;
    192         if (*s == ',') {
    193                 (*str)++;
    194                 return 2;
    195         }
    196183        return 1;
    197184}

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/minors.h

    r112 r281  
    8282#define SNDRV_OSS_DEVICE_TYPE_MUSIC     6
    8383
     84#define MODULE_ALIAS_SNDRV_MINOR(type) \
     85        MODULE_ALIAS("sound-service-?-" __stringify(type))
     86
    8487#endif
    8588

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/pcm_oss.h

    r277 r281  
    3232                     block:1,
    3333                     nonblock:1,
    34                      wholefrag:1,
     34                     partialfrag:1,
    3535                     nosilence:1;
    3636        unsigned int periods;

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/version.h

    r277 r281  
    11/* include/version.h.  Generated by configure.  */
    2 #define CONFIG_SND_VERSION "0.9.8"
     2#define CONFIG_SND_VERSION "1.0.1"
    33#define CONFIG_SND_DATE ""
Note: See TracChangeset for help on using the changeset viewer.