Changeset 96


Ignore:
Timestamp:
May 6, 2007, 4:25:12 AM (18 years ago)
Author:
Brendan Oakley
Message:

Merged some headers to beta12 that were missed before

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

Legend:

Unmodified
Added
Removed

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

    r32 r96  
    1 
    2 #ifndef __AD1816A_H
    3 #define __AD1816A_H
     1#ifndef __SOUND_AD1816A_H
     2#define __SOUND_AD1816A_H
    43
    54/*
    … …  
    1918    You should have received a copy of the GNU General Public License
    2019    along with this program; if not, write to the Free Software
    21     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     20    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2221*/
    2322
    … …  
    173172extern int snd_ad1816a_mixer(ad1816a_t *chip);
    174173
    175 #endif  /* __AD1816A_H */
    176 
     174#endif  /* __SOUND_AD1816A_H */

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

    r32 r96  
    1 #ifndef __AD1848_H
    2 #define __AD1848_H
     1#ifndef __SOUND_AD1848_H
     2#define __SOUND_AD1848_H
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 *
    2323 */
    … …  
    112112#define AD1848_MODE_TIMER       0x0004
    113113#define AD1848_MODE_OPEN        (AD1848_MODE_PLAY|AD1848_MODE_CAPTURE|AD1848_MODE_TIMER)
     114#define AD1848_MODE_RUNNING     0x0010
    114115
    115116/* defines for codec.hardware */
    … …  
    151152
    152153void snd_ad1848_out(ad1848_t *chip, unsigned char reg, unsigned char value);
     154void snd_ad1848_dout(ad1848_t *chip, unsigned char reg, unsigned char value);
     155unsigned char snd_ad1848_in(ad1848_t *chip, unsigned char reg);
     156void snd_ad1848_mce_up(ad1848_t *chip);
     157void snd_ad1848_mce_down(ad1848_t *chip);
    153158
    154159int snd_ad1848_create(snd_card_t * card,
    … …  
    202207#endif
    203208
    204 #endif                          /* __AD1848_H */
     209#endif /* __SOUND_AD1848_H */

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

    r32 r96  
    1818 *   You should have received a copy of the GNU General Public License
    1919 *   along with this program; if not, write to the Free Software
    20  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    21  *
    22  */
    23 
    24 #ifndef __AINSTR_GF1_H
    25 #define __AINSTR_GF1_H
     20 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
     21 *
     22 */
     23
     24#ifndef __SOUND_AINSTR_GF1_H
     25#define __SOUND_AINSTR_GF1_H
    2626
    2727#ifndef __KERNEL__
    … …  
    225225#endif
    226226
    227 #endif /* __SEQ_INSTR_GF1_H */
     227#endif /* __SOUND_AINSTR_GF1_H */

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

    r32 r96  
    1818 *   You should have received a copy of the GNU General Public License
    1919 *   along with this program; if not, write to the Free Software
    20  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    21  *
    22  */
    23 
    24 #ifndef __AINSTR_IW_H
    25 #define __AINSTR_IW_H
     20 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
     21 *
     22 */
     23
     24#ifndef __SOUND_AINSTR_IW_H
     25#define __SOUND_AINSTR_IW_H
    2626
    2727#ifndef __KERNEL__
    … …  
    373373#endif
    374374
    375 #endif /* __SEQ_INSTR_IW_H */
     375#endif /* __SOUND_AINSTR_IW_H */

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

    r34 r96  
    1818 *   You should have received a copy of the GNU General Public License
    1919 *   along with this program; if not, write to the Free Software
    20  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     20 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2121 *
    2222 */
    2323
    24 #ifndef __AINSTR_SIMPLE_H
    25 #define __AINSTR_SIMPLE_H
     24#ifndef __SOUND_AINSTR_SIMPLE_H
     25#define __SOUND_AINSTR_SIMPLE_H
    2626
    2727#ifndef __KERNEL__
    … …  
    156156#endif
    157157
    158 #endif /* __SEQ_INSTR_SIMPLE_H */
     158#endif /* __SOUND_AINSTR_SIMPLE_H */

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

    r32 r96  
    11/*
    22 *  Main header file for the ALSA sequencer
    3  *  Copyright (c) 1998-1999 by Frank van de Pol <fvdpol@coil.demon.nl>
     3 *  Copyright (c) 1998-1999 by Frank van de Pol <fvdpol@home.nl>
    44 *            (c) 1998-1999 by Jaroslav Kysela <perex@suse.cz>
    55 *
    … …  
    2727#include <sound/asound.h>
    2828#endif
     29
     30#include <sound/asound.h>
    2931
    3032/** version of the sequencer */

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

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

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

    r34 r96  
     1#ifndef __SOUND_ASOUNDEF_H
     2#define __SOUND_ASOUNDEF_H
     3
    14/*
    25 *  Advanced Linux Sound Architecture - ALSA - Driver
    … …  
    1619 *   You should have received a copy of the GNU General Public License
    1720 *   along with this program; if not, write to the Free Software
    18  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    1922 *
    2023 */
    21 
    22 #ifndef __ASOUNDEF_H
    23 #define __ASOUNDEF_H
    2424
    2525/****************************************************************************
    … …  
    225225#define MIDI_CTL_MONO2                  0x7f
    226226
    227 #endif                          /* __ASOUNDEF_H */
     227#endif /* __SOUND_ASOUNDEF_H */

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

    r77 r96  
    66 */
    77#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
     8
     9#include <linux/list.h>
     10#include <linux/pagemap.h>
     11#include <linux/ioport.h>
    812
    913#ifndef CONFIG_HAVE_DMA_ADDR_T
    … …  
    3337#endif /* !CONFIG_HAVE_MUTEX_MACROS */
    3438
     39/**
     40 * list_del_init - deletes entry from list and reinitialize it.
     41 * @entry: the element to delete from the list.
     42 */
     43static __inline__ void list_del_init(struct list_head *entry)
     44{
     45        __list_del(entry->prev, entry->next);
     46        INIT_LIST_HEAD(entry);
     47}
     48
     49/**
     50 * list_for_each_safe   -       iterate over a list safe against removal of list entry
     51 * @pos:        the &struct list_head to use as a loop counter.
     52 * @n:          another &struct list_head to use as temporary storage
     53 * @head:       the head for your list.
     54 */
     55#define list_for_each_safe(pos, n, head) \
     56        for (pos = (head)->next, n = pos->next; pos != (head); \
     57                pos = n, n = pos->next)
     58
     59/* rw_semaphore - replaced with mutex */
     60#define rw_semaphore semaphore
     61#define init_rwsem(x) init_MUTEX(x)
     62#define down_read(x) down(x)
     63#define down_write(x) down(x)
     64#define up_read(x) up(x)
     65#define up_write(x) up(x)
    3566
    3667#define virt_to_page(x) (&mem_map[MAP_NR(x)])
    … …  
    5081
    5182/* Some distributions use modified kill_fasync */
    52 #ifdef CONFIG_OLD_KILL_FASYNC
    53 #define snd_kill_fasync(fp, sig, band) kill_fasync(*(fp), sig)
    54 #else
    55 #define snd_kill_fasync(fp, sig, band) kill_fasync(*(fp), sig, band)
    56 #endif
     83#include <linux/fs.h>
     84#undef kill_fasync
     85#define kill_fasync(fp, sig, band) snd_wrapper_kill_fasync(fp, sig, band)
     86void snd_wrapper_kill_fasync(struct fasync_struct **, int, int);
    5787
    5888#define tasklet_hi_schedule(t)  queue_task((t), &tq_immediate); \
    … …  
    70100#define rwlock_init(x) do { *(x) = RW_LOCK_UNLOCKED; } while(0)
    71101
     102#ifndef __init
    72103#define __init
     104#endif
     105#ifndef __initdata
    73106#define __initdata
     107#endif
     108#ifndef __exit
    74109#define __exit
     110#endif
     111#ifndef __exitdata
    75112#define __exitdata
     113#endif
     114#ifndef __devinit
    76115#define __devinit
     116#endif
     117#ifndef __devinitdata
    77118#define __devinitdata
     119#endif
     120#ifndef __devexit
    78121#define __devexit
     122#endif
     123#ifndef __devexitdata
    79124#define __devexitdata
     125#endif
    80126
    81127#ifdef MODULE
    … …  
    167213#define PCI_ANY_ID (~0)
    168214
    169 #define PCI_GET_DRIVER_DATA snd_pci_compat_get_driver_data
    170 #define PCI_SET_DRIVER_DATA snd_pci_compat_set_driver_data
     215#define pci_get_drvdata snd_pci_compat_get_driver_data
     216#define pci_set_drvdata snd_pci_compat_set_driver_data
    171217
    172218#define pci_set_dma_mask snd_pci_compat_set_dma_mask
    173219
     220#undef pci_enable_device
    174221#define pci_enable_device snd_pci_compat_enable_device
    175222#define pci_register_driver snd_pci_compat_register_driver
    … …  
    187234        for(dev = pci_devices; dev; dev = dev->next)
    188235
     236#undef pci_resource_start
    189237#define pci_resource_start(dev,bar) \
    190238        (((dev)->base_address[(bar)] & PCI_BASE_ADDRESS_SPACE) ? \
    191239         ((dev)->base_address[(bar)] & PCI_BASE_ADDRESS_IO_MASK) : \
    192240         ((dev)->base_address[(bar)] & PCI_BASE_ADDRESS_MEM_MASK))
     241#undef pci_resource_end
    193242#define pci_resource_end(dev,bar) \
    194243        (pci_resource_start(dev,bar) + snd_pci_compat_get_size((dev),(bar)))
     244#undef pci_resource_len
     245#define pci_resource_len(dev,bar) \
     246        ((pci_resource_start((dev),(bar)) == 0 &&       \
     247          pci_resource_end((dev),(bar)) ==              \
     248          pci_resource_start((dev),(bar))) ? 0 :        \
     249                                                        \
     250        (pci_resource_end((dev),(bar)) -                \
     251         pci_resource_start((dev),(bar)) + 1))
     252#undef pci_resource_flags
    195253#define pci_resource_flags(dev,bar) (snd_pci_compat_get_flags((dev),(bar)))
    196254
    … …  
    201259        unsigned long driver_data;              /* Data private to the driver */
    202260};
     261
     262#ifndef PCI_OLD_SUSPEND
     263#define PCI_OLD_SUSPEND
     264#endif
    203265
    204266struct pci_driver {
    … …  
    294356};
    295357
     358#define __LINUX_PM_H    /* <linux/pm.h> in 2.2.18 is a bit stripped */
     359
    296360/*
    297361 * Device identifier

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

    r84 r96  
    1 #ifndef __CONTROL_H
    2 #define __CONTROL_H
     1#ifndef __SOUND_CONTROL_H
     2#define __SOUND_CONTROL_H
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 *
    2323 */
     24
     25#include <sound/asound.h>
     26
     27typedef struct sndrv_aes_iec958 snd_aes_iec958_t;
     28typedef struct sndrv_ctl_card_info snd_ctl_card_info_t;
     29typedef enum sndrv_ctl_elem_type snd_ctl_elem_type_t;
     30typedef enum sndrv_ctl_elem_iface snd_ctl_elem_iface_t;
     31typedef struct sndrv_ctl_elem_id snd_ctl_elem_id_t;
     32typedef struct sndrv_ctl_elem_list snd_ctl_elem_list_t;
     33typedef struct sndrv_ctl_elem_info snd_ctl_elem_info_t;
     34typedef struct sndrv_ctl_elem_value snd_ctl_elem_value_t;
     35typedef enum sndrv_ctl_event_type snd_ctl_event_type_t;
     36typedef struct sndrv_ctl_event snd_ctl_event_t;
    2437
    2538#define snd_kcontrol_chip(kcontrol) ((kcontrol)->private_data)
    … …  
    160173}
    161174
    162 #endif                          /* __CONTROL_H */
     175#endif  /* __SOUND_CONTROL_H */

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

    r32 r96  
    1 #ifndef __CS4231_H
    2 #define __CS4231_H
     1#ifndef __SOUND_CS4231_H
     2#define __SOUND_CS4231_H
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 *
    2323 */
    … …  
    337337#endif
    338338
    339 #endif                          /* __CS4231_H */
     339#endif /* __SOUND_CS4231_H */

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

    r32 r96  
    1 #ifndef __EMU8000_H
    2 #define __EMU8000_H
     1#ifndef __SOUND_EMU8000_H
     2#define __SOUND_EMU8000_H
    33/*
    44 *  Defines for the emu8000 (AWE32/64)
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 */
    2323
    24 #include "driver.h"
    2524#include "emux_synth.h"
    2625#include "seq_kernel.h"
    … …  
    118117int snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void *buf, long len);
    119118
    120 
    121 #endif
     119#endif /* __SOUND_EMU8000_H */

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

    r32 r96  
    1 #ifndef __EMU8000_REG_H
    2 #define __EMU8000_REG_H
     1#ifndef __SOUND_EMU8000_REG_H
     2#define __SOUND_EMU8000_REG_H
    33/*
    44 *  Register operations for the EMU8000
    … …  
    2020 *   You should have received a copy of the GNU General Public License
    2121 *   along with this program; if not, write to the Free Software
    22  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     22 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2323 *
    2424 */
    … …  
    205205        snd_emu8000_poke_dw((emu), EMU8000_DATA0(emu), EMU8000_CMD(5, (chan)), (val))
    206206
    207 #endif
     207#endif /* __SOUND_EMU8000_REG_H */

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

    r32 r96  
     1#ifndef __SOUND_EMUX_LEGACY_H
     2#define __SOUND_EMUX_LEGACY_H
     3
    14/*
    25 *  Copyright (c) 1999-2000 Takashi Iwai <tiwai@suse.de>
    … …  
    1619 *   You should have received a copy of the GNU General Public License
    1720 *   along with this program; if not, write to the Free Software
    18  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    1922 *
    2023 */
    21 
    22 #ifndef __EMUX_LEGACY_H
    23 #define __EMUX_LEGACY_H
    2424
    2525#include "seq_oss_legacy.h"
    … …  
    144144
    145145
    146 #endif
     146#endif /* __SOUND_EMUX_LEGACY_H */

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

    r32 r96  
    1 #ifndef __ES1688_H
    2 #define __ES1688_H
     1#ifndef __SOUND_ES1688_H
     2#define __SOUND_ES1688_H
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 *
    2323 */
    … …  
    123123int snd_es1688_mixer(es1688_t *chip);
    124124
    125 #endif                          /* __ES1688_H */
     125#endif /* __SOUND_ES1688_H */

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

    r32 r96  
    1 #ifndef __GUS_H
    2 #define __GUS_H
     1#ifndef __SOUND_GUS_H
     2#define __SOUND_GUS_H
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 *
    2323 */
    … …  
    3131#include "ainstr_gf1.h"
    3232#include "ainstr_simple.h"
    33 
    34 #define SNDRV_SEQ_DEV_ID_GUS                    "synth-gus"
     33#include <asm/io.h>
     34
     35#define SNDRV_SEQ_DEV_ID_GUS                    "gus-synth"
    3536
    3637/* IO ports */
    … …  
    216217typedef struct snd_gf1_dma_block {
    217218        void *buffer;           /* buffer in computer's RAM */
     219        unsigned long buf_addr; /* buffer address */
    218220        unsigned int addr;      /* address in onboard memory */
    219221        unsigned int count;     /* count in bytes */
    … …  
    605607
    606608void snd_gf1_dma_program(snd_gus_card_t * gus, unsigned int addr,
    607                          const void *buf, unsigned int count,
     609                         unsigned long buf_addr, unsigned int count,
    608610                         unsigned int cmd);
    609611void snd_gf1_dma_ack(snd_gus_card_t * gus);
    … …  
    696698                      unsigned int addr, unsigned int size, int rom);
    697699
    698 #ifdef CONFIG_SND_SEQUENCER
     700#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
    699701
    700702/* gus_sample.c */
    … …  
    724726                                 int atomic);
    725727
    726 #endif                          /* CONFIG_SND_SEQUENCER */
    727 
    728 #endif                          /* __GUS_H */
     728#endif /* CONFIG_SND_SEQUENCER */
     729
     730#endif /* __SOUND_GUS_H */

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

    r32 r96  
    1 #ifndef __HAL2_H
    2 #define __HAL2_H
     1#ifndef __SOUND_HAL2_H
     2#define __SOUND_HAL2_H
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 *
    2323 */
    … …  
    403403extern snd_pcm_t *snd_hal2_pcm(snd_hal2_card_t *hal2);
    404404
    405 #endif                          /* __HAL2_H */
     405#endif /* __SOUND_HAL2_H */

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

    r32 r96  
    1 #ifndef __SND_I2C_H
    2 #define __SND_I2C_H
     1#ifndef __SOUND_I2C_H
     2#define __SOUND_I2C_H
    33
    44/*
    … …  
    1717 *   You should have received a copy of the GNU General Public License
    1818 *   along with this program; if not, write to the Free Software
    19  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     19 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2020 *
    2121 *
    2222 */
    2323
    24 #define SNDRV_LOCK_I2C_BUS(bus) spin_lock_irqsave(&bus->lock, flags)
    25 #define SNDRV_UNLOCK_I2C_BUS(bus) spin_unlock_irqrestore(&bus->lock, flags)
     24typedef struct _snd_i2c_device snd_i2c_device_t;
     25typedef struct _snd_i2c_bus snd_i2c_bus_t;
    2626
    2727typedef struct _snd_i2c_device snd_i2c_device_t;
    28 typedef struct _snd_i2c_bus snd_i2c_bus_t;
     28#define SND_I2C_DEVICE_ADDRTEN  (1<<0)  /* 10-bit I2C address */
    2929
    3030struct _snd_i2c_device {
    … …  
    6161};
    6262
     63#define snd_i2c_slave_bus(n) list_entry(n, snd_i2c_bus_t, buses)
    6364
    6465int snd_i2c_bus_create(snd_card_t *card, const char *name, snd_i2c_bus_t **ri2c);
    … …  
    8384int snd_i2c_dev_write(snd_i2c_device_t *device, unsigned char b1, unsigned char b2, int both);
    8485
    85 #endif                          /* __SND_I2C_H */
     86#endif /* __SOUND_I2C_H */

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

    r32 r96  
    1 #ifndef __MINORS_H
    2 #define __MINORS_H
     1#ifndef __SOUND_MINORS_H
     2#define __SOUND_MINORS_H
    33
    44/*
    … …  
    1818 *   You should have received a copy of the GNU General Public License
    1919 *   along with this program; if not, write to the Free Software
    20  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     20 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2121 *
    2222 */
    … …  
    8484#endif
    8585
    86 #endif                          /* __MINORS_H */
     86#endif /* __SOUND_MINORS_H */

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

    r32 r96  
    1 #ifndef __MIXER_OSS_H
    2 #define __MIXER_OSS_H
     1#ifndef __SOUND_MIXER_OSS_H
     2#define __SOUND_MIXER_OSS_H
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 *
    2323 */
    … …  
    6767};
    6868
    69 #endif                          /* CONFIG_SND_OSSEMUL */
     69#endif /* CONFIG_SND_OSSEMUL */
    7070
    71 #endif                          /* __MIXER_OSS_H */
     71#endif /* __SOUND_MIXER_OSS_H */

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

    r32 r96  
    1 #ifndef __PCM_OSS_H
    2 #define __PCM_OSS_H
     1#ifndef __SOUND_PCM_OSS_H
     2#define __SOUND_PCM_OSS_H
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 *
    2323 */
    2424
    25 #include "pcm_plugin.h"
    26 
     25typedef struct _snd_pcm_plugin snd_pcm_plugin_t;
    2726typedef struct _snd_pcm_oss_setup snd_pcm_oss_setup_t;
    2827
    … …  
    8180} snd_pcm_oss_t;
    8281
    83 #endif /* __PCM_OSS_H */
     82#endif /* __SOUND_PCM_OSS_H */

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

    r92 r96  
    2222 *
    2323 */
     24
     25#include <linux/bitops.h>
    2426
    2527extern int snd_pcm_hw_param_mask(snd_pcm_substream_t *pcm, snd_pcm_hw_params_t *params,

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

    r32 r96  
    1 #ifndef __SB16_CSP_H
    2 #define __SB16_CSP_H
     1#ifndef __SOUND_SB16_CSP_H
     2#define __SOUND_SB16_CSP_H
    33
    44/*
    … …  
    2020 *   You should have received a copy of the GNU General Public License
    2121 *   along with this program; if not, write to the Free Software
    22  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     22 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2323 *
    2424 */
    … …  
    166166#endif
    167167
    168 #endif
     168#endif /* __SOUND_SB16_CSP */

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

    r32 r96  
     1#ifndef __SOUND_SEQ_OSS_H
     2#define __SOUND_SEQ_OSS_H
     3
    14/*
    25 * OSS compatible sequencer driver
    … …  
    1619 * You should have received a copy of the GNU General Public License
    1720 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    1922 */
    20 
    21 #ifndef __SEQ_OSS_H
    22 #define __SEQ_OSS_H
    2323
    2424#include "asequencer.h"
    … …  
    100100#define SNDRV_SEQ_DEV_ID_OSS            "seq-oss"
    101101
    102 #endif
     102#endif /* __SOUND_SEQ_OSS_H */

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

    r32 r96  
     1#ifndef __SOUND_SEQ_OSS_LEGACY_H
     2#define __SOUND_SEQ_OSS_LEGACY_H
     3
    14/*
    25 * OSS compatible macro definitions
    … …  
    1619 * You should have received a copy of the GNU General Public License
    1720 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    1922 */
    20 
    21 #ifndef __SEQ_OSS_LEGACY_H
    22 #define __SEQ_OSS_LEGACY_H
    2323
    2424#include <linux/soundcard.h>
    … …  
    2828#endif
    2929
    30 #endif
     30#endif /* __SOUND_SEQ_OSS_LEGACY_H */
     31

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

    r32 r96  
    1 #ifndef __SND_WAVEFRONT_H__
    2 #define __SND_WAVEFRONT_H__
     1#ifndef __SOUND_SND_WAVEFRONT_H__
     2#define __SOUND_SND_WAVEFRONT_H__
    33
    44#include "cs4231.h"
    … …  
    139139#define LOGNAME "WaveFront: "
    140140
    141 #endif  /* __SND_WAVEFRONT_H__ */
    142 
     141#endif  /* __SOUND_SND_WAVEFRONT_H__ */

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

    r32 r96  
    1 #ifndef __TEA6330T_H
    2 #define __TEA6330T_H
     1#ifndef __SOUND_TEA6330T_H
     2#define __SOUND_TEA6330T_H
    33
    44/*
    … …  
    1818 *   You should have received a copy of the GNU General Public License
    1919 *   along with this program; if not, write to the Free Software
    20  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     20 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2121 *
    2222 *
    … …  
    3434        unsigned char bass, treble;
    3535        unsigned char max_bass, max_treble;
    36         spinlock_t reg_lock;
    3736} tea6330t_t;
    3837
    … …  
    4039extern int snd_tea6330t_update_mixer(snd_card_t * card, snd_i2c_bus_t * bus, int equalizer, int fader);
    4140
    42 #endif                          /* __TEA6330T_H */
     41#endif /* __SOUND_TEA6330T_H */

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

    r32 r96  
    1 #ifndef __UTIL_MEM_H
    2 #define __UTIL_MEM_H
     1#ifndef __SOUND_UTIL_MEM_H
     2#define __SOUND_UTIL_MEM_H
    33/*
    44 *  Copyright (C) 2000 Takashi Iwai <tiwai@suse.de>
    … …  
    1818 *   You should have received a copy of the GNU General Public License
    1919 *   along with this program; if not, write to the Free Software
    20  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     20 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2121 */
    2222
    … …  
    6262snd_util_memblk_t *__snd_util_memblk_new(snd_util_memhdr_t *hdr, snd_util_unit_t units, struct list_head *prev);
    6363
    64 #endif /* __UTIL_MEM_H */
     64#endif /* __SOUND_UTIL_MEM_H */

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

    r32 r96  
    11#undef CONFIG_SND_VERSION
     2#undef CONFIG_SND_DATE

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

    r32 r96  
    1 #ifndef __WAVEFRONT_H__
    2 #define __WAVEFRONT_H__
     1#ifndef __SOUND_WAVEFRONT_H__
     2#define __SOUND_WAVEFRONT_H__
    33
    44/*
    … …  
    1919 *   You should have received a copy of the GNU General Public License
    2020 *   along with this program; if not, write to the Free Software
    21  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     21 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    2222 */
    2323
    … …  
    6565 */   
    6666
    67 typedef short INT16;
    68 typedef unsigned short UINT16;
    69 typedef int INT32;
    70 typedef unsigned int UINT32;
    71 typedef char CHAR8;
    72 typedef unsigned char UCHAR8;
     67#ifndef __KERNEL__
     68/* keep them for compatibility */
     69typedef short s16;
     70typedef unsigned short u16;
     71typedef int s32;
     72typedef unsigned int u32;
     73typedef char s8;
     74typedef unsigned char u8;
     75typedef s16 INT16;
     76typedef u16 UINT16;
     77typedef s32 INT32;
     78typedef u32 UINT32;
     79typedef s8 CHAR8;
     80typedef u8 UCHAR8;
     81#endif
    7382
    7483/* Pseudo-commands not part of the WaveFront command set.
    … …  
    198207struct wf_envelope
    199208{
    200     UCHAR8 attack_time:7;
    201     UCHAR8 Unused1:1;
    202 
    203     UCHAR8 decay1_time:7;
    204     UCHAR8 Unused2:1;
    205 
    206     UCHAR8 decay2_time:7;
    207     UCHAR8 Unused3:1;
    208 
    209     UCHAR8 sustain_time:7;
    210     UCHAR8 Unused4:1;
    211 
    212     UCHAR8 release_time:7;
    213     UCHAR8 Unused5:1;
    214 
    215     UCHAR8 release2_time:7;
    216     UCHAR8 Unused6:1;
    217 
    218     CHAR8 attack_level;
    219     CHAR8 decay1_level;
    220     CHAR8 decay2_level;
    221     CHAR8 sustain_level;
    222     CHAR8 release_level;
    223 
    224     UCHAR8 attack_velocity:7;
    225     UCHAR8 Unused7:1;
    226 
    227     UCHAR8 volume_velocity:7;
    228     UCHAR8 Unused8:1;
    229 
    230     UCHAR8 keyboard_scaling:7;
    231     UCHAR8 Unused9:1;
     209    u8 attack_time:7;
     210    u8 Unused1:1;
     211
     212    u8 decay1_time:7;
     213    u8 Unused2:1;
     214
     215    u8 decay2_time:7;
     216    u8 Unused3:1;
     217
     218    u8 sustain_time:7;
     219    u8 Unused4:1;
     220
     221    u8 release_time:7;
     222    u8 Unused5:1;
     223
     224    u8 release2_time:7;
     225    u8 Unused6:1;
     226
     227    s8 attack_level;
     228    s8 decay1_level;
     229    s8 decay2_level;
     230    s8 sustain_level;
     231    s8 release_level;
     232
     233    u8 attack_velocity:7;
     234    u8 Unused7:1;
     235
     236    u8 volume_velocity:7;
     237    u8 Unused8:1;
     238
     239    u8 keyboard_scaling:7;
     240    u8 Unused9:1;
    232241};
    233242typedef struct wf_envelope wavefront_envelope;
    … …  
    235244struct wf_lfo
    236245{
    237     UCHAR8 sample_number;
    238 
    239     UCHAR8 frequency:7;
    240     UCHAR8 Unused1:1;
    241 
    242     UCHAR8 am_src:4;
    243     UCHAR8 fm_src:4;
    244 
    245     CHAR8 fm_amount;
    246     CHAR8 am_amount;
    247     CHAR8 start_level;
    248     CHAR8 end_level;
    249 
    250     UCHAR8 ramp_delay:7;
    251     UCHAR8 wave_restart:1; /* for LFO2 only */
    252 
    253     UCHAR8 ramp_time:7;
    254     UCHAR8 Unused2:1;
     246    u8 sample_number;
     247
     248    u8 frequency:7;
     249    u8 Unused1:1;
     250
     251    u8 am_src:4;
     252    u8 fm_src:4;
     253
     254    s8 fm_amount;
     255    s8 am_amount;
     256    s8 start_level;
     257    s8 end_level;
     258
     259    u8 ramp_delay:7;
     260    u8 wave_restart:1; /* for LFO2 only */
     261
     262    u8 ramp_time:7;
     263    u8 Unused2:1;
    255264};
    256265typedef struct wf_lfo wavefront_lfo;
    … …  
    258267struct wf_patch
    259268{
    260     INT16  frequency_bias;         /*  ** THIS IS IN MOTOROLA FORMAT!! ** */
    261 
    262     UCHAR8 amplitude_bias:7;
    263     UCHAR8 Unused1:1;
    264 
    265     UCHAR8 portamento:7;
    266     UCHAR8 Unused2:1;
    267 
    268     UCHAR8 sample_number;
    269 
    270     UCHAR8 pitch_bend:4;
    271     UCHAR8 sample_msb:1;
    272     UCHAR8 Unused3:3;
    273 
    274     UCHAR8 mono:1;
    275     UCHAR8 retrigger:1;
    276     UCHAR8 nohold:1;
    277     UCHAR8 restart:1;
    278     UCHAR8 filterconfig:2; /* SDK says "not used" */
    279     UCHAR8 reuse:1;
    280     UCHAR8 reset_lfo:1;   
    281 
    282     UCHAR8 fm_src2:4;
    283     UCHAR8 fm_src1:4;   
    284 
    285     CHAR8 fm_amount1;
    286     CHAR8 fm_amount2;
    287 
    288     UCHAR8 am_src:4;
    289     UCHAR8 Unused4:4;
    290 
    291     CHAR8 am_amount;
    292 
    293     UCHAR8 fc1_mode:4;
    294     UCHAR8 fc2_mode:4;
    295 
    296     CHAR8 fc1_mod_amount;
    297     CHAR8 fc1_keyboard_scaling;
    298     CHAR8 fc1_bias;
    299     CHAR8 fc2_mod_amount;
    300     CHAR8 fc2_keyboard_scaling;
    301     CHAR8 fc2_bias;
    302 
    303     UCHAR8 randomizer:7;
    304     UCHAR8 Unused5:1;
     269    s16  frequency_bias;         /*  ** THIS IS IN MOTOROLA FORMAT!! ** */
     270
     271    u8 amplitude_bias:7;
     272    u8 Unused1:1;
     273
     274    u8 portamento:7;
     275    u8 Unused2:1;
     276
     277    u8 sample_number;
     278
     279    u8 pitch_bend:4;
     280    u8 sample_msb:1;
     281    u8 Unused3:3;
     282
     283    u8 mono:1;
     284    u8 retrigger:1;
     285    u8 nohold:1;
     286    u8 restart:1;
     287    u8 filterconfig:2; /* SDK says "not used" */
     288    u8 reuse:1;
     289    u8 reset_lfo:1;   
     290
     291    u8 fm_src2:4;
     292    u8 fm_src1:4;   
     293
     294    s8 fm_amount1;
     295    s8 fm_amount2;
     296
     297    u8 am_src:4;
     298    u8 Unused4:4;
     299
     300    s8 am_amount;
     301
     302    u8 fc1_mode:4;
     303    u8 fc2_mode:4;
     304
     305    s8 fc1_mod_amount;
     306    s8 fc1_keyboard_scaling;
     307    s8 fc1_bias;
     308    s8 fc2_mod_amount;
     309    s8 fc2_keyboard_scaling;
     310    s8 fc2_bias;
     311
     312    u8 randomizer:7;
     313    u8 Unused5:1;
    305314
    306315    struct wf_envelope envelope1;
    … …  
    313322struct wf_layer
    314323{
    315     UCHAR8 patch_number;
    316 
    317     UCHAR8 mix_level:7;
    318     UCHAR8 mute:1;
    319 
    320     UCHAR8 split_point:7;
    321     UCHAR8 play_below:1;
    322 
    323     UCHAR8 pan_mod_src:2;
    324     UCHAR8 pan_or_mod:1;
    325     UCHAR8 pan:4;
    326     UCHAR8 split_type:1;
     324    u8 patch_number;
     325
     326    u8 mix_level:7;
     327    u8 mute:1;
     328
     329    u8 split_point:7;
     330    u8 play_below:1;
     331
     332    u8 pan_mod_src:2;
     333    u8 pan_or_mod:1;
     334    u8 pan:4;
     335    u8 split_type:1;
    327336};
    328337typedef struct wf_layer wavefront_layer;
    … …  
    336345struct wf_sample_offset
    337346{
    338     INT32 Fraction:4;
    339     INT32 Integer:20;
    340     INT32 Unused:8;
     347    s32 Fraction:4;
     348    s32 Integer:20;
     349    s32 Unused:8;
    341350};
    342351typedef struct wf_sample_offset wavefront_sample_offset;         
    … …  
    430439    struct wf_sample_offset loopEndOffset;
    431440    struct wf_sample_offset sampleEndOffset;
    432     INT16 FrequencyBias;
    433     UCHAR8 SampleResolution:2;  /* sample_format */
    434     UCHAR8 Unused1:1;
    435     UCHAR8 Loop:1;
    436     UCHAR8 Bidirectional:1;
    437     UCHAR8 Unused2:1;
    438     UCHAR8 Reverse:1;
    439     UCHAR8 Unused3:1;
     441    s16 FrequencyBias;
     442    u8 SampleResolution:2;  /* sample_format */
     443    u8 Unused1:1;
     444    u8 Loop:1;
     445    u8 Bidirectional:1;
     446    u8 Unused2:1;
     447    u8 Reverse:1;
     448    u8 Unused3:1;
    440449} wavefront_sample;
    441450
    442451typedef struct wf_multisample {
    443     INT16 NumberOfSamples;   /* log2 of the number of samples */
    444     INT16 SampleNumber[NUM_MIDIKEYS];
     452    s16 NumberOfSamples;   /* log2 of the number of samples */
     453    s16 SampleNumber[NUM_MIDIKEYS];
    445454} wavefront_multisample;
    446455
    447456typedef struct wf_alias {
    448     INT16 OriginalSample __attribute__ ((packed));
     457    s16 OriginalSample __attribute__ ((packed));
    449458
    450459    struct wf_sample_offset sampleStartOffset __attribute__ ((packed));
    … …  
    453462    struct wf_sample_offset loopEndOffset __attribute__ ((packed));
    454463
    455     INT16  FrequencyBias __attribute__ ((packed));
    456 
    457     UCHAR8 SampleResolution:2  __attribute__ ((packed));
    458     UCHAR8 Unused1:1  __attribute__ ((packed));
    459     UCHAR8 Loop:1 __attribute__ ((packed));
    460     UCHAR8 Bidirectional:1  __attribute__ ((packed));
    461     UCHAR8 Unused2:1 __attribute__ ((packed));
    462     UCHAR8 Reverse:1 __attribute__ ((packed));
    463     UCHAR8 Unused3:1 __attribute__ ((packed));
     464    s16  FrequencyBias __attribute__ ((packed));
     465
     466    u8 SampleResolution:2  __attribute__ ((packed));
     467    u8 Unused1:1  __attribute__ ((packed));
     468    u8 Loop:1 __attribute__ ((packed));
     469    u8 Bidirectional:1  __attribute__ ((packed));
     470    u8 Unused2:1 __attribute__ ((packed));
     471    u8 Reverse:1 __attribute__ ((packed));
     472    u8 Unused3:1 __attribute__ ((packed));
    464473   
    465474    /* This structure is meant to be padded only to 16 bits on their
    … …  
    472481    */
    473482
    474     UCHAR8 sixteen_bit_padding __attribute__ ((packed));
     483    u8 sixteen_bit_padding __attribute__ ((packed));
    475484} wavefront_alias;
    476485
    477486typedef struct wf_drum {
    478     UCHAR8 PatchNumber;
    479     UCHAR8 MixLevel:7;
    480     UCHAR8 Unmute:1;
    481     UCHAR8 Group:4;
    482     UCHAR8 Unused1:4;
    483     UCHAR8 PanModSource:2;
    484     UCHAR8 PanModulated:1;
    485     UCHAR8 PanAmount:4;
    486     UCHAR8 Unused2:1;
     487    u8 PatchNumber;
     488    u8 MixLevel:7;
     489    u8 Unmute:1;
     490    u8 Group:4;
     491    u8 Unused1:4;
     492    u8 PanModSource:2;
     493    u8 PanModulated:1;
     494    u8 PanAmount:4;
     495    u8 Unused2:1;
    487496} wavefront_drum;
    488497
    … …  
    492501
    493502typedef struct wf_channel_programs {
    494     UCHAR8 Program[NUM_MIDICHANNELS];
     503    u8 Program[NUM_MIDICHANNELS];
    495504} wavefront_channel_programs;
    496505
    … …  
    523532    */
    524533
    525     INT16   key;               /* Use WAVEFRONT_PATCH here */
    526     UINT16  devno;             /* fill in when sending */
    527     UCHAR8  subkey;            /* WF_ST_{SAMPLE,ALIAS,etc.} */
     534    s16   key;               /* Use WAVEFRONT_PATCH here */
     535    u16  devno;             /* fill in when sending */
     536    u8  subkey;            /* WF_ST_{SAMPLE,ALIAS,etc.} */
    528537
    529538#define WAVEFRONT_FIND_FREE_SAMPLE_SLOT 999
    530539
    531     UINT16  number;            /* patch/sample/prog number */
    532 
    533     UINT32  size;              /* size of any data included in
     540    u16  number;            /* patch/sample/prog number */
     541
     542    u32  size;              /* size of any data included in
    534543                                  one of the fields in `hdrptr', or
    535544                                  as `dataptr'.
    … …  
    547556                               */
    548557    wavefront_any *hdrptr;      /* user-space ptr to hdr bytes */
    549     UINT16 *dataptr;            /* actual sample data */
     558    u16 *dataptr;            /* actual sample data */
    550559
    551560    wavefront_any hdr;          /* kernel-space copy of hdr bytes */         
    … …  
    684693#define WFFX_MEMSET              69
    685694
    686 #endif /* __WAVEFRONT_H__ */
    687 
     695#endif /* __SOUND_WAVEFRONT_H__ */

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

    r32 r96  
    1 #ifndef __WAVEFRONT_FX_H__
    2 #define __WAVEFRONT_FX_H__
     1#ifndef __SOUND_WAVEFRONT_FX_H
     2#define __SOUND_WAVEFRONT_FX_H
    33
    44extern int  snd_wavefront_fx_detect (snd_wavefront_t *);
    … …  
    77                                     unsigned long arg);
    88
    9 #endif  __WAVEFRONT_FX_H__
     9#endif  __SOUND_WAVEFRONT_FX_H

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

    r32 r96  
    1 #ifndef __yss255_h__
    2 #define __yss255_h__
     1#ifndef __SOUND_YSS225_H
     2#define __SOUND_YSS225_H
    33
    44extern unsigned char page_zero[256];
    … …  
    2121
    2222
    23 #endif /* __ys225_h__ */
    24 
     23#endif /* __SOUND_YSS225_H  */
Note: See TracChangeset for help on using the changeset viewer.