Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 353 insertions, 0 deletions

diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c
new file mode 100644
index 000000000000..bfc2b91001d5
--- /dev/null
+++ b/sound/isa/gus/gus_mem.c
@@ -0,0 +1,353 @@
+/*
+ *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  GUS's memory allocation routines / bottom layer
+ *
+ *
+ *   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
+ *
+ */
+
+#include <sound/driver.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/gus.h>
+#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);
+#endif
+
+void snd_gf1_mem_lock(snd_gf1_mem_t * alloc, int xup)
+{
+        if (!xup) {
+                down(&alloc->memory_mutex);
+        } else {
+                up(&alloc->memory_mutex);
+        }
+}
+
+snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,
+                                        snd_gf1_mem_block_t * block)
+{
+        snd_gf1_mem_block_t *pblock, *nblock;
+
+        nblock = (snd_gf1_mem_block_t *) kmalloc(sizeof(snd_gf1_mem_block_t), GFP_KERNEL);
+        if (nblock == NULL)
+                return NULL;
+        *nblock = *block;
+        pblock = alloc->first;
+        while (pblock) {
+                if (pblock->ptr > nblock->ptr) {
+                        nblock->prev = pblock->prev;
+                        nblock->next = pblock;
+                        pblock->prev = nblock;
+                        if (pblock == alloc->first)
+                                alloc->first = nblock;
+                        else
+                                nblock->prev->next = nblock;
+                        up(&alloc->memory_mutex);
+                        return NULL;
+                }
+                pblock = pblock->next;
+        }
+        nblock->next = NULL;
+        if (alloc->last == NULL) {
+                nblock->prev = NULL;
+                alloc->first = alloc->last = nblock;
+        } else {
+                nblock->prev = alloc->last;
+                alloc->last->next = nblock;
+                alloc->last = nblock;
+        }
+        return nblock;
+}
+
+int snd_gf1_mem_xfree(snd_gf1_mem_t * alloc, snd_gf1_mem_block_t * block)
+{
+        if (block->share) {     /* ok.. shared block */
+                block->share--;
+                up(&alloc->memory_mutex);
+                return 0;
+        }
+        if (alloc->first == block) {
+                alloc->first = block->next;
+                if (block->next)
+                        block->next->prev = NULL;
+        } else {
+                block->prev->next = block->next;
+                if (block->next)
+                        block->next->prev = block->prev;
+        }
+        if (alloc->last == block) {
+                alloc->last = block->prev;
+                if (block->prev)
+                        block->prev->next = NULL;
+        } else {
+                block->next->prev = block->prev;
+                if (block->prev)
+                        block->prev->next = block->next;
+        }
+        kfree(block->name);
+        kfree(block);
+        return 0;
+}
+
+snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,
+                                      unsigned int address)
+{
+        snd_gf1_mem_block_t *block;
+
+        for (block = alloc->first; block; block = block->next) {
+                if (block->ptr == address) {
+                        return block;
+                }
+        }
+        return NULL;
+}
+
+snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,
+                                       unsigned int *share_id)
+{
+        snd_gf1_mem_block_t *block;
+
+        if (!share_id[0] && !share_id[1] &&
+            !share_id[2] && !share_id[3])
+                return NULL;
+        for (block = alloc->first; block; block = block->next)
+                if (!memcmp(share_id, block->share_id, sizeof(share_id)))
+                        return block;
+        return NULL;
+}
+
+static int snd_gf1_mem_find(snd_gf1_mem_t * alloc,
+                            snd_gf1_mem_block_t * block,
+                            unsigned int size, int w_16, int align)
+{
+        snd_gf1_bank_info_t *info = w_16 ? alloc->banks_16 : alloc->banks_8;
+        unsigned int idx, boundary;
+        int size1;
+        snd_gf1_mem_block_t *pblock;
+        unsigned int ptr1, ptr2;
+
+        align--;
+        if (w_16 && align < 1)
+                align = 1;
+        block->flags = w_16 ? SNDRV_GF1_MEM_BLOCK_16BIT : 0;
+        block->owner = SNDRV_GF1_MEM_OWNER_DRIVER;
+        block->share = 0;
+        block->share_id[0] = block->share_id[1] =
+        block->share_id[2] = block->share_id[3] = 0;
+        block->name = NULL;
+        block->prev = block->next = NULL;
+        for (pblock = alloc->first, idx = 0; pblock; pblock = pblock->next) {
+                while (pblock->ptr >= (boundary = info[idx].address + info[idx].size))
+                        idx++;
+                while (pblock->ptr + pblock->size >= (boundary = info[idx].address + info[idx].size))
+                        idx++;
+                ptr2 = boundary;
+                if (pblock->next) {
+                        if (pblock->ptr + pblock->size == pblock->next->ptr)
+                                continue;
+                        if (pblock->next->ptr < boundary)
+                                ptr2 = pblock->next->ptr;
+                }
+                ptr1 = (pblock->ptr + pblock->size + align) & ~align;
+                if (ptr1 >= ptr2)
+                        continue;
+                size1 = ptr2 - ptr1;
+                if ((int)size <= size1) {
+                        block->ptr = ptr1;
+                        block->size = size;
+                        return 0;
+                }
+        }
+        while (++idx < 4) {
+                if (size <= info[idx].size) {
+                        /* I assume that bank address is already aligned.. */
+                        block->ptr = info[idx].address;
+                        block->size = size;
+                        return 0;
+                }
+        }
+        return -ENOMEM;
+}
+
+snd_gf1_mem_block_t *snd_gf1_mem_alloc(snd_gf1_mem_t * alloc, int owner,
+                                       char *name, int size, int w_16, int align,
+                                       unsigned int *share_id)
+{
+        snd_gf1_mem_block_t block, *nblock;
+
+        snd_gf1_mem_lock(alloc, 0);
+        if (share_id != NULL) {
+                nblock = snd_gf1_mem_share(alloc, share_id);
+                if (nblock != NULL) {
+                        if (size != (int)nblock->size) {
+                                /* TODO: remove in the future */
+                                snd_printk("snd_gf1_mem_alloc - share: sizes differ\n");
+                                goto __std;
+                        }
+                        nblock->share++;
+                        snd_gf1_mem_lock(alloc, 1);
+                        return NULL;
+                }
+        }
+      __std:
+        if (snd_gf1_mem_find(alloc, &block, size, w_16, align) < 0) {
+                snd_gf1_mem_lock(alloc, 1);
+                return NULL;
+        }
+        if (share_id != NULL)
+                memcpy(&block.share_id, share_id, sizeof(block.share_id));
+        block.owner = owner;
+        block.name = snd_kmalloc_strdup(name, GFP_KERNEL);
+        nblock = snd_gf1_mem_xalloc(alloc, &block);
+        snd_gf1_mem_lock(alloc, 1);
+        return nblock;
+}
+
+int snd_gf1_mem_free(snd_gf1_mem_t * alloc, unsigned int address)
+{
+        int result;
+        snd_gf1_mem_block_t *block;
+
+        snd_gf1_mem_lock(alloc, 0);
+        if ((block = snd_gf1_mem_look(alloc, address)) != NULL) {
+                result = snd_gf1_mem_xfree(alloc, block);
+                snd_gf1_mem_lock(alloc, 1);
+                return result;
+        }
+        snd_gf1_mem_lock(alloc, 1);
+        return -EINVAL;
+}
+
+int snd_gf1_mem_init(snd_gus_card_t * gus)
+{
+        snd_gf1_mem_t *alloc;
+        snd_gf1_mem_block_t block;
+#ifdef CONFIG_SND_DEBUG
+        snd_info_entry_t *entry;
+#endif
+
+        alloc = &gus->gf1.mem_alloc;
+        init_MUTEX(&alloc->memory_mutex);
+        alloc->first = alloc->last = NULL;
+        if (!gus->gf1.memory)
+                return 0;
+
+        memset(&block, 0, sizeof(block));
+        block.owner = SNDRV_GF1_MEM_OWNER_DRIVER;
+        if (gus->gf1.enh_mode) {
+                block.ptr = 0;
+                block.size = 1024;
+                block.name = snd_kmalloc_strdup("InterWave LFOs", GFP_KERNEL);
+                if (snd_gf1_mem_xalloc(alloc, &block) == NULL)
+                        return -ENOMEM;
+        }
+        block.ptr = gus->gf1.default_voice_address;
+        block.size = 4;
+        block.name = snd_kmalloc_strdup("Voice default (NULL's)", GFP_KERNEL);
+        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;
+        }
+#endif
+        return 0;
+}
+
+int snd_gf1_mem_done(snd_gus_card_t * gus)
+{
+        snd_gf1_mem_t *alloc;
+        snd_gf1_mem_block_t *block, *nblock;
+
+        alloc = &gus->gf1.mem_alloc;
+        block = alloc->first;
+        while (block) {
+                nblock = block->next;
+                snd_gf1_mem_xfree(alloc, block);
+                block = nblock;
+        }
+        return 0;
+}
+
+#ifdef CONFIG_SND_DEBUG
+static void snd_gf1_mem_info_read(snd_info_entry_t *entry, 
+                                  snd_info_buffer_t * buffer)
+{
+        snd_gus_card_t *gus;
+        snd_gf1_mem_t *alloc;
+        snd_gf1_mem_block_t *block;
+        unsigned int total, used;
+        int i;
+
+        gus = entry->private_data;
+        alloc = &gus->gf1.mem_alloc;
+        down(&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 ? "," : "");
+        snd_iprintf(buffer, "\n"
+                    "16-bit banks      : \n    ");
+        for (i = total = 0; i < 4; i++) {
+                snd_iprintf(buffer, "0x%06x (%04ik)%s", alloc->banks_16[i].address, alloc->banks_16[i].size >> 10, i + 1 < 4 ? "," : "");
+                total += alloc->banks_16[i].size;
+        }
+        snd_iprintf(buffer, "\n");
+        used = 0;
+        for (block = alloc->first, i = 0; block; block = block->next, i++) {
+                used += block->size;
+                snd_iprintf(buffer, "Block %i at 0x%lx onboard 0x%x size %i (0x%x):\n", i, (long) block, block->ptr, block->size, block->size);
+                if (block->share ||
+                    block->share_id[0] || block->share_id[1] ||
+                    block->share_id[2] || block->share_id[3])
+                        snd_iprintf(buffer, "  Share           : %i [id0 0x%x] [id1 0x%x] [id2 0x%x] [id3 0x%x]\n",
+                                block->share,
+                                block->share_id[0], block->share_id[1],
+                                block->share_id[2], block->share_id[3]);
+                snd_iprintf(buffer, "  Flags           :%s\n",
+                block->flags & SNDRV_GF1_MEM_BLOCK_16BIT ? " 16-bit" : "");
+                snd_iprintf(buffer, "  Owner           : ");
+                switch (block->owner) {
+                case SNDRV_GF1_MEM_OWNER_DRIVER:
+                        snd_iprintf(buffer, "driver - %s\n", block->name);
+                        break;
+                case SNDRV_GF1_MEM_OWNER_WAVE_SIMPLE:
+                        snd_iprintf(buffer, "SIMPLE wave\n");
+                        break;
+                case SNDRV_GF1_MEM_OWNER_WAVE_GF1:
+                        snd_iprintf(buffer, "GF1 wave\n");
+                        break;
+                case SNDRV_GF1_MEM_OWNER_WAVE_IWFFFF:
+                        snd_iprintf(buffer, "IWFFFF wave\n");
+                        break;
+                default:
+                        snd_iprintf(buffer, "unknown\n");
+                }
+        }
+        snd_iprintf(buffer, "  Total: memory = %i, used = %i, free = %i\n",
+                    total, used, total - used);
+        up(&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),
+                  ultra_memory_free_block(card, &card->gf1.mem_alloc, 0),
+                 ultra_memory_free_block(card, &card->gf1.mem_alloc, 1));
+#endif
+}
+#endif