Ignore:
Timestamp:
Jul 13, 2007, 4:47:31 PM (18 years ago)
Author:
Brendan Oakley
Message:

Merged to Alsa 0.9.0rc3

Location:
GPL/branches/alsa-resync1/alsa-kernel/include/sound
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

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

    r96 r210  
    167167void snd_ad1848_interrupt(int irq, void *dev_id, struct pt_regs *regs);
    168168
    169 #ifdef TARGET_OS2
    170169#define AD1848_SINGLE(xname, xindex, reg, shift, mask, invert) \
    171 { SNDRV_CTL_ELEM_IFACE_MIXER, 0, 0, xname, xindex, \
    172   0, 0, snd_ad1848_info_single, \
    173   snd_ad1848_get_single, snd_ad1848_put_single, \
    174   reg | (shift << 8) | (mask << 16) | (invert << 24) }
    175 #else
    176 #define AD1848_SINGLE(xname, xindex, reg, shift, mask, invert) \
    177 { iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
    178   info: snd_ad1848_info_single, \
    179   get: snd_ad1848_get_single, put: snd_ad1848_put_single, \
    180   private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
    181 #endif
     170{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
     171  .info = snd_ad1848_info_single, \
     172  .get = snd_ad1848_get_single, .put = snd_ad1848_put_single, \
     173  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
    182174
    183175int snd_ad1848_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);
    … …  
    185177int snd_ad1848_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
    186178
    187 #ifdef TARGET_OS2
    188179#define AD1848_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
    189 { SNDRV_CTL_ELEM_IFACE_MIXER, 0, 0, xname, xindex, \
    190   0, 0, snd_ad1848_info_double, \
    191   snd_ad1848_get_double, snd_ad1848_put_double, \
    192   left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
    193 #else
    194 #define AD1848_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
    195 { iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
    196   info: snd_ad1848_info_double, \
    197   get: snd_ad1848_get_double, put: snd_ad1848_put_double, \
    198   private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
    199 #endif
     180{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
     181  .info = snd_ad1848_info_double, \
     182  .get = snd_ad1848_get_double, .put = snd_ad1848_put_double, \
     183  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
    200184
    201185int snd_ad1848_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);

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

    r206 r210  
    373373
    374374#ifdef CONFIG_SND_VERBOSE_PRINTK
    375 #define snd_printk(format, args...) \
    376         snd_verbose_printk(__FILE__, __LINE__, format, ##args)
    377 #else
    378 #define snd_printk(format, args...) \
    379         printk(format, ##args)
     375#define snd_printk(fmt, args...) \
     376        snd_verbose_printk(__FILE__, __LINE__, fmt ,##args)
     377#else
     378#define snd_printk(fmt, args...) \
     379        printk(fmt ,##args)
    380380#endif
    381381
    … …  
    385385
    386386#ifdef CONFIG_SND_VERBOSE_PRINTK
    387 #define snd_printd(format, args...) \
    388         snd_verbose_printd(__FILE__, __LINE__, format, ##args)
     387#define snd_printd(fmt, args...) \
     388        snd_verbose_printd(__FILE__, __LINE__, fmt ,##args)
    389389#endif
    390390#define snd_assert(expr, args...) do {\
    … …  
    403403#else /* !CONFIG_SND_DEBUG */
    404404
    405 #define snd_printd(format, args...)     /* nothing */
    406 #define snd_assert(expr, args...)       /* nothing */
     405#define snd_printd(fmt, args...)        /* nothing */
     406#define snd_assert(expr, args...)       (void)(expr)
    407407#define snd_runtime_check(expr, args...) do { if (!(expr)) { args; } } while (0)
    408408

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

    r96 r210  
    297297 */
    298298
    299 #ifdef TARGET_OS2
    300299#define CS4231_SINGLE(xname, xindex, reg, shift, mask, invert) \
    301 { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, xindex, \
    302   0, 0, snd_cs4231_info_single, \
    303   snd_cs4231_get_single, snd_cs4231_put_single, \
    304   reg | (shift << 8) | (mask << 16) | (invert << 24) }
    305 #else
    306 #define CS4231_SINGLE(xname, xindex, reg, shift, mask, invert) \
    307 { iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
    308   info: snd_cs4231_info_single, \
    309   get: snd_cs4231_get_single, put: snd_cs4231_put_single, \
    310   private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
    311 #endif
     300{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
     301  .info = snd_cs4231_info_single, \
     302  .get = snd_cs4231_get_single, .put = snd_cs4231_put_single, \
     303  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
    312304
    313305int snd_cs4231_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);
    … …  
    315307int snd_cs4231_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
    316308
    317 #ifdef TARGET_OS2
    318309#define CS4231_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
    319 { SNDRV_CTL_ELEM_IFACE_MIXER, 0, 0, xname, xindex, \
    320   0, 0, snd_cs4231_info_double, \
    321   snd_cs4231_get_double, snd_cs4231_put_double, \
    322   left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
    323 #else
    324 #define CS4231_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
    325 { iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
    326   info: snd_cs4231_info_double, \
    327   get: snd_cs4231_get_double, put: snd_cs4231_put_double, \
    328   private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
    329 #endif
     310{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
     311  .info = snd_cs4231_info_double, \
     312  .get = snd_cs4231_get_double, .put = snd_cs4231_put_double, \
     313  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
    330314
    331315int snd_cs4231_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);

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

    r112 r210  
    5858
    5959#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
    60 #if defined(__i386__) || defined(__ppc__)
     60#if defined(__i386__) || defined(__ppc__) || defined(__x86_64__)
    6161/*
    62  * Here a dirty hack for 2.4 kernels.. See kernel/memory.c.
     62 * Here a dirty hack for 2.4 kernels.. See sound/core/memory.c.
    6363 */
    6464#define HACK_PCI_ALLOC_CONSISTENT

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

    r92 r210  
    179179#if defined(SNDRV_GET_ID) && !defined(MODULE)
    180180#include <linux/ctype.h>
     181#include <linux/init.h>
    181182static int __init get_id(char **str, char **dst)
    182183{

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

    r96 r210  
    2323 */
    2424
    25 #ifdef CONFIG_SND_OSSEMUL
     25#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
    2626
    2727typedef struct _snd_oss_mixer_slot snd_mixer_oss_slot_t;
    … …  
    6767};
    6868
    69 #endif /* CONFIG_SND_OSSEMUL */
     69#endif /* CONFIG_SND_MIXER_OSS */
    7070
    7171#endif /* __SOUND_MIXER_OSS_H */

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

    r112 r210  
    3737
    3838#define INLINE static inline
    39 #define SNDRV_MASK_BITS 64      /* we use so far 64bits only */
    40 #define SNDRV_MASK_SIZE (SNDRV_MASK_BITS / 32)
    41 #define MASK_OFS(i)     ((i) >> 5)
    42 #define MASK_BIT(i)     (1U << ((i) & 31))
    43 
    4439#define assert(a)
     40
     41#define SNDRV_MASK_BITS 64      /* we use so far 64bits only */
     42#define SNDRV_MASK_SIZE (SNDRV_MASK_BITS / 32)
     43#define MASK_OFS(i)     ((i) >> 5)
     44#define MASK_BIT(i)     (1U << ((i) & 31))
    4545
    4646INLINE unsigned int ld2(u_int32_t v)
Note: See TracChangeset for help on using the changeset viewer.