diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-07-18 13:53:29 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-07-18 13:53:29 +0200 |
commit | f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de (patch) | |
tree | d6ea8cc44a9d55d29d38605165a09cf69ff9a536 /sound/pci/pcxhr/pcxhr_core.h | |
parent | Merge branch 'topic/hda' into for-next (diff) | |
parent | ALSA: opti9xx: Fix section mismatch by PM support (diff) | |
download | linux-dev-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.tar.xz linux-dev-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.zip |
Merge branch 'topic/misc' into for-next
Generic updates for sound 3.6
Diffstat (limited to 'sound/pci/pcxhr/pcxhr_core.h')
-rw-r--r-- | sound/pci/pcxhr/pcxhr_core.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/pcxhr/pcxhr_core.h b/sound/pci/pcxhr/pcxhr_core.h index be0173796cdb..a81ab6b811e7 100644 --- a/sound/pci/pcxhr/pcxhr_core.h +++ b/sound/pci/pcxhr/pcxhr_core.h @@ -79,6 +79,8 @@ enum { CMD_FORMAT_STREAM_IN, /* cmd_len >= 4 stat_len = 0 */ CMD_STREAM_SAMPLE_COUNT, /* cmd_len = 2 stat_len = (2 * nb_stream) */ CMD_AUDIO_LEVEL_ADJUST, /* cmd_len = 3 stat_len = 0 */ + CMD_GET_TIME_CODE, /* cmd_len = 1 stat_len = 5 */ + CMD_MANAGE_SIGNAL, /* cmd_len = 1 stat_len = 0 */ CMD_LAST_INDEX }; @@ -116,7 +118,7 @@ int pcxhr_send_msg(struct pcxhr_mgr *mgr, struct pcxhr_rmh *rmh); #define IO_NUM_REG_OUT_ANA_LEVEL 20 #define IO_NUM_REG_IN_ANA_LEVEL 21 - +#define REG_CONT_VALSMPTE 0x000800 #define REG_CONT_UNMUTE_INPUTS 0x020000 /* parameters used with register IO_NUM_REG_STATUS */ |