Changeset 212 for GPL/branches/alsa-resync1/alsa-kernel/include

Timestamp:

Jul 14, 2007, 7:13:46 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.0rc5

Location:

GPL/branches/alsa-resync1/alsa-kernel/include/sound

Files:

• core.h (modified) (2 diffs)
• cs4231.h (modified) (4 diffs)
• mixer_oss.h (modified) (5 diffs)
• pcm_params.h (modified) (1 diff)
• snd_wavefront.h (modified) (1 diff)
• sscape_ioctl.h (added)

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

@@ -218 +218 @@
 
 extern int snd_ecards_limit;
-extern int snd_device_mode;
-extern int snd_device_gid;
-extern int snd_device_uid;
+extern int device_mode;
+extern int device_gid;
+extern int device_uid;
 
 void snd_request_card(int card);
@@ -243 +243 @@
 
 int snd_oss_init_module(void);
-void snd_oss_cleanup_module(void);
 
 #endif

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

@@ -55 +55 @@
 #define CS4231_PLY_LWR_CNT      0x0f    /* playback lower base count */
 #define CS4231_ALT_FEATURE_1    0x10    /* alternate #1 feature enable */
+#define AD1845_AF1_MIC_LEFT     0x10    /* alternate #1 feature + MIC left */
 #define CS4231_ALT_FEATURE_2    0x11    /* alternate #2 feature enable */
+#define AD1845_AF2_MIC_RIGHT    0x11    /* alternate #2 feature + MIC right */
 #define CS4231_LEFT_LINE_IN     0x12    /* left line input control */
 #define CS4231_RIGHT_LINE_IN    0x13    /* right line input control */
@@ -61 +63 @@
 #define CS4231_TIMER_HIGH       0x15    /* timer high byte */
 #define CS4231_LEFT_MIC_INPUT   0x16    /* left MIC input control register (InterWave only) */
+#define AD1845_UPR_FREQ_SEL     0x16    /* upper byte of frequency select */
 #define CS4231_RIGHT_MIC_INPUT  0x17    /* right MIC input control register (InterWave only) */
+#define AD1845_LWR_FREQ_SEL     0x17    /* lower byte of frequency select */
 #define CS4236_EXT_REG          0x17    /* extended register access */
 #define CS4231_IRQ_STATUS       0x18    /* irq status register */
@@ -68 +72 @@
 #define CS4231_MONO_CTRL        0x1a    /* mono input/output control */
 #define CS4231_LINE_RIGHT_OUTPUT 0x1b   /* right line output control register (InterWave only) */
+#define AD1845_PWR_DOWN         0x1b    /* power down control */
 #define CS4235_LEFT_MASTER      0x1b    /* left master output control */
 #define CS4231_REC_FORMAT       0x1c    /* clock and data format - record - bits 7-0 MCE */
 #define CS4231_PLY_VAR_FREQ     0x1d    /* playback variable frequency */
+#define AD1845_CLOCK            0x1d    /* crystal clock select and total power down */
 #define CS4235_RIGHT_MASTER     0x1d    /* right master output control */
 #define CS4231_REC_UPR_CNT      0x1e    /* record upper count */
@@ -192 +198 @@
 #define CS4231_HW_CS4231        0x0100  /* CS4231 chip */
 #define CS4231_HW_CS4231A       0x0101  /* CS4231A chip */
+#define CS4231_HW_AD1845        0x0102  /* AD1845 chip */
 #define CS4231_HW_CS4232_MASK   0x0200  /* CS4232 serie (has control ports) */
 #define CS4231_HW_CS4232        0x0200  /* CS4232 */

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

@@ -35 +35 @@
 typedef int (*snd_mixer_oss_put_recsrce_t)(snd_mixer_oss_file_t *fmixer, int active_index);
 
+#define SNDRV_OSS_MAX_MIXERS    32
+
 struct _snd_oss_mixer_slot {
         int number;
@@ -45 +47 @@
         void *private_data;
         void (*private_free)(snd_mixer_oss_slot_t *slot);
+        int volume[2];
 };
 
@@ -51 +54 @@
         char id[16];
         char name[32];
-        snd_mixer_oss_slot_t slots[32];         /* OSS mixer slots */
+        snd_mixer_oss_slot_t slots[SNDRV_OSS_MAX_MIXERS]; /* OSS mixer slots */
         unsigned int mask_recsrc;               /* exclusive recsrc mask */
         snd_mixer_oss_get_recsrce_t get_recsrc;
@@ -57 +60 @@
         void *private_data_recsrc;
         void (*private_free_recsrc)(snd_mixer_oss_t *mixer);
+        struct semaphore reg_mutex;
+        snd_info_entry_t *proc_entry;
         /* --- */
         int oss_recsrc;
@@ -62 +67 @@
 
 struct _snd_oss_file {
-        int volume[32][2];
         snd_card_t *card;
         snd_mixer_oss_t *mixer;

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

@@ -37 +37 @@
 
 #define INLINE static inline
-#define assert(a)
+#define assert(a) (void)(a)
 
 #define SNDRV_MASK_BITS 64      /* we use so far 64bits only */

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

@@ -92 +92 @@
         char interrupts_are_midi;          /* h/w MPU interrupts enabled ? */
         char rom_samples_rdonly;           /* can we write on ROM samples */
+        spinlock_t irq_lock;
         wait_queue_head_t interrupt_sleeper; 
         snd_wavefront_midi_t midi;         /* ICS2115 MIDI interface */