Changeset 34 for GPL/trunk/alsa-kernel/include/sound/asound.h

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

File:

• GPL/trunk/alsa-kernel/include/sound/asound.h (modified) (4 diffs)

GPL/trunk/alsa-kernel/include/sound/asound.h

@@ -55 +55 @@
 #ifndef __bitwise
 #define __bitwise
+#endif
+
+#ifdef TARGET_OS2
+#define SNDRV_PCM_VOL_FRONT_LEFT        0
+#define SNDRV_PCM_VOL_FRONT_RIGHT       1
+#define SNDRV_PCM_VOL_REAR_LEFT         2
+#define SNDRV_PCM_VOL_REAR_RIGHT        3
+#define SNDRV_PCM_VOL_CENTER            4
+#define SNDRV_PCM_VOL_LFE               5
+
+#define SNDRV_PCM_VOL_MAX               100
+
+struct snd_pcm_volume {
+        int nrchannels;
+        int volume[6];
+};
 #endif
 
@@ -314 +330 @@
 #define SNDRV_PCM_HW_PARAM_ACCESS       ((__force snd_pcm_hw_param_t) 0) /* Access type */
 #define SNDRV_PCM_HW_PARAM_FORMAT       ((__force snd_pcm_hw_param_t) 1) /* Format */
-#define SNDRV_PCM_HW_PARAM_SUBFORMAT    ((__force snd_pcm_hw_param_t) 2) /* Subformat */
+#ifdef TARGET_OS2
+#define SNDRV_PCM_HW_PARAM_RATE_MASK    ((__force snd_pcm_hw_param_t) 2) /* Format */
+#endif
+#define SNDRV_PCM_HW_PARAM_SUBFORMAT    ((__force snd_pcm_hw_param_t) 3) /* Subformat */
 #define SNDRV_PCM_HW_PARAM_FIRST_MASK   SNDRV_PCM_HW_PARAM_ACCESS
 #define SNDRV_PCM_HW_PARAM_LAST_MASK    SNDRV_PCM_HW_PARAM_SUBFORMAT
@@ -856 +875 @@
         SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE = _IOW('U', 0x42, int),
         SNDRV_CTL_IOCTL_POWER = _IOWR('U', 0xd0, int),
-        SNDRV_CTL_IOCTL_POWER_STATE = _IOR('U', 0xd1, int),
+        SNDRV_CTL_IOCTL_POWER_STATE = _IOR('U', 0xd1, int),
+#ifdef TARGET_OS2
+        SNDRV_PCM_IOCTL_SETVOLUME = _IOW('A', 0x62, struct snd_pcm_volume),
+        SNDRV_PCM_IOCTL_GETVOLUME = _IOR('A', 0x63, struct snd_pcm_volume),
+#endif
+
 };
 
@@ -916 +940 @@
 };
 
+#define msleep(msecs) \
+        do { \
+                set_current_state(TASK_UNINTERRUPTIBLE); \
+                schedule_timeout(((msecs) * HZ + 999) / 1000);  \
+        } while (0)
+
+#define schedule_timeout_interruptible(x) \
+ {set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(x);}
+#define schedule_timeout_uninterruptible(x) {set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(x);}
+
 #endif /* __SOUND_ASOUND_H */