ALSA: Move some headers to local directories from include/sound
This is a bit clean up of public sound header directory. Some header files in include/sound aren't really necessary to be located there but can be moved to their local directories gracefully. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
@@ -30,7 +30,7 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/cs46xx.h>
|
||||
#include "cs46xx.h"
|
||||
#include <sound/initval.h>
|
||||
|
||||
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
|
||||
|
||||
1744
sound/pci/cs46xx/cs46xx.h
Normal file
1744
sound/pci/cs46xx/cs46xx.h
Normal file
文件差異過大導致無法顯示
Load Diff
1213
sound/pci/cs46xx/cs46xx_dsp_scb_types.h
Normal file
1213
sound/pci/cs46xx/cs46xx_dsp_scb_types.h
Normal file
文件差異過大導致無法顯示
Load Diff
234
sound/pci/cs46xx/cs46xx_dsp_spos.h
Normal file
234
sound/pci/cs46xx/cs46xx_dsp_spos.h
Normal file
@@ -0,0 +1,234 @@
|
||||
/*
|
||||
* The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards
|
||||
* Copyright (c) by Jaroslav Kysela <perex@perex.cz>
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __CS46XX_DSP_SPOS_H__
|
||||
#define __CS46XX_DSP_SPOS_H__
|
||||
|
||||
#include "cs46xx_dsp_scb_types.h"
|
||||
#include "cs46xx_dsp_task_types.h"
|
||||
|
||||
#define SYMBOL_CONSTANT 0x0
|
||||
#define SYMBOL_SAMPLE 0x1
|
||||
#define SYMBOL_PARAMETER 0x2
|
||||
#define SYMBOL_CODE 0x3
|
||||
|
||||
#define SEGTYPE_SP_PROGRAM 0x00000001
|
||||
#define SEGTYPE_SP_PARAMETER 0x00000002
|
||||
#define SEGTYPE_SP_SAMPLE 0x00000003
|
||||
#define SEGTYPE_SP_COEFFICIENT 0x00000004
|
||||
|
||||
#define DSP_SPOS_UU 0x0deadul /* unused */
|
||||
#define DSP_SPOS_DC 0x0badul /* don't care */
|
||||
#define DSP_SPOS_DC_DC 0x0bad0badul /* don't care */
|
||||
#define DSP_SPOS_UUUU 0xdeadc0edul /* unused */
|
||||
#define DSP_SPOS_UUHI 0xdeadul
|
||||
#define DSP_SPOS_UULO 0xc0edul
|
||||
#define DSP_SPOS_DCDC 0x0badf1d0ul /* don't care */
|
||||
#define DSP_SPOS_DCDCHI 0x0badul
|
||||
#define DSP_SPOS_DCDCLO 0xf1d0ul
|
||||
|
||||
#define DSP_MAX_TASK_NAME 60
|
||||
#define DSP_MAX_SYMBOL_NAME 100
|
||||
#define DSP_MAX_SCB_NAME 60
|
||||
#define DSP_MAX_SCB_DESC 200
|
||||
#define DSP_MAX_TASK_DESC 50
|
||||
|
||||
#define DSP_MAX_PCM_CHANNELS 32
|
||||
#define DSP_MAX_SRC_NR 14
|
||||
|
||||
#define DSP_PCM_MAIN_CHANNEL 1
|
||||
#define DSP_PCM_REAR_CHANNEL 2
|
||||
#define DSP_PCM_CENTER_LFE_CHANNEL 3
|
||||
#define DSP_PCM_S71_CHANNEL 4 /* surround 7.1 */
|
||||
#define DSP_IEC958_CHANNEL 5
|
||||
|
||||
#define DSP_SPDIF_STATUS_OUTPUT_ENABLED 1
|
||||
#define DSP_SPDIF_STATUS_PLAYBACK_OPEN 2
|
||||
#define DSP_SPDIF_STATUS_HW_ENABLED 4
|
||||
#define DSP_SPDIF_STATUS_INPUT_CTRL_ENABLED 8
|
||||
|
||||
struct dsp_symbol_entry {
|
||||
u32 address;
|
||||
char symbol_name[DSP_MAX_SYMBOL_NAME];
|
||||
int symbol_type;
|
||||
|
||||
/* initialized by driver */
|
||||
struct dsp_module_desc * module;
|
||||
int deleted;
|
||||
};
|
||||
|
||||
struct dsp_symbol_desc {
|
||||
int nsymbols;
|
||||
|
||||
struct dsp_symbol_entry *symbols;
|
||||
|
||||
/* initialized by driver */
|
||||
int highest_frag_index;
|
||||
};
|
||||
|
||||
struct dsp_segment_desc {
|
||||
int segment_type;
|
||||
u32 offset;
|
||||
u32 size;
|
||||
u32 * data;
|
||||
};
|
||||
|
||||
struct dsp_module_desc {
|
||||
char * module_name;
|
||||
struct dsp_symbol_desc symbol_table;
|
||||
int nsegments;
|
||||
struct dsp_segment_desc * segments;
|
||||
|
||||
/* initialized by driver */
|
||||
u32 overlay_begin_address;
|
||||
u32 load_address;
|
||||
int nfixups;
|
||||
};
|
||||
|
||||
struct dsp_scb_descriptor {
|
||||
char scb_name[DSP_MAX_SCB_NAME];
|
||||
u32 address;
|
||||
int index;
|
||||
u32 *data;
|
||||
|
||||
struct dsp_scb_descriptor * sub_list_ptr;
|
||||
struct dsp_scb_descriptor * next_scb_ptr;
|
||||
struct dsp_scb_descriptor * parent_scb_ptr;
|
||||
|
||||
struct dsp_symbol_entry * task_entry;
|
||||
struct dsp_symbol_entry * scb_symbol;
|
||||
|
||||
struct snd_info_entry *proc_info;
|
||||
int ref_count;
|
||||
|
||||
u16 volume[2];
|
||||
unsigned int deleted :1;
|
||||
unsigned int updated :1;
|
||||
unsigned int volume_set :1;
|
||||
};
|
||||
|
||||
struct dsp_task_descriptor {
|
||||
char task_name[DSP_MAX_TASK_NAME];
|
||||
int size;
|
||||
u32 address;
|
||||
int index;
|
||||
u32 *data;
|
||||
};
|
||||
|
||||
struct dsp_pcm_channel_descriptor {
|
||||
int active;
|
||||
int src_slot;
|
||||
int pcm_slot;
|
||||
u32 sample_rate;
|
||||
u32 unlinked;
|
||||
struct dsp_scb_descriptor * pcm_reader_scb;
|
||||
struct dsp_scb_descriptor * src_scb;
|
||||
struct dsp_scb_descriptor * mixer_scb;
|
||||
|
||||
void * private_data;
|
||||
};
|
||||
|
||||
struct dsp_spos_instance {
|
||||
struct dsp_symbol_desc symbol_table; /* currently available loaded symbols in SP */
|
||||
|
||||
int nmodules;
|
||||
struct dsp_module_desc * modules; /* modules loaded into SP */
|
||||
|
||||
struct dsp_segment_desc code;
|
||||
|
||||
/* Main PCM playback mixer */
|
||||
struct dsp_scb_descriptor * master_mix_scb;
|
||||
u16 dac_volume_right;
|
||||
u16 dac_volume_left;
|
||||
|
||||
/* Rear/surround PCM playback mixer */
|
||||
struct dsp_scb_descriptor * rear_mix_scb;
|
||||
|
||||
/* Center/LFE mixer */
|
||||
struct dsp_scb_descriptor * center_lfe_mix_scb;
|
||||
|
||||
int npcm_channels;
|
||||
int nsrc_scb;
|
||||
struct dsp_pcm_channel_descriptor pcm_channels[DSP_MAX_PCM_CHANNELS];
|
||||
int src_scb_slots[DSP_MAX_SRC_NR];
|
||||
|
||||
/* cache this symbols */
|
||||
struct dsp_symbol_entry * null_algorithm; /* used by PCMreaderSCB's */
|
||||
struct dsp_symbol_entry * s16_up; /* used by SRCtaskSCB's */
|
||||
|
||||
/* proc fs */
|
||||
struct snd_card *snd_card;
|
||||
struct snd_info_entry * proc_dsp_dir;
|
||||
struct snd_info_entry * proc_sym_info_entry;
|
||||
struct snd_info_entry * proc_modules_info_entry;
|
||||
struct snd_info_entry * proc_parameter_dump_info_entry;
|
||||
struct snd_info_entry * proc_sample_dump_info_entry;
|
||||
|
||||
/* SCB's descriptors */
|
||||
int nscb;
|
||||
int scb_highest_frag_index;
|
||||
struct dsp_scb_descriptor scbs[DSP_MAX_SCB_DESC];
|
||||
struct snd_info_entry * proc_scb_info_entry;
|
||||
struct dsp_scb_descriptor * the_null_scb;
|
||||
|
||||
/* Task's descriptors */
|
||||
int ntask;
|
||||
struct dsp_task_descriptor tasks[DSP_MAX_TASK_DESC];
|
||||
struct snd_info_entry * proc_task_info_entry;
|
||||
|
||||
/* SPDIF status */
|
||||
int spdif_status_out;
|
||||
int spdif_status_in;
|
||||
u16 spdif_input_volume_right;
|
||||
u16 spdif_input_volume_left;
|
||||
/* spdif channel status,
|
||||
left right and user validity bits */
|
||||
unsigned int spdif_csuv_default;
|
||||
unsigned int spdif_csuv_stream;
|
||||
|
||||
/* SPDIF input sample rate converter */
|
||||
struct dsp_scb_descriptor * spdif_in_src;
|
||||
/* SPDIF input asynch. receiver */
|
||||
struct dsp_scb_descriptor * asynch_rx_scb;
|
||||
|
||||
/* Capture record mixer SCB */
|
||||
struct dsp_scb_descriptor * record_mixer_scb;
|
||||
|
||||
/* CODEC input SCB */
|
||||
struct dsp_scb_descriptor * codec_in_scb;
|
||||
|
||||
/* reference snooper */
|
||||
struct dsp_scb_descriptor * ref_snoop_scb;
|
||||
|
||||
/* SPDIF output PCM reference */
|
||||
struct dsp_scb_descriptor * spdif_pcm_input_scb;
|
||||
|
||||
/* asynch TX task */
|
||||
struct dsp_scb_descriptor * asynch_tx_scb;
|
||||
|
||||
/* record sources */
|
||||
struct dsp_scb_descriptor * pcm_input;
|
||||
struct dsp_scb_descriptor * adc_input;
|
||||
|
||||
int spdif_in_sample_rate;
|
||||
};
|
||||
|
||||
#endif /* __DSP_SPOS_H__ */
|
||||
252
sound/pci/cs46xx/cs46xx_dsp_task_types.h
Normal file
252
sound/pci/cs46xx/cs46xx_dsp_task_types.h
Normal file
@@ -0,0 +1,252 @@
|
||||
/*
|
||||
* The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards
|
||||
* Copyright (c) by Jaroslav Kysela <perex@perex.cz>
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*
|
||||
* NOTE: comments are copy/paste from cwcemb80.lst
|
||||
* provided by Tom Woller at Cirrus (my only
|
||||
* documentation about the SP OS running inside
|
||||
* the DSP)
|
||||
*/
|
||||
|
||||
#ifndef __CS46XX_DSP_TASK_TYPES_H__
|
||||
#define __CS46XX_DSP_TASK_TYPES_H__
|
||||
|
||||
#include "cs46xx_dsp_scb_types.h"
|
||||
|
||||
/*********************************************************************************************
|
||||
Example hierarchy of stream control blocks in the SP
|
||||
|
||||
hfgTree
|
||||
Ptr____Call (c)
|
||||
\
|
||||
-------+------ ------------- ------------- ------------- -----
|
||||
| SBlaster IF |______\| Foreground |___\| Middlegr'nd |___\| Background |___\| Nul |
|
||||
| |Goto /| tree header |g /| tree header |g /| tree header |g /| SCB |r
|
||||
-------------- (g) ------------- ------------- ------------- -----
|
||||
|c |c |c |c
|
||||
| | | |
|
||||
\/ ------------- ------------- -------------
|
||||
| Foreground |_\ | Middlegr'nd |_\ | Background |_\
|
||||
| tree |g/ | tree |g/ | tree |g/
|
||||
------------- ------------- -------------
|
||||
|c |c |c
|
||||
| | |
|
||||
\/ \/ \/
|
||||
|
||||
*********************************************************************************************/
|
||||
|
||||
#define HFG_FIRST_EXECUTE_MODE 0x0001
|
||||
#define HFG_FIRST_EXECUTE_MODE_BIT 0
|
||||
#define HFG_CONTEXT_SWITCH_MODE 0x0002
|
||||
#define HFG_CONTEXT_SWITCH_MODE_BIT 1
|
||||
|
||||
#define MAX_FG_STACK_SIZE 32 /* THESE NEED TO BE COMPUTED PROPERLY */
|
||||
#define MAX_MG_STACK_SIZE 16
|
||||
#define MAX_BG_STACK_SIZE 9
|
||||
#define MAX_HFG_STACK_SIZE 4
|
||||
|
||||
#define SLEEP_ACTIVE_INCREMENT 0 /* Enable task tree thread to go to sleep
|
||||
This should only ever be used on the Background thread */
|
||||
#define STANDARD_ACTIVE_INCREMENT 1 /* Task tree thread normal operation */
|
||||
#define SUSPEND_ACTIVE_INCREMENT 2 /* Cause execution to suspend in the task tree thread
|
||||
This should only ever be used on the Background thread */
|
||||
|
||||
#define HOSTFLAGS_DISABLE_BG_SLEEP 0 /* Host-controlled flag that determines whether we go to sleep
|
||||
at the end of BG */
|
||||
|
||||
/* Minimal context save area for Hyper Forground */
|
||||
struct dsp_hf_save_area {
|
||||
u32 r10_save;
|
||||
u32 r54_save;
|
||||
u32 r98_save;
|
||||
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
status_save,
|
||||
ind_save
|
||||
)
|
||||
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
rci1_save,
|
||||
rci0_save
|
||||
)
|
||||
|
||||
u32 r32_save;
|
||||
u32 r76_save;
|
||||
u32 rsd2_save;
|
||||
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
rsi2_save, /* See TaskTreeParameterBlock for
|
||||
remainder of registers */
|
||||
rsa2Save
|
||||
)
|
||||
/* saved as part of HFG context */
|
||||
};
|
||||
|
||||
|
||||
/* Task link data structure */
|
||||
struct dsp_tree_link {
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
/* Pointer to sibling task control block */
|
||||
next_scb,
|
||||
/* Pointer to child task control block */
|
||||
sub_ptr
|
||||
)
|
||||
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
/* Pointer to code entry point */
|
||||
entry_point,
|
||||
/* Pointer to local data */
|
||||
this_spb
|
||||
)
|
||||
};
|
||||
|
||||
|
||||
struct dsp_task_tree_data {
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
/* Initial tock count; controls task tree execution rate */
|
||||
tock_count_limit,
|
||||
/* Tock down counter */
|
||||
tock_count
|
||||
)
|
||||
|
||||
/* Add to ActiveCount when TockCountLimit reached:
|
||||
Subtract on task tree termination */
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
active_tncrement,
|
||||
/* Number of pending activations for task tree */
|
||||
active_count
|
||||
)
|
||||
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
/* BitNumber to enable modification of correct bit in ActiveTaskFlags */
|
||||
active_bit,
|
||||
/* Pointer to OS location for indicating current activity on task level */
|
||||
active_task_flags_ptr
|
||||
)
|
||||
|
||||
/* Data structure for controlling movement of memory blocks:-
|
||||
currently unused */
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
mem_upd_ptr,
|
||||
/* Data structure for controlling synchronous link update */
|
||||
link_upd_ptr
|
||||
)
|
||||
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
/* Save area for remainder of full context. */
|
||||
save_area,
|
||||
/* Address of start of local stack for data storage */
|
||||
data_stack_base_ptr
|
||||
)
|
||||
|
||||
};
|
||||
|
||||
|
||||
struct dsp_interval_timer_data
|
||||
{
|
||||
/* These data items have the same relative locations to those */
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
interval_timer_period,
|
||||
itd_unused
|
||||
)
|
||||
|
||||
/* used for this data in the SPOS control block for SPOS 1.0 */
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
num_FG_ticks_this_interval,
|
||||
num_intervals
|
||||
)
|
||||
};
|
||||
|
||||
|
||||
/* This structure contains extra storage for the task tree
|
||||
Currently, this additional data is related only to a full context save */
|
||||
struct dsp_task_tree_context_block {
|
||||
/* Up to 10 values are saved onto the stack. 8 for the task tree, 1 for
|
||||
The access to the context switch (call or interrupt), and 1 spare that
|
||||
users should never use. This last may be required by the system */
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
stack1,
|
||||
stack0
|
||||
)
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
stack3,
|
||||
stack2
|
||||
)
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
stack5,
|
||||
stack4
|
||||
)
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
stack7,
|
||||
stack6
|
||||
)
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
stack9,
|
||||
stack8
|
||||
)
|
||||
|
||||
u32 saverfe;
|
||||
|
||||
/* Value may be overwriten by stack save algorithm.
|
||||
Retain the size of the stack data saved here if used */
|
||||
___DSP_DUAL_16BIT_ALLOC(
|
||||
reserved1,
|
||||
stack_size
|
||||
)
|
||||
u32 saverba; /* (HFG) */
|
||||
u32 saverdc;
|
||||
u32 savers_config_23; /* (HFG) */
|
||||
u32 savers_DMA23; /* (HFG) */
|
||||
u32 saversa0;
|
||||
u32 saversi0;
|
||||
u32 saversa1;
|
||||
u32 saversi1;
|
||||
u32 saversa3;
|
||||
u32 saversd0;
|
||||
u32 saversd1;
|
||||
u32 saversd3;
|
||||
u32 savers_config01;
|
||||
u32 savers_DMA01;
|
||||
u32 saveacc0hl;
|
||||
u32 saveacc1hl;
|
||||
u32 saveacc0xacc1x;
|
||||
u32 saveacc2hl;
|
||||
u32 saveacc3hl;
|
||||
u32 saveacc2xacc3x;
|
||||
u32 saveaux0hl;
|
||||
u32 saveaux1hl;
|
||||
u32 saveaux0xaux1x;
|
||||
u32 saveaux2hl;
|
||||
u32 saveaux3hl;
|
||||
u32 saveaux2xaux3x;
|
||||
u32 savershouthl;
|
||||
u32 savershoutxmacmode;
|
||||
};
|
||||
|
||||
|
||||
struct dsp_task_tree_control_block {
|
||||
struct dsp_hf_save_area context;
|
||||
struct dsp_tree_link links;
|
||||
struct dsp_task_tree_data data;
|
||||
struct dsp_task_tree_context_block context_blk;
|
||||
struct dsp_interval_timer_data int_timer;
|
||||
};
|
||||
|
||||
|
||||
#endif /* __DSP_TASK_TYPES_H__ */
|
||||
@@ -61,7 +61,7 @@
|
||||
#include <sound/info.h>
|
||||
#include <sound/pcm.h>
|
||||
#include <sound/pcm_params.h>
|
||||
#include <sound/cs46xx.h>
|
||||
#include "cs46xx.h"
|
||||
|
||||
#include <asm/io.h>
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <sound/control.h>
|
||||
#include <sound/info.h>
|
||||
#include <sound/asoundef.h>
|
||||
#include <sound/cs46xx.h>
|
||||
#include "cs46xx.h"
|
||||
|
||||
#include "cs46xx_lib.h"
|
||||
#include "dsp_spos.h"
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <sound/core.h>
|
||||
#include <sound/control.h>
|
||||
#include <sound/info.h>
|
||||
#include <sound/cs46xx.h>
|
||||
#include "cs46xx.h"
|
||||
|
||||
#include "cs46xx_lib.h"
|
||||
#include "dsp_spos.h"
|
||||
|
||||
Reference in New Issue
Block a user