sound/pci: coding style fixes: mixart
PATCH 15/24 sound/pci: coding style fixes: mixart
- <asm/io.h> -> <linux/io.h>
- remove trailing whitespaces
- convert comments
Only compile tested.
Signed-off-by Alexander Beregalov <[email protected]>
---
sound/pci/mixart/mixart.c | 148 +++++++++++++++++++------------------- sound/pci/mixart/mixart_core.c | 100 +++++++++++++------------- sound/pci/mixart/mixart_hwdep.c | 128 +++++++++++++++++----------------- sound/pci/mixart/mixart_hwdep.h | 28 ++++---- sound/pci/mixart/mixart_mixer.c | 56 +++++++------- 5 files changed, 230 insertions(+), 230 deletions(-)
sound/pci/mixart/mixart.c +74 -74
@@ -80,10 +80,10 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr,switch (pipe->status) {case PIPE_RUNNING :case PIPE_CLOCK_SET : -if (start)return 0 ;/* already started */ +if (start)return 0 ;/* already started */ break ;case PIPE_STOPPED : -if (!start)return 0 ;/* already stopped */ +if (!start)return 0 ;/* already stopped */ break ;default :snd_printk (KERN_ERR "error mixart_set_pipe_state called with wrong pipe->status!\n" );
@@ -100,7 +100,7 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr, request.size =sizeof (system_msg_uid); err =snd_mixart_send_msg_wait_notif (mgr, &request, system_msg_uid); -if (err) { +if (err) {snd_printk (KERN_ERR "error : MSG_SYSTEM_WAIT_SYNCHRO_CMD was not notified !\n" );return err; }
@@ -111,7 +111,7 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr, group_state.pipe_count =1 ; group_state.pipe_uid[0 ] = pipe->group_uid; -if (start) +if (start) request.message_id =MSG_STREAM_START_STREAM_GRP_PACKET ;else request.message_id =MSG_STREAM_STOP_STREAM_GRP_PACKET ;
@@ -126,7 +126,7 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr,return -EINVAL ; } -if (start) { +if (start) {u32 stat; group_state.pipe_count =0 ;/* in case of start same command once again with pipe_count=0 */
@@ -171,10 +171,10 @@ static int mixart_set_clock(struct mixart_mgr *mgr,case PIPE_CLOCK_SET :break ;case PIPE_RUNNING : -if (rate !=0 ) +if (rate !=0 )break ;default : -if (rate ==0 ) +if (rate ==0 )return 0 ;/* nothing to do */ else {snd_printk (KERN_ERR "error mixart_set_clock(%d) called with wrong pipe->status !\n" , rate);
@@ -202,7 +202,7 @@ static int mixart_set_clock(struct mixart_mgr *mgr,return -EINVAL ; } -if (rate) pipe->status =PIPE_CLOCK_SET ; +if (rate) pipe->status =PIPE_CLOCK_SET ;else pipe->status =PIPE_RUNNING ;return 0 ;
@@ -220,7 +220,7 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture,struct mixart_pipe *pipe;struct mixart_msg request; -if (capture) { +if (capture) {if (pcm_number ==MIXART_PCM_ANALOG ) { pipe = &(chip->pipe_in_ana);/* analog inputs */ }else {
@@ -239,12 +239,12 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture, }/* a new stream is opened and there are already all streams in use */ -if ( (monitoring ==0 ) && (pipe->references >= stream_count) ) { +if ((monitoring ==0 ) && (pipe->references >= stream_count)) {return NULL ; }/* pipe is not yet defined */ -if ( pipe->status ==PIPE_UNDEFINED ) { +if (pipe->status ==PIPE_UNDEFINED ) {int err, i;struct {struct mixart_streaming_group_req sgroup_req;
@@ -268,11 +268,11 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture, buf->sgroup_req.latency =256 ; buf->sgroup_req.connector = pipe->uid_left_connector;/* the left connector */ -for (i=0 ; i<stream_count; i++) { +for (i =0 ; i < stream_count; i++) {int j;struct mixart_flowinfo *flowinfo;struct mixart_bufferinfo *bufferinfo; - +/* we don't yet know the format, so config 16 bit pcm audio for instance */ buf->sgroup_req.stream_info[i].size_max_byte_frame =1024 ; buf->sgroup_req.stream_info[i].size_max_sample_frame =256 ;
@@ -280,7 +280,7 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture,/* find the right bufferinfo_array */ j = (chip->chip_idx *MIXART_MAX_STREAM_PER_CARD ) + (pcm_number * (MIXART_PLAYBACK_STREAMS +MIXART_CAPTURE_STREAMS )) + i; -if (capture) j +=MIXART_PLAYBACK_STREAMS ;/* in the array capture is behind playback */ +if (capture) j +=MIXART_PLAYBACK_STREAMS ;/* in the array capture is behind playback */ buf->sgroup_req.flow_entry[i] = j;
@@ -294,13 +294,13 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture,/* construct the identifier of the stream buffer received in the interrupts ! */ bufferinfo[j].buffer_id = (chip->chip_idx <<MIXART_NOTIFY_CARD_OFFSET ) + (pcm_number <<MIXART_NOTIFY_PCM_OFFSET ) + i; -if (capture) { +if (capture) { bufferinfo[j].buffer_id |=MIXART_NOTIFY_CAPT_MASK ; } } err =snd_mixart_send_msg (chip->mgr, &request,sizeof (buf->sgroup_resp), &buf->sgroup_resp); -if ((err <0 ) || (buf->sgroup_resp.status !=0 )) { +if ((err <0 ) || (buf->sgroup_resp.status !=0 )) {snd_printk (KERN_ERR "error MSG_STREAM_ADD_**PUT_GROUP err=%x stat=%x !\n" , err, buf->sgroup_resp.status);kfree (buf);return NULL ;
@@ -314,7 +314,7 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture,kfree (buf); } -if (monitoring) pipe->monitoring =1 ; +if (monitoring) pipe->monitoring =1 ;else pipe->references++;return pipe;
@@ -326,28 +326,28 @@ int snd_mixart_kill_ref_pipe(struct mixart_mgr *mgr, {int err =0 ; -if (pipe->status ==PIPE_UNDEFINED ) +if (pipe->status ==PIPE_UNDEFINED )return 0 ; -if (monitoring) +if (monitoring) pipe->monitoring =0 ;else pipe->references--; -if ((pipe->references <=0 ) && (pipe->monitoring ==0 )) { +if ((pipe->references <=0 ) && (pipe->monitoring ==0 )) {struct mixart_msg request;struct mixart_delete_group_resp delete_resp;/* release the clock */ err =mixart_set_clock ( mgr, pipe,0 ); -if ( err <0 ) { +if (err <0 ) {snd_printk (KERN_ERR "mixart_set_clock(0) return error!\n" ); }/* stop the pipe */ err =mixart_set_pipe_state (mgr, pipe,0 ); -if ( err <0 ) { +if (err <0 ) {snd_printk (KERN_ERR "error stopping pipe!\n" ); }
@@ -376,7 +376,7 @@ static int mixart_set_stream_state(struct mixart_stream *stream, int start)struct mixart_stream_state_req stream_state_req;struct mixart_msg request; -if (!stream->substream) +if (!stream->substream)return -EINVAL ;memset (&stream_state_req,0 ,sizeof (stream_state_req));
@@ -416,7 +416,7 @@ static int snd_mixart_trigger(struct snd_pcm_substream *subs, int cmd)snd_printdd ("SNDRV_PCM_TRIGGER_START\n" );/* START_STREAM */ -if (mixart_set_stream_state (stream,1 ) ) +if (mixart_set_stream_state (stream,1 ))return -EINVAL ; stream->status =MIXART_STREAM_STATUS_RUNNING ;
@@ -425,7 +425,7 @@ static int snd_mixart_trigger(struct snd_pcm_substream *subs, int cmd)case SNDRV_PCM_TRIGGER_STOP :/* STOP_STREAM */ -if (mixart_set_stream_state (stream,0 ) ) +if (mixart_set_stream_state (stream,0 ))return -EINVAL ; stream->status =MIXART_STREAM_STATUS_OPEN ;
@@ -479,12 +479,12 @@ static int snd_mixart_prepare(struct snd_pcm_substream *subs)/* only the first stream can choose the sample rate */ /* the further opened streams will be limited to its frequency (see open) */ -if (chip->mgr->ref_count_rate ==1 ) +if (chip->mgr->ref_count_rate ==1 ) chip->mgr->sample_rate = subs->runtime->rate;/* set the clock only once (first stream) on the same pipe */ -if (stream->pipe->references ==1 ) { -if (mixart_set_clock (chip->mgr, stream->pipe, subs->runtime->rate) ) +if (stream->pipe->references ==1 ) { +if (mixart_set_clock (chip->mgr, stream->pipe, subs->runtime->rate))return -EINVAL ; }
@@ -508,7 +508,7 @@ static int mixart_set_format(struct mixart_stream *stream, snd_pcm_format_t form stream_param.number_of_channel = stream->channels; stream_param.sampling_freq = chip->mgr->sample_rate; -if (stream_param.sampling_freq ==0 ) +if (stream_param.sampling_freq ==0 ) stream_param.sampling_freq =44100 ;/* if frequency not yet defined, use some default */ switch (format){
@@ -564,7 +564,7 @@ static int mixart_set_format(struct mixart_stream *stream, snd_pcm_format_t form request.size =sizeof (stream_param); err =snd_mixart_send_msg (chip->mgr, &request,sizeof (resp), &resp); -if ((err <0 ) || resp.error_code) { +if ((err <0 ) || resp.error_code) {snd_printk (KERN_ERR "MSG_STREAM_SET_INPUT_STAGE_PARAM err=%x; resp=%x\n" , err, resp.error_code);return -EINVAL ; }
@@ -594,9 +594,9 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,mutex_lock (&mgr->setup_mutex);/* update the stream levels */ -if ( stream->pcm_number <=MIXART_PCM_DIGITAL ) { +if (stream->pcm_number <=MIXART_PCM_DIGITAL ) {int is_aes = stream->pcm_number >MIXART_PCM_ANALOG ; -if ( subs->stream ==SNDRV_PCM_STREAM_PLAYBACK ) +if (subs->stream ==SNDRV_PCM_STREAM_PLAYBACK )mixart_update_playback_stream_level (chip, is_aes, subs->number);else mixart_update_capture_stream_level ( chip, is_aes);
@@ -606,7 +606,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,/* set the format to the board */ err =mixart_set_format (stream, format); -if (err <0 ) { +if (err <0 ) {return err; }
@@ -616,10 +616,10 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,if (err >0 ) {struct mixart_bufferinfo *bufferinfo;int i = (chip->chip_idx *MIXART_MAX_STREAM_PER_CARD ) + (stream->pcm_number * (MIXART_PLAYBACK_STREAMS +MIXART_CAPTURE_STREAMS )) + subs->number; -if ( subs->stream ==SNDRV_PCM_STREAM_CAPTURE ) { +if (subs->stream ==SNDRV_PCM_STREAM_CAPTURE ) { i +=MIXART_PLAYBACK_STREAMS ;/* in array capture is behind playback */ } - + bufferinfo = (struct mixart_bufferinfo *)chip->mgr->bufferinfo.area; bufferinfo[i].buffer_address = subs->runtime->dma_addr; bufferinfo[i].available_length = subs->runtime->dma_bytes;
@@ -704,7 +704,7 @@ static int snd_mixart_playback_open(struct snd_pcm_substream *subs)mutex_lock (&mgr->setup_mutex); -if ( pcm == chip->pcm ) { +if (pcm == chip->pcm) { pcm_number =MIXART_PCM_ANALOG ; runtime->hw = snd_mixart_analog_caps; }else {
@@ -734,7 +734,7 @@ static int snd_mixart_playback_open(struct snd_pcm_substream *subs)/* start the pipe if necessary */ err =mixart_set_pipe_state (chip->mgr, pipe,1 ); -if ( err <0 ) { +if (err <0 ) {snd_printk (KERN_ERR "error starting pipe!\n" );snd_mixart_kill_ref_pipe (chip->mgr, pipe,0 ); err = -EINVAL ;
@@ -753,13 +753,13 @@ static int snd_mixart_playback_open(struct snd_pcm_substream *subs)snd_pcm_hw_constraint_step (runtime,0 ,SNDRV_PCM_HW_PARAM_BUFFER_SIZE ,64 );/* if a sample rate is already used, another stream cannot change */ -if (mgr->ref_count_rate++) { -if (mgr->sample_rate) { +if (mgr->ref_count_rate++) { +if (mgr->sample_rate) { runtime->hw.rate_min = runtime->hw.rate_max = mgr->sample_rate; } } - _exit_open: +_exit_open:mutex_unlock (&mgr->setup_mutex);return err;
@@ -779,7 +779,7 @@ static int snd_mixart_capture_open(struct snd_pcm_substream *subs)mutex_lock (&mgr->setup_mutex); -if ( pcm == chip->pcm ) { +if (pcm == chip->pcm) { pcm_number =MIXART_PCM_ANALOG ; runtime->hw = snd_mixart_analog_caps; }else {
@@ -812,7 +812,7 @@ static int snd_mixart_capture_open(struct snd_pcm_substream *subs)/* start the pipe if necessary */ err =mixart_set_pipe_state (chip->mgr, pipe,1 ); -if ( err <0 ) { +if (err <0 ) {snd_printk (KERN_ERR "error starting pipe!\n" );snd_mixart_kill_ref_pipe (chip->mgr, pipe,0 ); err = -EINVAL ;
@@ -831,13 +831,13 @@ static int snd_mixart_capture_open(struct snd_pcm_substream *subs)snd_pcm_hw_constraint_step (runtime,0 ,SNDRV_PCM_HW_PARAM_BUFFER_SIZE ,64 );/* if a sample rate is already used, another stream cannot change */ -if (mgr->ref_count_rate++) { -if (mgr->sample_rate) { +if (mgr->ref_count_rate++) { +if (mgr->sample_rate) { runtime->hw.rate_min = runtime->hw.rate_max = mgr->sample_rate; } } - _exit_open: +_exit_open:mutex_unlock (&mgr->setup_mutex);return err;
@@ -856,7 +856,7 @@ static int snd_mixart_close(struct snd_pcm_substream *subs)snd_printdd ("snd_mixart_close C%d/P%d/Sub%d\n" , chip->chip_idx, stream->pcm_number, subs->number);/* sample rate released */ -if (--mgr->ref_count_rate ==0 ) { +if (--mgr->ref_count_rate ==0 ) { mgr->sample_rate =0 ; }
@@ -1011,7 +1011,7 @@ static int __devinit snd_mixart_create(struct mixart_mgr *mgr, struct snd_card * }; mgr->chip[idx] = chip =kzalloc (sizeof (*chip),GFP_KERNEL ); -if (! chip) { +if (!chip) {snd_printk (KERN_ERR "cannot allocate chip\n" );return -ENOMEM ; }
@@ -1038,7 +1038,7 @@ int snd_mixart_create_pcm(struct snd_mixart* chip)if (err <0 )return err; -if (chip->mgr->board_type ==MIXART_DAUGHTER_TYPE_AES ) { +if (chip->mgr->board_type ==MIXART_DAUGHTER_TYPE_AES ) { err =snd_mixart_pcm_digital (chip);if (err <0 )
@@ -1068,7 +1068,7 @@ static int snd_mixart_free(struct mixart_mgr *mgr)free_irq (mgr->irq, mgr);/* reset board if some firmware was loaded */ -if (mgr->dsp_loaded) { +if (mgr->dsp_loaded) {snd_mixart_reset_board (mgr);snd_printdd ("reset miXart !\n" ); }
@@ -1081,12 +1081,12 @@ static int snd_mixart_free(struct mixart_mgr *mgr)pci_release_regions (mgr->pci);/* free flowarray */ -if (mgr->flowinfo.area) { +if (mgr->flowinfo.area) {snd_dma_free_pages (&mgr->flowinfo); mgr->flowinfo.area =NULL ; }/* free bufferarray */ -if (mgr->bufferinfo.area) { +if (mgr->bufferinfo.area) {snd_dma_free_pages (&mgr->bufferinfo); mgr->bufferinfo.area =NULL ; }
@@ -1120,7 +1120,7 @@ static long long snd_mixart_BA0_llseek(struct snd_info_entry *entry,default :return -EINVAL ; } -if (file->f_pos >MIXART_BA0_SIZE ) +if (file->f_pos >MIXART_BA0_SIZE ) file->f_pos =MIXART_BA0_SIZE ;return file->f_pos; }
@@ -1146,7 +1146,7 @@ static long long snd_mixart_BA1_llseek(struct snd_info_entry *entry,default :return -EINVAL ; } -if (file->f_pos >MIXART_BA1_SIZE ) +if (file->f_pos >MIXART_BA1_SIZE ) file->f_pos =MIXART_BA1_SIZE ;return file->f_pos; }
@@ -1161,11 +1161,11 @@ static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_privatestruct mixart_mgr *mgr = entry->private_data; count = count & ~3 ;/* make sure the read size is a multiple of 4 bytes */ -if (count <=0 ) +if (count <=0 )return 0 ; -if (pos + count >MIXART_BA0_SIZE ) +if (pos + count >MIXART_BA0_SIZE ) count = (long )(MIXART_BA0_SIZE - pos); -if (copy_to_user_fromio (buf,MIXART_MEM ( mgr, pos ), count)) +if (copy_to_user_fromio (buf,MIXART_MEM ( mgr, pos ), count))return -EFAULT ;return count; }
@@ -1180,11 +1180,11 @@ static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_privatestruct mixart_mgr *mgr = entry->private_data; count = count & ~3 ;/* make sure the read size is a multiple of 4 bytes */ -if (count <=0 ) +if (count <=0 )return 0 ; -if (pos + count >MIXART_BA1_SIZE ) +if (pos + count >MIXART_BA1_SIZE ) count = (long )(MIXART_BA1_SIZE - pos); -if (copy_to_user_fromio (buf,MIXART_REG ( mgr, pos ), count)) +if (copy_to_user_fromio (buf,MIXART_REG ( mgr, pos ), count))return -EFAULT ;return count; }
@@ -1200,25 +1200,25 @@ static struct snd_info_entry_ops snd_mixart_proc_ops_BA1 = { }; -static void snd_mixart_proc_read (struct snd_info_entry *entry, +static void snd_mixart_proc_read (struct snd_info_entry *entry,struct snd_info_buffer *buffer) { -struct snd_mixart *chip = entry->private_data; -u32 ref; +struct snd_mixart *chip = entry->private_data; +u32 ref;snd_iprintf (buffer,"Digigram miXart (alsa card %d)\n\n" , chip->chip_idx);/* stats available when embedded OS is running */ if (chip->mgr->dsp_loaded & (1 <<MIXART_MOTHERBOARD_ELF_INDEX )) {snd_iprintf (buffer,"- hardware -\n" ); -switch (chip->mgr->board_type ) { +switch (chip->mgr->board_type) {case MIXART_DAUGHTER_TYPE_NONE :snd_iprintf (buffer,"\tmiXart8 (no daughter board)\n\n" );break ;case MIXART_DAUGHTER_TYPE_AES :snd_iprintf (buffer,"\tmiXart8 AES/EBU\n\n" );break ;case MIXART_DAUGHTER_TYPE_COBRANET :snd_iprintf (buffer,"\tmiXart8 Cobranet\n\n" );break ;default :snd_iprintf (buffer,"\tUNKNOWN!\n\n" );break ; } -snd_iprintf (buffer,"- system load -\n" ); +snd_iprintf (buffer,"- system load -\n" );/* get perf reference */
@@ -1241,18 +1241,18 @@ static void __devinit snd_mixart_proc_init(struct snd_mixart *chip)struct snd_info_entry *entry;/* text interface to read perf and temp meters */ -if (!snd_card_proc_new (chip->card,"board_info" , &entry)) { +if (!snd_card_proc_new (chip->card,"board_info" , &entry)) { entry->private_data = chip; entry->c.text.read = snd_mixart_proc_read; } -if (!snd_card_proc_new (chip->card,"mixart_BA0" , &entry)) { +if (!snd_card_proc_new (chip->card,"mixart_BA0" , &entry)) { entry->content =SNDRV_INFO_CONTENT_DATA ; - entry->private_data = chip->mgr; + entry->private_data = chip->mgr; entry->c.ops = &snd_mixart_proc_ops_BA0; entry->size =MIXART_BA0_SIZE ; } -if (!snd_card_proc_new (chip->card,"mixart_BA1" , &entry)) { +if (!snd_card_proc_new (chip->card,"mixart_BA1" , &entry)) { entry->content =SNDRV_INFO_CONTENT_DATA ; entry->private_data = chip->mgr; entry->c.ops = &snd_mixart_proc_ops_BA1;
@@ -1278,7 +1278,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,*/ if (dev >=SNDRV_CARDS )return -ENODEV ; -if (! enable[dev]) { +if (!enable[dev]) { dev++;return -ENOENT ; }
@@ -1298,7 +1298,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,/* */ mgr =kzalloc (sizeof (*mgr),GFP_KERNEL ); -if (! mgr) { +if (!mgr) {pci_disable_device (pci);return -ENOMEM ; }
@@ -1367,7 +1367,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,snprintf (tmpid,sizeof (tmpid),"%s-%d" , id[dev] ? id[dev] :"MIXART" , i); card =snd_card_new (idx, tmpid,THIS_MODULE ,0 ); -if (! card) { +if (!card) {snd_printk (KERN_ERR "cannot allocate the card %d\n" , i);snd_mixart_free (mgr);return -ENOMEM ;
@@ -1382,7 +1382,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,return err; } -if (i==0 ) { +if (i==0 ) {/* init proc interface only for chip0 */ snd_mixart_proc_init (mgr->chip[i]); }
@@ -1398,7 +1398,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,/* create array of streaminfo */ size =PAGE_ALIGN ( (MIXART_MAX_STREAM_PER_CARD *MIXART_MAX_CARDS * -sizeof (struct mixart_flowinfo )) ); +sizeof (struct mixart_flowinfo )));if (snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV ,snd_dma_pci_data (pci), size, &mgr->flowinfo) <0 ) {snd_mixart_free (mgr);
@@ -1409,7 +1409,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,/* create array of bufferinfo */ size =PAGE_ALIGN ( (MIXART_MAX_STREAM_PER_CARD *MIXART_MAX_CARDS * -sizeof (struct mixart_bufferinfo )) ); +sizeof (struct mixart_bufferinfo )));if (snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV ,snd_dma_pci_data (pci), size, &mgr->bufferinfo) <0 ) {snd_mixart_free (mgr);
sound/pci/mixart/mixart_core.c +50 -50
295 lines not on this page · raw message
sound/pci/mixart/mixart_hwdep.c +64 -64
361 lines not on this page · raw message
sound/pci/mixart/mixart_hwdep.h +14 -14
@@ -36,12 +36,12 @@/* Daughter board Type */ -#define DAUGHTER_TYPE_MASK 0x0F -#define DAUGHTER_VER_MASK 0xF0 +#define DAUGHTER_TYPE_MASK 0x0F +#define DAUGHTER_VER_MASK 0xF0#define DAUGHTER_TYPEVER_MASK (DAUGHTER_TYPE_MASK|DAUGHTER_VER_MASK) - -#define MIXART_DAUGHTER_TYPE_NONE 0x00 -#define MIXART_DAUGHTER_TYPE_COBRANET 0x08 + +#define MIXART_DAUGHTER_TYPE_NONE 0x00 +#define MIXART_DAUGHTER_TYPE_COBRANET 0x08#define MIXART_DAUGHTER_TYPE_AES 0x0E
@@ -63,28 +63,28 @@#define MIXART_PSEUDOREG_PERF_INTERR_LOAD_OFFSET MIXART_PSEUDOREG+0x74/* interrupt handling load */ /* motherboard xilinx loader info */ -#define MIXART_PSEUDOREG_MXLX_BASE_ADDR_OFFSET MIXART_PSEUDOREG+0x9C/* 0x00600000 */ -#define MIXART_PSEUDOREG_MXLX_SIZE_OFFSET MIXART_PSEUDOREG+0xA0/* xilinx size in bytes */ -#define MIXART_PSEUDOREG_MXLX_STATUS_OFFSET MIXART_PSEUDOREG+0xA4/* status = EMBEBBED_STAT_XXX */ +#define MIXART_PSEUDOREG_MXLX_BASE_ADDR_OFFSET MIXART_PSEUDOREG+0x9C/* 0x00600000 */ +#define MIXART_PSEUDOREG_MXLX_SIZE_OFFSET MIXART_PSEUDOREG+0xA0/* xilinx size in bytes */ +#define MIXART_PSEUDOREG_MXLX_STATUS_OFFSET MIXART_PSEUDOREG+0xA4/* status = EMBEBBED_STAT_XXX */ /* elf loader info */ -#define MIXART_PSEUDOREG_ELF_STATUS_OFFSET MIXART_PSEUDOREG+0xB0/* status = EMBEBBED_STAT_XXX */ +#define MIXART_PSEUDOREG_ELF_STATUS_OFFSET MIXART_PSEUDOREG+0xB0/* status = EMBEBBED_STAT_XXX */ -/* +/* * after the elf code is loaded, and the flowtable info was passed to it, * the driver polls on this address, until it shows 1 (presence) or 2 (absence) * once it is non-zero, the daughter board type may be read */ -#define MIXART_PSEUDOREG_DBRD_PRESENCE_OFFSET MIXART_PSEUDOREG+0x990 +#define MIXART_PSEUDOREG_DBRD_PRESENCE_OFFSET MIXART_PSEUDOREG+0x990/* Global info structure */ #define MIXART_PSEUDOREG_DBRD_TYPE_OFFSET MIXART_PSEUDOREG+0x994/* Type and version of daughterboard */ /* daughterboard xilinx loader info */ -#define MIXART_PSEUDOREG_DXLX_BASE_ADDR_OFFSET MIXART_PSEUDOREG+0x998/* get the address here where to write the file */ -#define MIXART_PSEUDOREG_DXLX_SIZE_OFFSET MIXART_PSEUDOREG+0x99C/* xilinx size in bytes */ -#define MIXART_PSEUDOREG_DXLX_STATUS_OFFSET MIXART_PSEUDOREG+0x9A0/* status = EMBEBBED_STAT_XXX */ +#define MIXART_PSEUDOREG_DXLX_BASE_ADDR_OFFSET MIXART_PSEUDOREG+0x998/* get the address here where to write the file */ +#define MIXART_PSEUDOREG_DXLX_SIZE_OFFSET MIXART_PSEUDOREG+0x99C/* xilinx size in bytes */ +#define MIXART_PSEUDOREG_DXLX_STATUS_OFFSET MIXART_PSEUDOREG+0x9A0/* status = EMBEBBED_STAT_XXX */ /* */ #define MIXART_FLOWTABLE_PTR 0x3000/* pointer to flow table */
sound/pci/mixart/mixart_mixer.c +28 -28
193 lines not on this page · raw message