Changeset 398 for GPL/branches


Ignore:
Timestamp:
Oct 24, 2008, 11:14:31 AM (17 years ago)
Author:
Paul Smedley
Message:

Clean up some headers that did not get correctly updated to 1.0.17 level

Location:
GPL/branches/uniaud32-2.0/alsa-kernel
Files:
24 edited

Legend:

Unmodified
Added
Removed

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

    r305 r398  
    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
    … …  
    138137
    139138        unsigned short mode;
     139        unsigned int clock_freq;
    140140
    141141        struct snd_card *card;
    … …  
    171171extern int snd_ad1816a_mixer(struct snd_ad1816a *chip);
    172172
    173 #endif  /* __AD1816A_H */
    174 
     173#endif  /* __SOUND_AD1816A_H */

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

    r305 r398  
    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 */
    2424
    25 #include "control.h"
    2625#include "pcm.h"
     26#include <linux/interrupt.h>
    2727
    2828/* IO ports */
    … …  
    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 */
    … …  
    120121#define AD1848_HW_CS4248        0x0003  /* CS4248 chip */
    121122#define AD1848_HW_CMI8330       0x0004  /* CMI8330 chip */
     123#define AD1848_HW_THINKPAD      0x0005  /* Thinkpad 360/750/755 */
     124
     125/* IBM Thinkpad specific stuff */
     126#define AD1848_THINKPAD_CTL_PORT1               0x15e8
     127#define AD1848_THINKPAD_CTL_PORT2               0x15e9
     128#define AD1848_THINKPAD_CS4248_ENABLE_BIT       0x02
    122129
    123130struct snd_ad1848 {
    … …  
    139146        int mce_bit;
    140147        int calibrate_mute;
    141         int dma_size;
    142         int thinkpad_flag;              /* Thinkpad CS4248 needs some extra help */
     148        int dma_size;
     149        int thinkpad_flag;              /* Thinkpad CS4248 needs some extra help */
    143150
    144151#ifdef CONFIG_PM

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

    r320 r398  
    265265#define SNDRV_PCM_SUBFORMAT_LAST        SNDRV_PCM_SUBFORMAT_STD
    266266
    267 
    268 #ifdef SNDRV_LITTLE_ENDIAN
    269 #define SNDRV_PCM_FORMAT_S16            SNDRV_PCM_FORMAT_S16_LE
    270 #define SNDRV_PCM_FORMAT_U16            SNDRV_PCM_FORMAT_U16_LE
    271 #define SNDRV_PCM_FORMAT_S24            SNDRV_PCM_FORMAT_S24_LE
    272 #define SNDRV_PCM_FORMAT_U24            SNDRV_PCM_FORMAT_U24_LE
    273 #define SNDRV_PCM_FORMAT_S32            SNDRV_PCM_FORMAT_S32_LE
    274 #define SNDRV_PCM_FORMAT_U32            SNDRV_PCM_FORMAT_U32_LE
    275 #define SNDRV_PCM_FORMAT_FLOAT          SNDRV_PCM_FORMAT_FLOAT_LE
    276 #define SNDRV_PCM_FORMAT_FLOAT64        SNDRV_PCM_FORMAT_FLOAT64_LE
    277 #define SNDRV_PCM_FORMAT_IEC958_SUBFRAME SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE
    278 #endif
    279 #ifdef SNDRV_BIG_ENDIAN
    280 #define SNDRV_PCM_FORMAT_S16            SNDRV_PCM_FORMAT_S16_BE
    281 #define SNDRV_PCM_FORMAT_U16            SNDRV_PCM_FORMAT_U16_BE
    282 #define SNDRV_PCM_FORMAT_S24            SNDRV_PCM_FORMAT_S24_BE
    283 #define SNDRV_PCM_FORMAT_U24            SNDRV_PCM_FORMAT_U24_BE
    284 #define SNDRV_PCM_FORMAT_S32            SNDRV_PCM_FORMAT_S32_BE
    285 #define SNDRV_PCM_FORMAT_U32            SNDRV_PCM_FORMAT_U32_BE
    286 #define SNDRV_PCM_FORMAT_FLOAT          SNDRV_PCM_FORMAT_FLOAT_BE
    287 #define SNDRV_PCM_FORMAT_FLOAT64        SNDRV_PCM_FORMAT_FLOAT64_BE
    288 #define SNDRV_PCM_FORMAT_IEC958_SUBFRAME SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE
    289 #endif
    290 
    291267#define SNDRV_PCM_INFO_MMAP             0x00000001      /* hardware supports mmap */
    292268#define SNDRV_PCM_INFO_MMAP_VALID       0x00000002      /* period data are valid during transfer */
    … …  
    891867};
    892868
    893 
    894869enum {
    895870        SNDRV_CTL_IOCTL_PVERSION = _IOR('U', 0x00, int),

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

    r358 r398  
    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 */
    … …  
    182182                     
    183183#endif  /* __SOUND_CONTROL_H */
    184 

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

    r358 r398  
    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 */
    … …  
    4545#define CS4231_HW_CS4231        0x0100  /* CS4231 chip */
    4646#define CS4231_HW_CS4231A       0x0101  /* CS4231A chip */
     47#define CS4231_HW_AD1845        0x0102  /* AD1845 chip */
    4748#define CS4231_HW_CS4232_MASK   0x0200  /* CS4232 serie (has control ports) */
    4849#define CS4231_HW_CS4232        0x0200  /* CS4232 */
    … …  
    152153 */
    153154
    154 #ifndef TARGET_OS2
    155155#define CS4231_SINGLE(xname, xindex, reg, shift, mask, invert) \
    156156{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
    … …  
    158158  .get = snd_cs4231_get_single, .put = snd_cs4231_put_single, \
    159159  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
    160 #else
    161 #define CS4231_SINGLE(xname, xindex, reg, shift, mask, invert) \
    162 { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, xindex, \
    163   0, 0, snd_cs4231_info_single, \
    164   snd_cs4231_get_single, snd_cs4231_put_single, \
    165   reg | (shift << 8) | (mask << 16) | (invert << 24) }
    166 #endif
     160
    167161int snd_cs4231_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
    168162int snd_cs4231_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
    169163int snd_cs4231_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
    170164
    171 #ifndef TARGET_OS2
    172165#define CS4231_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
    173166{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
    … …  
    175168  .get = snd_cs4231_get_double, .put = snd_cs4231_put_double, \
    176169  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
    177 #else
    178 #define CS4231_SINGLE(xname, xindex, reg, shift, mask, invert) \
    179 { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, xindex, \
    180   0, 0, snd_cs4231_info_single, \
    181   snd_cs4231_get_single, snd_cs4231_put_single, \
    182   reg | (shift << 8) | (mask << 16) | (invert << 24) }
    183 #endif
     170
    184171int snd_cs4231_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
    185172int snd_cs4231_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

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

    r305 r398  
    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"

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

    r32 r398  
    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/uniaud32-2.0/alsa-kernel/include/sound/es1688.h

    r305 r398  
    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 */
    … …  
    2525#include "control.h"
    2626#include "pcm.h"
     27#include <linux/interrupt.h>
    2728
    2829#define ES1688_HW_AUTO          0x0000
    … …  
    118119int snd_es1688_mixer(struct snd_es1688 *chip);
    119120
    120 #endif                          /* __ES1688_H */
     121#endif /* __SOUND_ES1688_H */

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

    r305 r398  
    1 #ifndef __SND_I2C_H
    2 #define __SND_I2C_H
     1#ifndef __SOUND_I2C_H
     2#define __SOUND_I2C_H
    33
    44/*

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

    r305 r398  
    1 #ifndef __INITVAL_H
    2 #define __INITVAL_H
     1#ifndef __SOUND_INITVAL_H
     2#define __SOUND_INITVAL_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 */

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

    r305 r398  
    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 */
    … …  
    101101#define SNDRV_OSS_DEVICE_TYPE_MUSIC     6
    102102
     103#define MODULE_ALIAS_SNDRV_MINOR(type) \
     104        MODULE_ALIAS("sound-service-?-" __stringify(type))
     105
    103106#endif
    104107
    105 #endif                          /* __MINORS_H */
     108#endif /* __SOUND_MINORS_H */

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

    r305 r398  
    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 */
    2424
    25 #ifdef CONFIG_SND_OSSEMUL
     25#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
    2626
    2727#define SNDRV_OSS_MAX_MIXERS    32

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

    r305 r398  
    1 #ifndef __PCM_OSS_H
    2 #define __PCM_OSS_H
     1#ifndef __SOUND_PCM_OSS_H
     2#define __SOUND_PCM_OSS_H
    33
    44/*

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

    r305 r398  
    1 #ifndef __PCM_PARAMS_H
    2 #define __PCM_PARAMS_H
     1#ifndef __SOUND_PCM_PARAMS_H
     2#define __SOUND_PCM_PARAMS_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 */
    … …  
    324324}
    325325
    326 INLINE unsigned int add(unsigned int a, unsigned int b)
     326static inline unsigned int add(unsigned int a, unsigned int b)
    327327{
    328328        if (a >= UINT_MAX - b)
    … …  
    331331}
    332332
    333 INLINE unsigned int sub(unsigned int a, unsigned int b)
     333static inline unsigned int sub(unsigned int a, unsigned int b)
    334334{
    335335        if (a > b)
    … …  
    338338}
    339339
    340 #endif
     340#endif /* __SOUND_PCM_PARAMS_H */
     341

  • GPL/branches/uniaud32-2.0/alsa-kernel/include/sound/rawmidi.h

    r305 r398  
    2929#include <linux/mutex.h>
    3030
    31 #ifdef TARGET_OS2x
    32 #define tasklet_struct          tq_struct
    33 #endif
    3431#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
    3532#include "seq_device.h"

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

    r305 r398  
    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 */

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

    r305 r398  
     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"
    … …  
    9494#define SNDRV_SEQ_DEV_ID_OSS            "seq-oss"
    9595
    96 #endif
     96#endif /* __SOUND_SEQ_OSS_H */

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

    r32 r398  
     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/uniaud32-2.0/alsa-kernel/include/sound/tea6330t.h

    r305 r398  
    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 *

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

    r358 r398  
    1 /*
    2  *  Configuration header file for compilation of the ALSA driver
    3  */
    4 
    5 #ifndef __ALSA_VERSION_H__
    6 #define __ALSA_VERSION_H__
     1/* include/version.h */
     2#define CONFIG_SND_VERSION "1.0.17"
    73#define CONFIG_SND_DATE ""
    8 #define CONFIG_SND_VERSION "1.0.17"
    9 #endif //__ALSA_VERSION_H__

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

    r305 r398  
    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;         
    … …  
    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'.
    … …  
    546555
    547556                               */
    548     wavefront_any *hdrptr;      /* user-space ptr to hdr bytes */
    549     UINT16 *dataptr;            /* actual sample data */
     557    wavefront_any __user *hdrptr;      /* user-space ptr to hdr bytes */
     558    u16 __user *dataptr;            /* actual sample data */
    550559
    551560    wavefront_any hdr;          /* kernel-space copy of hdr bytes */         
    … …  
    679688/* Allow direct user-space control over FX memory/coefficient data.
    680689   In theory this could be used to download the FX microprogram,
    681    but it would be a little slower, and involve some wierd code.
     690   but it would be a little slower, and involve some weird code.
    682691 */
    683692
    684693#define WFFX_MEMSET              69
    685694
    686 #endif /* __WAVEFRONT_H__ */
    687 
     695#endif /* __SOUND_WAVEFRONT_H__ */

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/ac97/Makefile

    r32 r398  
    11#
    22# Makefile for ALSA
    3 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
     3# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
    44#
    55
    6 snd-ac97-codec-objs := ac97_codec.o ac97_proc.o ac97_patch.o
    7 snd-ak4531-codec-objs := ak4531_codec.o
     6snd-ac97-codec-y := ac97_codec.o ac97_pcm.o
     7snd-ac97-codec-$(CONFIG_PROC_FS) += ac97_proc.o
    88
    99# Toplevel Module Dependency
    10 obj-$(CONFIG_SND_CS4281) += snd-ac97-codec.o
    11 obj-$(CONFIG_SND_ENS1370) += snd-ak4531-codec.o
    12 obj-$(CONFIG_SND_ENS1371) += snd-ac97-codec.o
    13 obj-$(CONFIG_SND_ES1968) += snd-ac97-codec.o
    14 obj-$(CONFIG_SND_FM801) += snd-ac97-codec.o
    15 obj-$(CONFIG_SND_ICE1712) += snd-ac97-codec.o
    16 obj-$(CONFIG_SND_ICE1724) += snd-ac97-codec.o
    17 obj-$(CONFIG_SND_INTEL8X0) += snd-ac97-codec.o
    18 obj-$(CONFIG_SND_MAESTRO3) += snd-ac97-codec.o
    19 obj-$(CONFIG_SND_VIA82XX) += snd-ac97-codec.o
    20 obj-$(CONFIG_SND_ALI5451) += snd-ac97-codec.o
    21 obj-$(CONFIG_SND_CS46XX) += snd-ac97-codec.o
    22 obj-$(CONFIG_SND_EMU10K1) += snd-ac97-codec.o
    23 obj-$(CONFIG_SND_NM256) += snd-ac97-codec.o
    24 obj-$(CONFIG_SND_TRIDENT) += snd-ac97-codec.o
    25 obj-$(CONFIG_SND_YMFPCI) += snd-ac97-codec.o
    26 
    27 obj-m := $(sort $(obj-m))
     10obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/au88x0/Makefile

    r32 r398  
    1 TOPDIR = ../..
    2 
    3 include $(TOPDIR)/toplevel.config
    4 include $(TOPDIR)/Makefile.conf
    5 
    6 snd-au8810-objs := au8810.o au8810_core.o au8810_pcm.o au8810_mixer.o au8810_mpu401.o au8810_game.o au8810_eq.o
    7 snd-au8820-objs := au8820.o au8820_core.o au8820_pcm.o au8820_mixer.o au8820_mpu401.o au8820_game.o au8820_synth.o
    8 snd-au8830-objs := au8830.o au8830_core.o au8830_pcm.o au8830_mixer.o au8830_mpu401.o au8830_game.o au8830_eq.o au8830_synth.o
     1snd-au8810-objs := au8810.o
     2snd-au8820-objs := au8820.o
     3snd-au8830-objs := au8830.o
    94
    105obj-$(CONFIG_SND_AU8810) += snd-au8810.o
    116obj-$(CONFIG_SND_AU8820) += snd-au8820.o
    127obj-$(CONFIG_SND_AU8830) += snd-au8830.o
    13 
    14 include $(TOPDIR)/Rules.make

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/ca0106/Makefile

    r32 r398  
    1 snd-ca0106-objs := ca0106_main.o ca0106_proc.o ca0106_mixer.o
     1snd-ca0106-objs := ca0106_main.o ca0106_proc.o ca0106_mixer.o ca_midi.o
    22
    33obj-$(CONFIG_SND_CA0106) += snd-ca0106.o
Note: See TracChangeset for help on using the changeset viewer.