Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / sound / pci / pcxhr / pcxhr_core.h

diff --git a/sound/pci/pcxhr/pcxhr_core.h b/sound/pci/pcxhr/pcxhr_core.h
index e7415d6d18264a0bb1e87c29c7cace60635ebb7b..bbbd66d13a643301230121c00c959779ef9e3fcb 100644 (file)
--- a/sound/pci/pcxhr/pcxhr_core.h
+++ b/sound/pci/pcxhr/pcxhr_core.h
@@ -65,7 +65,7 @@ enum {
        CMD_RESYNC_AUDIO_INPUTS,        /* cmd_len = 1  stat_len = 0 */
        CMD_GET_DSP_RESOURCES,          /* cmd_len = 1  stat_len = 4 */
        CMD_SET_TIMER_INTERRUPT,        /* cmd_len = 1  stat_len = 0 */
-       CMD_RES_PIPE,                   /* cmd_len = 2  stat_len = 0 */
+       CMD_RES_PIPE,                   /* cmd_len >=2  stat_len = 0 */
        CMD_FREE_PIPE,                  /* cmd_len = 1  stat_len = 0 */
        CMD_CONF_PIPE,                  /* cmd_len = 2  stat_len = 0 */
        CMD_STOP_PIPE,                  /* cmd_len = 1  stat_len = 0 */
@@ -96,6 +96,8 @@ void pcxhr_init_rmh(struct pcxhr_rmh *rmh, int cmd);
 void pcxhr_set_pipe_cmd_params(struct pcxhr_rmh* rmh, int capture, unsigned int param1,
                               unsigned int param2, unsigned int param3);
 
+#define DSP_EXT_CMD_SET(x) (x->dsp_version > 0x012800)
+
 /*
  send the rmh
  */
@@ -110,6 +112,7 @@ int pcxhr_send_msg(struct pcxhr_mgr *mgr, struct pcxhr_rmh *rmh);
 #define IO_NUM_REG_STATUS              5
 #define IO_NUM_REG_CUER                        10
 #define IO_NUM_UER_CHIP_REG            11
+#define IO_NUM_REG_CONFIG_SRC          12
 #define IO_NUM_REG_OUT_ANA_LEVEL       20
 #define IO_NUM_REG_IN_ANA_LEVEL                21
 
@@ -194,7 +197,7 @@ int pcxhr_write_io_num_reg_cont(struct pcxhr_mgr *mgr, unsigned int mask,
 
 
 /* interrupt handling */
-irqreturn_t pcxhr_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t pcxhr_interrupt(int irq, void *dev_id);
 void pcxhr_msg_tasklet(unsigned long arg);
 
 #endif /* __SOUND_PCXHR_CORE_H */