Changeset 106


Ignore:
Timestamp:
May 20, 2007, 1:00:05 AM (18 years ago)
Author:
Brendan Oakley
Message:

More merges to beta12, and fixes. Now compiles, though link phase fails.

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

Legend:

Unmodified
Added
Removed

  • GPL/branches/alsa-resync1/alsa-kernel/core/hwdep.c

    r34 r106  
    2121
    2222#include <sound/driver.h>
     23#include <linux/major.h>
     24#include <linux/init.h>
     25#include <linux/slab.h>
     26#include <linux/time.h>
     27#include <sound/core.h>
    2328#include <sound/control.h>
    2429#include <sound/minors.h>
    … …  
    6974static int snd_hwdep_open(struct inode *inode, struct file * file)
    7075{
    71     int major = MAJOR(inode->i_rdev);
     76        int major = major(inode->i_rdev);
    7277    int cardnum;
    7378    int device;
    … …  
    7883    switch (major) {
    7984    case CONFIG_SND_MAJOR:
    80         cardnum = SNDRV_MINOR_CARD(MINOR(inode->i_rdev));
    81         device = SNDRV_MINOR_DEVICE(MINOR(inode->i_rdev)) - SNDRV_MINOR_HWDEP;
     85                cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
     86                device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev)) - SNDRV_MINOR_HWDEP;
    8287        break;
    8388#ifdef CONFIG_SND_OSSEMUL
    8489    case SOUND_MAJOR:
    85         cardnum = SNDRV_MINOR_OSS_CARD(MINOR(inode->i_rdev));
     90                cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
    8691        device = 0;
    8792        break;
    … …  
    416421                                   hwdep->card, hwdep->device,
    417422                                   &snd_hwdep_reg, name)) < 0) {
    418         snd_printk("unable to register hardware dependant device %i:%i\n",
     423                snd_printk(KERN_ERR "unable to register hardware dependant device %i:%i\n",
    419424                   hwdep->card->number, hwdep->device);
    420425        snd_hwdep_devices[idx] = NULL;
    … …  
    426431    if (hwdep->oss_type >= 0) {
    427432        if ((hwdep->oss_type == SNDRV_OSS_DEVICE_TYPE_DMFM) && (hwdep->device != 0)) {
    428             snd_printk ("only hwdep device 0 can be registered as OSS direct FM device!\n");
     433                        snd_printk (KERN_WARNING "only hwdep device 0 can be registered as OSS direct FM device!\n");
    429434        } else {
    430435            if (snd_register_oss_device(hwdep->oss_type,
    431436                                        hwdep->card, hwdep->device,
    432437                                        &snd_hwdep_reg, hwdep->oss_dev) < 0) {
    433                 snd_printk("unable to register OSS compatibility device %i:%i\n",
     438                                snd_printk(KERN_ERR "unable to register OSS compatibility device %i:%i\n",
    434439                           hwdep->card->number, hwdep->device);
    435440            } else

  • GPL/branches/alsa-resync1/alsa-kernel/core/timer.c

    r92 r106  
    2020 */
    2121
    22 #define SNDRV_MAIN_OBJECT_FILE
    2322#include <sound/driver.h>
     23#include <linux/delay.h>
     24#include <linux/init.h>
     25#include <linux/slab.h>
     26#include <linux/time.h>
     27#include <sound/core.h>
    2428#include <sound/timer.h>
    2529#include <sound/control.h>
    … …  
    2731#include <sound/minors.h>
    2832#include <sound/initval.h>
    29 #ifdef CONFIG_KMOD
    3033#include <linux/kmod.h>
    31 #endif
    3234#ifdef CONFIG_KERNELD
    3335#include <linux/kerneld.h>
    … …  
    8486
    8587static void snd_timer_reschedule(snd_timer_t * timer, unsigned long ticks_left);
     88
     89#ifndef TARGET_OS2
     90static inline void dec_mod_count(struct module *module)
     91{
     92        if (module)
     93                __MOD_DEC_USE_COUNT(module);
     94}
     95#else /* TARGET_OS2 */
     96#define dec_mod_count(a)        (*(unsigned long *)a)--
     97#endif /* TARGET_OS2 */
    8698
    8799/*

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

    r100 r106  
    2626
    2727typedef struct sndrv_aes_iec958 snd_aes_iec958_t;
    28 typedef struct sndrv_ctl_card_info snd_ctl_card_info_t;
    29 typedef struct sndrv_ctl_elem_id snd_ctl_elem_id_t;
    30 typedef struct sndrv_ctl_elem_list snd_ctl_elem_list_t;
    31 typedef struct sndrv_ctl_elem_info snd_ctl_elem_info_t;
    32 typedef struct sndrv_ctl_elem_value snd_ctl_elem_value_t;
     28typedef struct snd_ctl_card_info snd_ctl_card_info_t;
     29typedef struct snd_ctl_elem_id snd_ctl_elem_id_t;
     30typedef struct snd_ctl_elem_list snd_ctl_elem_list_t;
     31typedef struct snd_ctl_elem_info snd_ctl_elem_info_t;
     32typedef struct snd_ctl_elem_value snd_ctl_elem_value_t;
    3333typedef enum sndrv_ctl_event_type snd_ctl_event_type_t;
    3434typedef struct sndrv_ctl_event snd_ctl_event_t;

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

    r105 r106  
    9090#define snd_enter_user() 0
    9191#define snd_leave_user(a)
    92 #define dec_mod_count(a)        (*(unsigned long *)a)--
    9392#endif
    9493

  • GPL/branches/alsa-resync1/alsa-kernel/isa/opl3sa2.c

    r92 r106  
    760760        opl3_t *opl3;
    761761        static snd_device_ops_t ops = {
    762                 dev_free:       snd_opl3sa2_dev_free,
     762                /* dev_free: */ snd_opl3sa2_dev_free,
    763763        };
    764764        int err;
    … …  
    853853        }
    854854#ifdef CONFIG_PM
    855         /* Power Management */
    856         chip->pm_dev = pm_register(PM_ISA_DEV, 0, snd_opl3sa2_pm_callback);
    857         if (chip->pm_dev) {
    858                 chip->pm_dev->data = chip;
    859                 /* remember callbacks for cs4231 - they are called inside
    860                  * opl3sa2 pm callback
    861                  */
    862855                chip->cs4231_suspend = chip->cs4231->suspend;
    863856                chip->cs4231_resume = chip->cs4231->resume;
    … …  
    865858                chip->cs4231->suspend = NULL;
    866859                chip->cs4231->resume = NULL;
    867                 /* set control api callback */
    868                 card->set_power_state = snd_opl3sa2_set_power_state;
    869                 card->pm_private_data = chip;
    870         }
     860        snd_card_set_isa_pm_callback(card, snd_opl3sa2_suspend, snd_opl3sa2_resume, chip);
    871861#endif
    872862

  • GPL/branches/alsa-resync1/alsa-kernel/pci/es1968.c

    r92 r106  
    9797#define __SND_OSS_COMPAT__
    9898#include <sound/driver.h>
     99#include <asm/io.h>
     100#include <linux/delay.h>
     101#include <linux/interrupt.h>
     102#include <linux/init.h>
     103#include <linux/slab.h>
     104#include <sound/core.h>
    99105#include <sound/pcm.h>
    100106#include <sound/mpu401.h>
    … …  
    19111917    es->count += diff;
    19121918
    1913     if (es->count > es->frag_size) {
     1919        while (es->count > es->frag_size) {
    19141920        spin_unlock(&chip->substream_lock);
    19151921        snd_pcm_period_elapsed(subs);

  • GPL/branches/alsa-resync1/alsa-kernel/pci/maestro3.c

    r92 r106  
    3333
    3434#include <sound/driver.h>
     35#include <asm/io.h>
     36#include <linux/delay.h>
     37#include <linux/interrupt.h>
     38#include <linux/init.h>
     39#include <linux/slab.h>
     40#include <linux/vmalloc.h>
     41#include <sound/core.h>
    3542#include <sound/info.h>
    3643#include <sound/control.h>
    … …  
    4249MODULE_AUTHOR("Zach Brown <zab@zabbo.net>, Takashi Iwai <tiwai@suse.de>");
    4350MODULE_DESCRIPTION("ESS Maestro3 PCI");
     51MODULE_LICENSE("GPL");
    4452MODULE_CLASSES("{sound}");
    4553MODULE_DEVICES("{{ESS,Maestro3 PCI},"
    … …  
    28042812    chip->suspend_mem = vmalloc(sizeof(u16) * (REV_B_CODE_MEMORY_LENGTH + REV_B_DATA_MEMORY_LENGTH));
    28052813    if (chip->suspend_mem == NULL)
    2806         snd_printk("can't allocate apm buffer\n");
     2814                snd_printk(KERN_WARNING "can't allocate apm buffer\n");
     2815        else
     2816                snd_card_set_pm_callback(card, m3_suspend, m3_resume, chip);
    28072817#endif
    28082818

  • GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident_main.c

    r84 r106  
    2828 */
    2929
    30 #define SNDRV_MAIN_OBJECT_FILE
     30#define __NO_VERSION__
    3131#include <sound/driver.h>
     32#include <asm/io.h>
     33#include <linux/delay.h>
     34#include <linux/init.h>
     35#include <linux/slab.h>
     36#include <linux/vmalloc.h>
     37#include <sound/core.h>
    3238#include <sound/info.h>
    3339#include <sound/control.h>
    3440#include <sound/trident.h>
     41#include <sound/asoundef.h>
    3542
    3643static int snd_trident_pcm_mixer_build(struct snd_trident *trident, struct snd_trident_voice* voice, snd_pcm_substream_t *substream);

  • GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident_memory.c

    r34 r106  
    2424 */
    2525
     26#define __NO_VERSION__
    2627#include <sound/driver.h>
     28#include <asm/io.h>
    2729#include <linux/pci.h>
     30#include <linux/time.h>
     31#include <sound/core.h>
    2832#include <sound/trident.h>
    2933

  • GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident_synth.c

    r34 r106  
    2020 */
    2121
    22 #define SNDRV_MAIN_OBJECT_FILE
    2322#include <sound/driver.h>
     23#include <asm/io.h>
     24#include <linux/init.h>
     25#include <linux/slab.h>
    2426#include <linux/pci.h>
     27#include <sound/core.h>
    2528#include <sound/trident.h>
    2629#include <sound/seq_device.h>

  • GPL/branches/alsa-resync1/alsa-kernel/pci/ymfpci/ymfpci_main.c

    r84 r106  
    2525 */
    2626
     27#define __NO_VERSION__
    2728#include <sound/driver.h>
     29#include <asm/io.h>
     30#include <linux/delay.h>
     31#include <linux/init.h>
     32#include <linux/slab.h>
     33#include <sound/core.h>
    2834#include <sound/control.h>
    2935#include <sound/info.h>
    3036#include <sound/ymfpci.h>
     37#include <sound/asoundef.h>
     38#include <sound/mpu401.h>
     39#ifdef TARGET_OS2
    3140#include <sound/timer.h>
     41#endif /* TARGET_OS2 */
    3242
    3343/*
Note: See TracChangeset for help on using the changeset viewer.