[ALSA] wavefront - Use standard firmware loader
[linux-2.6.git] / sound / isa / gus / gus_mem.c
index 5eb766d..7107753 100644 (file)
 #include <sound/info.h>
 
 #ifdef CONFIG_SND_DEBUG
-static void snd_gf1_mem_info_read(snd_info_entry_t *entry, 
-                                 snd_info_buffer_t * buffer);
+static void snd_gf1_mem_info_read(struct snd_info_entry *entry, 
+                                 struct snd_info_buffer *buffer);
 #endif
 
-void snd_gf1_mem_lock(snd_gf1_mem_t * alloc, int xup)
+void snd_gf1_mem_lock(struct snd_gf1_mem * alloc, int xup)
 {
        if (!xup) {
-               down(&alloc->memory_mutex);
+               mutex_lock(&alloc->memory_mutex);
        } else {
-               up(&alloc->memory_mutex);
+               mutex_unlock(&alloc->memory_mutex);
        }
 }
 
-static snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,
-                                              snd_gf1_mem_block_t * block)
+static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc,
+                                              struct snd_gf1_mem_block * block)
 {
-       snd_gf1_mem_block_t *pblock, *nblock;
+       struct snd_gf1_mem_block *pblock, *nblock;
 
-       nblock = (snd_gf1_mem_block_t *) kmalloc(sizeof(snd_gf1_mem_block_t), GFP_KERNEL);
+       nblock = kmalloc(sizeof(struct snd_gf1_mem_block), GFP_KERNEL);
        if (nblock == NULL)
                return NULL;
        *nblock = *block;
@@ -59,7 +59,7 @@ static snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,
                                alloc->first = nblock;
                        else
                                nblock->prev->next = nblock;
-                       up(&alloc->memory_mutex);
+                       mutex_unlock(&alloc->memory_mutex);
                        return NULL;
                }
                pblock = pblock->next;
@@ -76,11 +76,11 @@ static snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,
        return nblock;
 }
 
-int snd_gf1_mem_xfree(snd_gf1_mem_t * alloc, snd_gf1_mem_block_t * block)
+int snd_gf1_mem_xfree(struct snd_gf1_mem * alloc, struct snd_gf1_mem_block * block)
 {
        if (block->share) {     /* ok.. shared block */
                block->share--;
-               up(&alloc->memory_mutex);
+               mutex_unlock(&alloc->memory_mutex);
                return 0;
        }
        if (alloc->first == block) {
@@ -106,10 +106,10 @@ int snd_gf1_mem_xfree(snd_gf1_mem_t * alloc, snd_gf1_mem_block_t * block)
        return 0;
 }
 
-static snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,
+static struct snd_gf1_mem_block *snd_gf1_mem_look(struct snd_gf1_mem * alloc,
                                             unsigned int address)
 {
-       snd_gf1_mem_block_t *block;
+       struct snd_gf1_mem_block *block;
 
        for (block = alloc->first; block; block = block->next) {
                if (block->ptr == address) {
@@ -119,10 +119,10 @@ static snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,
        return NULL;
 }
 
-static snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,
+static struct snd_gf1_mem_block *snd_gf1_mem_share(struct snd_gf1_mem * alloc,
                                              unsigned int *share_id)
 {
-       snd_gf1_mem_block_t *block;
+       struct snd_gf1_mem_block *block;
 
        if (!share_id[0] && !share_id[1] &&
            !share_id[2] && !share_id[3])
@@ -133,19 +133,18 @@ static snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,
        return NULL;
 }
 
-static int snd_gf1_mem_find(snd_gf1_mem_t * alloc,
-                           snd_gf1_mem_block_t * block,
+static int snd_gf1_mem_find(struct snd_gf1_mem * alloc,
+                           struct snd_gf1_mem_block * block,
                            unsigned int size, int w_16, int align)
 {
-       snd_gf1_bank_info_t *info = w_16 ? alloc->banks_16 : alloc->banks_8;
+       struct snd_gf1_bank_info *info = w_16 ? alloc->banks_16 : alloc->banks_8;
        unsigned int idx, boundary;
        int size1;
-       snd_gf1_mem_block_t *pblock;
+       struct snd_gf1_mem_block *pblock;
        unsigned int ptr1, ptr2;
 
-       align--;
-       if (w_16 && align < 1)
-               align = 1;
+       if (w_16 && align < 2)
+               align = 2;
        block->flags = w_16 ? SNDRV_GF1_MEM_BLOCK_16BIT : 0;
        block->owner = SNDRV_GF1_MEM_OWNER_DRIVER;
        block->share = 0;
@@ -165,7 +164,7 @@ static int snd_gf1_mem_find(snd_gf1_mem_t * alloc,
                        if (pblock->next->ptr < boundary)
                                ptr2 = pblock->next->ptr;
                }
-               ptr1 = (pblock->ptr + pblock->size + align) & ~align;
+               ptr1 = ALIGN(pblock->ptr + pblock->size, align);
                if (ptr1 >= ptr2)
                        continue;
                size1 = ptr2 - ptr1;
@@ -186,11 +185,11 @@ static int snd_gf1_mem_find(snd_gf1_mem_t * alloc,
        return -ENOMEM;
 }
 
-snd_gf1_mem_block_t *snd_gf1_mem_alloc(snd_gf1_mem_t * alloc, int owner,
+struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owner,
                                       char *name, int size, int w_16, int align,
                                       unsigned int *share_id)
 {
-       snd_gf1_mem_block_t block, *nblock;
+       struct snd_gf1_mem_block block, *nblock;
 
        snd_gf1_mem_lock(alloc, 0);
        if (share_id != NULL) {
@@ -198,7 +197,7 @@ snd_gf1_mem_block_t *snd_gf1_mem_alloc(snd_gf1_mem_t * alloc, int owner,
                if (nblock != NULL) {
                        if (size != (int)nblock->size) {
                                /* TODO: remove in the future */
-                               snd_printk("snd_gf1_mem_alloc - share: sizes differ\n");
+                               snd_printk(KERN_ERR "snd_gf1_mem_alloc - share: sizes differ\n");
                                goto __std;
                        }
                        nblock->share++;
@@ -220,10 +219,10 @@ snd_gf1_mem_block_t *snd_gf1_mem_alloc(snd_gf1_mem_t * alloc, int owner,
        return nblock;
 }
 
-int snd_gf1_mem_free(snd_gf1_mem_t * alloc, unsigned int address)
+int snd_gf1_mem_free(struct snd_gf1_mem * alloc, unsigned int address)
 {
        int result;
-       snd_gf1_mem_block_t *block;
+       struct snd_gf1_mem_block *block;
 
        snd_gf1_mem_lock(alloc, 0);
        if ((block = snd_gf1_mem_look(alloc, address)) != NULL) {
@@ -235,16 +234,16 @@ int snd_gf1_mem_free(snd_gf1_mem_t * alloc, unsigned int address)
        return -EINVAL;
 }
 
-int snd_gf1_mem_init(snd_gus_card_t * gus)
+int snd_gf1_mem_init(struct snd_gus_card * gus)
 {
-       snd_gf1_mem_t *alloc;
-       snd_gf1_mem_block_t block;
+       struct snd_gf1_mem *alloc;
+       struct snd_gf1_mem_block block;
 #ifdef CONFIG_SND_DEBUG
-       snd_info_entry_t *entry;
+       struct snd_info_entry *entry;
 #endif
 
        alloc = &gus->gf1.mem_alloc;
-       init_MUTEX(&alloc->memory_mutex);
+       mutex_init(&alloc->memory_mutex);
        alloc->first = alloc->last = NULL;
        if (!gus->gf1.memory)
                return 0;
@@ -264,18 +263,16 @@ int snd_gf1_mem_init(snd_gus_card_t * gus)
        if (snd_gf1_mem_xalloc(alloc, &block) == NULL)
                return -ENOMEM;
 #ifdef CONFIG_SND_DEBUG
-       if (! snd_card_proc_new(gus->card, "gusmem", &entry)) {
-               snd_info_set_text_ops(entry, gus, 1024, snd_gf1_mem_info_read);
-               entry->c.text.read_size = 256 * 1024;
-       }
+       if (! snd_card_proc_new(gus->card, "gusmem", &entry))
+               snd_info_set_text_ops(entry, gus, snd_gf1_mem_info_read);
 #endif
        return 0;
 }
 
-int snd_gf1_mem_done(snd_gus_card_t * gus)
+int snd_gf1_mem_done(struct snd_gus_card * gus)
 {
-       snd_gf1_mem_t *alloc;
-       snd_gf1_mem_block_t *block, *nblock;
+       struct snd_gf1_mem *alloc;
+       struct snd_gf1_mem_block *block, *nblock;
 
        alloc = &gus->gf1.mem_alloc;
        block = alloc->first;
@@ -288,18 +285,18 @@ int snd_gf1_mem_done(snd_gus_card_t * gus)
 }
 
 #ifdef CONFIG_SND_DEBUG
-static void snd_gf1_mem_info_read(snd_info_entry_t *entry, 
-                                 snd_info_buffer_t * buffer)
+static void snd_gf1_mem_info_read(struct snd_info_entry *entry, 
+                                 struct snd_info_buffer *buffer)
 {
-       snd_gus_card_t *gus;
-       snd_gf1_mem_t *alloc;
-       snd_gf1_mem_block_t *block;
+       struct snd_gus_card *gus;
+       struct snd_gf1_mem *alloc;
+       struct snd_gf1_mem_block *block;
        unsigned int total, used;
        int i;
 
        gus = entry->private_data;
        alloc = &gus->gf1.mem_alloc;
-       down(&alloc->memory_mutex);
+       mutex_lock(&alloc->memory_mutex);
        snd_iprintf(buffer, "8-bit banks       : \n    ");
        for (i = 0; i < 4; i++)
                snd_iprintf(buffer, "0x%06x (%04ik)%s", alloc->banks_8[i].address, alloc->banks_8[i].size >> 10, i + 1 < 4 ? "," : "");
@@ -343,7 +340,7 @@ static void snd_gf1_mem_info_read(snd_info_entry_t *entry,
        }
        snd_iprintf(buffer, "  Total: memory = %i, used = %i, free = %i\n",
                    total, used, total - used);
-       up(&alloc->memory_mutex);
+       mutex_unlock(&alloc->memory_mutex);
 #if 0
        ultra_iprintf(buffer, "  Verify: free = %i, max 8-bit block = %i, max 16-bit block = %i\n",
                      ultra_memory_free_size(card, &card->gf1.mem_alloc),