diff options
author | 2009-09-06 17:36:12 +0000 | |
---|---|---|
committer | 2009-09-06 17:36:12 +0000 | |
commit | 6fa0e61caa3a22dbeb5d2f5efbb450a06fed5873 (patch) | |
tree | 0b84aa7251d811da9c456b07f077ac4e283e51c9 | |
parent | ia64 stable wrt #282356 (diff) | |
download | gentoo-2-6fa0e61caa3a22dbeb5d2f5efbb450a06fed5873.tar.gz gentoo-2-6fa0e61caa3a22dbeb5d2f5efbb450a06fed5873.tar.bz2 gentoo-2-6fa0e61caa3a22dbeb5d2f5efbb450a06fed5873.zip |
Remove files/ directory since it's all unused.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
6 files changed, 0 insertions, 449 deletions
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest index 16b4053c4b26..fdabe599dd70 100644 --- a/media-sound/alsa-driver/Manifest +++ b/media-sound/alsa-driver/Manifest @@ -1,8 +1,3 @@ -AUX 1.0.14_rc3-configure.in-core2.patch 843 RMD160 c64d41133b7e93fa1842c45b18f3332c42e38eec SHA1 ffbe56bb87d41b60dc0ac9852e3cb61ad181292e SHA256 6f8f462a654a0f56b49c520be7c0d832903966176f48309d4c82c2bc5be5aef8 -AUX alsa-driver-1.0.11-kernel-2.6.17.patch 953 RMD160 8790da12c78912a4dec53f287838846e303a18dd SHA1 71b552329bc6ab179956b3f7d65f92fa393dec4c SHA256 517f494c5fe3039d62a18268f2c3d03cbcd6b2bff09771bfaafd439c39642c2c -AUX alsa-driver-1.0.14-seq_file.patch 11129 RMD160 ac02481afc9d9b4cab1cb56a5c0cd8e11c32fd25 SHA1 5ffa287584464c57bbe3eee2fc512bccddcd749f SHA256 37f8020632147d89f2c97c9b6ea88abd2000efa2abafd2711652f22c8c6b20b0 -AUX alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105 RMD160 ae270a067ba51e4e580373465d698dd8aa872c5f SHA1 c4dd46e302417272b1123fc435d742e89677ee8d SHA256 1c154e2235697383fae4b06a0d3ec9e5c437188481711e639a186d0d920aeb76 -AUX alsa-driver-1.0.15-linux-2.4.patch 278 RMD160 13b53ecf56b11de3d6ae4683578b12b3fdc8c649 SHA1 4bfb7c3bf4980cbe26a33ef271f3ea3813c46d0f SHA256 e7584aedf46dcbfbc6ee5afaa998991e5adaea3057b69b747d2cd403dccac877 DIST alsa-driver-1.0.20.tar.bz2 2900799 RMD160 33aaed9ab466827b7e543d45f137a0b38ba7ff61 SHA1 b72678d625053bff3de922f211a969ae90544f66 SHA256 e831852f1e50b50e13667b126a65064282218e0ad130dce7fdeb614314cee626 DIST alsa-driver-1.0.21.tar.bz2 3112563 RMD160 8ceb899707714fefbf7f19c6f0fda79bb7ea0c05 SHA1 149d2253e3c9f5923314ba1528606e6563182ac0 SHA256 ae5ce695377eeb6c4ecdcecf18516d51b9e2f4c3a0bc5dc429ca29d5e5617194 EBUILD alsa-driver-1.0.20-r1.ebuild 7060 RMD160 9122240193984d53a2ef5de94deaaa563ab57afd SHA1 e8fe964933d03c8d970d305e5f4e50162d227de8 SHA256 b4d363ef0327baf83f8b879323a8a766a3d93c5fd20006c12fbbbcb6fe430b58 diff --git a/media-sound/alsa-driver/files/1.0.14_rc3-configure.in-core2.patch b/media-sound/alsa-driver/files/1.0.14_rc3-configure.in-core2.patch deleted file mode 100644 index f4818361e5ee..000000000000 --- a/media-sound/alsa-driver/files/1.0.14_rc3-configure.in-core2.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -r 4a485db25506 configure.in ---- a/configure.in Tue Mar 06 13:18:02 2007 +0100 -+++ b/configure.in Sat Mar 17 19:25:53 2007 +0200 -@@ -844,6 +844,7 @@ fi - fi - AC_TRY_RUN([ - #include <stdio.h> -+#include <stdlib.h> - #include "$KERNDIR/include/linux/autoconf.h" - int main(void) { - FILE *file = fopen("processor.id", "w+"); -@@ -861,7 +862,7 @@ int main(void) { - fprintf(file, "i586tsc"); - #elif defined(CONFIG_M586MMX) - fprintf(file, "i586mmx"); --#elif defined(CONFIG_M686) || defined(CONFIG_MPENTIUMII) || defined(CONFIG_MPENTIUMIII) || defined(CONFIG_MPENTIUM4) || defined(CONFIG_MPENTIUMM) -+#elif defined(CONFIG_M686) || defined(CONFIG_MPENTIUMII) || defined(CONFIG_MPENTIUMIII) || defined(CONFIG_MPENTIUM4) || defined(CONFIG_MPENTIUMM) || defined(CONFIG_MCORE2) - fprintf(file, "i686"); - #elif defined(CONFIG_MK6) - fprintf(file, "k6"); diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch deleted file mode 100644 index 825d87f7c8dc..000000000000 --- a/media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch +++ /dev/null @@ -1,30 +0,0 @@ -In kernel 2.6.17 non-counting semaphores are replaced by mutexes, this patch -makes serialmidi driver to work with the changes. -Index: alsa-driver-1.0.11/drivers/serialmidi.c -=================================================================== ---- alsa-driver-1.0.11.orig/drivers/serialmidi.c -+++ alsa-driver-1.0.11/drivers/serialmidi.c -@@ -314,12 +314,12 @@ static void tx_loop(serialmidi_t *serial - if (driver == NULL) - return; - -- if (down_trylock(&tty->atomic_write)) -+ if (!mutex_trylock(&tty->atomic_write_lock)) - return; - while (1) { - count = driver->write_room(tty); - if (count <= 0) { -- up(&tty->atomic_write); -+ mutex_unlock(&tty->atomic_write_lock); - return; - } - count = count > TX_BUF_SIZE ? TX_BUF_SIZE : count; -@@ -336,7 +336,7 @@ static void tx_loop(serialmidi_t *serial - break; - } - } -- up(&tty->atomic_write); -+ mutex_unlock(&tty->atomic_write_lock); - } - - static void ldisc_write_wakeup(struct tty_struct *tty) diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.14-seq_file.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.14-seq_file.patch deleted file mode 100644 index 0dc6635eb1f6..000000000000 --- a/media-sound/alsa-driver/files/alsa-driver-1.0.14-seq_file.patch +++ /dev/null @@ -1,342 +0,0 @@ ---- a/alsa-kernel/core/memalloc.c -+++ b/alsa-kernel/core/memalloc.c -@@ -1,3 +1,4 @@ -+#include "memalloc.inc" - /* - * Copyright (c) by Jaroslav Kysela <perex@suse.cz> - * Takashi Iwai <tiwai@suse.de> -@@ -27,6 +28,7 @@ - #include <linux/pci.h> - #include <linux/slab.h> - #include <linux/mm.h> -+#include <linux/seq_file.h> - #include <asm/uaccess.h> - #include <linux/dma-mapping.h> - #include <linux/moduleparam.h> -@@ -82,7 +84,50 @@ struct snd_mem_list { - * Hacks - */ - --#if defined(__i386__) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 5) -+static void *snd_dma_alloc_coherent1(struct device *dev, size_t size, -+ dma_addr_t *dma_handle, int flags) -+{ -+ if (dev) -+ return dma_alloc_coherent(dev, size, dma_handle, flags); -+ else /* FIXME: dma_alloc_coherent does't always accept dev=NULL */ -+ return pci_alloc_consistent(NULL, size, dma_handle); -+} -+ -+static void snd_dma_free_coherent1(struct device *dev, size_t size, void *dma_addr, -+ dma_addr_t dma_handle) -+{ -+ if (dev) -+ return dma_free_coherent(dev, size, dma_addr, dma_handle); -+ else -+ return pci_free_consistent(NULL, size, dma_addr, dma_handle); -+} -+ -+#undef dma_alloc_coherent -+#define dma_alloc_coherent snd_dma_alloc_coherent1 -+#undef dma_free_coherent -+#define dma_free_coherent snd_dma_free_coherent1 -+#endif /* < 2.6.5 */ -+ -+#else -+ -+/* for 2.2/2.4 kernels */ -+#if defined(CONFIG_PCI) || defined(CONFIG_ISA) || defined(__i386__) -+#define dma_alloc_coherent(dev,size,addr,flags) pci_alloc_consistent((struct pci_dev *)(dev),size,addr) -+#define dma_free_coherent(dev,size,ptr,addr) pci_free_consistent((struct pci_dev *)(dev),size,ptr,addr) -+#elif CONFIG_SBUS -+#define dma_alloc_coherent(dev,size,addr,flags) sbus_alloc_consistent((struct sbus_dev *)(dev),size,addr) -+#define dma_free_coherent(dev,size,ptr,addr) sbus_free_consistent((struct sbus_dev *)(dev),size,ptr,addr) -+#else -+#error "Need a bus for dma_alloc_coherent()" -+#endif -+ -+#endif /* >= 2.6.0 */ -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) -+#if defined(__i386__) || defined(__ppc__) || defined(__x86_64__) -+ - /* - * A hack to allocate large buffers via dma_alloc_coherent() - * -@@ -99,6 +144,30 @@ struct snd_mem_list { - * so dma_mask doesn't have to be messed with. - */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -+#define VALID_DMA_MASK(dev) (dev)->dma_mask -+#define GET_DMA_MASK(dev) *(dev)->dma_mask -+#define SET_DMA_MASK(dev,val) (*(dev)->dma_mask = (val)) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 5) -+#define GET_COHERENT_DMA_MASK(dev) (dev)->coherent_dma_mask -+#define SET_COHERENT_DMA_MASK(dev,val) ((dev)->coherent_dma_mask = (val)) -+#else -+#define GET_COHERENT_DMA_MASK(dev) 0 /* dummy */ -+#define SET_COHERENT_DMA_MASK(dev,val) -+#endif -+#else /* 2.4.x */ -+#define VALID_DMA_MASK(dev) 1 -+#define GET_DMA_MASK(dev) ((struct pci_dev *)(dev))->dma_mask -+#define SET_DMA_MASK(dev,val) (((struct pci_dev *)(dev))->dma_mask = (val)) -+#ifdef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK -+#define GET_COHERENT_DMA_MASK(dev) ((struct pci_dev *)(dev))->consistent_dma_mask -+#define SET_COHERENT_DMA_MASK(dev,val) (((struct pci_dev *)(dev))->consistent_dma_mask = (val)) -+#else -+#define GET_COHERENT_DMA_MASK(dev) 0 /* dummy */ -+#define SET_COHERENT_DMA_MASK(dev,val) -+#endif -+#endif -+ - static void *snd_dma_hack_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, - gfp_t flags) -@@ -106,15 +175,15 @@ static void *snd_dma_hack_alloc_coherent - void *ret; - u64 dma_mask, coherent_dma_mask; - -- if (dev == NULL || !dev->dma_mask) -+ if (dev == NULL || !VALID_DMA_MASK(dev)) - return dma_alloc_coherent(dev, size, dma_handle, flags); -- dma_mask = *dev->dma_mask; -- coherent_dma_mask = dev->coherent_dma_mask; -- *dev->dma_mask = 0xffffffff; /* do without masking */ -- dev->coherent_dma_mask = 0xffffffff; /* do without masking */ -+ dma_mask = GET_DMA_MASK(dev); -+ coherent_dma_mask = GET_COHERENT_DMA_MASK(dev); -+ SET_DMA_MASK(dev, 0xffffffff); /* do without masking */ -+ SET_COHERENT_DMA_MASK(dev, 0xffffffff); /* do without masking */ - ret = dma_alloc_coherent(dev, size, dma_handle, flags); -- *dev->dma_mask = dma_mask; /* restore */ -- dev->coherent_dma_mask = coherent_dma_mask; /* restore */ -+ SET_DMA_MASK(dev, dma_mask); /* restore */ -+ SET_COHERENT_DMA_MASK(dev, coherent_dma_mask) /* restore */; - if (ret) { - /* obtained address is out of range? */ - if (((unsigned long)*dma_handle + size - 1) & ~dma_mask) { -@@ -139,6 +208,8 @@ static void *snd_dma_hack_alloc_coherent - #define dma_alloc_coherent snd_dma_hack_alloc_coherent - - #endif /* arch */ -+#endif /* >= 2.4.0 */ -+ - - /* - * -@@ -158,6 +229,24 @@ static inline void dec_snd_pages(int ord - snd_allocated_pages -= 1 << order; - } - -+static void mark_pages(struct page *page, int order) -+{ -+#if ! defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16) -+ struct page *last_page = page + (1 << order); -+ while (page < last_page) -+ SetPageReserved(page++); -+#endif -+} -+ -+static void unmark_pages(struct page *page, int order) -+{ -+#if ! defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16) -+ struct page *last_page = page + (1 << order); -+ while (page < last_page) -+ ClearPageReserved(page++); -+#endif -+} -+ - /** - * snd_malloc_pages - allocate pages with the given size - * @size: the size to allocate in bytes -@@ -176,8 +265,10 @@ void *snd_malloc_pages(size_t size, gfp_ - snd_assert(gfp_flags != 0, return NULL); - gfp_flags |= __GFP_COMP; /* compound page lets parts be mapped */ - pg = get_order(size); -- if ((res = (void *) __get_free_pages(gfp_flags, pg)) != NULL) -+ if ((res = (void *) __get_free_pages(gfp_flags, pg)) != NULL) { -+ mark_pages(virt_to_page(res), pg); - inc_snd_pages(pg); -+ } - return res; - } - -@@ -196,6 +287,7 @@ void snd_free_pages(void *ptr, size_t si - return; - pg = get_order(size); - dec_snd_pages(pg); -+ unmark_pages(virt_to_page(ptr), pg); - free_pages((unsigned long) ptr, pg); - } - -@@ -220,8 +312,10 @@ static void *snd_malloc_dev_pages(struct - | __GFP_NORETRY /* don't trigger OOM-killer */ - | __GFP_NOWARN; /* no stack trace print - this call is non-critical */ - res = dma_alloc_coherent(dev, PAGE_SIZE << pg, dma, gfp_flags); -- if (res != NULL) -+ if (res != NULL) { -+ mark_pages(virt_to_page(res), pg); - inc_snd_pages(pg); -+ } - - return res; - } -@@ -236,6 +330,7 @@ static void snd_free_dev_pages(struct de - return; - pg = get_order(size); - dec_snd_pages(pg); -+ unmark_pages(virt_to_page(ptr), pg); - dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma); - } - -@@ -481,53 +576,55 @@ static void free_all_reserved_pages(void - #define SND_MEM_PROC_FILE "driver/snd-page-alloc" - static struct proc_dir_entry *snd_mem_proc; - --static int snd_mem_proc_read(char *page, char **start, off_t off, -- int count, int *eof, void *data) -+static int snd_mem_proc_read(struct seq_file *seq, void *offset) - { -- int len = 0; - long pages = snd_allocated_pages >> (PAGE_SHIFT-12); - struct snd_mem_list *mem; - int devno; - static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG", "SBUS" }; - - mutex_lock(&list_mutex); -- len += snprintf(page + len, count - len, -- "pages : %li bytes (%li pages per %likB)\n", -- pages * PAGE_SIZE, pages, PAGE_SIZE / 1024); -+ seq_printf(seq, "pages : %li bytes (%li pages per %likB)\n", -+ pages * PAGE_SIZE, pages, PAGE_SIZE / 1024); - devno = 0; - list_for_each_entry(mem, &mem_list_head, list) { - devno++; -- len += snprintf(page + len, count - len, -- "buffer %d : ID %08x : type %s\n", -- devno, mem->id, types[mem->buffer.dev.type]); -- len += snprintf(page + len, count - len, -- " addr = 0x%lx, size = %d bytes\n", -- (unsigned long)mem->buffer.addr, (int)mem->buffer.bytes); -+ seq_printf(seq, "buffer %d : ID %08x : type %s\n", -+ devno, mem->id, types[mem->buffer.dev.type]); -+ seq_printf(seq, " addr = 0x%lx, size = %d bytes\n", -+ (unsigned long)mem->buffer.addr, -+ (int)mem->buffer.bytes); - } - mutex_unlock(&list_mutex); -- return len; -+ return 0; -+} -+ -+static int snd_mem_proc_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, snd_mem_proc_read, NULL); - } - - /* FIXME: for pci only - other bus? */ - #ifdef CONFIG_PCI -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) - #define gettoken(bufp) strsep(bufp, " \t\n") - --static int snd_mem_proc_write(struct file *file, const char __user *buffer, -- unsigned long count, void *data) -+static ssize_t snd_mem_proc_write(struct file *file, const char __user * buffer, -+ size_t count, loff_t * ppos) - { - char buf[128]; - char *token, *p; - -- if (count > ARRAY_SIZE(buf) - 1) -- count = ARRAY_SIZE(buf) - 1; -+ if (count > sizeof(buf) - 1) -+ return -EINVAL; - if (copy_from_user(buf, buffer, count)) - return -EFAULT; -- buf[ARRAY_SIZE(buf) - 1] = '\0'; -+ buf[count] = '\0'; - - p = buf; - token = gettoken(&p); - if (! token || *token == '#') -- return (int)count; -+ return count; - if (strcmp(token, "add") == 0) { - char *endp; - int vendor, device, size, buffers; -@@ -548,7 +645,7 @@ static int snd_mem_proc_write(struct fil - (buffers = simple_strtol(token, NULL, 0)) <= 0 || - buffers > 4) { - printk(KERN_ERR "snd-page-alloc: invalid proc write format\n"); -- return (int)count; -+ return count; - } - vendor &= 0xffff; - device &= 0xffff; -@@ -560,7 +657,7 @@ static int snd_mem_proc_write(struct fil - if (pci_set_dma_mask(pci, mask) < 0 || - pci_set_consistent_dma_mask(pci, mask) < 0) { - printk(KERN_ERR "snd-page-alloc: cannot set DMA mask %lx for pci %04x:%04x\n", mask, vendor, device); -- return (int)count; -+ return count; - } - } - for (i = 0; i < buffers; i++) { -@@ -570,7 +667,7 @@ static int snd_mem_proc_write(struct fil - size, &dmab) < 0) { - printk(KERN_ERR "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", size); - pci_dev_put(pci); -- return (int)count; -+ return count; - } - snd_dma_reserve_buf(&dmab, snd_dma_pci_buf_id(pci)); - } -@@ -596,9 +693,22 @@ static int snd_mem_proc_write(struct fil - free_all_reserved_pages(); - else - printk(KERN_ERR "snd-page-alloc: invalid proc cmd\n"); -- return (int)count; -+ return count; - } -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) */ - #endif /* CONFIG_PCI */ -+ -+static const struct file_operations snd_mem_proc_fops = { -+ .owner = THIS_MODULE, -+ .open = snd_mem_proc_open, -+ .read = seq_read, -+#ifdef CONFIG_PCI -+ .write = snd_mem_proc_write, -+#endif -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - #endif /* CONFIG_PROC_FS */ - - /* -@@ -609,12 +719,8 @@ static int __init snd_mem_init(void) - { - #ifdef CONFIG_PROC_FS - snd_mem_proc = create_proc_entry(SND_MEM_PROC_FILE, 0644, NULL); -- if (snd_mem_proc) { -- snd_mem_proc->read_proc = snd_mem_proc_read; --#ifdef CONFIG_PCI -- snd_mem_proc->write_proc = snd_mem_proc_write; --#endif -- } -+ if (snd_mem_proc) -+ snd_mem_proc->proc_fops = &snd_mem_proc_fops; - #endif - return 0; - } -@@ -644,3 +750,5 @@ EXPORT_SYMBOL(snd_dma_reserve_buf); - - EXPORT_SYMBOL(snd_malloc_pages); - EXPORT_SYMBOL(snd_free_pages); -+ -+#include "memalloc.inc1" diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch deleted file mode 100644 index 7fa8d10e8154..000000000000 --- a/media-sound/alsa-driver/files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: alsa-driver-1.0.14rc2/ppc/tumbler.patch -=================================================================== ---- alsa-driver-1.0.14rc2.orig/ppc/tumbler.patch -+++ alsa-driver-1.0.14rc2/ppc/tumbler.patch -@@ -5,7 +5,7 @@ - /* - * PMac Tumbler/Snapper lowlevel functions - * --@@ -940,7 +941,11 @@ -+@@ -940,8 +941,12 @@ - } - } - -@@ -14,6 +14,7 @@ - +#else - static struct work_struct device_change; - +#endif -+ static struct snd_pmac *device_change_chip; - - static void device_change_handler(void *self) - { -@@ -29,15 +30,16 @@ - } - } - #endif /* PMAC_SUPPORT_AUTOMUTE */ --@@ -1416,7 +1425,11 @@ -+@@ -1416,8 +1425,12 @@ - chip->resume = tumbler_resume; - #endif - - +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) --+ INIT_TQUEUE(&device_change, device_change_handler, (void *)chip); -++ INIT_TQUEUE(&device_change, device_change_handler); - +#else -- INIT_WORK(&device_change, device_change_handler, (void *)chip); -+ INIT_WORK(&device_change, device_change_handler); - +#endif -+ device_change_chip = chip; - - #ifdef PMAC_SUPPORT_AUTOMUTE - if ((mix->headphone_irq >=0 || mix->lineout_irq >= 0) diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.15-linux-2.4.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.15-linux-2.4.patch deleted file mode 100644 index 16980fa95ea6..000000000000 --- a/media-sound/alsa-driver/files/alsa-driver-1.0.15-linux-2.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/alsa-kernel/core/sound.c -+++ b/alsa-kernel/core/sound.c -@@ -168,7 +168,7 @@ static int snd_open(struct inode *inode, - return err; - } - --static const struct file_operations snd_fops = -+const struct file_operations snd_fops = - { - .owner = THIS_MODULE, - .open = snd_open |