Sync include/sound/asound.h with 3.17-rc1 kernel
PATCH 1/2 Sync include/sound/asound.h with 3.17-rc1 kernel
Signed-off-by Takashi Iwai <[email protected]>
--- include/sound/asound.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
include/sound/asound.h +9 -4
@@ -93,9 +93,12 @@ enum {SNDRV_HWDEP_IFACE_SB_RC ,/* SB Extigy/Audigy2NX remote control */ SNDRV_HWDEP_IFACE_HDA ,/* HD-audio */ SNDRV_HWDEP_IFACE_USB_STREAM ,/* direct access to usb stream */ +SNDRV_HWDEP_IFACE_FW_DICE ,/* TC DICE FireWire device */ +SNDRV_HWDEP_IFACE_FW_FIREWORKS ,/* Echo Audio Fireworks based device */ +SNDRV_HWDEP_IFACE_FW_BEBOB ,/* BridgeCo BeBoB based device */ /* Don't forget to change the following: */ -SNDRV_HWDEP_IFACE_LAST =SNDRV_HWDEP_IFACE_USB_STREAM +SNDRV_HWDEP_IFACE_LAST =SNDRV_HWDEP_IFACE_FW_BEBOB }; struct snd_hwdep_info {
@@ -214,8 +217,8 @@ typedef int __bitwise snd_pcm_format_t;#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45)/* 1 sample in 1 byte */ #define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46)/* 8 Samples in 5 bytes */ #define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47)/* 1 sample in 1 byte */ -#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48)/* 8 1-bit samples in 1 byte */ -#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49)/* 16 1-bit samples in 2 bytes */ +#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48)/* DSD, 1-byte samples DSD (x8) */ +#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49)/* DSD, 2-byte samples DSD (x16), little endian */ #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U16_LE#ifdef SNDRV_LITTLE_ENDIAN
@@ -461,7 +464,7 @@ struct snd_xfern {enum {SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY =0 ,/* gettimeofday equivalent */ SNDRV_PCM_TSTAMP_TYPE_MONOTONIC ,/* posix_clock_monotonic equivalent */ -SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW ,/* monotonic_raw (no NTP) */ +SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW ,/* monotonic_raw (no NTP) */ SNDRV_PCM_TSTAMP_TYPE_LAST =SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW , };
@@ -820,6 +823,8 @@ typedef int __bitwise snd_ctl_elem_iface_t;#define SNDRV_CTL_POWER_D3hot (SNDRV_CTL_POWER_D3|0x0000)/* Off, with power */ #define SNDRV_CTL_POWER_D3cold (SNDRV_CTL_POWER_D3|0x0001)/* Off, without power */ +#define SNDRV_CTL_ELEM_ID_NAME_MAXLEN 44 +struct snd_ctl_elem_id {unsigned int numid;/* numeric identifier, zero = invalid */ snd_ctl_elem_iface_t iface;/* interface identifier */
Signature · 1 line
2.0.4
PATCH 2/2 pcm: Add missing signed and endianess definitions for DSD formats
Signed-off-by Takashi Iwai <[email protected]>
--- src/pcm/pcm_misc.c | 4 ++++ 1 file changed, 4 insertions(+)
src/pcm/pcm_misc.c +4 -0
@@ -62,6 +62,8 @@ int snd_pcm_format_signed(snd_pcm_format_t format)case SNDRV_PCM_FORMAT_U20_3BE :case SNDRV_PCM_FORMAT_U18_3LE :case SNDRV_PCM_FORMAT_U18_3BE : +case SNDRV_PCM_FORMAT_DSD_U8 : +case SNDRV_PCM_FORMAT_DSD_U16_LE :return 0 ;default :return -EINVAL ;
@@ -150,6 +152,8 @@ int snd_pcm_format_little_endian(snd_pcm_format_t format)case SNDRV_PCM_FORMAT_U24_3BE :case SNDRV_PCM_FORMAT_U20_3BE :case SNDRV_PCM_FORMAT_U18_3BE : +case SNDRV_PCM_FORMAT_DSD_U8 : +case SNDRV_PCM_FORMAT_DSD_U16_LE :return 0 ;default :return -EINVAL ;
Signature · 1 line
2.0.4