diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-11-13 15:43:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-11-13 15:43:13 +0100 |
| commit | c429bda21ffafb28f02fb2eb4055b4ab6879ed58 (patch) | |
| tree | 80715bf534bfa3bcb69ef77cf1dc5f9d98919b44 /sound/oss/vidc.h | |
| parent | 75ee94b20b46459e3d29f5ac2c3af3cebdeef777 (diff) | |
| parent | 9718a29d40b7e5ae4692796eb23c54f25559d35e (diff) | |
| download | kernel_replicant_linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.gz kernel_replicant_linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.bz2 kernel_replicant_linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.zip | |
Merge branch 'for-next' into for-linus
Pull 4.15 updates to take over the previous urgent fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/vidc.h')
| -rw-r--r-- | sound/oss/vidc.h | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/sound/oss/vidc.h b/sound/oss/vidc.h deleted file mode 100644 index 0d1424751ecd..000000000000 --- a/sound/oss/vidc.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * linux/drivers/sound/vidc.h - * - * Copyright (C) 1997 Russell King <rmk@arm.linux.org.uk> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * VIDC sound function prototypes - */ - -/* vidc_fill.S */ - -/* - * Filler routines for different channels and sample sizes - */ - -extern unsigned long vidc_fill_1x8_u(unsigned long ibuf, unsigned long iend, - unsigned long obuf, int mask); -extern unsigned long vidc_fill_2x8_u(unsigned long ibuf, unsigned long iend, - unsigned long obuf, int mask); -extern unsigned long vidc_fill_1x8_s(unsigned long ibuf, unsigned long iend, - unsigned long obuf, int mask); -extern unsigned long vidc_fill_2x8_s(unsigned long ibuf, unsigned long iend, - unsigned long obuf, int mask); -extern unsigned long vidc_fill_1x16_s(unsigned long ibuf, unsigned long iend, - unsigned long obuf, int mask); -extern unsigned long vidc_fill_2x16_s(unsigned long ibuf, unsigned long iend, - unsigned long obuf, int mask); - -/* - * DMA Interrupt handler - */ - -extern irqreturn_t vidc_sound_dma_irq(int irqnr, void *ref); - -/* - * Filler routine pointer - */ - -extern unsigned long (*vidc_filler) (unsigned long ibuf, unsigned long iend, - unsigned long obuf, int mask); - -/* - * Virtual DMA buffer exhausted - */ - -extern irqreturn_t (*dma_interrupt) (void); - -/* - * Virtual DMA buffer addresses - */ - -extern unsigned long dma_start, dma_count, dma_bufsize; -extern unsigned long dma_buf[2], dma_pbuf[2]; - -/* vidc_synth.c */ - -extern void vidc_synth_init(struct address_info *hw_config); -extern void vidc_synth_exit(struct address_info *hw_config); -extern int vidc_synth_get_volume(void); -extern int vidc_synth_set_volume(int vol); |