Skip to content

L
linux
Commit bee1a5be authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: PCI Trident 

Modules: Trident driver

Remove xxx_t typedefs from the PCI Trident driver.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent abfd67bd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 592 additions and 522 deletions
include/sound/trident.h
View file @ bee1a5be
This diff is collapsed.
sound/pci/trident/trident.c
View file @ bee1a5be
...@@ -76,8 +76,8 @@ static int __devinit snd_trident_probe(struct pci_dev *pci, ...@@ -76,8 +76,8 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
static int dev; static int dev;
snd_card_t *card; struct snd_card *card;
trident_t *trident; struct snd_trident *trident;
const char *str; const char *str;
int err, pcm_dev = 0; int err, pcm_dev = 0;
......
sound/pci/trident/trident_main.c
View file @ bee1a5be
This diff is collapsed.
sound/pci/trident/trident_memory.c
View file @ bee1a5be
...@@ -68,13 +68,14 @@ ...@@ -68,13 +68,14 @@
#define page_to_addr(trident,page) __tlb_to_addr(trident, (page) << 1) #define page_to_addr(trident,page) __tlb_to_addr(trident, (page) << 1)
/* fill TLB entries -- we need to fill two entries */ /* fill TLB entries -- we need to fill two entries */
static inline void set_tlb_bus(trident_t *trident, int page, unsigned long ptr, dma_addr_t addr) static inline void set_tlb_bus(struct snd_trident *trident, int page,
unsigned long ptr, dma_addr_t addr)
{ {
page <<= 1; page <<= 1;
__set_tlb_bus(trident, page, ptr, addr); __set_tlb_bus(trident, page, ptr, addr);
__set_tlb_bus(trident, page+1, ptr + SNDRV_TRIDENT_PAGE_SIZE, addr + SNDRV_TRIDENT_PAGE_SIZE); __set_tlb_bus(trident, page+1, ptr + SNDRV_TRIDENT_PAGE_SIZE, addr + SNDRV_TRIDENT_PAGE_SIZE);
} }
static inline void set_silent_tlb(trident_t *trident, int page) static inline void set_silent_tlb(struct snd_trident *trident, int page)
{ {
page <<= 1; page <<= 1;
__set_tlb_bus(trident, page, (unsigned long)trident->tlb.silent_page.area, trident->tlb.silent_page.addr); __set_tlb_bus(trident, page, (unsigned long)trident->tlb.silent_page.area, trident->tlb.silent_page.addr);
...@@ -97,7 +98,8 @@ static inline void set_silent_tlb(trident_t *trident, int page) ...@@ -97,7 +98,8 @@ static inline void set_silent_tlb(trident_t *trident, int page)
#define page_to_addr(trident,page) __tlb_to_addr(trident, (page) * UNIT_PAGES) #define page_to_addr(trident,page) __tlb_to_addr(trident, (page) * UNIT_PAGES)
/* fill TLB entries -- UNIT_PAGES entries must be filled */ /* fill TLB entries -- UNIT_PAGES entries must be filled */
static inline void set_tlb_bus(trident_t *trident, int page, unsigned long ptr, dma_addr_t addr) static inline void set_tlb_bus(struct snd_trident *trident, int page,
unsigned long ptr, dma_addr_t addr)
{ {
int i; int i;
page *= UNIT_PAGES; page *= UNIT_PAGES;
...@@ -107,7 +109,7 @@ static inline void set_tlb_bus(trident_t *trident, int page, unsigned long ptr, ...@@ -107,7 +109,7 @@ static inline void set_tlb_bus(trident_t *trident, int page, unsigned long ptr,
addr += SNDRV_TRIDENT_PAGE_SIZE; addr += SNDRV_TRIDENT_PAGE_SIZE;
} }
} }
static inline void set_silent_tlb(trident_t *trident, int page) static inline void set_silent_tlb(struct snd_trident *trident, int page)
{ {
int i; int i;
page *= UNIT_PAGES; page *= UNIT_PAGES;
...@@ -118,7 +120,7 @@ static inline void set_silent_tlb(trident_t *trident, int page) ...@@ -118,7 +120,7 @@ static inline void set_silent_tlb(trident_t *trident, int page)
#endif /* PAGE_SIZE */ #endif /* PAGE_SIZE */
/* calculate buffer pointer from offset address */ /* calculate buffer pointer from offset address */
static inline void *offset_ptr(trident_t *trident, int offset) static inline void *offset_ptr(struct snd_trident *trident, int offset)
{ {
char *ptr; char *ptr;
ptr = page_to_ptr(trident, get_aligned_page(offset)); ptr = page_to_ptr(trident, get_aligned_page(offset));
...@@ -127,16 +129,16 @@ static inline void *offset_ptr(trident_t *trident, int offset) ...@@ -127,16 +129,16 @@ static inline void *offset_ptr(trident_t *trident, int offset)
} }
/* first and last (aligned) pages of memory block */ /* first and last (aligned) pages of memory block */
#define firstpg(blk) (((snd_trident_memblk_arg_t*)snd_util_memblk_argptr(blk))->first_page) #define firstpg(blk) (((struct snd_trident_memblk_arg *)snd_util_memblk_argptr(blk))->first_page)
#define lastpg(blk) (((snd_trident_memblk_arg_t*)snd_util_memblk_argptr(blk))->last_page) #define lastpg(blk) (((struct snd_trident_memblk_arg *)snd_util_memblk_argptr(blk))->last_page)
/* /*
* search empty pages which may contain given size * search empty pages which may contain given size
*/ */
static snd_util_memblk_t * static struct snd_util_memblk *
search_empty(snd_util_memhdr_t *hdr, int size) search_empty(struct snd_util_memhdr *hdr, int size)
{ {
snd_util_memblk_t *blk, *prev; struct snd_util_memblk *blk, *prev;
int page, psize; int page, psize;
struct list_head *p; struct list_head *p;
...@@ -144,7 +146,7 @@ search_empty(snd_util_memhdr_t *hdr, int size) ...@@ -144,7 +146,7 @@ search_empty(snd_util_memhdr_t *hdr, int size)
prev = NULL; prev = NULL;
page = 0; page = 0;
list_for_each(p, &hdr->block) { list_for_each(p, &hdr->block) {
blk = list_entry(p, snd_util_memblk_t, list); blk = list_entry(p, struct snd_util_memblk, list);
if (page + psize <= firstpg(blk)) if (page + psize <= firstpg(blk))
goto __found_pages; goto __found_pages;
page = lastpg(blk) + 1; page = lastpg(blk) + 1;
...@@ -183,12 +185,13 @@ static int is_valid_page(unsigned long ptr) ...@@ -183,12 +185,13 @@ static int is_valid_page(unsigned long ptr)
/* /*
* page allocation for DMA (Scatter-Gather version) * page allocation for DMA (Scatter-Gather version)
*/ */
static snd_util_memblk_t * static struct snd_util_memblk *
snd_trident_alloc_sg_pages(trident_t *trident, snd_pcm_substream_t *substream) snd_trident_alloc_sg_pages(struct snd_trident *trident,
struct snd_pcm_substream *substream)
{ {
snd_util_memhdr_t *hdr; struct snd_util_memhdr *hdr;
snd_util_memblk_t *blk; struct snd_util_memblk *blk;
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int idx, page; int idx, page;
struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream); struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
...@@ -230,13 +233,14 @@ snd_trident_alloc_sg_pages(trident_t *trident, snd_pcm_substream_t *substream) ...@@ -230,13 +233,14 @@ snd_trident_alloc_sg_pages(trident_t *trident, snd_pcm_substream_t *substream)
/* /*
* page allocation for DMA (contiguous version) * page allocation for DMA (contiguous version)
*/ */
static snd_util_memblk_t * static struct snd_util_memblk *
snd_trident_alloc_cont_pages(trident_t *trident, snd_pcm_substream_t *substream) snd_trident_alloc_cont_pages(struct snd_trident *trident,
struct snd_pcm_substream *substream)
{ {
snd_util_memhdr_t *hdr; struct snd_util_memhdr *hdr;
snd_util_memblk_t *blk; struct snd_util_memblk *blk;
int page; int page;
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
dma_addr_t addr; dma_addr_t addr;
unsigned long ptr; unsigned long ptr;
...@@ -270,8 +274,9 @@ snd_trident_alloc_cont_pages(trident_t *trident, snd_pcm_substream_t *substream) ...@@ -270,8 +274,9 @@ snd_trident_alloc_cont_pages(trident_t *trident, snd_pcm_substream_t *substream)
/* /*
* page allocation for DMA * page allocation for DMA
*/ */
snd_util_memblk_t * struct snd_util_memblk *
snd_trident_alloc_pages(trident_t *trident, snd_pcm_substream_t *substream) snd_trident_alloc_pages(struct snd_trident *trident,
struct snd_pcm_substream *substream)
{ {
snd_assert(trident != NULL, return NULL); snd_assert(trident != NULL, return NULL);
snd_assert(substream != NULL, return NULL); snd_assert(substream != NULL, return NULL);
...@@ -285,9 +290,10 @@ snd_trident_alloc_pages(trident_t *trident, snd_pcm_substream_t *substream) ...@@ -285,9 +290,10 @@ snd_trident_alloc_pages(trident_t *trident, snd_pcm_substream_t *substream)
/* /*
* release DMA buffer from page table * release DMA buffer from page table
*/ */
int snd_trident_free_pages(trident_t *trident, snd_util_memblk_t *blk) int snd_trident_free_pages(struct snd_trident *trident,
struct snd_util_memblk *blk)
{ {
snd_util_memhdr_t *hdr; struct snd_util_memhdr *hdr;
int page; int page;
snd_assert(trident != NULL, return -EINVAL); snd_assert(trident != NULL, return -EINVAL);
...@@ -314,17 +320,17 @@ int snd_trident_free_pages(trident_t *trident, snd_util_memblk_t *blk) ...@@ -314,17 +320,17 @@ int snd_trident_free_pages(trident_t *trident, snd_util_memblk_t *blk)
/* /*
*/ */
static int synth_alloc_pages(trident_t *hw, snd_util_memblk_t *blk); static int synth_alloc_pages(struct snd_trident *hw, struct snd_util_memblk *blk);
static int synth_free_pages(trident_t *hw, snd_util_memblk_t *blk); static int synth_free_pages(struct snd_trident *hw, struct snd_util_memblk *blk);
/* /*
* allocate a synth sample area * allocate a synth sample area
*/ */
snd_util_memblk_t * struct snd_util_memblk *
snd_trident_synth_alloc(trident_t *hw, unsigned int size) snd_trident_synth_alloc(struct snd_trident *hw, unsigned int size)
{ {
snd_util_memblk_t *blk; struct snd_util_memblk *blk;
snd_util_memhdr_t *hdr = hw->tlb.memhdr; struct snd_util_memhdr *hdr = hw->tlb.memhdr;
down(&hdr->block_mutex); down(&hdr->block_mutex);
blk = __snd_util_mem_alloc(hdr, size); blk = __snd_util_mem_alloc(hdr, size);
...@@ -346,9 +352,9 @@ snd_trident_synth_alloc(trident_t *hw, unsigned int size) ...@@ -346,9 +352,9 @@ snd_trident_synth_alloc(trident_t *hw, unsigned int size)
* free a synth sample area * free a synth sample area
*/ */
int int
snd_trident_synth_free(trident_t *hw, snd_util_memblk_t *blk) snd_trident_synth_free(struct snd_trident *hw, struct snd_util_memblk *blk)
{ {
snd_util_memhdr_t *hdr = hw->tlb.memhdr; struct snd_util_memhdr *hdr = hw->tlb.memhdr;
down(&hdr->block_mutex); down(&hdr->block_mutex);
synth_free_pages(hw, blk); synth_free_pages(hw, blk);
...@@ -361,7 +367,7 @@ snd_trident_synth_free(trident_t *hw, snd_util_memblk_t *blk) ...@@ -361,7 +367,7 @@ snd_trident_synth_free(trident_t *hw, snd_util_memblk_t *blk)
/* /*
* reset TLB entry and free kernel page * reset TLB entry and free kernel page
*/ */
static void clear_tlb(trident_t *trident, int page) static void clear_tlb(struct snd_trident *trident, int page)
{ {
void *ptr = page_to_ptr(trident, page); void *ptr = page_to_ptr(trident, page);
dma_addr_t addr = page_to_addr(trident, page); dma_addr_t addr = page_to_addr(trident, page);
...@@ -378,20 +384,22 @@ static void clear_tlb(trident_t *trident, int page) ...@@ -378,20 +384,22 @@ static void clear_tlb(trident_t *trident, int page)
} }
/* check new allocation range */ /* check new allocation range */
static void get_single_page_range(snd_util_memhdr_t *hdr, snd_util_memblk_t *blk, int *first_page_ret, int *last_page_ret) static void get_single_page_range(struct snd_util_memhdr *hdr,
struct snd_util_memblk *blk,
int *first_page_ret, int *last_page_ret)
{ {
struct list_head *p; struct list_head *p;
snd_util_memblk_t *q; struct snd_util_memblk *q;
int first_page, last_page; int first_page, last_page;
first_page = firstpg(blk); first_page = firstpg(blk);
if ((p = blk->list.prev) != &hdr->block) { if ((p = blk->list.prev) != &hdr->block) {
q = list_entry(p, snd_util_memblk_t, list); q = list_entry(p, struct snd_util_memblk, list);
if (lastpg(q) == first_page) if (lastpg(q) == first_page)
first_page++; /* first page was already allocated */ first_page++; /* first page was already allocated */
} }
last_page = lastpg(blk); last_page = lastpg(blk);
if ((p = blk->list.next) != &hdr->block) { if ((p = blk->list.next) != &hdr->block) {
q = list_entry(p, snd_util_memblk_t, list); q = list_entry(p, struct snd_util_memblk, list);
if (firstpg(q) == last_page) if (firstpg(q) == last_page)
last_page--; /* last page was already allocated */ last_page--; /* last page was already allocated */
} }
...@@ -402,7 +410,7 @@ static void get_single_page_range(snd_util_memhdr_t *hdr, snd_util_memblk_t *blk ...@@ -402,7 +410,7 @@ static void get_single_page_range(snd_util_memhdr_t *hdr, snd_util_memblk_t *blk
/* /*
* allocate kernel pages and assign them to TLB * allocate kernel pages and assign them to TLB
*/ */
static int synth_alloc_pages(trident_t *hw, snd_util_memblk_t *blk) static int synth_alloc_pages(struct snd_trident *hw, struct snd_util_memblk *blk)
{ {
int page, first_page, last_page; int page, first_page, last_page;
struct snd_dma_buffer dmab; struct snd_dma_buffer dmab;
...@@ -438,7 +446,7 @@ static int synth_alloc_pages(trident_t *hw, snd_util_memblk_t *blk) ...@@ -438,7 +446,7 @@ static int synth_alloc_pages(trident_t *hw, snd_util_memblk_t *blk)
/* /*
* free pages * free pages
*/ */
static int synth_free_pages(trident_t *trident, snd_util_memblk_t *blk) static int synth_free_pages(struct snd_trident *trident, struct snd_util_memblk *blk)
{ {
int page, first_page, last_page; int page, first_page, last_page;
...@@ -452,7 +460,9 @@ static int synth_free_pages(trident_t *trident, snd_util_memblk_t *blk) ...@@ -452,7 +460,9 @@ static int synth_free_pages(trident_t *trident, snd_util_memblk_t *blk)
/* /*
* copy_from_user(blk + offset, data, size) * copy_from_user(blk + offset, data, size)
*/ */
int snd_trident_synth_copy_from_user(trident_t *trident, snd_util_memblk_t *blk, int offset, const char __user *data, int size) int snd_trident_synth_copy_from_user(struct snd_trident *trident,
struct snd_util_memblk *blk,
int offset, const char __user *data, int size)
{ {
int page, nextofs, end_offset, temp, temp1; int page, nextofs, end_offset, temp, temp1;
......
sound/pci/trident/trident_synth.c
View file @ bee1a5be
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7