Ignore:
Timestamp:
Jul 26, 2007, 7:21:09 AM (18 years ago)
Author:
Brendan Oakley
Message:

Merged to Alsa 0.9.1

Location:
GPL/branches/alsa-resync1/alsa-kernel/include/sound
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

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

    r96 r224  
    11/*
    22 *  Advanced Linux Sound Architecture - ALSA - Driver
    3  *  Copyright (c) 1994-2000 by Jaroslav Kysela <perex@suse.cz>,
     3 *  Copyright (c) 1994-2003 by Jaroslav Kysela <perex@suse.cz>,
    44 *                             Abramo Bagnara <abramo@alsa-project.org>
    55 *

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

    r222 r224  
    3131
    3232/* Typedef's */
    33 typedef struct timeval snd_timestamp_t;
     33typedef struct timespec snd_timestamp_t;
    3434#ifndef TARGET_OS2
    3535typedef enum sndrv_card_type snd_card_type;
    … …  
    325325void snd_dma_program(unsigned long dma, const void *buf, unsigned int size, unsigned short mode);
    326326void snd_dma_disable(unsigned long dma);
    327 unsigned int snd_dma_residue(unsigned long dma);
     327unsigned int snd_dma_pointer(unsigned long dma, unsigned int size);
    328328
    329329/* misc.c */

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

    r210 r224  
    5757#endif /* TARGET_OS2 */
    5858
    59 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
    60 #if defined(__i386__) || defined(__ppc__) || defined(__x86_64__)
    61 /*
    62  * Here a dirty hack for 2.4 kernels.. See sound/core/memory.c.
    63  */
    64 #define HACK_PCI_ALLOC_CONSISTENT
    65 #include <linux/pci.h>
    66 void *snd_pci_hack_alloc_consistent(struct pci_dev *hwdev, size_t size,
    67                                     dma_addr_t *dma_handle);
    68 #undef pci_alloc_consistent
    69 #define pci_alloc_consistent snd_pci_hack_alloc_consistent
    70 #endif /* i386 or ppc */
    71 #endif /* 2.4.0 */
    72 
    7359#ifdef CONFIG_SND_DEBUG_MEMORY
    7460#include <linux/slab.h>

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

    r222 r224  
    2626#define MODULE_GENERIC_STRING(name, string) \
    2727static const char __module_generic_string_##name [] \
    28   __attribute__ ((section(".modstring"))) = #name "=" string;
     28  __attribute__ ((unused, __section__(".modstring"))) = #name "=" string;
    2929#else
    3030#define MODULE_GENERIC_STRING(name, string)
    … …  
    102102#define SNDRV_BOOLEAN_FALSE_DESC "allows:{{0,Disabled},{1,Enabled}},default:0,dialog:check"
    103103
    104 #define SNDRV_ENABLED           "enable:(snd_enable)"
     104#define SNDRV_ENABLED           "enable:(enable)"
    105105
    106106#define SNDRV_INDEX_DESC        SNDRV_ENABLED ",allows:{{0,7}},unique,skill:required,dialog:list"

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

    r222 r224  
    3232typedef int (*snd_mixer_oss_get_recsrc_t)(snd_mixer_oss_file_t *fmixer, snd_mixer_oss_slot_t *chn, int *active);
    3333typedef int (*snd_mixer_oss_put_recsrc_t)(snd_mixer_oss_file_t *fmixer, snd_mixer_oss_slot_t *chn, int active);
    34 typedef int (*snd_mixer_oss_get_recsrce_t)(snd_mixer_oss_file_t *fmixer, int *active_index);
    35 typedef int (*snd_mixer_oss_put_recsrce_t)(snd_mixer_oss_file_t *fmixer, int active_index);
     34typedef int (*snd_mixer_oss_get_recsrce_t)(snd_mixer_oss_file_t *fmixer, unsigned int *active_index);
     35typedef int (*snd_mixer_oss_put_recsrce_t)(snd_mixer_oss_file_t *fmixer, unsigned int active_index);
    3636
    3737#define SNDRV_OSS_MAX_MIXERS    32

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

    r215 r224  
    1616 */
    1717
    18 /* uda1341.h,v 1.2 2002/04/17 07:53:22 perex Exp */
     18/* uda1341.h,v 1.4 2003/02/25 12:48:16 perex Exp */
    1919
    2020#define UDA1341_ALSA_NAME "snd-uda1341"
     21
     22/*
     23 * Default rate set after inicialization
     24 */
     25#define AUDIO_RATE_DEFAULT      44100
    2126
    2227/*
    … …  
    161166 *
    162167 * UDA1341 datasheet on page 21: Peak value (dB) = (Peak level - 63.5)*5*log2
    163  * There is an tabel with these values [level]=value: [3]=-90.31, [7]=-84.29
     168 * There is an table with these values [level]=value: [3]=-90.31, [7]=-84.29
    164169 * [61]=-2.78, [62] = -1.48, [63] = 0.0
    165170 * I tried to compute it, but using but even using logarithm with base either 10 or 2
Note: See TracChangeset for help on using the changeset viewer.