[alsa-cvslog] CVS: alsa-driver/pci/pdplus pdplus.c,1.13,1.14
Update of /cvsroot/alsa/alsa-driver/pci/pdplus
In directory sc8-pr-cvs1:/tmp/cvs-serv1333
Modified Files:
pdplus.c
Log Message:
fixed memory leaks and non-initialized irq.
Index: pdplus.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/pdplus/pdplus.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pdplus.c12 Aug 2003 15:32:30 - 1.13
+++ pdplus.c25 Sep 2003 09:58:28 - 1.14
@@ -1464,8 +1464,10 @@
if (mem) {
if (mem-vaddr)
iounmap((void *) (mem-vaddr PAGE_MASK));
- if (mem-resource)
+ if (mem-resource) {
release_resource(mem-resource);
+ kfree_nocheck(mem-resource);
+ }
}
}
@@ -5957,6 +5959,7 @@
scard-pci = pci;
scard-card = card;
+ scard-irq = -1;
/* Set up variables which are possibly non-null at start-up. */
/* *INIT* */
@@ -6012,6 +6015,7 @@
snd_printk (Unable to grab interrupt %d.\n, pci-irq);
return -EBUSY;
}
+ scard-irq = pci-irq;
/* Register io memory */
if ((err = pdplus_register_iomem (card, pci, 2, 0x2, scard-MEM_iomem,
FULL_NAME - MEM)) 0)
@@ -6084,7 +6088,7 @@
pci_dev_t *pci,
pci_device_id_t const *pci_id)
{
-static int __initdata dev = 0;
+ static int dev = 0;
int err;
snd_card_t *card;
ENTER;
@@ -6154,8 +6158,10 @@
pdplus_unregister_iomem (scard-FPGA_iomem);
pdplus_unregister_iomem (scard-HW_iomem);
- if (scard-res_PLX_io)
+ if (scard-res_PLX_io) {
release_resource(scard-res_PLX_io);
+ kfree_nocheck(scard-res_PLX_io);
+ }
if (scard-irq = 0)
free_irq(scard-irq, (void *)scard);
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/usb usbaudio.c,1.64,1.65 usbmixer.c,1.22,1.23
Update of /cvsroot/alsa/alsa-kernel/usb
In directory sc8-pr-cvs1:/tmp/cvs-serv13649
Modified Files:
usbaudio.c usbmixer.c
Log Message:
- don't create controls from selector units with a single content.
- suppress the error if async-out or adaptive-in has only one EP.
don't create a sync pipe in this case.
Index: usbaudio.c
===
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- usbaudio.c 16 Sep 2003 06:55:18 - 1.64
+++ usbaudio.c 24 Sep 2003 13:12:50 - 1.65
@@ -1095,12 +1095,16 @@
subs-fill_max = 0;
/* we need a sync pipe in async OUT or adaptive IN mode */
+ /* check the number of EP, since some devices have broken
+* descriptors which fool us. if it has only one EP,
+* assume it as adaptive-out or sync-in.
+*/
attr = fmt-ep_attr EP_ATTR_MASK;
- if ((is_playback attr == EP_ATTR_ASYNC) ||
- (! is_playback attr == EP_ATTR_ADAPTIVE)) {
- /* check endpoint */
- if (altsd-bNumEndpoints 2 ||
- get_endpoint(alts, 1)-bmAttributes != 0x01 ||
+ if (((is_playback attr == EP_ATTR_ASYNC) ||
+(! is_playback attr == EP_ATTR_ADAPTIVE))
+ altsd-bNumEndpoints = 2) {
+ /* check sync-pipe endpoint */
+ if (get_endpoint(alts, 1)-bmAttributes != 0x01 ||
get_endpoint(alts, 1)-bSynchAddress != 0) {
snd_printk(KERN_ERR %d:%d:%d : invalid synch pipe\n,
dev-devnum, fmt-iface, fmt-altsetting);
Index: usbmixer.c
===
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbmixer.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- usbmixer.c 20 Aug 2003 09:59:59 - 1.22
+++ usbmixer.c 24 Sep 2003 13:12:50 - 1.23
@@ -1358,6 +1358,9 @@
return -EINVAL;
}
+ if (num_ins == 1) /* only one ? nonsense! */
+ return 0;
+
if (check_ignored_ctl(state, unitid, 0))
return 0;
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver configure.in,1.189,1.190
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv29166 Modified Files: configure.in Log Message: fixed the detection of strlcpy() and the new request_module(). Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- configure.in9 Sep 2003 18:08:42 - 1.189 +++ configure.in24 Sep 2003 16:39:12 - 1.190 @@ -930,6 +930,7 @@ #define __KERNEL__ #include $CONFIG_SND_KERNELDIR/include/linux/config.h #include $CONFIG_SND_KERNELDIR/include/linux/kernel.h +#include $CONFIG_SND_KERNELDIR/include/linux/string.h ],[ char buf[128]; strlcpy(buf, abcd, sizeof(buf)); @@ -978,7 +979,7 @@ #define __KERNEL__ #include $CONFIG_SND_KERNELDIR/include/linux/config.h #include $CONFIG_SND_KERNELDIR/include/linux/time.h -#include $CONFIG_SND_KERNELDIR/include/linux/slab.h +#include $CONFIG_SND_KERNELDIR/include/linux/mm.h ],[ struct page * (*func)(void*); func = vmalloc_to_page; @@ -1002,13 +1003,13 @@ AC_TRY_COMPILE([ #define __KERNEL__ #include $CONFIG_SND_KERNELDIR/include/linux/config.h -#include $CONFIG_SND_KERNELDIR/include/linux/module.h +#include $CONFIG_SND_KERNELDIR/include/linux/kmod.h ],[ - kmod(abcd, def, ixj); + request_module(abcd, def, ixj); ], -AC_MSG_RESULT(yes);old_kmod=1, AC_MSG_RESULT(no);old_kmod=0, -AC_MSG_RESULT(unknown);old_kmod=0 +AC_MSG_RESULT(yes);old_kmod=1, +AC_MSG_RESULT(unknown);old_kmod=1 ) CFLAGS=$ac_save_CFLAGS CONFIG_HAVE_OLD_REQUEST_MODULE=$old_kmod --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/include adriver.h,1.55,1.56
Update of /cvsroot/alsa/alsa-driver/include
In directory sc8-pr-cvs1:/tmp/cvs-serv29349
Modified Files:
adriver.h
Log Message:
fixed the compilation with 2.6 environment.
added definition of the obsolete EXPORT_NO_SYMBOLS.
Index: adriver.h
===
RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- adriver.h 8 Sep 2003 09:15:23 - 1.55
+++ adriver.h 24 Sep 2003 16:40:19 - 1.56
@@ -187,8 +187,8 @@
#define writeq(v, a) do { __writeq((v),(a)); mb(); } while(0)
#endif
-#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 28)
#include linux/interrupt.h
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 28)
static inline void synchronize_irq_wrapper(unsigned int irq) { synchronize_irq(); }
#undef synchronize_irq
#define synchronize_irq(irq) synchronize_irq_wrapper(irq)
@@ -383,6 +383,10 @@
}
#undef vmap
#define vmap snd_compat_vmap
+#endif
+
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 5, 0) /* correct version? */
+#define EXPORT_NO_SYMBOLS
#endif
#include amagic.h
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/drivers serialmidi.c,1.7,1.8
Update of /cvsroot/alsa/alsa-driver/drivers
In directory sc8-pr-cvs1:/tmp/cvs-serv29800
Modified Files:
serialmidi.c
Log Message:
fixed the compilation on 2.6 kernel.
Index: serialmidi.c
===
RCS file: /cvsroot/alsa/alsa-driver/drivers/serialmidi.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- serialmidi.c22 Feb 2003 09:37:11 - 1.7
+++ serialmidi.c24 Sep 2003 16:41:33 - 1.8
@@ -132,6 +132,7 @@
int retval = 0;
struct tty_struct *tty;
struct termios old_termios, *ntermios;
+ struct tty_driver *driver;
int ldisc, speed, cflag;
down(serial-open_lock);
@@ -150,7 +151,12 @@
retval = -EIO;
goto __end;
}
- if (tty-driver.set_termios == NULL) {
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 5, 0) /* correct version? */
+ driver = tty-driver;
+#else
+ driver = tty-driver;
+#endif
+ if (driver == NULL || driver-set_termios == NULL) {
snd_printk(KERN_ERR tty %s has not set_termios, serial-sdev);
retval = -EIO;
goto __end;
@@ -215,7 +221,7 @@
ntermios-c_cc[VKILL] = 0;
ntermios-c_cc[VMIN] = 0;
ntermios-c_cc[VTIME] = 0;
- (*tty-driver.set_termios)(tty, old_termios);
+ (*driver-set_termios)(tty, old_termios);
serial-tty = tty;
/* some magic here, we need own receive_buf */
@@ -290,12 +296,21 @@
struct tty_struct *tty;
char *buf = serial-tx_buf;
int count;
+ struct tty_driver *driver;
tty = serial-tty;
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 5, 0) /* correct version? */
+ driver = tty-driver;
+#else
+ driver = tty-driver;
+#endif
+ if (driver == NULL)
+ return;
+
if (down_trylock(tty-atomic_write))
return;
while (1) {
- count = tty-driver.write_room(tty);
+ count = driver-write_room(tty);
if (count = 0) {
up(tty-atomic_write);
return;
@@ -303,7 +318,7 @@
count = count TX_BUF_SIZE ? TX_BUF_SIZE : count;
count = snd_rawmidi_transmit_peek(serial-substream_output, buf,
count);
if (count 0) {
- count = tty-driver.write(tty, 0, buf, count);
+ count = driver-write(tty, 0, buf, count);
snd_rawmidi_transmit_ack(serial-substream_output, count);
} else {
clear_bit(TTY_DO_WRITE_WAKEUP, tty-flags);
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/mixart mixart_core.c,1.1,1.2 mixart_core.h,1.3,1.4 mixart_hwdep.h,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/pci/mixart
In directory sc8-pr-cvs1:/tmp/cvs-serv29872
Modified Files:
mixart_core.c mixart_core.h mixart_hwdep.h
Log Message:
fixed the compilation on 2.2 and 2.6 kernels.
Index: mixart_core.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/mixart/mixart_core.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mixart_core.c 22 Jul 2003 13:39:10 - 1.1
+++ mixart_core.c 24 Sep 2003 16:41:58 - 1.2
@@ -409,9 +409,9 @@
}
-void snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
- mixart_mgr_t *mgr = snd_magic_cast(mixart_mgr_t, dev_id, return);
+ mixart_mgr_t *mgr = snd_magic_cast(mixart_mgr_t, dev_id, return IRQ_NONE);
int err;
mixart_msg_t resp;
@@ -424,7 +424,7 @@
if( !(it_reg MIXART_OIDI) ) {
/* this device did not cause the interrupt */
spin_unlock(mgr-lock);
- return;
+ return IRQ_NONE;
}
/* mask all interrupts */
@@ -559,7 +559,7 @@
spin_unlock(mgr-lock);
- return;
+ return IRQ_HANDLED;
}
Index: mixart_core.h
===
RCS file: /cvsroot/alsa/alsa-driver/pci/mixart/mixart_core.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mixart_core.h 28 Jul 2003 13:23:46 - 1.3
+++ mixart_core.h 24 Sep 2003 16:41:58 - 1.4
@@ -599,7 +599,7 @@
int snd_mixart_send_msg_wait_notif(mixart_mgr_t *mgr, mixart_msg_t *request, u32
notif_event);
int snd_mixart_send_msg_nonblock(mixart_mgr_t *mgr, mixart_msg_t *request);
-void snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs);
void snd_mixart_msg_tasklet( unsigned long arg);
void snd_mixart_reset_board(mixart_mgr_t *mgr);
Index: mixart_hwdep.h
===
RCS file: /cvsroot/alsa/alsa-driver/pci/mixart/mixart_hwdep.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mixart_hwdep.h 22 Jul 2003 13:39:10 - 1.1
+++ mixart_hwdep.h 24 Sep 2003 16:41:58 - 1.2
@@ -25,6 +25,15 @@
#include sound/hwdep.h
+#ifdef LINUX_2_2
+#ifdef __i386__
+#define __raw_readl(x) readl(x)
+#define __raw_writel(x,y) writel(x,y)
+#else
+#warning This architecture will not work correctly!
+#endif
+#endif
+
#define readl_be(x) be32_to_cpu(__raw_readl(x))
#define writel_be(data,addr) __raw_writel(cpu_to_be32(data),addr)
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pcmcia/vx vx_entry.inc,NONE,1.1 vx_entry.inc1,NONE,1.1 vx_entry.patch,NONE,1.1 .cvsignore,1.1,1.2 Makefile,1.6,1.7 vx_entry.c,1.9,NONE
Update of /cvsroot/alsa/alsa-driver/pcmcia/vx
In directory sc8-pr-cvs1:/tmp/cvs-serv30173
Modified Files:
.cvsignore Makefile
Added Files:
vx_entry.inc vx_entry.inc1 vx_entry.patch
Removed Files:
vx_entry.c
Log Message:
fixed the compilation on 2.6 kernel.
the compatible layer patch is supplied now.
--- NEW FILE: vx_entry.inc ---
#define __NO_VERSION__
#include linux/config.h
#include linux/version.h
#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0)
#include pcmcia/cs_types.h
static void cs_error(client_handle_t handle, int func, int ret);
#endif
--- NEW FILE: vx_entry.inc1 ---
#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0)
/*
* print the error message related with cs
*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, err);
}
#endif
--- NEW FILE: vx_entry.patch ---
--- vx_entry.c 2003-09-24 18:12:23.0 +0200
+++ vx_entry.c 2003-09-24 18:13:13.0 +0200
@@ -1,3 +1,4 @@
+#include vx_entry.inc
/*
* Driver for Digigram VXpocket soundcards
*
@@ -146,6 +147,11 @@
link-irq.Handler = snd_vx_irq_handler;
link-irq.Instance = chip;
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0) /* correct version? */
+ link-release.function = (void (*)(unsigned long))vxpocket_release;
+ link-release.data = (u_long)link;
+#endif
+
link-conf.Attributes = CONF_ENABLE_IRQ;
link-conf.Vcc = 50;
link-conf.IntType = INT_MEMORY_AND_IO;
@@ -224,6 +230,10 @@
{
vx_core_t *chip = snd_magic_cast(vx_core_t, link-priv, return);
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0) /* correct version? */
+ del_timer(link-release);
+#endif
+
snd_printdd(KERN_DEBUG vxpocket_detach called\n);
/* Remove the interface data from the linked list */
if (hw) {
@@ -319,6 +329,9 @@
snd_printdd(KERN_DEBUG CARD_REMOVAL..\n);
link-state = ~DEV_PRESENT;
if (link-state DEV_CONFIG) {
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0) /* correct version? */
+ mod_timer(link-release, jiffies + HZ/20);
+#endif
chip-chip_status |= VX_STAT_IS_STALE;
}
break;
@@ -370,3 +383,5 @@
EXPORT_SYMBOL(snd_vxpocket_attach);
EXPORT_SYMBOL(snd_vxpocket_detach);
EXPORT_SYMBOL(snd_vxpocket_detach_all);
+
+#include vx_entry.inc1
Index: .cvsignore
===
RCS file: /cvsroot/alsa/alsa-driver/pcmcia/vx/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 31 Oct 2002 10:41:37 - 1.1
+++ .cvsignore 24 Sep 2003 16:43:33 - 1.2
@@ -1 +1,2 @@
.depend
+vx_entry.c
Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-driver/pcmcia/vx/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile10 Jun 2003 14:04:27 - 1.6
+++ Makefile24 Sep 2003 16:43:33 - 1.7
@@ -3,6 +3,8 @@
include $(TOPDIR)/toplevel.config
include $(TOPDIR)/Makefile.conf
+EXTRA_CLEAN = vx_entry.c
+
#
#
#
@@ -13,3 +15,5 @@
include $(TOPDIR)/alsa-kernel/pcmcia/vx/Makefile
include $(TOPDIR)/Rules.make
+
+vx_entry.c: vx_entry.patch vx_entry.inc vx_entry.inc1
$(TOPDIR)/alsa-kernel/pcmcia/vx/vx_entry.c
--- vx_entry.c DELETED ---
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pcmcia/pdaudiocf pdaudiocf.c,1.2,1.3
Update of /cvsroot/alsa/alsa-driver/pcmcia/pdaudiocf
In directory sc8-pr-cvs1:/tmp/cvs-serv30271
Modified Files:
pdaudiocf.c
Log Message:
fixed the compilation on 2.6 kernel.
Index: pdaudiocf.c
===
RCS file: /cvsroot/alsa/alsa-driver/pcmcia/pdaudiocf/pdaudiocf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdaudiocf.c 29 Jul 2003 15:24:41 - 1.2
+++ pdaudiocf.c 24 Sep 2003 16:43:53 - 1.3
@@ -79,6 +79,7 @@
static int pdacf_event(event_t event, int priority, event_callback_args_t *args);
static void snd_pdacf_detach(dev_link_t *link);
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0)
/*
* print the error message related with cs
*/
@@ -87,11 +88,10 @@
error_info_t err = { func, ret };
CardServices(ReportError, handle, err);
}
+#endif
-static void pdacf_release(u_long arg)
+static void pdacf_release(dev_link_t *link)
{
- dev_link_t *link = (dev_link_t *)arg;
-
if (link-state DEV_CONFIG) {
/* release cs resources */
CardServices(ReleaseConfiguration, link-handle);
@@ -108,7 +108,7 @@
{
dev_link_t *link = pdacf-link;
- pdacf_release((u_long)link);
+ pdacf_release(link);
/* Break the link with Card Services */
if (link-handle)
@@ -191,10 +191,10 @@
link-irq.IRQInfo2 |= 1 irq_list[i];
link-irq.Handler = pdacf_interrupt;
link-irq.Instance = pdacf;
-
- link-release.function = pdacf_release;
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0) /* correct version? */
+ link-release.function = (void (*)(unsigned long))pdacf_release;
link-release.data = (u_long)link;
-
+#endif
link-conf.Attributes = CONF_ENABLE_IRQ;
link-conf.IntType = INT_MEMORY_AND_IO;
link-conf.ConfigIndex = 1;
@@ -281,8 +281,9 @@
{
pdacf_t *chip = snd_magic_cast(pdacf_t, link-priv, return);
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0) /* correct version? */
del_timer(link-release);
-
+#endif
snd_printdd(KERN_DEBUG pdacf_detach called\n);
/* Remove the interface data from the linked list */
{
@@ -378,7 +379,9 @@
snd_printdd(KERN_DEBUG CARD_REMOVAL..\n);
link-state = ~DEV_PRESENT;
if (link-state DEV_CONFIG) {
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0) /* correct version? */
mod_timer(link-release, jiffies + HZ/20);
+#endif
chip-chip_status |= PDAUDIOCF_STAT_IS_STALE;
}
break;
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/support/pnp pnp.c,1.12,1.13
Update of /cvsroot/alsa/alsa-driver/support/pnp
In directory sc8-pr-cvs1:/tmp/cvs-serv30349
Modified Files:
pnp.c
Log Message:
fixed the compile warnings on 2.2 kernel.
Index: pnp.c
===
RCS file: /cvsroot/alsa/alsa-driver/support/pnp/pnp.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pnp.c 5 Sep 2003 17:44:12 - 1.12
+++ pnp.c 24 Sep 2003 16:44:11 - 1.13
@@ -72,7 +72,7 @@
#define __exit
#endif
-#if LINUX_VERSION_CODE KERNEL_VERSION(2,3,0)
+#ifndef module_init
#define module_init(x) int init_module(void) { return x(); }
#define module_exit(x) void cleanup_module(void) { x(); }
#endif
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/usb/us428 usX2Yhwdep.c,1.1,1.2 usbus428.c,1.2,1.3 usbus428.h,1.1,1.2 usbus428audio.c,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/usb/us428
In directory sc8-pr-cvs1:/tmp/cvs-serv30455/us428
Modified Files:
usX2Yhwdep.c usbus428.c usbus428.h usbus428audio.c
Log Message:
fixed the compilation on 2.2 and 2.6 kernels.
us428 driver has bunch of ifdefs, so far.
we'll need to clean up later (maybe after integration with
the core usbaudio.c).
Index: usX2Yhwdep.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usX2Yhwdep.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- usX2Yhwdep.c8 Sep 2003 10:57:41 - 1.1
+++ usX2Yhwdep.c24 Sep 2003 16:45:10 - 1.2
@@ -1,3 +1,4 @@
+#define __NO_VERSION__
/*
* Driver for Tascam US-X2Y USB soundcards
*
@@ -19,6 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define SND_NEED_USB_WRAPPER
#include sound/driver.h
#include sound/core.h
#include usx2y.h
@@ -26,8 +28,6 @@
#include usbus428.h
#include usX2Yhwdep.h
-extern void snd_us428_In04Int(urb_t* urb);
-
static void us428ctls_vm_open(struct vm_area_struct *area)
{
@@ -37,7 +37,11 @@
{
}
+#ifndef LINUX_2_2
static struct page * us428ctls_vm_nopage(struct vm_area_struct *area, unsigned long
address, int no_share)
+#else
+static unsigned long us428ctls_vm_nopage(struct vm_area_struct *area, unsigned long
address, int no_share)
+#endif
{
unsigned long offset;
struct page * page;
@@ -50,14 +54,26 @@
address,
no_share);
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 3, 25)
offset = area-vm_pgoff PAGE_SHIFT;
+#else
+ offset = area-vm_offset;
+#endif
offset += address - area-vm_start;
snd_assert((offset % PAGE_SIZE) == 0, return NOPAGE_OOM);
vaddr = (char*)((us428dev_t*)area-vm_private_data)-us428ctls_sharedmem +
offset;
page = virt_to_page(vaddr);
get_page(page);
- snd_printd( vaddr=%X made us428ctls_vm_nopage() return %X; offset=%X\n,
(unsigned)vaddr, (unsigned)page, offset);
+ snd_printd( vaddr=%p made us428ctls_vm_nopage() return %p; offset=%X\n,
vaddr, page, offset);
+#ifndef LINUX_2_2
return page;
+#else
+ /* why 2.2's kcomp.h redefines this? */
+#ifdef page_address
+#undef page_address
+#endif
+ return page_address(page);
+#endif
}
static struct vm_operations_struct us428ctls_vm_ops = {
@@ -89,8 +105,14 @@
memset(us428-us428ctls_sharedmem, -1, sizeof(us428ctls_sharedmem_t));
}
area-vm_ops = us428ctls_vm_ops;
+#ifdef VM_RESERVED
area-vm_flags |= VM_RESERVED;
+#endif
+#ifndef LINUX_2_2
area-vm_private_data = hw-private_data;
+#else
+ area-vm_private_data = (long)hw-private_data;
+#endif
return 0;
}
@@ -156,7 +178,7 @@
err = -ENOMEM;
}else
for (i = 0; i URBS_AsyncSeq; ++i){
- if (NULL == (us428-AS04.urb[i] = usb_alloc_urb(0))){
+ if (NULL == (us428-AS04.urb[i] = usb_alloc_urb(0,
GFP_KERNEL))){
err = -ENOMEM;
break;
}
@@ -183,11 +205,15 @@
.type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = quirk_data
};
+ struct usb_interface *iface;
snd_printd(snd_us428_create_usbmidi \n);
- return snd_usb_create_midi_interface(us428(card)-chip,
us428(card)-chip.dev-actconfig-interface , quirk);
+ iface = get_iface(us428(card)-chip.dev-actconfig, 0);
+
+ return snd_usb_create_midi_interface(us428(card)-chip, iface, quirk);
}
+
static int snd_us428_create_alsa_devices(snd_card_t* card)
{
int err;
@@ -209,7 +235,7 @@
static int snd_us428_In04_init(us428dev_t* us428)
{
int err = 0;
- if (! (us428-In04urb = usb_alloc_urb(0)))
+ if (! (us428-In04urb = usb_alloc_urb(0, GFP_KERNEL)))
return -ENOMEM;
if (! (us428-In04Buf = kmalloc(21, GFP_KERNEL))){
@@ -218,12 +244,14 @@
}
init_waitqueue_head(us428-In04WaitQueue);
- usb_fill_int_urb( us428-In04urb, us428-chip.dev,
usb_rcvintpipe(us428-chip.dev, 0x4),
- us428-In04Buf, 21,
- snd_us428_In04Int, us428,
- 10);
+ usb_fill_int_urb(us428-In04urb, us428-chip.dev,
usb_rcvintpipe(us428-chip.dev, 0x4),
+us428-In04Buf, 21,
+snd_us428_In04Int, us428,
+10);
+#ifdef OLD_USB
us428-In04urb-transfer_flags = USB_QUEUE_BULK;
- err = usb_submit_urb(us428-In04urb);
+#endif
+ err = usb_submit_urb(us428-In04urb, GFP_KERNEL);
return err;
}
Index: usbus428.c
[alsa-cvslog] CVS: alsa-driver/usb Makefile,1.9,1.10 usbaudio.inc1,1.3,1.4 usbcompat.c,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/usb In directory sc8-pr-cvs1:/tmp/cvs-serv30455 Modified Files: Makefile usbaudio.inc1 usbcompat.c Log Message: fixed the compilation on 2.2 and 2.6 kernels. us428 driver has bunch of ifdefs, so far. we'll need to clean up later (maybe after integration with the core usbaudio.c). Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/usb/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile8 Sep 2003 10:57:41 - 1.9 +++ Makefile24 Sep 2003 16:45:10 - 1.10 @@ -11,7 +11,7 @@ extra-subdir-y := us428 extra-subdir-m := $(extra-subdir-y) -export-objs := usbmidi.o +export-objs := usbaudio.o usbmidi.o TOPDIR = $(MAINSRCDIR) Index: usbaudio.inc1 === RCS file: /cvsroot/alsa/alsa-driver/usb/usbaudio.inc1,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- usbaudio.inc1 8 Sep 2003 10:57:41 - 1.3 +++ usbaudio.inc1 24 Sep 2003 16:45:10 - 1.4 @@ -109,4 +109,6 @@ /* * symbols */ -// EXPORT_NO_SYMBOLS; +#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 24) +EXPORT_SYMBOL(snd_hack_usb_set_interface); +#endif Index: usbcompat.c === RCS file: /cvsroot/alsa/alsa-driver/usb/usbcompat.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- usbcompat.c 8 Mar 2003 14:23:04 - 1.1 +++ usbcompat.c 24 Sep 2003 16:45:10 - 1.2 @@ -161,8 +161,3 @@ } #endif /* LINUX_VERSION 2.3.0 */ - -/* - * symbols - */ -EXPORT_NO_SYMBOLS; --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pcmcia/vx vx_entry.c,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/pcmcia/vx
In directory sc8-pr-cvs1:/tmp/cvs-serv30865
Modified Files:
vx_entry.c
Log Message:
remove timer and clean up for 2.6 kernel.
Index: vx_entry.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/vx/vx_entry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vx_entry.c 10 Jun 2003 14:07:24 - 1.2
+++ vx_entry.c 24 Sep 2003 16:47:04 - 1.3
@@ -34,10 +34,8 @@
static int vxpocket_event(event_t event, int priority, event_callback_args_t *args);
-static void vxpocket_release(u_long arg)
+static void vxpocket_release(dev_link_t *link)
{
- dev_link_t *link = (dev_link_t *)arg;
-
if (link-state DEV_CONFIG) {
/* release cs resources */
CardServices(ReleaseConfiguration, link-handle);
@@ -56,7 +54,7 @@
struct snd_vxp_entry *hw;
dev_link_t *link = vxp-link;
- vxpocket_release((u_long)link);
+ vxpocket_release(link);
/* Break the link with Card Services */
if (link-handle)
@@ -148,9 +146,6 @@
link-irq.Handler = snd_vx_irq_handler;
link-irq.Instance = chip;
- link-release.function = vxpocket_release;
- link-release.data = (u_long)link;
-
link-conf.Attributes = CONF_ENABLE_IRQ;
link-conf.Vcc = 50;
link-conf.IntType = INT_MEMORY_AND_IO;
@@ -229,8 +224,6 @@
{
vx_core_t *chip = snd_magic_cast(vx_core_t, link-priv, return);
- del_timer(link-release);
-
snd_printdd(KERN_DEBUG vxpocket_detach called\n);
/* Remove the interface data from the linked list */
if (hw) {
@@ -326,7 +319,6 @@
snd_printdd(KERN_DEBUG CARD_REMOVAL..\n);
link-state = ~DEV_PRESENT;
if (link-state DEV_CONFIG) {
- mod_timer(link-release, jiffies + HZ/20);
chip-chip_status |= VX_STAT_IS_STALE;
}
break;
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/usx2yloader/firmware tascam_loader.ihx,NONE,1.1 us428fw.ihx,NONE,1.1 Makefile.am,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/usx2yloader/firmware In directory sc8-pr-cvs1:/tmp/cvs-serv20613/firmware Modified Files: Makefile.am Added Files: tascam_loader.ihx us428fw.ihx Log Message: updated to version 0.3 by Karsten: - added INSTALL and README documents. - fixed compile warnings. - install hotplug scripts to /etc/hotplug/usb. - added phase1 firmware files. --- NEW FILE: tascam_loader.ihx --- :10146C00C200907FA5E05418FF131313541F44506F :10147C00F51C139201D2E8907FAB74FFF0907FA91A :10148C00F0907FAAF05391EF907F95E044C0F090DC :10149C007FAFE04401F0907FAEE04405F0D2AF1294 :0D14AC00175F3000FD121100C20080F62213 :1011907FE9E0245D600D147003021244240214 :10111000600302124A907FEAE0750800F509A3E037 :10112000FEE42509F509EE3508F508907FEEE07537 :10113A00F50BA3E0FEE4250BF50BEE350AF5EE :10114A907FE8E064C060030211D4E50B450A11 :10115000700302124AC3E50B9440E50A940050085C :10116000850A0C850B0D8006750C00750D40907F6F :10117000E9E0B4A325AE0CAF0DAA08A9097B01C014 :101183C002C0017A7F790078007C7FAD03D074 :101191D002D003121356800FAF09AE08AD0D77 :1011A0007A7F79007B001215A4907FB5E50DF0E5FC :1011BD2509F509E50C3508F508C3E50B950D76 :1011C000F50BE50A950CF50A907FB4E020E20302E6 :1011D000114C80F4907FE8E06440706EE50B450AA6 :1011E0006068E4907FC5F0907FB4E020E3F9907FE1 :1011F000C5E0750C00F50D907FE9E0B4A315AE0CC9 :1012AF0DA809AC087D017B017A7E79C012136D :1012100056800FAF09AE08AD0D7A7F79007B0012C2 :1012200014B9E50D2509F509E50C3508F508C3E500 :10123B950DF50BE50A950CF50A907FB4E0448B :0A1242F08098907FEAE0F51CB0 :01124A002281 :06155800AB07AA06AC057A :10155E00E4FD300111EAFFAE050DEE2400F582E444 :10156E0034E0F583EFF0EBAE050D74002EF582E45A :10157E0034E0F583EBF0AF050D74002FF582E43403 :10158E00E0F583ECF0AF1C7AE07B001217207F0AA7 :05159E007E0012173C65 :0115A3002225 :0A14B9008E0E8F0F8D108A118B121A :1014C300E4F513E513C395105020050FE50FAE0E99 :1014D3007002050E14FFE5122513F582E43511F5AC :0A14E30083E0FD121558051380D9AF :0114ED0022DC :0A15A4008E0E8F0F8D108A118B122E :1015AE00E4FD300112E50EFFAE050DEE2403F582CB :1015BE00E434E0F583EFF0E50FAE050D74032EF580 :1015CE0082E434E0F583E50FF0AF1C7AE07B031282 :0D15DE001720AF1CAD10AB12AA111217049C :0115EB0022DD :10166E00C0E0C083C082C085C084C086758600D2AB :10167E5391EF907FAB7401F0D086D084D0856B :07168E00D082D083D0E032CE :10164400C0E0C083C082C085C084C0867586009017 :101654007FC4E4F05391EF907FAB7404F0D086D054 :0A16640084D085D082D083D0E0321C :10169500C0E0C083C082C085C084C0867586005303 :1016A50091EF907FAB7402F0D086D084D085D08244 :0516B500D083D0E032FB :1016BA00C0E0C083C082C085C084C08675860053DE :1016CA0091EF907FAB7410F0D086D084D085D08211 :0516DA00D083D0E032D6 :0114FF0032BA :1016DF00C0E0C083C082C085C084C08675860053B9 :1016EF0091EF907FAB7408F0D086D084D085D082F4 :0516FF00D083D0E032B1 :01176700324F :01176800324E :01176900324D :01176A00324C :01176B00324B :01176C00324A :01176D003249 :01176E003248 :01176F003247 :011770003246 :011771003245 :011772003244 :011773003243 :011774003242 :011775003241 :011776003240 :03004300021500A3 :101502166E0002169500021644000216DF0055 :10151216BA000214FF000217670002176800E3 :10152217690002176A0002176B0002176C00AD :101532176D0002176E0002176F00021770008D :1015421771000217720002177300021774006D :0815521775000217760076 :10173C008E148F15E5151515AE14700215144E6028 :07174C00051214EE80EE22ED :08175F00E4F51BD2E9D2AF2230 :10161900A907E51B7023907FA5E04480F0E925E048 :10162900907FA6F08D16AF03A9077517018A18894F :0B16390019E4F51A751B01D322C3222F :1015EC00A907E51B7025907FA5E04480F0E925E074 :1015FC004401907FA6F08D16AF03A9077517018AD9 :0D160C00188919E4F51A751B03D322C322B7 :03004B0002137F1E :10137F00C0E0C083C082C085C084C086758600C0AF :10138F00D075D000C000C001C002C003C006C007A6 :10139F00907FA5E030E206751B0602144E907FA5E4 :1013AF00E020E10CE51B64026006751B0702144E7A :1013BF00AF1BEF24FE604814602C24FE60772404DA :1013CF00600302144EAB17AA18A919AF1A051A8F8A :1013DF008275830012124B907FA6F0E51A65167086 :1013EF005E751B058059907FA6E0AB17AA18A91947 :1013FF00AE1A8E82758300121278751B028040E53B :10140F001624FEB51A07907FA5E04420F0E51614C8 :10141F00B51A0A907FA5E04440F0751B00907FA697 :10142F00E0AB17AA18A919AE1A8E82758300121293 :10143F0078051A800A907FA5E04440F0751B005391 :10144F0091DFD007D006D003D002D001D000D0D08A :0D145F00D086D084D085D082D083D0E032FA :101704001215ECE51B24FA600E146006240770F32E :0C171400D322E4F51BD322E4F51BD32202 :10172000121619E51B24FA600E146006240770F3E4 :0C173000D322E4F51BD322E4F51BD322E6 :1014EE007400F58690FDA57C05A3E582458370F911 :0114FE0022CB :030002175391 :0C175300787FE4F6D8FD75812002146C4C :10124B00BB010CE58229F582E5833AF583E0225058 :10125B0006E92582F8E622BBFE06E92582F8E222A2 :0D126B00E58229F582E5833AF583E49322BC :10127800F8BB010DE58229F582E5833AF583E8F0AC :10128800225006E92582C8F622BBFE05E92582C858 :02129800F22240 :10129A00E709F608DFFA8046E709F208DFFA803E36 :1012AA0088828C83E709F0A3DFFA8032E309F60823 :1012BA00DFFA806EE309F208DFFA806688828C839F :1012CA00E309F0A3DFFA805A89828A83E0A3F60849 :1012DA00DFFA804E89828A83E0A3F208DFFA80422D
[alsa-cvslog] CVS: alsa-tools/usx2yloader INSTALL,NONE,1.1 README,NONE,1.1 cvscompile,NONE,1.1 tascam_fw,NONE,1.1 tascam_fw.usermap,NONE,1.1 Makefile.am,1.1,1.2 configure.in,1.1,1.2 usx2yloader.c,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/usx2yloader In directory sc8-pr-cvs1:/tmp/cvs-serv20613 Modified Files: Makefile.am configure.in usx2yloader.c Added Files: INSTALL README cvscompile tascam_fw tascam_fw.usermap Log Message: updated to version 0.3 by Karsten: - added INSTALL and README documents. - fixed compile warnings. - install hotplug scripts to /etc/hotplug/usb. - added phase1 firmware files. --- NEW FILE: INSTALL --- For Installing from CVS do: ./cvscompile make install --- NEW FILE: README --- USX2YLOADER - Second Phase Firmware loader for Tascam USX2Y USB soundcards 2003-09-15 Karsten Wiese [EMAIL PROTECTED] GENERAL === Usx2yloader is a helper program to load the 2nd Phase firmware binaries onto the Tascam USX2Y USB soundcards. It has proven to work so far only for the US428. US122 US224 will hopefully follow. The snd-usb-us428 module requires this program. US428 initialisation outlined = A. Phase 1 A.1. US428 is plugged to the PC and powered on. This makes the kernel see a new USB-device with the Vendor/Product ID 0x1604/0x8000. The kernel reacts by starting the usb-hotplug script. A.2. The usb-hotplug script starts the executable fxload, which transfers the EZUSB firmware to the US428. A.3. The US428 disconnects itself from the USB-Bus and ... (see Phase 2). B. Phase 2 B.1. The US428 reintroduces itself as USB-device with the Vendor/Product ID 0x1604/0x8001. The kernel reacts by loading the module snd-usb-us428, if it is not already loaded. B.2 The module snd-usb-us428 takes the US428 as its device and sets up a hardware dependent interface. (The module doesn't create any pcm nor midi devices now.) B.3 Subsequently the kernel starts the usb-hotplug script, which launches usx2yloader. B.4 usx2yloader transfers the 2nd Phase firmware binary to the US428 by means of the hardware dependent interface. When this transfer finishes, the snd-usb-us428 module creates the pcm- and midi-devices. Initialisation is complete. USAGE = When usx2yloader is invoked without options, it will probe all existing soundcards until a valid USX2Y-driver is found. If a valid USX2Y-driver is found, usx2yloader reads the board type from the driver. The corresponding firmware binaries are then read and transferred to the driver. Finally, usx2yloader initializes the PCM, MIDI and the mixer devices on the driver for making the soundcard full functional. Instead of auto-probing, you can specify the card number or the hwdep device name or the usb device name via -c, -D or -u options, respectively. % usx2yloader -c 1 % usx2yloader -D hw:0 % usx2yloader -u /proc/bus/usb/001/003 For loading everything automatically in response to a hotplug event there are the hotplug script files - tascam_fw.usermap - tascam_fw - tascam_fpga and the Firmwarefiles. You also need hotplug to be installed. FIRMWAREFILES = The firmware binaries are installed on /usr/share/alsa/firmware (or /usr/local/share/alsa/firmware, depending to the prefix option of configure). There will be *.conf files, which define the dsp image files for each different card type. COPYRIGHT = Copyright (c) 2003 Karsten Wiese [EMAIL PROTECTED] Distributalbe under GPL. The firmware files included in firmware sub-directory are copyright by Tascam / TEAC Corporation. --- NEW FILE: cvscompile --- #!/bin/bash aclocal $ACLOCAL_FLAGS automake --foreign --add-missing autoconf export CFLAGS='-O2 -Wall -pipe -g' echo CFLAGS=$CFLAGS echo ./configure $@ ./configure $@ unset CFLAGS make --- NEW FILE: tascam_fw --- #!/bin/sh # load the firmware into Tascam USB devices FIRMWARE= FIRMWAREDIR=/usr/local/share/alsa/firmware FLAGS= LOADER=/sbin/fxload LOADERFIRMWARE=$FIRMWAREDIR/tascam_loader.ihx case $PRODUCT in 1604/8000/*) FIRMWARE=$FIRMWAREDIR/us428fw.ihx ;; 1604/8004/*) FIRMWARE=$FIRMWAREDIR/us224fw.ihx ;; 1604/8006/*) FIRMWARE=$FIRMWAREDIR/us122fw.ihx ;; *) if [ -x /usr/bin/logger ]; then /usr/bin/logger -t $0 unknown product $PRODUCT fi exit 1 esac # missing loader firmware? if [ ! -r $LOADERFIRMWARE ]; then if [ -x /usr/bin/logger ]; then /usr/bin/logger -t $0 missing $LOADERFIRMWARE ?? fi exit 1 fi # missing firmware? if [ ! -r $FIRMWARE ]; then if [ -x /usr/bin/logger ]; then /usr/bin/logger -t $0 missing $FIRMWARE for $PRODUCT ?? fi exit 1 fi # missing loader? if [ ! -x $LOADER ]; then if [ -x /usr/bin/logger ]; then /usr/bin/logger -t $0 missing $LOADER ?? fi exit 1 fi if [ -x /usr/bin/logger ]; then /usr/bin/logger -t $0 load $FIRMWARE for $PRODUCT to $DEVICE fi $LOADER $FLAGS -s $LOADERFIRMWARE -I $FIRMWARE --- NEW FILE:
[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.17,1.18
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv13851/Documentation Modified Files: ALSA-Configuration.txt Log Message: - added enable_mpu option to enable/disable MPU401. - added the blacklist for MPU401. - removed the obsolete codes. Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ALSA-Configuration.txt 28 Aug 2003 15:07:26 - 1.17 +++ ALSA-Configuration.txt 17 Sep 2003 13:34:33 - 1.18 @@ -449,7 +449,8 @@ pcm_substreams_c - capture channels (1-8, default=0) clock - clock (0 = auto-detection) use_pm - support the power-management (0 = off, 1 = on, - 2 = auto) + 2 = auto (default)) +enable_mpu - enable MPU401 (0 = off, 1 = on, 2 = auto (default)) Module supports up to 8 cards and autoprobe. --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/acore Makefile,1.28,1.29
Update of /cvsroot/alsa/alsa-driver/acore In directory sc8-pr-cvs1:/tmp/cvs-serv17099 Modified Files: Makefile Log Message: added snd-hwdep to the dependency of mixart driver. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/acore/Makefile,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Makefile8 Sep 2003 10:57:41 - 1.28 +++ Makefile16 Sep 2003 10:14:03 - 1.29 @@ -6,7 +6,7 @@ EXTRA_CLEAN = info.c pcm_native.c control.c hwdep.c init.c rawmidi.c sound.c timer.c memalloc.c obj-$(CONFIG_SND_PDPLUS) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o -obj-$(CONFIG_SND_MIXART) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o +obj-$(CONFIG_SND_MIXART) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-hwdep.o obj-$(CONFIG_SND_SERIALMIDI) += snd-rawmidi.o snd.o obj-$(CONFIG_SND_MSND_PINNACLE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o obj-$(CONFIG_SND_USB_US428) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core/oss pcm_plugin.c,1.16,1.17 pcm_plugin.h,1.5,1.6
Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv2996
Modified Files:
pcm_plugin.c pcm_plugin.h
Log Message:
- fixed the debug print for the recent gcc.
- fixed the missing initialization of the recording frame size through
plugin. the problem of zero-size read with the rate plugin should
be fixed now.
Index: pcm_plugin.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pcm_plugin.c6 Aug 2003 17:45:09 - 1.16
+++ pcm_plugin.c16 Sep 2003 16:34:48 - 1.17
@@ -646,6 +646,7 @@
nchannels = format-channels;
snd_assert(plugin-access == SNDRV_PCM_ACCESS_RW_INTERLEAVED ||
format-channels = 1, return -ENXIO);
for (channel = 0; channel nchannels; channel++, v++) {
+ v-frames = count;
v-enabled = 1;
v-wanted = (stream == SNDRV_PCM_STREAM_CAPTURE);
v-area.addr = buf;
Index: pcm_plugin.h
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pcm_plugin.h6 Aug 2003 17:45:09 - 1.5
+++ pcm_plugin.h16 Sep 2003 16:34:48 - 1.6
@@ -243,9 +243,9 @@
size_t samples);
#ifdef PLUGIN_DEBUG
-#define pdprintf( args... ) printk( plugin: ##args)
+#define pdprintf( fmt, args... ) printk( plugin: fmt, ##args)
#else
-#define pdprintf( args... ) { ; }
+#define pdprintf( fmt, args... )
#endif
#endif /* __PCM_PLUGIN_H */
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core/ioctl32 pcm32.c,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/core/ioctl32
In directory sc8-pr-cvs1:/tmp/cvs-serv896
Modified Files:
pcm32.c
Log Message:
added missing SND_PCM_IOCTL_TSTAMP ioctl.
Index: pcm32.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/ioctl32/pcm32.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pcm32.c 6 Jun 2003 11:54:27 - 1.14
+++ pcm32.c 15 Sep 2003 16:19:42 - 1.15
@@ -421,6 +421,7 @@
struct ioctl32_mapper pcm_mappers[] = {
MAP_COMPAT(SNDRV_PCM_IOCTL_PVERSION),
MAP_COMPAT(SNDRV_PCM_IOCTL_INFO),
+ MAP_COMPAT(SNDRV_PCM_IOCTL_TSTAMP),
{ SNDRV_PCM_IOCTL_HW_REFINE32, AP(pcm_hw_refine) },
{ SNDRV_PCM_IOCTL_HW_PARAMS32, AP(pcm_hw_params) },
{ SNDRV_PCM_IOCTL_HW_REFINE_OLD32, AP(pcm_hw_refine_old) },
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/usb/us428 usbus428.c,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/usb/us428
In directory sc8-pr-cvs1:/tmp/cvs-serv11923
Modified Files:
usbus428.c
Log Message:
removed the unused struct.
Index: usbus428.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- usbus428.c 8 Sep 2003 10:57:41 - 1.1
+++ usbus428.c 12 Sep 2003 15:29:54 - 1.2
@@ -99,13 +99,6 @@
static void snd_us428_usb_disconnect(struct usb_device* usb_device, void* ptr);
static void snd_us428_card_private_free(snd_card_t *card);
-struct us428_control{
- unsigned short TransferBuLe;
- unsigned char TransferBuffer[16];
- unsigned char Request;
- unsigned short Value;
-};
-
#ifdef CONFIG_SND_DEBUG
/*
* pipe 4 is used for switching the lamps, setting samplerate, volumes
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils/aplay aplay.c,1.172,1.173
Update of /cvsroot/alsa/alsa-utils/aplay
In directory sc8-pr-cvs1:/tmp/cvs-serv2219
Modified Files:
aplay.c
Log Message:
- fixed the order of period and buffer size setting.
firstly period then buffer size. this will avoid the problem of
rounding.
Index: aplay.c
===
RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- aplay.c 27 Aug 2003 11:12:50 - 1.172
+++ aplay.c 11 Sep 2003 11:23:58 - 1.173
@@ -848,16 +848,8 @@
}
}
rate = hwparams.rate;
- if (buffer_time == 0 buffer_frames 0) {
- err = snd_pcm_hw_params_set_buffer_size_near(handle, params,
-buffer_frames);
- } else {
- if (buffer_time == 0)
- buffer_time = 50;
- err = snd_pcm_hw_params_set_buffer_time_near(handle, params,
-buffer_time, 0);
- }
- assert(err = 0);
+ if (buffer_time == 0 buffer_frames == 0)
+ buffer_time = 50;
if (period_time == 0 period_frames == 0) {
if (buffer_time 0)
period_time = buffer_time / 4;
@@ -870,6 +862,14 @@
else
err = snd_pcm_hw_params_set_period_size_near(handle, params,
period_frames, 0);
+ assert(err = 0);
+ if (buffer_time 0) {
+ err = snd_pcm_hw_params_set_buffer_time_near(handle, params,
+buffer_time, 0);
+ } else {
+ err = snd_pcm_hw_params_set_buffer_size_near(handle, params,
+buffer_frames);
+ }
assert(err = 0);
err = snd_pcm_hw_params(handle, params);
if (err 0) {
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_rate.c,1.73,1.74
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv514
Modified Files:
pcm_rate.c
Log Message:
corrections in the last changes.
samples are exapnded properly in linear interpolation now.
Index: pcm_rate.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_rate.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pcm_rate.c 9 Sep 2003 19:04:22 - 1.73
+++ pcm_rate.c 10 Sep 2003 11:02:57 - 1.74
@@ -126,29 +126,25 @@
dst_step = snd_pcm_channel_area_step(dst_area);
src_frames1 = 0;
dst_frames1 = 0;
- if (states-init) {
+ if (! states-init) {
sample = initial_sample(src, getidx);
- src_frames1++;
- states-init = 0;
old_sample = new_sample = sample;
- goto put_sample;
+ src += src_step;
+ src_frames1++;
+ states-init = 2; /* get a new sample */
}
- while (dst_frames1 dst_frames src_frames1 src_frames) {
- pos += DIV;
- if (pos = get_threshold) {
+ while (dst_frames1 dst_frames) {
+ if (states-init == 2) {
old_sample = new_sample;
- pos -= get_threshold;
goto *get;
#define GET16_END after_get
#include plugin_ops.h
#undef GET16_END
after_get:
new_sample = sample;
- src += src_step;
- src_frames1++;
+ states-init = 1;
}
sample = (((int64_t)old_sample * (int64_t)(get_threshold -
pos)) + ((int64_t)new_sample * pos)) / get_threshold;
- put_sample:
goto *put;
#define PUT16_END after_put
#include plugin_ops.h
@@ -156,7 +152,16 @@
after_put:
dst += dst_step;
dst_frames1++;
- }
+ pos += DIV;
+ if (pos = get_threshold) {
+ pos -= get_threshold;
+ src += src_step;
+ src_frames1++;
+ states-init = 2; /* get a new sample */
+ if (src_frames1 = src_frames)
+ break;
+ }
+ }
states-old_sample = old_sample;
states-new_sample = new_sample;
states-pos = pos;
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver configure.in,1.188,1.189
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv9599 Modified Files: configure.in Log Message: fixed c_opts for MIPS. Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- configure.in1 Sep 2003 15:18:57 - 1.188 +++ configure.in9 Sep 2003 18:08:42 - 1.189 @@ -706,7 +706,17 @@ test $CONFIG_ISA = probe CONFIG_ISA= ;; mips*) -c_opts=-mcpu=r4600 -G 0 -mips2 -fno-pic -mno-abicalls -mlong-calls +if $CC -mtune=mips32 -S -o /dev/null -xc /dev/null /dev/null 21; then + c_opts=-mtune=mips32 +else + c_opts=-mcpu=r4600 +fi +if $CC -mips32 -mabi=32 -S -o /dev/null -xc /dev/null /dev/null 21; then + c_opts=$c_opts -mips32 -mabi=32 +else + c_opts=$_opts -mips2 +fi +c_opts=$c_opts -G 0 -fno-pic -mno-abicalls -mlong-calls processor=mips test $CONFIG_ISA = probe CONFIG_ISA= ;; --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/utils alsaconf,1.8,1.9
Update of /cvsroot/alsa/alsa-driver/utils
In directory sc8-pr-cvs1:/tmp/cvs-serv9448/utils
Modified Files:
alsaconf
Log Message:
search more different paths for lsmod.
Index: alsaconf
===
RCS file: /cvsroot/alsa/alsa-driver/utils/alsaconf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsaconf8 Sep 2003 14:49:38 - 1.8
+++ alsaconf9 Sep 2003 18:08:12 - 1.9
@@ -36,11 +36,12 @@
distribution=unknown
fi
-if [ -x /sbin/lsmod ]; then
- lsmod=/sbin/lsmod
-else
- lsmod=/bin/lsmod
-fi
+for prog in lspci lsmod; do
+ for path in /sbin /usr/sbin /bin /usr/bin;do
+ [[ -x $path/$prog ]] eval $prog=$path/$prog
+ done
+done
+unset prog path
usage() {
echo ALSA configurator version $version
@@ -446,7 +447,7 @@
/^[literal spaceliteral tab]*PCI: /{
gsub(/0x/, );
gsub(/=/, :);
- x = sprintf (/sbin/lspci -n | grep ''Class 0401'' | grep %s, $2);
+ x = sprintf ('$lspci' -n | grep ''Class 0401'' | grep %s, $2);
if (system (x) == 0)
printf %s %s\n, $2, driver '$FOUND'
}
@@ -476,7 +477,7 @@
#
find_device_name () {
if expr $1 :
'[0-9a-f][0-9a-f][0-9a-f][0-9a-f]:[0-9a-f][0-9a-f][0-9a-f][0-9a-f]' /dev/null; then
- /sbin/lspci -d $1 | sed -e 's/^..:..\.. Multimedia audio controller: //g'
+ $lspci -d $1 | sed -e 's/^..:..\.. Multimedia audio controller: //g'
return
elif expr $1 : '[EMAIL PROTECTED]@[EMAIL PROTECTED]' /dev/null; then
cardname=`grep '^Card [0-9]\+ '\'$1':' $DUMP | head -n 1 | sed -e 's/^Card
[0-9]\+ '\''.*:\(.*\)'\'' .*$/\1/'`
@@ -1034,7 +1035,7 @@
# check for TP600E
#
if [ ${devs_found[0]} = cs46xx ]; then
- if /sbin/lspci -nv | grep -q Subsystem: 1014:1010; then
+ if $lspci -nv | grep -q Subsystem: 1014:1010; then
if $DIALOG --yesno
Looks like you having a Thinkpad 600E notebook.
On this notebook, CS4236 driver should be used
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/usx2yloader/firmware - New directory
Update of /cvsroot/alsa/alsa-tools/usx2yloader/firmware In directory sc8-pr-cvs1:/tmp/cvs-serv25618/firmware Log Message: Directory /cvsroot/alsa/alsa-tools/usx2yloader/firmware added to the repository --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/utils Modules.dep,1.24,1.25
Update of /cvsroot/alsa/alsa-driver/utils In directory sc8-pr-cvs1:/tmp/cvs-serv23040/utils Modified Files: Modules.dep Log Message: - added snd-usb-us428 driver by Karsten Wiese. - export some functsion in usbmidi.c for usb-us428 driver. Index: Modules.dep === RCS file: /cvsroot/alsa/alsa-driver/utils/Modules.dep,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Modules.dep 22 Jul 2003 13:39:10 - 1.24 +++ Modules.dep 8 Sep 2003 10:57:41 - 1.25 @@ -16,3 +16,6 @@ %dir linux/sound/pcmcia/pdaudiocf |snd-pdaudiocf snd-pcm + +%dir linux/sound/usb/us428 +|snd-usb-us428 snd-usb-audio snd-hwdep --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/include hwdep.h,1.22,1.23
Update of /cvsroot/alsa/alsa-lib/include In directory sc8-pr-cvs1:/tmp/cvs-serv24946 Modified Files: hwdep.h Log Message: added hwdep entries for mixart and us428. Index: hwdep.h === RCS file: /cvsroot/alsa/alsa-lib/include/hwdep.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- hwdep.h 19 Feb 2003 15:39:35 - 1.22 +++ hwdep.h 8 Sep 2003 11:05:42 - 1.23 @@ -61,7 +61,9 @@ SND_HWDEP_IFACE_ICS2115,/** ICS2115 driver */ SND_HWDEP_IFACE_SSCAPE, /** Ensoniq SoundScape ISA card (MC68EC000) */ SND_HWDEP_IFACE_VX, /** Digigram VX cards */ - SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_VX /** last know hwdep interface */ + SNDRV_HWDEP_IFACE_MIXART, /** Digigram miXart cards */ + SNDRV_HWDEP_IFACE_USX2Y,/** Tascam US122, US224 US428 usb */ + SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_USX2Y /** last know hwdep interface */ } snd_hwdep_iface_t; /** open for reading */ --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/include hwdep.h,1.23,1.24
Update of /cvsroot/alsa/alsa-lib/include In directory sc8-pr-cvs1:/tmp/cvs-serv19536 Modified Files: hwdep.h Log Message: fixed typos. Index: hwdep.h === RCS file: /cvsroot/alsa/alsa-lib/include/hwdep.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- hwdep.h 8 Sep 2003 11:05:42 - 1.23 +++ hwdep.h 8 Sep 2003 17:26:17 - 1.24 @@ -61,8 +61,8 @@ SND_HWDEP_IFACE_ICS2115,/** ICS2115 driver */ SND_HWDEP_IFACE_SSCAPE, /** Ensoniq SoundScape ISA card (MC68EC000) */ SND_HWDEP_IFACE_VX, /** Digigram VX cards */ - SNDRV_HWDEP_IFACE_MIXART, /** Digigram miXart cards */ - SNDRV_HWDEP_IFACE_USX2Y,/** Tascam US122, US224 US428 usb */ + SND_HWDEP_IFACE_MIXART, /** Digigram miXart cards */ + SND_HWDEP_IFACE_USX2Y, /** Tascam US122, US224 US428 usb */ SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_USX2Y /** last know hwdep interface */ } snd_hwdep_iface_t; --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.48,1.49
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv7996
Modified Files:
via82xx.c
Log Message:
- added device mask bits to DXS channel check.
- added an entry for DXS channel check.
Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- via82xx.c 28 Aug 2003 15:07:25 - 1.48
+++ via82xx.c 8 Sep 2003 09:32:23 - 1.49
@@ -1959,13 +1959,14 @@
struct dxs_whitelist {
unsigned short vendor;
unsigned short device;
- int action; /* new dxs_support value */
+ unsigned short mask;
+ short action; /* new dxs_support value */
};
static int __devinit check_dxs_list(struct pci_dev *pci)
{
static struct dxs_whitelist whitelist[] = {
- // { .vendor = , .device = , .action = x },
+ { .vendor = 0x1019, .device = 0x0996, .action = VIA_DXS_48K },
{ } /* terminator */
};
struct dxs_whitelist *w;
@@ -1975,10 +1976,17 @@
pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, subsystem_vendor);
pci_read_config_word(pci, PCI_SUBSYSTEM_ID, subsystem_device);
- for (w = whitelist; w-vendor; w++)
- if (w-vendor == subsystem_vendor
- w-device == subsystem_device)
- return w-action;
+ for (w = whitelist; w-vendor; w++) {
+ if (w-vendor != subsystem_vendor)
+ continue;
+ if (w-mask) {
+ if ((w-mask subsystem_device) == w-device)
+ return w-action;
+ } else {
+ if (subsystem_device == w-device)
+ return w-action;
+ }
+ }
/*
* not detected, try 48k rate only to be sure.
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/usx2yloader - New directory
Update of /cvsroot/alsa/alsa-tools/usx2yloader In directory sc8-pr-cvs1:/tmp/cvs-serv25568/usx2yloader Log Message: Directory /cvsroot/alsa/alsa-tools/usx2yloader added to the repository --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include asound.h,1.31,1.32
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv23270/include
Modified Files:
asound.h
Log Message:
- added hwdep entry for usb-us428 driver.
Index: asound.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/asound.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- asound.h22 Jul 2003 17:00:42 - 1.31
+++ asound.h8 Sep 2003 10:58:07 - 1.32
@@ -106,9 +106,10 @@
SNDRV_HWDEP_IFACE_SSCAPE, /* Ensoniq SoundScape ISA card (MC68EC000) */
SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */
SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */
+ SNDRV_HWDEP_IFACE_USX2Y,/* Tascam US122, US224 US428 usb */
/* Don't forget to change the following: */
- SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_MIXART,
+ SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USX2Y,
};
struct sndrv_hwdep_info {
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/include adriver.h,1.54,1.55
Update of /cvsroot/alsa/alsa-driver/include
In directory sc8-pr-cvs1:/tmp/cvs-serv5039
Modified Files:
adriver.h
Log Message:
Marc-Christian Petersen [EMAIL PROTECTED]:
fixed for WOLK.
Index: adriver.h
===
RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- adriver.h 29 Aug 2003 14:35:17 - 1.54
+++ adriver.h 8 Sep 2003 09:15:23 - 1.55
@@ -121,7 +121,7 @@
#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 3) !defined(need_resched)
#define need_resched() (current-need_resched)
#endif
-#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 4)
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 4) !defined(WE_ARE_WOLK)
#include linux/fs.h
static inline struct proc_dir_entry *PDE(const struct inode *inode)
{
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/acore Makefile,1.27,1.28
Update of /cvsroot/alsa/alsa-driver/acore In directory sc8-pr-cvs1:/tmp/cvs-serv23040/acore Modified Files: Makefile Log Message: - added snd-usb-us428 driver by Karsten Wiese. - export some functsion in usbmidi.c for usb-us428 driver. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/acore/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile22 Jul 2003 13:39:10 - 1.27 +++ Makefile8 Sep 2003 10:57:41 - 1.28 @@ -9,6 +9,7 @@ obj-$(CONFIG_SND_MIXART) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o obj-$(CONFIG_SND_SERIALMIDI) += snd-rawmidi.o snd.o obj-$(CONFIG_SND_MSND_PINNACLE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o +obj-$(CONFIG_SND_USB_US428) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o export-objs := sound.o pcm.o pcm_lib.o rawmidi.o timer.o hwdep.o memalloc.o --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/utils alsaconf,1.7,1.8
Update of /cvsroot/alsa/alsa-driver/utils
In directory sc8-pr-cvs1:/tmp/cvs-serv8790
Modified Files:
alsaconf
Log Message:
fixed error messages during building database.
Index: alsaconf
===
RCS file: /cvsroot/alsa/alsa-driver/utils/alsaconf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alsaconf17 Jul 2003 18:14:28 - 1.7
+++ alsaconf8 Sep 2003 14:49:38 - 1.8
@@ -119,7 +119,7 @@
fi
alsa_device_opts=
-if modinfo -p snd | grep uid ; then
+if modinfo -p snd | grep -q uid ; then
if [ x$alsa_uid != x0 ]; then
alsa_device_opts=$alsa_device_opts ${mpfx}device_uid=$alsa_uid
fi
@@ -127,7 +127,7 @@
alsa_device_opts=$alsa_device_opts ${mpfx}device_gid=$alsa_gid
fi
fi
-if modinfo -p snd | grep device_mode ; then
+if modinfo -p snd | grep -q device_mode ; then
if [ x$alsa_mode != x0 ]; then
alsa_device_opts=$alsa_device_opts ${mpfx}device_mode=$alsa_mode
fi
@@ -343,6 +343,10 @@
# convert ISA PnP id number to string 'ABC'
convert_isapnp_id () {
+if [ -z $1 ]; then
+ echo
+ return
+fi
let a='('$1'2) 0x3f'
let b='(('$1' 0x03) 3) | (('$1' 13) 0x07)'
let c='('$1' 8) 0x1f'
@@ -352,6 +356,10 @@
# swap high low bytes
swap_number () {
+if [ -z $1 ]; then
+ echo
+ return
+fi
let v='(('$1'8)0xff)|(('$1'0xff)8)'
printf %04x $v
}
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/support/pnp pnp.c,1.11,1.12 pnp.h,1.3,1.4
Update of /cvsroot/alsa/alsa-driver/support/pnp
In directory sc8-pr-cvs1:/tmp/cvs-serv21447
Modified Files:
pnp.c pnp.h
Log Message:
- added pnp_disable_dev().
- disable the devices when PNP_DRIVER_RES_DISABLE is set in
pnp_register_card_driver().
Index: pnp.c
===
RCS file: /cvsroot/alsa/alsa-driver/support/pnp/pnp.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pnp.c 8 Jul 2003 13:37:40 - 1.11
+++ pnp.c 5 Sep 2003 17:44:12 - 1.12
@@ -145,9 +145,6 @@
if (parse_id(id, vendor, function) 0)
return NULL;
dev = (struct pnp_dev *)isapnp_find_dev((struct isapnp_card *)clink-card,
vendor, function, (struct isapnp_dev *)from);
- if (dev != NULL dev-p.active
- (clink-driver-flags PNP_DRIVER_RES_DO_NOT_CHANGE) == 0)
- return NULL;
return dev;
}
@@ -193,6 +190,15 @@
dev = ninst-devs[i] = (struct pnp_dev
*)isapnp_find_dev((struct isapnp_card *)card, vendor, device, NULL);
if (dev == NULL)
goto __next;
+ if (! dev-p.active) {
+ if (! (drv-flags
PNP_DRIVER_RES_DO_NOT_CHANGE)) {
+ pnp_activate_dev(dev);
+ }
+ } else {
+ if ((drv-flags
PNP_DRIVER_RES_DISABLE) == PNP_DRIVER_RES_DISABLE) {
+ pnp_disable_dev(dev);
+ }
+ }
}
ninst-link.card = card;
ninst-link.driver = drv;
@@ -216,16 +222,12 @@
{
struct pnp_card_driver_instance *inst;
struct list_head *p, *n;
- unsigned int i;
list_for_each_safe(p, n, pnp_card_drivers) {
inst = list_entry(p, struct pnp_card_driver_instance, list);
if (inst-link.driver == drv) {
list_del(p);
drv-remove(inst-link);
- if ((drv-flags PNP_DRIVER_RES_DO_NOT_CHANGE) == 0)
- for (i = 0; i PNP_MAX_DEVICES inst-devs[i]; i++)
- pnp_release_card_device(inst-devs[i]);
kfree(inst);
}
}
@@ -346,7 +348,7 @@
unsigned int idx;
if (dev-p.active)
- return -EBUSY;
+ return 0; /* FIXME: should be -EBUSY but 2.6 pnp layer behaves like
this */
/* reserve the manual configuration */
tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
@@ -369,6 +371,14 @@
return dev-p.activate((struct isapnp_dev *)dev);
}
+int pnp_disable_dev(struct pnp_dev *dev)
+{
+ if (! dev-p.active)
+ return 0;
+ return dev-p.deactivate((struct isapnp_dev *)dev);
+ /* FIXME: do we need clean up the resources again? */
+}
+
static int __init pnp_init(void)
{
return 0;
@@ -390,3 +400,4 @@
EXPORT_SYMBOL(pnp_init_resource_table);
EXPORT_SYMBOL(pnp_manual_config_dev);
EXPORT_SYMBOL(pnp_activate_dev);
+EXPORT_SYMBOL(pnp_disable_dev);
Index: pnp.h
===
RCS file: /cvsroot/alsa/alsa-driver/support/pnp/pnp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pnp.h 16 May 2003 09:08:24 - 1.3
+++ pnp.h 5 Sep 2003 17:44:12 - 1.4
@@ -198,6 +198,7 @@
int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res, int
mode);
int pnp_activate_dev(struct pnp_dev *dev);
static inline int pnp_is_active(struct pnp_dev *dev) { return dev-p.active; }
+int pnp_disable_dev(struct pnp_dev *dev);
#else
@@ -211,6 +212,7 @@
static inline int pnp_manual_config_dev(struct pnp_dev *dev, struct
pnp_resource_table *res, int mode) { return -ENODEV; }
static inline int pnp_activate_dev(struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_is_active(struct pnp_dev * dev) { return -ENODEV; }
+static inline int pnp_disable_dev(struct pnp_dev *dev) { return -ENODEV; }
#endif
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.90,1.91
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv25770
Modified Files:
intel8x0.c
Log Message:
- check CIV register to sync the current index position.
this may fix the noisy output on machines with sloppy interrupts.
Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- intel8x0.c 2 Sep 2003 18:07:31 - 1.90
+++ intel8x0.c 5 Sep 2003 17:46:42 - 1.91
@@ -360,6 +360,7 @@
int frags;
int lvi;
int lvi_frag;
+ int civ;
int ack;
int ack_reload;
unsigned int ack_bit;
@@ -710,6 +711,7 @@
ichdev-frags = ichdev-size / ichdev-fragsize;
}
iputbyte(chip, port + ICH_REG_OFF_LVI, ichdev-lvi = ICH_REG_LVI_MASK);
+ ichdev-civ = 0;
iputbyte(chip, port + ICH_REG_OFF_CIV, 0);
ichdev-lvi_frag = ICH_REG_LVI_MASK % ichdev-frags;
ichdev-position = 0;
@@ -728,19 +730,39 @@
static inline void snd_intel8x0_update(intel8x0_t *chip, ichdev_t *ichdev)
{
unsigned long port = ichdev-reg_offset;
+ int civ, i, step;
int ack = 0;
- ichdev-position += ichdev-fragsize1;
+ civ = igetbyte(chip, port + ICH_REG_OFF_CIV);
+ if (civ == ichdev-civ) {
+ // snd_printd(civ same %d\n, civ);
+ step = 1;
+ ichdev-civ++;
+ ichdev-civ = ICH_REG_LVI_MASK;
+ } else {
+ step = civ - ichdev-civ;
+ if (step 0)
+ step += ICH_REG_LVI_MASK + 1;
+ // if (step != 1)
+ // snd_printd(step = %d, %d - %d\n, step, ichdev-civ, civ);
+ ichdev-civ = civ;
+ }
+
+ ichdev-position += step * ichdev-fragsize1;
ichdev-position %= ichdev-size;
- ichdev-lvi++;
+ ichdev-lvi += step;
ichdev-lvi = ICH_REG_LVI_MASK;
iputbyte(chip, port + ICH_REG_OFF_LVI, ichdev-lvi);
- ichdev-lvi_frag++;
- ichdev-lvi_frag %= ichdev-frags;
- ichdev-bdbar[ichdev-lvi * 2] = cpu_to_le32(ichdev-physbuf +
ichdev-lvi_frag * ichdev-fragsize1);
+ for (i = 0; i step; i++) {
+ ichdev-lvi_frag++;
+ ichdev-lvi_frag %= ichdev-frags;
+ ichdev-bdbar[ichdev-lvi * 2] = cpu_to_le32(ichdev-physbuf +
ichdev-lvi_frag * ichdev-fragsize1);
// printk(new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n,
ichdev-lvi * 2, ichdev-bdbar[ichdev-lvi * 2], ichdev-bdbar[ichdev-lvi * 2 + 1],
inb(ICH_REG_OFF_PIV + port), inl(port + 4), inb(port + ICH_REG_OFF_CR));
- if ((ack = (--ichdev-ack == 0)) != 0)
- ichdev-ack = ichdev-ack_reload;
+ if (--ichdev-ack == 0) {
+ ichdev-ack = ichdev-ack_reload;
+ ack = 1;
+ }
+ }
if (ack ichdev-substream) {
spin_unlock(chip-reg_lock);
snd_pcm_period_elapsed(ichdev-substream);
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver INSTALL,1.144,1.145
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv22894 Modified Files: INSTALL Log Message: fixed the installation: added make (because make install doesn't build modules any more). Index: INSTALL === RCS file: /cvsroot/alsa/alsa-driver/INSTALL,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- INSTALL 22 Jul 2003 13:39:10 - 1.144 +++ INSTALL 4 Sep 2003 17:48:28 - 1.145 @@ -39,11 +39,12 @@ If you have kernel source code in another directory than /usr/src/linux, use --with-kernel=kernel_directory. Example: ./configure --with-isapnp=yes --with-debug=full -4) Run 'make install'. -5) Run the './snddevices' script to create new sound devices in /dev directory. +4) Run 'make'. +5) Run 'make install'. +6) Run the './snddevices' script to create new sound devices in /dev directory. Skip this step, if you have a kernel with the DEVFS support. -6) Edit your /etc/modules.conf (see the kmod support section below). -7) Run 'modprobe snd-' where is the name of your card. +7) Edit your /etc/modules.conf (see the kmod support section below). +8) Run 'modprobe snd-' where is the name of your card. Note: If you have a ISA PnP soundcard you need to first run the isapnp program from isapnptools package to initialize your soundcard. You can also use the native ISA PnP support by --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/usb usbquirks.h,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/usb
In directory sc8-pr-cvs1:/tmp/cvs-serv5839
Modified Files:
usbquirks.h
Log Message:
Clemens Ladisch [EMAIL PROTECTED]:
- adds a quirk for the Midiman Ozone
Index: usbquirks.h
===
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbquirks.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- usbquirks.h 18 Jun 2003 12:55:34 - 1.21
+++ usbquirks.h 2 Sep 2003 18:06:40 - 1.22
@@ -755,6 +755,19 @@
}
}
},
+{
+ USB_DEVICE_VENDOR_SPEC(0x0763, 0x2008),
+ .driver_info = (unsigned long) (const snd_usb_audio_quirk_t) {
+ .vendor_name = M-Audio,
+ .product_name = Ozone,
+ .ifnum = 3,
+ .type = QUIRK_MIDI_MIDIMAN,
+ .data = (const snd_usb_midi_endpoint_info_t) {
+ .out_cables = 0x0001,
+ .in_cables = 0x0001
+ }
+ }
+},
/* Mark of the Unicorn devices */
{
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/pci/ice1712 In directory sc8-pr-cvs1:/tmp/cvs-serv6609 Modified Files: aureon.c Log Message: fixed the SPDIF bit on aureon boards. spdif out should work now. Index: aureon.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aureon.c18 Jun 2003 11:09:40 - 1.2 +++ aureon.c1 Sep 2003 09:20:56 - 1.3 @@ -457,7 +457,7 @@ 0x12, /* SYSCONF: clock 512, mpu401, spdif-in/ADC, 3DACs */ 0x80, /* ACLINK: I2S */ 0xf8, /* I2S: vol, 96k, 24bit, 192k */ - 0xc2, /* SPDIF: out-en, out-int, spdif-in */ + 0xc3, /* SPDIF: out-en, out-int, spdif-in */ 0xff, /* GPIO_DIR */ 0xff, /* GPIO_DIR1 */ 0xbf, /* GPIO_DIR2 */ @@ -473,7 +473,7 @@ 0x13, /* SYSCONF: clock 512, mpu401, spdif-in/ADC, 4DACs */ 0x80, /* ACLINK: I2S */ 0xf8, /* I2S: vol, 96k, 24bit, 192k */ - 0xc2, /* SPDIF: out-en, out-int, spdif-in */ + 0xc3, /* SPDIF: out-en, out-int, spdif-in */ 0xff, /* GPIO_DIR */ 0xff, /* GPIO_DIR1 */ 0xbf, /* GPIO_DIR2 */ --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include ac97_codec.h,1.33,1.34
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1:/tmp/cvs-serv11562/include Modified Files: ac97_codec.h Log Message: James Courtier-Dutton [EMAIL PROTECTED]: - enabled SPDIF input of ALC650. Index: ac97_codec.h === RCS file: /cvsroot/alsa/alsa-kernel/include/ac97_codec.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ac97_codec.h28 Aug 2003 15:36:44 - 1.33 +++ ac97_codec.h1 Sep 2003 09:53:26 - 1.34 @@ -214,11 +214,46 @@ #define AC97_CXR_SPDIF_AC3 0x2 /* specific - ALC */ +#define AC97_ALC650_SPDIF_INPUT_STATUS10x60 +/* S/PDIF input status 1 bit defines */ +#define AC97_ALC650_PRO 0x0001 /* Professional status */ +#define AC97_ALC650_NAUDIO 0x0002 /* Non audio stream */ +#define AC97_ALC650_COPY0x0004 /* Copyright status */ +#define AC97_ALC650_PRE 0x0038 /* Preemphasis status */ +#define AC97_ALC650_PRE_SHIFT 3 +#define AC97_ALC650_MODE0x00C0 /* Preemphasis status */ +#define AC97_ALC650_MODE_SHIFT 6 +#define AC97_ALC650_CC_MASK 0x7f00 /* Category Code mask */ +#define AC97_ALC650_CC_SHIFT8 +#define AC97_ALC650_L 0x8000 /* Generation Level status */ + +#define AC97_ALC650_SPDIF_INPUT_STATUS20x62 +/* S/PDIF input status 2 bit defines */ +#define AC97_ALC650_SOUCE_MASK 0x000f /* Source number */ +#define AC97_ALC650_CHANNEL_MASK0x00f0 /* Channel number */ +#define AC97_ALC650_CHANNEL_SHIFT 4 +#define AC97_ALC650_SPSR_MASK 0x0f00 /* S/PDIF Sample Rate bits */ +#define AC97_ALC650_SPSR_SHIFT 8 +#define AC97_ALC650_SPSR_44K0x /* Use 44.1kHz Sample rate */ +#define AC97_ALC650_SPSR_48K0x0200 /* Use 48kHz Sample rate */ +#define AC97_ALC650_SPSR_32K0x0300 /* Use 32kHz Sample rate */ +#define AC97_ALC650_CLOCK_ACCURACY 0x3000 /* Clock accuracy */ +#define AC97_ALC650_CLOCK_SHIFT 12 +#define AC97_ALC650_CLOCK_LOCK 0x4000 /* Clock locked status */ +#define AC97_ALC650_V 0x8000 /* Validity status */ + #define AC97_ALC650_SURR_DAC_VOL 0x64 #define AC97_ALC650_LFE_DAC_VOL0x66 -#define AC97_ALC650_MULTICH0x6a -#define AC97_ALC650_REVISION0x6e -#define AC97_ALC650_CLOCK 0x7a +#define AC97_ALC650_UNKNOWN1 0x68 +#define AC97_ALC650_MULTICH0x6a +#define AC97_ALC650_UNKNOWN2 0x6c +#define AC97_ALC650_REVISION 0x6e +#define AC97_ALC650_UNKNOWN3 0x70 +#define AC97_ALC650_UNKNOWN4 0x72 +#define AC97_ALC650_MISC 0x74 +#define AC97_ALC650_GPIO_SETUP 0x76 +#define AC97_ALC650_GPIO_STATUS0x78 +#define AC97_ALC650_CLOCK 0x7a /* specific - Yamaha YMF753 */ #define AC97_YMF753_DIT_CTRL2 0x66/* DIT Control 2 */ --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_patch.c,1.21,1.22 ac97_proc.c,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv11562/pci/ac97
Modified Files:
ac97_patch.c ac97_proc.c
Log Message:
James Courtier-Dutton [EMAIL PROTECTED]:
- enabled SPDIF input of ALC650.
Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ac97_patch.c28 Aug 2003 15:36:44 - 1.21
+++ ac97_patch.c1 Sep 2003 09:53:26 - 1.22
@@ -915,6 +915,9 @@
}
if (spdif) {
+ /* enable AC97_ALC650_GPIO_SETUP, AC97_ALC650_CLOCK for R/W */
+ snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_STATUS,
+ snd_ac97_read(ac97, AC97_ALC650_GPIO_STATUS) | 0x8000);
/* enable spdif in */
snd_ac97_write_cache(ac97, AC97_ALC650_CLOCK,
snd_ac97_read(ac97, AC97_ALC650_CLOCK) | 0x03);
@@ -930,18 +933,18 @@
int mic_off;
mic_off = snd_ac97_read(ac97, AC97_ALC650_MULTICH) (1 10);
/* GPIO0 direction */
- val = snd_ac97_read(ac97, 0x76);
+ val = snd_ac97_read(ac97, AC97_ALC650_GPIO_SETUP);
if (mic_off)
val = ~0x01;
else
val |= 0x01;
- snd_ac97_write_cache(ac97, 0x76, val);
- val = snd_ac97_read(ac97, 0x78);
+ snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_SETUP, val);
+ val = snd_ac97_read(ac97, AC97_ALC650_GPIO_STATUS);
if (mic_off)
val = ~0x100;
else
val = val | 0x100;
- snd_ac97_write_cache(ac97, 0x78, val);
+ snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_STATUS, val);
}
/* full DAC volume */
Index: ac97_proc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_proc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ac97_proc.c 17 Jun 2003 18:43:32 - 1.1
+++ ac97_proc.c 1 Sep 2003 09:53:26 - 1.2
@@ -151,7 +151,7 @@
snd_iprintf(buffer, SPDIF Control:%s%s%s%s Category=0x%x
Generation=%i%s%s%s\n,
val AC97_SC_PRO ? PRO : Consumer,
val AC97_SC_NAUDIO ? Non-audio : PCM,
- val AC97_SC_COPY ? Copyright : ,
+ val AC97_SC_COPY ? : Copyright,
val AC97_SC_PRE ? Preemph50/15 : ,
(val AC97_SC_CC_MASK) AC97_SC_CC_SHIFT,
(val AC97_SC_L) 11,
@@ -164,7 +164,31 @@
(ac97-flags AC97_CS_SPDIF) ?
(val AC97_SC_V ? Enabled : ) :
(val AC97_SC_V ? Validity : ));
+ /* ALC650 specific*/
+ if ((ac97-id 0xfff0) == 0x414c4720
+ (snd_ac97_read(ac97, AC97_ALC650_CLOCK) 0x01)) {
+ val = snd_ac97_read(ac97, AC97_ALC650_SPDIF_INPUT_STATUS2);
+ if (val AC97_ALC650_CLOCK_LOCK) {
+ val = snd_ac97_read(ac97,
AC97_ALC650_SPDIF_INPUT_STATUS1);
+ snd_iprintf(buffer, SPDIF In Status :%s%s%s%s
Category=0x%x Generation=%i,
+ val AC97_ALC650_PRO ? PRO :
Consumer,
+ val AC97_ALC650_NAUDIO ? Non-audio :
PCM,
+ val AC97_ALC650_COPY ? : Copyright,
+ val AC97_ALC650_PRE ? Preemph50/15 :
,
+ (val AC97_ALC650_CC_MASK)
AC97_ALC650_CC_SHIFT,
+ (val AC97_ALC650_L) 15);
+ val = snd_ac97_read(ac97,
AC97_ALC650_SPDIF_INPUT_STATUS2);
+ snd_iprintf(buffer, %s Accuracy=%i%s%s\n,
+ spdif_rates[(val AC97_ALC650_SPSR_MASK)
AC97_ALC650_SPSR_SHIFT],
+ (val AC97_ALC650_CLOCK_ACCURACY)
AC97_ALC650_CLOCK_SHIFT,
+ (val AC97_ALC650_CLOCK_LOCK ? Locked
: Unlocked),
+ (val AC97_ALC650_V ? Validity? : ));
+ } else {
+ snd_iprintf(buffer, SPDIF In Status : Not Locked\n);
+ }
+ }
}
+
__modem:
mext = snd_ac97_read(ac97, AC97_EXTENDED_MID);
---
This sf.net email is sponsored by:ThinkGeek
Welcome
[alsa-cvslog] CVS: alsa-driver configure.in,1.187,1.188
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv1669 Modified Files: configure.in Log Message: fixed the modification of linux/kmod.h. Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- configure.in19 Aug 2003 06:58:43 - 1.187 +++ configure.in1 Sep 2003 15:18:57 - 1.188 @@ -319,7 +319,7 @@ AC_DEFUN(MODIFY_KERNEL_HEADER, [ AC_MSG_CHECKING(to modify of kernel $1) - if grep $2 $CONFIG_SND_KERNELDIR/include/$1 /dev/null; then + if grep $2 $CONFIG_SND_KERNELDIR/include/$1 /dev/null 21; then AC_MSG_RESULT(no) if test -f include/$1; then echo Removing a dummy $1. @@ -327,6 +327,8 @@ fi else AC_MSG_RESULT(yes) +mkdir -p include/linux +mkdir -p include/asm echo #ifndef $2 include/$1 echo #define $2 include/$1 cat $CONFIG_SND_KERNELDIR/include/$1 include/$1 --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include emu10k1.h,1.30,1.31
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1:/tmp/cvs-serv1290/include Modified Files: emu10k1.h Log Message: Peter Zubaj [EMAIL PROTECTED]: - Added the support of AC3 passthrough on Audigy. James Courtier-Dutton [EMAIL PROTECTED]: - Use different driver name for Audigy2. Index: emu10k1.h === RCS file: /cvsroot/alsa/alsa-kernel/include/emu10k1.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- emu10k1.h 30 Jul 2003 18:54:01 - 1.30 +++ emu10k1.h 29 Aug 2003 09:22:27 - 1.31 @@ -1152,6 +1152,8 @@ #define FXBUS_MIDI_RIGHT 0x05 #define FXBUS_PCM_CENTER 0x06 #define FXBUS_PCM_LFE 0x07 +#define FXBUS_PT_LEFT 20 +#define FXBUS_PT_RIGHT 21 #define FXBUS_MIDI_REVERB 0x0c #define FXBUS_MIDI_CHORUS 0x0d --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emu10k1.c,1.20,1.21 emufx.c,1.37,1.38 emupcm.c,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv1290/pci/emu10k1
Modified Files:
emu10k1.c emufx.c emupcm.c
Log Message:
Peter Zubaj [EMAIL PROTECTED]:
- Added the support of AC3 passthrough on Audigy.
James Courtier-Dutton [EMAIL PROTECTED]:
- Use different driver name for Audigy2.
Index: emu10k1.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emu10k1.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- emu10k1.c 12 Aug 2003 14:10:15 - 1.20
+++ emu10k1.c 29 Aug 2003 09:22:27 - 1.21
@@ -170,7 +170,10 @@
}
#endif
- if (emu-audigy) {
+ if (emu-audigy (emu-revision == 4) ) {
+ strcpy(card-driver, Audigy2);
+ strcpy(card-shortname, Sound Blaster Audigy2);
+ } else if (emu-audigy) {
strcpy(card-driver, Audigy);
strcpy(card-shortname, Sound Blaster Audigy);
} else if (emu-APS) {
Index: emufx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- emufx.c 5 Aug 2003 12:42:23 - 1.37
+++ emufx.c 29 Aug 2003 09:22:27 - 1.38
@@ -1235,6 +1235,7 @@
*/
#define A_GPR_ACCU 0xd6
+#define A_GPR_COND 0xd7
static int __devinit _snd_emu10k1_audigy_init_efx(emu10k1_t *emu)
{
@@ -1502,13 +1503,7 @@
A_OP(icode, ptr, iMAC0,
A_GPR(playback+1+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_, A_GPR(gpr+1),
A_GPR(playback+1+SND_EMU10K1_PLAYBACK_CHANNELS));
snd_emu10k1_init_stereo_control(controls[nctl++], Wave Master
Playback Volume, gpr, 0);
gpr += 2;
- }
-
- /* digital outputs */
- A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback +
SND_EMU10K1_PLAYBACK_CHANNELS);
- A_PUT_STEREO_OUTPUT(A_EXTOUT_REAR_L, A_EXTOUT_REAR_R, playback+2 +
SND_EMU10K1_PLAYBACK_CHANNELS);
- A_PUT_OUTPUT(A_EXTOUT_CENTER, playback+4 + SND_EMU10K1_PLAYBACK_CHANNELS);
- A_PUT_OUTPUT(A_EXTOUT_LFE, playback+5 + SND_EMU10K1_PLAYBACK_CHANNELS);
+ }
/* analog speakers */
if (emu-revision == 4) { /* audigy2 */
@@ -1522,6 +1517,29 @@
/* headphone */
A_PUT_STEREO_OUTPUT(A_EXTOUT_HEADPHONE_L, A_EXTOUT_HEADPHONE_R, playback +
SND_EMU10K1_PLAYBACK_CHANNELS);
+
+ /* digital outputs */
+// A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback +
SND_EMU10K1_PLAYBACK_CHANNELS);
+
+ /* IEC958 Optical Raw Playback Switch */
+ icode-gpr_map[gpr++] = 0x1008;
+ icode-gpr_map[gpr++] = 0x;
+ for (z = 0; z 2; z++) {
+ A_OP(icode, ptr, iMAC0, A_GPR(tmp + 2), A_FXBUS(FXBUS_PT_LEFT + z),
A_C_, A_C_);
+ A_OP(icode, ptr, iSKIP, A_GPR_COND, A_GPR_COND, A_GPR(gpr - 2),
A_C_0001);
+ A_OP(icode, ptr, iACC3, A_GPR(tmp + 2), A_C_, A_C_0001,
A_GPR(tmp + 2));
+ A_OP(icode, ptr, iANDXOR, A_GPR(tmp + 2), A_GPR(tmp + 2), A_GPR(gpr -
1), A_C_);
+ A_SWITCH(icode, ptr, tmp + 0, tmp + 2, gpr + z);
+ A_SWITCH_NEG(icode, ptr, tmp + 1, gpr + z);
+ A_SWITCH(icode, ptr, tmp + 1, playback +
SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);
+ A_OP(icode, ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(tmp +
0), A_GPR(tmp + 1), A_C_);
+ }
+ snd_emu10k1_init_stereo_onoff_control(controls + nctl++, IEC958 Optical Raw
Playback Switch, gpr, 0);
+ gpr += 2;
+
+ A_PUT_STEREO_OUTPUT(A_EXTOUT_REAR_L, A_EXTOUT_REAR_R, playback+2 +
SND_EMU10K1_PLAYBACK_CHANNELS);
+ A_PUT_OUTPUT(A_EXTOUT_CENTER, playback+4 + SND_EMU10K1_PLAYBACK_CHANNELS);
+ A_PUT_OUTPUT(A_EXTOUT_LFE, playback+5 + SND_EMU10K1_PLAYBACK_CHANNELS);
/* ADC buffer */
A_PUT_OUTPUT(A_EXTOUT_ADC_CAP_L, capture);
Index: emupcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emupcm.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- emupcm.c9 Apr 2003 15:00:06 - 1.21
+++ emupcm.c29 Aug 2003 09:22:27 - 1.22
@@ -666,8 +666,11 @@
#else /* EMU10K1 Open Source code from Creative */
if (ptr epcm-ccca_start_addr)
ptr += runtime-buffer_size - epcm-ccca_start_addr;
- else
+ else {
ptr -= epcm-ccca_start_addr;
+ if (ptr = runtime-buffer_size)
+ ptr -= runtime-buffer_size;
+ }
#endif
// printk(ptr = 0x%x, buffer_size = 0x%x, period_size = 0x%x\n, ptr,
runtime-buffer_size, runtime-period_size);
return ptr;
---
This
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.102,1.103 ac97_patch.c,1.20,1.21
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/pci/ac97
Modified Files:
ac97_codec.c ac97_patch.c
Log Message:
- added the detection of revision of ALC650 chip by
James Courtier-Dutton [EMAIL PROTECTED]
- fixed the patch_alc650() to refer to the detected revision.
- detect the availability of stereo mute bits in snd_ac97_cmute_new().
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ac97_codec.c27 Aug 2003 16:17:31 - 1.102
+++ ac97_codec.c28 Aug 2003 15:36:44 - 1.103
@@ -64,7 +64,7 @@
{ 0x414b4d00, 0xff00, Asahi Kasei, NULL, NULL },
{ 0x41445300, 0xff00, Analog Devices,NULL, NULL },
{ 0x414c4300, 0xff00, Realtek, NULL, NULL },
-{ 0x414c4700, 0xff00, Avance Logic, NULL, NULL },
+{ 0x414c4700, 0xff00, Realtek, NULL, NULL },
{ 0x434d4900, 0xff00, C-Media Electronics, NULL, NULL },
{ 0x43525900, 0xff00, Cirrus Logic, NULL, NULL },
{ 0x43585400, 0xff00, Conexant, NULL, NULL },
@@ -109,6 +109,9 @@
{ 0x414c4320, 0xfff0, RL5383,NULL, NULL },
{ 0x414c4710, 0xfff0, ALC200/200P, NULL, NULL },
{ 0x414c4720, 0xfff0, ALC650,patch_alc650, NULL },
+{ 0x414c4721, 0xfff0, ALC650D, patch_alc650, NULL },
+{ 0x414c4722, 0xfff0, ALC650E, patch_alc650, NULL },
+{ 0x414c4723, 0xfff0, ALC650F, patch_alc650, NULL },
{ 0x414c4730, 0x, ALC101,NULL, NULL },
{ 0x414c4740, 0xfff0, ALC202,NULL, NULL },
{ 0x414c4750, 0xfff0, ALC250,NULL, NULL },
@@ -1125,7 +1128,19 @@
static int snd_ac97_cmute_new(snd_card_t *card, char *name, int reg, ac97_t *ac97)
{
snd_kcontrol_t *kctl;
+ int stereo = 0;
+
if (ac97-flags AC97_STEREO_MUTES) {
+ /* check whether both mute bits work */
+ unsigned short val, val1;
+ val = snd_ac97_read(ac97, reg);
+ val1 = val | 0x8080;
+ snd_ac97_write(ac97, reg, val1);
+ if (val1 == snd_ac97_read(ac97, reg))
+ stereo = 1;
+ snd_ac97_write(ac97, reg, val);
+ }
+ if (stereo) {
snd_kcontrol_new_t tmp = AC97_DOUBLE(name, reg, 15, 7, 1, 1);
tmp.index = ac97-num;
kctl = snd_ctl_new1(tmp, ac97);
@@ -1622,6 +1637,7 @@
ac97_t *ac97;
char name[64];
unsigned long end_time;
+ unsigned int reg;
static snd_device_ops_t ops = {
.dev_free = snd_ac97_dev_free,
};
@@ -1665,6 +1681,20 @@
snd_ac97_free(ac97);
return -EIO;
}
+ /* AC97 audio codec chip revision detection. */
+ /* Currently only Realtek ALC650 detection implemented. */
+ switch(ac97-id 0xfff0) {
+ case 0x414c4720:/* ALC650 */
+ reg = snd_ac97_read(ac97, AC97_ALC650_REVISION);
+ if (((reg 0x3f) = 0) ((reg 0x3f) 3))
+ ac97-id = 0x414c4720; /* Old version */
+ else if (((reg 0x3f) = 3) ((reg 0x3f) 0x10))
+ ac97-id = 0x414c4721; /* D version */
+ else if ((reg0x30) == 0x10)
+ ac97-id = 0x414c4722; /* E version */
+ else if ((reg0x30) == 0x20)
+ ac97-id = 0x414c4723; /* F version */
+}
/* test for AC'97 */
if (! (ac97-scaps AC97_SCAP_AUDIO)) {
Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ac97_patch.c27 Aug 2003 16:17:32 - 1.20
+++ ac97_patch.c28 Aug 2003 15:36:44 - 1.21
@@ -897,20 +897,22 @@
int patch_alc650(ac97_t * ac97)
{
- unsigned short val;
+ unsigned short val, reg;
int spdif = 0;
- /* FIXME: set the below 1 if we can detect the chip rev.E correctly.
-*this is used for switching mic and center/lfe, which needs
-*resetting GPIO0 level on the older revision.
-*/
ac97-build_ops = patch_alc650_ops;
- ac97-spec.dev_flags = 0;
+
+ /* revision E or F */
+ /* FIXME: what about revision D ? */
+ ac97-spec.dev_flags = (ac97-id == 0x414c4722 ||
+ ac97-id == 0x414c4723);
/* check spdif (should be only on rev.E) */
- val = snd_ac97_read(ac97, AC97_EXTENDED_STATUS);
- if (val AC97_EA_SPCV)
-
[alsa-cvslog] CVS: alsa-kernel/Documentation OSS-Emulation.txt,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv13120 Modified Files: OSS-Emulation.txt Log Message: added descriptions for whole-frag and no-silence commands. Index: OSS-Emulation.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/OSS-Emulation.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- OSS-Emulation.txt 29 Apr 2003 14:32:15 - 1.4 +++ OSS-Emulation.txt 27 Aug 2003 16:05:36 - 1.5 @@ -152,6 +152,9 @@ direct don't use plugins block force block open mode non-block force non-block open mode + whole-frag write only whole fragments (optimization affecting + playback only) + no-silence do not fill silence ahead to avoid clicks The disable option is useful when one stream direction (playback or capture) is not handled correctly by the application although the @@ -184,6 +187,12 @@ for OSS devices, define like the following: options snd-pcm-oss nonblock_open=1 + +The whole-frag and no-silence commands have been added recently. +Both commands are for optimization use only. The former command +specifies to invoke the write transfer only when the whole fragment is +filled. The latter stops writing the silence data ahead +automatically. Both are disabled as default. You can check the currently defined configuration by reading the proc file. The read image can be sent to the proc file again, hence you --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.15,1.16
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv13973/Documentation Modified Files: ALSA-Configuration.txt Log Message: - use dxs_support=3 (48k fixed) as default, since there are so many problems with dxs_support=0. - added kernel boot parameter for dxs_support option. Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ALSA-Configuration.txt 12 Aug 2003 15:37:42 - 1.15 +++ ALSA-Configuration.txt 27 Aug 2003 16:12:03 - 1.16 @@ -992,8 +992,8 @@ [VIA686A/686B only] ac97_clock - AC'97 codec clock base (default 48000Hz) dxs_support- support DXS channels, - 0 = auto (default), 1 = enable, 2 = disable, - 3 = 48k only + 0 = auto, 1 = enable, 2 = disable, + 3 = 48k only (default) [VIA8233/C,8235 only] Module supports autoprobe and multiple bus-master chips (max 8). @@ -1007,11 +1007,9 @@ Note: VIA8233/5 (not VIA8233A) can support DXS (direct sound) channels as the first PCM. With this device, up to 4 streams can be played at the same time. On some motherboards, - these channels don't work properly due to the bug of BIOS. - If you experience that the playback on this PCM is noisy, - try to specify dxs_support option to 2 or 3. In most cases - dxs_support=3 would suffice, so you can keep the multi-play - capability. + these channels don't work properly except for 48k due to the + bug of BIOS. For supporting other sample rates, try to + specify dxs_support=0. Note: for the MPU401 on VIA823x, use snd-mpu401 driver additonally. The mpu_port option is for VIA686 chips only. --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.46,1.47
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv13973/pci
Modified Files:
via82xx.c
Log Message:
- use dxs_support=3 (48k fixed) as default, since there are so many problems
with dxs_support=0.
- added kernel boot parameter for dxs_support option.
Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- via82xx.c 14 Aug 2003 11:05:38 - 1.46
+++ via82xx.c 27 Aug 2003 16:12:03 - 1.47
@@ -74,7 +74,7 @@
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 48000};
-static int dxs_support[SNDRV_CARDS];
+static int dxs_support[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 3};
MODULE_PARM(index, 1- __MODULE_STRING(SNDRV_CARDS) i);
MODULE_PARM_DESC(index, Index value for VIA 82xx bridge.);
@@ -2083,7 +2083,7 @@
#ifndef MODULE
/* format is: snd-via82xx=enable,index,id,
- mpu_port,ac97_clock */
+ mpu_port,ac97_clock,dxs_support */
static int __init alsa_card_via82xx_setup(char *str)
{
@@ -2095,7 +2095,8 @@
get_option(str,index[nr_dev]) == 2
get_id(str,id[nr_dev]) == 2
get_option(str,(int *)mpu_port[nr_dev]) == 2
- get_option(str,ac97_clock[nr_dev]) == 2);
+ get_option(str,ac97_clock[nr_dev]) == 2
+ get_option(str,dxs_support[nr_dev]) == 2);
nr_dev++;
return 1;
}
---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/ppc pmac.c,1.23,1.24 tumbler.c,1.22,1.23
Update of /cvsroot/alsa/alsa-kernel/ppc
In directory sc8-pr-cvs1:/tmp/cvs-serv19575
Modified Files:
pmac.c tumbler.c
Log Message:
- initialize tumbler/snapper audio via gpio before i2c initialization.
- enabled capture on snapper. don't know whether it works :)
Index: pmac.c
===
RCS file: /cvsroot/alsa/alsa-kernel/ppc/pmac.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pmac.c 18 Jun 2003 11:09:58 - 1.23
+++ pmac.c 27 Aug 2003 16:44:23 - 1.24
@@ -923,8 +923,6 @@
}
if (device_is_compatible(sound, snapper)) {
chip-model = PMAC_SNAPPER;
- chip-can_capture = 0; /* no capture */
- chip-can_duplex = 0;
// chip-can_byte_swap = 0; /* FIXME: check this */
chip-num_freqs = 2;
chip-freq_table = tumbler_freqs;
Index: tumbler.c
===
RCS file: /cvsroot/alsa/alsa-kernel/ppc/tumbler.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tumbler.c 18 Jun 2003 11:09:58 - 1.22
+++ tumbler.c 27 Aug 2003 16:44:23 - 1.23
@@ -42,7 +42,7 @@
#define TAS_I2C_ADDR 0x34
/* registers */
-#define TAS_REG_MCS0x01
+#define TAS_REG_MCS0x01/* main control */
#define TAS_REG_DRC0x02
#define TAS_REG_VOL0x04
#define TAS_REG_TREBLE 0x05
@@ -56,6 +56,8 @@
/* tas3004 */
#define TAS_REG_LMIX TAS_REG_INPUT1
#define TAS_REG_RMIX TAS_REG_INPUT2
+#define TAS_REG_MCS2 0x43/* main control 2 */
+#define TAS_REG_ACS0x40/* analog control */
/* mono volumes for tas3001c/tas3004 */
enum {
@@ -98,21 +100,48 @@
/*
*/
-static int tumbler_init_client(pmac_keywest_t *i2c)
+static int send_init_client(pmac_keywest_t *i2c, unsigned int *regs)
{
- int err, count = 10;
- do {
- /* normal operation, SCLK=64fps, i2s output, i2s input, 16bit width */
- err = snd_pmac_keywest_write_byte(i2c, TAS_REG_MCS,
- (16)+(24)+(22)+0);
- if (err = 0)
- return err;
- mdelay(10);
- } while (count--);
- return -ENXIO;
+ while (*regs 0) {
+ int err, count = 10;
+ do {
+ err = snd_pmac_keywest_write_byte(i2c, regs[0], regs[1]);
+ if (err = 0)
+ break;
+ mdelay(10);
+ } while (count--);
+ if (err 0)
+ return -ENXIO;
+ regs += 2;
+ }
+ return 0;
}
+static int tumbler_init_client(pmac_keywest_t *i2c)
+{
+ static unsigned int regs[] = {
+ /* normal operation, SCLK=64fps, i2s output, i2s input, 16bit width */
+ TAS_REG_MCS, (16)|(24)|(22)|0,
+ 0, /* terminator */
+ };
+ return send_init_client(i2c, regs);
+}
+
+static int snapper_init_client(pmac_keywest_t *i2c)
+{
+ static unsigned int regs[] = {
+ /* normal operation, SCLK=64fps, i2s output, 16bit width */
+ TAS_REG_MCS, (16)|(24)|0,
+ /* normal operation, all-pass mode */
+ TAS_REG_MCS2, (11),
+ /* normal output, no deemphasis, A input, power-up */
+ TAS_REG_ACS, 0,
+ 0, /* terminator */
+ };
+ return send_init_client(i2c, regs);
+}
+
/*
* gpio access
*/
@@ -882,8 +911,8 @@
snd_assert(mix, return);
tumbler_reset_audio(chip);
- if (mix-i2c.client) {
- if (tumbler_init_client(mix-i2c) 0)
+ if (mix-i2c.client mix-i2c.init_client) {
+ if (mix-i2c.init_client(mix-i2c) 0)
printk(KERN_ERR tumbler_init_client error\n);
} else
printk(KERN_ERR tumbler: i2c is not initialized\n);
@@ -976,6 +1005,9 @@
chip-mixer_data = mix;
chip-mixer_free = tumbler_cleanup;
+ if ((err = tumbler_init(chip)) 0)
+ return err;
+
/* set up TAS */
tas_node = find_devices(deq);
if (tas_node == NULL)
@@ -987,11 +1019,12 @@
else
mix-i2c.addr = TAS_I2C_ADDR;
- mix-i2c.init_client = tumbler_init_client;
if (chip-model == PMAC_TUMBLER) {
+ mix-i2c.init_client = tumbler_init_client;
mix-i2c.name = TAS3001c;
chipname = Tumbler;
} else {
+ mix-i2c.init_client = snapper_init_client;
mix-i2c.name = TAS3004;
chipname = Snapper;
}
@@ -1020,9 +1053,6 @@
return err;
chip-speaker_sw_ctl = snd_ctl_new1(tumbler_speaker_sw, chip);
if ((err = snd_ctl_add(chip-card,
[alsa-cvslog] CVS: alsa-lib/include alsa-symbols.h,1.3,1.4
Update of /cvsroot/alsa/alsa-lib/include In directory sc8-pr-cvs1:/tmp/cvs-serv24297 Modified Files: alsa-symbols.h Log Message: added workaround for ppc64. Index: alsa-symbols.h === RCS file: /cvsroot/alsa/alsa-lib/include/alsa-symbols.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- alsa-symbols.h 11 Mar 2003 18:51:32 - 1.3 +++ alsa-symbols.h 13 Aug 2003 13:18:36 - 1.4 @@ -29,10 +29,19 @@ #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name) -#define symbol_version(real, name, version) \ +#ifdef __powerpc64__ +# define symbol_version(real, name, version) \ + __asm__ (.symver #real , #name @ #version); \ + __asm__ (.symver . #real ,. #name @ #version) +# define default_symbol_version(real, name, version) \ + __asm__ (.symver #real , #name @@ #version); \ + __asm__ (.symver . #real ,. #name @@ #version) +#else +# define symbol_version(real, name, version) \ __asm__ (.symver #real , #name @ #version) -#define default_symbol_version(real, name, version) \ +# define default_symbol_version(real, name, version) \ __asm__ (.symver #real , #name @@ #version) +#endif #ifdef USE_VERSIONED_SYMBOLS #define use_symbol_version(real, name, version) \ @@ -41,9 +50,17 @@ default_symbol_version(real, name, version) #else #define use_symbol_version(real, name, version) /* nothing */ +#ifdef __powerpc64__ +#define use_default_symbol_version(real, name, version) \ + __asm__ (.weak #name); \ + __asm__ (.weak . #name); \ + __asm__ (.set #name , #real); \ + __asm__ (.set . #name ,. #real) +#else #define use_default_symbol_version(real, name, version) \ __asm__ (.weak #name); \ __asm__ (.set #name , #real) +#endif #endif #endif /* __ALSA_SYMBOLS_H */ --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.100,1.101
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv12334
Modified Files:
ac97_codec.c
Log Message:
fix by James Courtier-Dutton [EMAIL PROTECTED]:
Fixes ac3 passthru non-audio bit setting for AC97 codecs.
I have :-
Card: Intel ICH5
Chip: Avance Logic ALC650 rev 0
The problem I was having was that the spdif non-audio bit was not
being set.
This patch fixes that problem.
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ac97_codec.c30 Jul 2003 10:54:03 - 1.100
+++ ac97_codec.c14 Aug 2003 16:05:13 - 1.101
@@ -823,7 +823,13 @@
AC97_CXR_SPDIF_MASK | AC97_CXR_COPYRGT,
v);
} else {
+ unsigned short extst = ac97-regs[AC97_EXTENDED_STATUS];
+ snd_ac97_update_bits(ac97, AC97_EXTENDED_STATUS, AC97_EA_SPDIF, 0); /*
turn off */
+
change |= snd_ac97_update_bits(ac97, AC97_SPDIF, 0x3fff, val);
+ if (extst AC97_EA_SPDIF) {
+ snd_ac97_update_bits(ac97, AC97_EXTENDED_STATUS,
AC97_EA_SPDIF, AC97_EA_SPDIF); /* turn on again */
+}
}
return change;
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa opl3sa2.c,1.28,1.29
Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1:/tmp/cvs-serv22171 Modified Files: opl3sa2.c Log Message: fixed the uninitialized spin_lock. Index: opl3sa2.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/opl3sa2.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- opl3sa2.c 12 Aug 2003 14:10:11 - 1.28 +++ opl3sa2.c 13 Aug 2003 13:01:22 - 1.29 @@ -752,6 +752,7 @@ err = -ENOMEM; goto __error; } + spin_lock_init(chip-reg_lock); chip-irq = -1; if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, ops)) 0) goto __error; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/trident trident_main.c,1.45,1.46
Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1:/tmp/cvs-serv16068/pci/trident
Modified Files:
trident_main.c
Log Message:
fixed the wrong order of object destruction:
a released object is referred after the *_free() call.
Index: trident_main.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- trident_main.c 21 Jun 2003 07:52:38 - 1.45
+++ trident_main.c 14 Aug 2003 11:05:38 - 1.46
@@ -3538,13 +3538,13 @@
trident-port = pci_resource_start(pci, 0);
if ((trident-res_port = request_region(trident-port, 0x100, Trident
Audio)) == NULL) {
- snd_trident_free(trident);
snd_printk(unable to grab I/O region 0x%lx-0x%lx\n, trident-port,
trident-port + 0x100 - 1);
+ snd_trident_free(trident);
return -EBUSY;
}
if (request_irq(pci-irq, snd_trident_interrupt, SA_INTERRUPT|SA_SHIRQ,
Trident Audio, (void *) trident)) {
- snd_trident_free(trident);
snd_printk(unable to grab IRQ %d\n, pci-irq);
+ snd_trident_free(trident);
return -EBUSY;
}
trident-irq = pci-irq;
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/sparc amd7930.c,1.6,1.7 cs4231.c,1.8,1.9
Update of /cvsroot/alsa/alsa-kernel/sparc
In directory sc8-pr-cvs1:/tmp/cvs-serv16068/sparc
Modified Files:
amd7930.c cs4231.c
Log Message:
fixed the wrong order of object destruction:
a released object is referred after the *_free() call.
Index: amd7930.c
===
RCS file: /cvsroot/alsa/alsa-kernel/sparc/amd7930.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amd7930.c 8 May 2003 08:32:35 - 1.6
+++ amd7930.c 14 Aug 2003 11:05:39 - 1.7
@@ -992,10 +992,10 @@
if (request_irq(irq_prop-pri, snd_amd7930_interrupt,
SA_INTERRUPT | SA_SHIRQ, amd7930, amd)) {
- snd_amd7930_free(amd);
snd_printk(amd7930-%d: Unable to grab IRQ %s\n,
dev,
__irq_itoa(irq_prop-pri));
+ snd_amd7930_free(amd);
return -EBUSY;
}
amd-irq = irq_prop-pri;
Index: cs4231.c
===
RCS file: /cvsroot/alsa/alsa-kernel/sparc/cs4231.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cs4231.c6 Jun 2003 11:54:28 - 1.8
+++ cs4231.c14 Aug 2003 11:05:39 - 1.9
@@ -1994,10 +1994,10 @@
if (request_irq(sdev-irqs[0], snd_cs4231_sbus_interrupt,
SA_SHIRQ, cs4231, chip)) {
- snd_cs4231_sbus_free(chip);
snd_printk(cs4231-%d: Unable to grab SBUS IRQ %s\n,
dev,
__irq_itoa(sdev-irqs[0]));
+ snd_cs4231_sbus_free(chip);
return -EBUSY;
}
chip-irq[0] = sdev-irqs[0];
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils/aplay aplay.1,1.6,1.7 aplay.c,1.169,1.170
Update of /cvsroot/alsa/alsa-utils/aplay
In directory sc8-pr-cvs1:/tmp/cvs-serv25869
Modified Files:
aplay.1 aplay.c
Log Message:
- added --buffer-size and --period-size options.
- accept -h as the help :)
- fixed VU meter for 8 bit and negative values.
- updated man page.
Index: aplay.1
===
RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.1,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aplay.1 7 Aug 2001 10:34:51 - 1.6
+++ aplay.1 7 Aug 2003 14:48:17 - 1.7
@@ -25,7 +25,7 @@
.SS Options
.TP
-\fI--help\fP
+\fI-h, --help\fP
Help: show syntax.
.TP
\fI--version\fP
@@ -86,6 +86,12 @@
\fI-B, --buffer-time=#\fP
Buffer duration is # microseconds
.TP
+\fI--period-size=#\fP
+Distance between interrupts is # frames
+.TP
+\fI--buffer-size=#\fP
+Buffer duration is # frames
+.TP
\fI-A, --avail-min=#\fP
Min available space for wakeup is # microseconds
.TP
@@ -97,14 +103,15 @@
Delay for automatic PCM stop is # microseconds from xrun
.TP
\fI-v, --verbose\fP
-Show PCM structure and setup
+Show PCM structure and setup.
+This option is accumulative. The VU meter is displayed when this
+is given twice.
.TP
\fI-I, --separate-channels\fP
One file for each channel
-.TP
.SS
-Example:
+Example:
.RS
\fBaplay -c 1 -t raw -r 22050 -f mu_law foobar\fR
Index: aplay.c
===
RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- aplay.c 31 Jul 2003 07:39:13 - 1.169
+++ aplay.c 7 Aug 2003 14:48:17 - 1.170
@@ -83,6 +83,8 @@
static snd_pcm_uframes_t chunk_size = 0;
static unsigned period_time = 0;
static unsigned buffer_time = 0;
+static snd_pcm_uframes_t period_frames = 0;
+static snd_pcm_uframes_t buffer_frames = 0;
static int avail_min = -1;
static int start_delay = 0;
static int stop_delay = 0;
@@ -142,8 +144,8 @@
fprintf(stderr,
Usage: %s [OPTION]... [FILE]...\n
\n
---help help\n
---version print current version\n
+-h, --help help\n
+--version print current version\n
-l, --list-devices list all soundcards and digital audio devices\n
-L, --list-pcms list all PCMs defined\n
-D, --device=NAME select PCM by name\n
@@ -158,6 +160,8 @@
-N, --nonblock nonblocking mode\n
-F, --period-time=# distance between interrupts is # microseconds\n
-B, --buffer-time=# buffer duration is # microseconds\n
+--period-size=# distance between interrupts is # frames\n
+--buffer-size=# buffer duration is # frames\n
-A, --avail-min=# min available space for wakeup is # microseconds\n
-R, --start-delay=# delay for automatic PCM start is # microseconds \n
(relative to buffer size if = 0)\n
@@ -287,15 +291,18 @@
exit(EXIT_FAILURE);
}
-#define OPT_HELP 1
-#define OPT_VERSION 2
+enum {
+ OPT_VERSION = 1,
+ OPT_PERIOD_SIZE,
+ OPT_BUFFER_SIZE
+};
int main(int argc, char *argv[])
{
int option_index;
- char *short_options = lLD:qt:c:f:r:d:s:MNF:A:X:R:T:B:vIPC;
+ char *short_options = hlLD:qt:c:f:r:d:s:MNF:A:X:R:T:B:vIPC;
static struct option long_options[] = {
- {help, 0, 0, OPT_HELP},
+ {help, 0, 0, 'h'},
{version, 0, 0, OPT_VERSION},
{list-devices, 0, 0, 'l'},
{list-pcms, 0, 0, 'L'},
@@ -310,10 +317,12 @@
{mmap, 0, 0, 'M'},
{nonblock, 0, 0, 'N'},
{period-time, 1, 0, 'F'},
+ {period-size, 1, 0, OPT_PERIOD_SIZE},
{avail-min, 1, 0, 'A'},
{start-delay, 1, 0, 'R'},
{stop-delay, 1, 0, 'T'},
{buffer-time, 1, 0, 'B'},
+ {buffer-size, 1, 0, OPT_BUFFER_SIZE},
{verbose, 0, 0, 'v'},
{separate-channels, 0, 0, 'I'},
{playback, 0, 0, 'P'},
@@ -350,7 +359,7 @@
while ((c = getopt_long(argc, argv, short_options, long_options,
option_index)) != -1) {
switch (c) {
- case OPT_HELP:
+ case 'h':
usage(command);
return 0;
case OPT_VERSION:
@@ -435,6 +444,12 @@
case 'B':
buffer_time = atoi(optarg);
break;
+ case OPT_PERIOD_SIZE:
+ period_frames = atoi(optarg);
+ break;
+ case OPT_BUFFER_SIZE:
+ buffer_frames = atoi(optarg);
+ break;
case 'A':
avail_min = atoi(optarg);
break;
@@ -829,15 +844,28 @@
[alsa-cvslog] CVS: alsa-kernel/pci es1968.c,1.47,1.48
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv13006
Modified Files:
es1968.c
Log Message:
removed buggy copy callback.
the standard copy routine works properly.
Index: es1968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- es1968.c5 Aug 2003 12:45:12 - 1.47
+++ es1968.c6 Aug 2003 17:44:50 - 1.48
@@ -1642,28 +1642,6 @@
return 0;
}
-static int snd_es1968_capture_copy(snd_pcm_substream_t *substream,
- int channel, snd_pcm_uframes_t pos,
- void *buf, snd_pcm_uframes_t count)
-{
- //es1968_t *chip = snd_pcm_substream_chip(substream);
- snd_pcm_runtime_t *runtime = substream-runtime;
- esschan_t *es = snd_magic_cast(esschan_t, runtime-private_data, return
-ENXIO);
- char *src = runtime-dma_area;
-
- if (runtime-channels == 1)
- return copy_to_user(buf, src + pos, count) ? -EFAULT : 0;
- else {
- count /= 2;
- pos /= 2;
- if (copy_to_user(buf, src + pos, count))
- return -EFAULT;
- if (copy_to_user(buf + count, src + pos + es-dma_size/2, count))
- return -EFAULT;
- return 0;
- }
-}
-
static int snd_es1968_capture_open(snd_pcm_substream_t *substream)
{
snd_pcm_runtime_t *runtime = substream-runtime;
@@ -1778,7 +1756,6 @@
.prepare = snd_es1968_pcm_prepare,
.trigger = snd_es1968_pcm_trigger,
.pointer = snd_es1968_pcm_pointer,
- .copy = snd_es1968_capture_copy,
};
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation/DocBook writing-an-alsa-driver.tmpl,1.12,1.13
Update of /cvsroot/alsa/alsa-kernel/Documentation/DocBook
In directory sc8-pr-cvs1:/tmp/cvs-serv16846
Modified Files:
writing-an-alsa-driver.tmpl
Log Message:
fix typos
Index: writing-an-alsa-driver.tmpl
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/DocBook/writing-an-alsa-driver.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- writing-an-alsa-driver.tmpl 3 Jul 2003 11:37:29 - 1.12
+++ writing-an-alsa-driver.tmpl 11 Aug 2003 12:37:56 - 1.13
@@ -438,7 +438,7 @@
// chip-specific constructor
// (see Management of Cards and Components)
static int __devinit snd_mychip_create(snd_card_t *card,
- struct pci_device *pci,
+ struct pci_dev *pci,
mychip_t **rchip)
{
mychip_t *chip;
@@ -1915,7 +1915,7 @@
};
/* open callback */
- static int snd_mychip_pcm_open(snd_pcm_substream_t *subs)
+ static int snd_mychip_pcm_open(snd_pcm_substream_t *substream)
{
mychip_t *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream-runtime;
@@ -2716,7 +2716,7 @@
informalexample
programlisting
![CDATA[
- static int snd_xxx_open(snd_pcm_substream_t *subs);
+ static int snd_xxx_open(snd_pcm_substream_t *substream);
]]
/programlisting
/informalexample
@@ -2767,7 +2767,7 @@
informalexample
programlisting
![CDATA[
- static int snd_xxx_close(snd_pcm_substream_t *subs);
+ static int snd_xxx_close(snd_pcm_substream_t *substream);
]]
/programlisting
/informalexample
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core/oss pcm_plugin.c,1.15,1.16 pcm_plugin.h,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv13195
Modified Files:
pcm_plugin.c pcm_plugin.h
Log Message:
removed unused functions.
Index: pcm_plugin.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pcm_plugin.c24 Jul 2003 13:33:52 - 1.15
+++ pcm_plugin.c6 Aug 2003 17:45:09 - 1.16
@@ -923,47 +923,6 @@
return 0;
}
-int snd_pcm_areas_silence(const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t
dst_offset,
- unsigned int channels, snd_pcm_uframes_t frames, int format)
-{
- int width = snd_pcm_format_physical_width(format);
- while (channels 0) {
- void *addr = dst_areas-addr;
- unsigned int step = dst_areas-step;
- const snd_pcm_channel_area_t *begin = dst_areas;
- int vc = channels;
- unsigned int v = 0;
- int err;
- while (1) {
- vc--;
- v++;
- dst_areas++;
- if (vc == 0 ||
- dst_areas-addr != addr ||
- dst_areas-step != step ||
- dst_areas-first != dst_areas[-1].first + width)
- break;
- }
- if (v 1 v * width == step) {
- /* Collapse the areas */
- snd_pcm_channel_area_t d;
- d.addr = begin-addr;
- d.first = begin-first;
- d.step = width;
- err = snd_pcm_area_silence(d, dst_offset * v, frames * v,
format);
- channels -= v;
- } else {
- err = snd_pcm_area_silence(begin, dst_offset, frames, format);
- dst_areas = begin + 1;
- channels--;
- }
- if (err 0)
- return err;
- }
- return 0;
-}
-
-
int snd_pcm_area_copy(const snd_pcm_channel_area_t *src_area, size_t src_offset,
const snd_pcm_channel_area_t *dst_area, size_t dst_offset,
size_t samples, int format)
@@ -1055,53 +1014,6 @@
}
default:
snd_BUG();
- }
- return 0;
-}
-
-int snd_pcm_areas_copy(const snd_pcm_channel_area_t *src_areas, snd_pcm_uframes_t
src_offset,
- const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t
dst_offset,
- unsigned int channels, snd_pcm_uframes_t frames, int format)
-{
- int width = snd_pcm_format_physical_width(format);
- while (channels 0) {
- unsigned int step = src_areas-step;
- void *src_addr = src_areas-addr;
- const snd_pcm_channel_area_t *src_start = src_areas;
- void *dst_addr = dst_areas-addr;
- const snd_pcm_channel_area_t *dst_start = dst_areas;
- int vc = channels;
- unsigned int v = 0;
- while (dst_areas-step == step) {
- vc--;
- v++;
- src_areas++;
- dst_areas++;
- if (vc == 0 ||
- src_areas-step != step ||
- src_areas-addr != src_addr ||
- dst_areas-addr != dst_addr ||
- src_areas-first != src_areas[-1].first + width ||
- dst_areas-first != dst_areas[-1].first + width)
- break;
- }
- if (v 1 v * width == step) {
- /* Collapse the areas */
- snd_pcm_channel_area_t s, d;
- s.addr = src_start-addr;
- s.first = src_start-first;
- s.step = width;
- d.addr = dst_start-addr;
- d.first = dst_start-first;
- d.step = width;
- snd_pcm_area_copy(s, src_offset * v, d, dst_offset * v,
frames * v, format);
- channels -= v;
- } else {
- snd_pcm_area_copy(src_start, src_offset, dst_start,
dst_offset, frames, format);
- src_areas = src_start + 1;
- dst_areas = dst_start + 1;
- channels--;
- }
}
return 0;
}
Index: pcm_plugin.h
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
---
[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.87,1.88
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv16809
Modified Files:
intel8x0.c
Log Message:
fix mixed up vendor/device ID's for Asus P4P800
Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- intel8x0.c 30 Jul 2003 14:39:38 - 1.87
+++ intel8x0.c 11 Aug 2003 12:37:36 - 1.88
@@ -1568,6 +1568,12 @@
.name = ASUS P4PE Mobo,
.type = AC97_TUNE_SWAP_SURROUND
},
+ {
+ .vendor = 0x1043,
+ .device = 0x80f3,
+ .name = ASUS ICH5/AD1985,
+ .type = AC97_TUNE_AD_SHARING
+ },
{
.vendor = 0x10f1,
.device = 0x2665,
@@ -1641,12 +1647,6 @@
.mask = 0xfff0,
.name = Intel ICH5/AD1985 (discrete),
.type = AC97_TUNE_HP_ONLY
- },
- {
- .vendor = 0x80f3,
- .device = 0x1043,
- .name = ASUS ICH5/AD1985,
- .type = AC97_TUNE_AD_SHARING
},
{ } /* terminator */
};
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/opl3 opl3_lib.c,1.17,1.18
Update of /cvsroot/alsa/alsa-kernel/drivers/opl3
In directory sc8-pr-cvs1:/tmp/cvs-serv16068/drivers/opl3
Modified Files:
opl3_lib.c
Log Message:
fixed the wrong order of object destruction:
a released object is referred after the *_free() call.
Index: opl3_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl3/opl3_lib.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- opl3_lib.c 21 Jun 2003 07:52:37 - 1.17
+++ opl3_lib.c 14 Aug 2003 11:05:38 - 1.18
@@ -440,9 +440,9 @@
default:
opl3-command = snd_opl2_command;
if ((err = snd_opl3_detect(opl3)) 0) {
- snd_opl3_free(opl3);
snd_printd(OPL2/3 chip not detected at 0x%lx/0x%lx\n,
opl3-l_port, opl3-r_port);
+ snd_opl3_free(opl3);
return err;
}
/* detect routine returns correct hardware type */
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emu10k1.c,1.19,1.20
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/emu10k1
Modified Files:
emu10k1.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: emu10k1.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emu10k1.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- emu10k1.c 25 Jul 2003 10:39:38 - 1.19
+++ emu10k1.c 12 Aug 2003 14:10:15 - 1.20
@@ -78,7 +78,7 @@
MODULE_PARM_DESC(enable_ir, Enable IR.);
MODULE_PARM_SYNTAX(enable_ir, SNDRV_ENABLE_DESC);
-static struct pci_device_id snd_emu10k1_ids[] __devinitdata = {
+static struct pci_device_id snd_emu10k1_ids[] = {
{ 0x1102, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },/* EMU10K1 */
{ 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },/* Dell OEM version
(EMU10K1) */
{ 0x1102, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },/* Audigy */
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/cs46xx cs46xx.c,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/cs46xx
Modified Files:
cs46xx.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: cs46xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cs46xx.c18 Jun 2003 11:07:21 - 1.21
+++ cs46xx.c12 Aug 2003 14:10:14 - 1.22
@@ -72,7 +72,7 @@
MODULE_PARM_DESC(mmap_valid, Support OSS mmap.);
MODULE_PARM_SYNTAX(mmap_valid, SNDRV_ENABLED , SNDRV_BOOLEAN_FALSE_DESC);
-static struct pci_device_id snd_cs46xx_ids[] __devinitdata = {
+static struct pci_device_id snd_cs46xx_ids[] = {
{ 0x1013, 0x6001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4280 */
{ 0x1013, 0x6003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4612 */
{ 0x1013, 0x6004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4615 */
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/arm sa11xx-uda1341.c,1.11,1.12
Update of /cvsroot/alsa/alsa-kernel/arm In directory sc8-pr-cvs1:/tmp/cvs-serv23748 Modified Files: sa11xx-uda1341.c Log Message: fixed missing spin_lock_init(). Index: sa11xx-uda1341.c === RCS file: /cvsroot/alsa/alsa-kernel/arm/sa11xx-uda1341.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sa11xx-uda1341.c30 Apr 2003 14:53:11 - 1.11 +++ sa11xx-uda1341.c13 Aug 2003 13:14:31 - 1.12 @@ -965,6 +965,8 @@ sa11xx_uda1341 = snd_magic_kcalloc(sa11xx_uda1341_t, 0, GFP_KERNEL); if (sa11xx_uda1341 == NULL) return -ENOMEM; + spin_lock_init(chip-s[0].dma_lock); + spin_lock_init(chip-s[1].dma_lock); card-private_data = (void *)sa11xx_uda1341; card-private_free = snd_sa11xx_uda1341_free; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci azt3328.c,1.2,1.3 cs4281.c,1.43,1.44 ens1370.c,1.47,1.48 es1938.c,1.26,1.27 es1968.c,1.51,1.52 sonicvibes.c,1.25,1.26 via82xx.c,1.45,1.46
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv16068/pci
Modified Files:
azt3328.c cs4281.c ens1370.c es1938.c es1968.c sonicvibes.c
via82xx.c
Log Message:
fixed the wrong order of object destruction:
a released object is referred after the *_free() call.
Index: azt3328.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/azt3328.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azt3328.c 12 Aug 2003 14:10:12 - 1.2
+++ azt3328.c 14 Aug 2003 11:05:38 - 1.3
@@ -1347,38 +1347,38 @@
chip-codec_port = pci_resource_start(pci, 0);
if ((chip-res_codec_port = request_region(chip-codec_port, 0x80, Aztech
AZF3328 I/O)) == NULL) {
- snd_azf3328_free(chip);
snd_printk(unable to grab I/O port at 0x%lx-0x%lx\n,
chip-codec_port, chip-codec_port + 0x80 - 1);
+ snd_azf3328_free(chip);
return -EBUSY;
}
chip-io2_port = pci_resource_start(pci, 1);
if ((chip-res_io2_port = request_region(chip-io2_port, 0x08, Aztech AZF3328
I/O 2)) == NULL) {
- snd_azf3328_free(chip);
snd_printk(unable to grab I/O 2 port at 0x%lx-0x%lx\n,
chip-io2_port, chip-io2_port + 0x08 - 1);
+ snd_azf3328_free(chip);
return -EBUSY;
}
chip-mpu_port = pci_resource_start(pci, 2);
if ((chip-res_mpu_port = request_region(chip-mpu_port, 0x04, Aztech AZF3328
MPU401)) == NULL) {
- snd_azf3328_free(chip);
snd_printk(unable to grab MPU401 port at 0x%lx-0x%lx\n,
chip-mpu_port, chip-mpu_port + 0x04 - 1);
+ snd_azf3328_free(chip);
return -EBUSY;
}
chip-synth_port = pci_resource_start(pci, 3);
if ((chip-res_synth_port = request_region(chip-synth_port, 0x08, Aztech
AZF3328 OPL3)) == NULL) {
- snd_azf3328_free(chip);
snd_printk(unable to grab OPL3 port at 0x%lx-0x%lx\n,
chip-synth_port, chip-synth_port + 0x08 - 1);
+ snd_azf3328_free(chip);
return -EBUSY;
}
chip-mixer_port = pci_resource_start(pci, 4);
if ((chip-res_mixer_port = request_region(chip-mixer_port, 0x40, Aztech
AZF3328 Mixer)) == NULL) {
- snd_azf3328_free(chip);
snd_printk(unable to grab mixer port at 0x%lx-0x%lx\n,
chip-mixer_port, chip-mixer_port + 0x40 - 1);
+ snd_azf3328_free(chip);
return -EBUSY;
}
if (request_irq(pci-irq, snd_azf3328_interrupt, SA_INTERRUPT|SA_SHIRQ,
card-shortname, (void *)chip)) {
- snd_azf3328_free(chip);
snd_printk(unable to grab IRQ %d\n, pci-irq);
+ snd_azf3328_free(chip);
return -EBUSY;
}
chip-irq = pci-irq;
@@ -1499,8 +1499,8 @@
if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_MPU401,
chip-mpu_port, 1, pci-irq, 0,
chip-rmidi)) 0) {
- snd_card_free(card);
snd_printk(azf3328: no MPU-401 device at 0x%lx?\n, chip-mpu_port);
+ snd_card_free(card);
return err;
}
Index: cs4281.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cs4281.c12 Aug 2003 14:10:12 - 1.43
+++ cs4281.c14 Aug 2003 11:05:38 - 1.44
@@ -1439,18 +1439,18 @@
chip-dual_codec = dual_codec;
if ((chip-ba0_res = request_mem_region(chip-ba0_addr, CS4281_BA0_SIZE,
CS4281 BA0)) == NULL) {
- snd_cs4281_free(chip);
snd_printk(KERN_ERR unable to grab memory region 0x%lx-0x%lx\n,
chip-ba0_addr, chip-ba0_addr + CS4281_BA0_SIZE - 1);
+ snd_cs4281_free(chip);
return -ENOMEM;
}
if ((chip-ba1_res = request_mem_region(chip-ba1_addr, CS4281_BA1_SIZE,
CS4281 BA1)) == NULL) {
- snd_cs4281_free(chip);
snd_printk(KERN_ERR unable to grab memory region 0x%lx-0x%lx\n,
chip-ba1_addr, chip-ba1_addr + CS4281_BA1_SIZE - 1);
+ snd_cs4281_free(chip);
return -ENOMEM;
}
if (request_irq(pci-irq, snd_cs4281_interrupt, SA_INTERRUPT|SA_SHIRQ,
CS4281, (void *)chip)) {
- snd_cs4281_free(chip);
snd_printk(KERN_ERR unable to grab IRQ %d\n, pci-irq);
+ snd_cs4281_free(chip);
return -ENOMEM;
}
chip-irq = pci-irq;
Index: ens1370.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.42,1.43 rme9652.c,1.35,1.36
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/rme9652
Modified Files:
hdsp.c rme9652.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: hdsp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- hdsp.c 28 Jul 2003 13:50:51 - 1.42
+++ hdsp.c 12 Aug 2003 14:10:16 - 1.43
@@ -473,7 +473,7 @@
}
#endif
-static struct pci_device_id snd_hdsp_ids[] __devinitdata = {
+static struct pci_device_id snd_hdsp_ids[] = {
{
.vendor = PCI_VENDOR_ID_XILINX,
.device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP,
Index: rme9652.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/rme9652.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- rme9652.c 3 Jul 2003 11:31:21 - 1.35
+++ rme9652.c 12 Aug 2003 14:10:16 - 1.36
@@ -345,7 +345,7 @@
#endif
-static struct pci_device_id snd_rme9652_ids[] __devinitdata = {
+static struct pci_device_id snd_rme9652_ids[] = {
{
.vendor= 0x10ee,
.device= 0x3fc4,
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ymfpci ymfpci.c,1.25,1.26
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/ymfpci
Modified Files:
ymfpci.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: ymfpci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ymfpci.c21 Jun 2003 07:52:39 - 1.25
+++ ymfpci.c12 Aug 2003 14:10:16 - 1.26
@@ -67,7 +67,7 @@
MODULE_PARM_DESC(rear_switch, Enable shared rear/line-in switch);
MODULE_PARM_SYNTAX(rear_switch, SNDRV_ENABLED , SNDRV_BOOLEAN_FALSE_DESC);
-static struct pci_device_id snd_ymfpci_ids[] __devinitdata = {
+static struct pci_device_id snd_ymfpci_ids[] = {
{ 0x1073, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724 */
{ 0x1073, 0x000d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724F */
{ 0x1073, 0x000a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF740 */
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation/DocBook writing-an-alsa-driver.tmpl,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/Documentation/DocBook
In directory sc8-pr-cvs1:/tmp/cvs-serv28090/DocBook
Modified Files:
writing-an-alsa-driver.tmpl
Log Message:
removed __devinitdata prefix from pci id table.
Index: writing-an-alsa-driver.tmpl
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/DocBook/writing-an-alsa-driver.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- writing-an-alsa-driver.tmpl 11 Aug 2003 12:37:56 - 1.13
+++ writing-an-alsa-driver.tmpl 12 Aug 2003 15:38:01 - 1.14
@@ -1340,7 +1340,7 @@
}
// PCI IDs
- static struct pci_device_id snd_mychip_ids[] __devinitdata = {
+ static struct pci_device_id snd_mychip_ids[] = {
{ PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
@@ -1718,7 +1718,7 @@
informalexample
programlisting
![CDATA[
- static struct pci_device_id snd_mychip_ids[] __devinitdata = {
+ static struct pci_device_id snd_mychip_ids[] = {
{ PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/trident trident.c,1.19,1.20
Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/trident
Modified Files:
trident.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: trident.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- trident.c 21 Jun 2003 07:52:38 - 1.19
+++ trident.c 12 Aug 2003 14:10:16 - 1.20
@@ -69,7 +69,7 @@
MODULE_PARM_DESC(wavetable_size, Maximum memory size in kB for wavetable synth.);
MODULE_PARM_SYNTAX(wavetable_size, SNDRV_ENABLED ,default:8192,skill:advanced);
-static struct pci_device_id snd_trident_ids[] __devinitdata = {
+static struct pci_device_id snd_trident_ids[] = {
{ 0x1023, 0x2000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Trident 4DWave DX
PCI Audio */
{ 0x1023, 0x2001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Trident 4DWave NX
PCI Audio */
{ 0x1039, 0x7018, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* SiS SI7018 PCI
Audio */
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/sb es968.c,1.18,1.19 sb16.c,1.36,1.37
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/isa/sb
Modified Files:
es968.c sb16.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: es968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/es968.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- es968.c 9 May 2003 14:07:24 - 1.18
+++ es968.c 12 Aug 2003 14:10:12 - 1.19
@@ -69,7 +69,7 @@
struct pnp_dev *dev;
};
-static struct pnp_card_device_id snd_es968_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_es968_pnpids[] = {
{ .id = ESS0968, .devs = { { @@@0968 }, } },
{ .id = , } /* end */
};
Index: sb16.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sb16.c 28 Jul 2003 10:20:21 - 1.36
+++ sb16.c 12 Aug 2003 14:10:12 - 1.37
@@ -157,7 +157,7 @@
static snd_card_t *snd_sb16_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-static struct pnp_card_device_id snd_sb16_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_sb16_pnpids[] = {
#ifndef SNDRV_SBAWE
/* Sound Blaster 16 PnP */
{ .id = CTL0024, .devs = { { CTL0031 } } },
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/cs46xx cs46xx_lib.c,1.62,1.63
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1:/tmp/cvs-serv16068/pci/cs46xx
Modified Files:
cs46xx_lib.c
Log Message:
fixed the wrong order of object destruction:
a released object is referred after the *_free() call.
Index: cs46xx_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cs46xx_lib.c21 Jun 2003 07:52:38 - 1.62
+++ cs46xx_lib.c14 Aug 2003 11:05:38 - 1.63
@@ -3887,8 +3887,8 @@
chip-ba1_addr = pci_resource_start(pci, 1);
if (chip-ba0_addr == 0 || chip-ba0_addr == (unsigned long)~0 ||
chip-ba1_addr == 0 || chip-ba1_addr == (unsigned long)~0) {
- snd_cs46xx_free(chip);
snd_printk(wrong address(es) - ba0 = 0x%lx, ba1 = 0x%lx\n,
chip-ba0_addr, chip-ba1_addr);
+ snd_cs46xx_free(chip);
return -ENOMEM;
}
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/wavefront wavefront.c,1.23,1.24
Update of /cvsroot/alsa/alsa-kernel/isa/wavefront
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/isa/wavefront
Modified Files:
wavefront.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: wavefront.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wavefront.c 9 May 2003 14:07:24 - 1.23
+++ wavefront.c 12 Aug 2003 14:10:12 - 1.24
@@ -102,7 +102,7 @@
#ifdef CONFIG_PNP
-static struct pnp_card_device_id snd_wavefront_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_wavefront_pnpids[] = {
/* Tropez */
{ .id = CSC7532, .devs = { { CSC }, { CSC0010 }, { PnPb006 }, {
CSC0004 } } },
/* Tropez+ */
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci als4000.c,1.20,1.21 azt3328.c,1.1,1.2 cmipci.c,1.47,1.48 cs4281.c,1.42,1.43 ens1370.c,1.46,1.47 es1938.c,1.25,1.26 es1968.c,1.50,1.51 fm801.c,1.34,1.35 intel8x0.c,1.88,1.89 maestro3.c,1.40,1.41 rme32.c,1.24,1.25 rme96.c,1.27,1.28 sonicvibes.c,1.24,1.25 via82xx.c,1.44,1.45
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci
Modified Files:
als4000.c azt3328.c cmipci.c cs4281.c ens1370.c es1938.c
es1968.c fm801.c intel8x0.c maestro3.c rme32.c rme96.c
sonicvibes.c via82xx.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: als4000.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- als4000.c 23 Apr 2003 10:01:43 - 1.20
+++ als4000.c 12 Aug 2003 14:10:12 - 1.21
@@ -107,7 +107,7 @@
unsigned long gcr;
} snd_card_als4000_t;
-static struct pci_device_id snd_als4000_ids[] __devinitdata = {
+static struct pci_device_id snd_als4000_ids[] = {
{ 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ALS4000 */
{ 0, }
};
Index: azt3328.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/azt3328.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azt3328.c 2 Jun 2003 12:59:41 - 1.1
+++ azt3328.c 12 Aug 2003 14:10:12 - 1.2
@@ -205,7 +205,7 @@
spinlock_t reg_lock;
};
-static struct pci_device_id snd_azf3328_ids[] __devinitdata = {
+static struct pci_device_id snd_azf3328_ids[] = {
{ 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* PCI168/3328 */
{ 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 3328 */
{ 0, }
Index: cmipci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cmipci.c2 Jul 2003 10:31:16 - 1.47
+++ cmipci.c12 Aug 2003 14:10:12 - 1.48
@@ -2819,7 +2819,7 @@
}
-static struct pci_device_id snd_cmipci_ids[] __devinitdata = {
+static struct pci_device_id snd_cmipci_ids[] = {
{PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A, PCI_ANY_ID, PCI_ANY_ID,
0, 0, 0},
{PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B, PCI_ANY_ID, PCI_ANY_ID,
0, 0, 0},
{PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738, PCI_ANY_ID, PCI_ANY_ID, 0,
0, 0},
Index: cs4281.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cs4281.c21 Jun 2003 07:52:38 - 1.42
+++ cs4281.c12 Aug 2003 14:10:12 - 1.43
@@ -513,7 +513,7 @@
static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static struct pci_device_id snd_cs4281_ids[] __devinitdata = {
+static struct pci_device_id snd_cs4281_ids[] = {
{ 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */
{ 0, }
};
Index: ens1370.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ens1370.c 21 Jun 2003 07:52:38 - 1.46
+++ ens1370.c 12 Aug 2003 14:10:12 - 1.47
@@ -417,7 +417,7 @@
static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs
*regs);
-static struct pci_device_id snd_audiopci_ids[] __devinitdata = {
+static struct pci_device_id snd_audiopci_ids[] = {
#ifdef CHIP1370
{ 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */
#endif
Index: es1938.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1938.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- es1938.c21 Jun 2003 07:52:38 - 1.25
+++ es1938.c12 Aug 2003 14:10:12 - 1.26
@@ -251,7 +251,7 @@
static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static struct pci_device_id snd_es1938_ids[] __devinitdata = {
+static struct pci_device_id snd_es1938_ids[] = {
{ 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */
{ 0, }
};
Index: es1968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- es1968.c11 Aug 2003 09:20:00 - 1.50
+++ es1968.c12 Aug 2003 14:10:12 - 1.51
@@ -602,7 +602,7 @@
static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static struct pci_device_id snd_es1968_ids[] __devinitdata = {
+static struct pci_device_id snd_es1968_ids[] = {
/* Maestro 1 */
{ 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO 8,
0x00, TYPE_MAESTRO },
/* Maestro 2 */
Index: fm801.c
[alsa-cvslog] CVS: alsa-kernel/pci/vx222 vx222.c,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/pci/vx222
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/vx222
Modified Files:
vx222.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: vx222.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/vx222/vx222.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vx222.c 23 May 2003 16:00:45 - 1.1
+++ vx222.c 12 Aug 2003 14:10:16 - 1.2
@@ -68,7 +68,7 @@
VX_PCI_VX222_NEW
};
-static struct pci_device_id snd_vx222_ids[] __devinitdata = {
+static struct pci_device_id snd_vx222_ids[] = {
{ 0x10b5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, }, /* PLX
*/
{ 0x10b5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, }, /* PLX
*/
{ 0, }
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus gusclassic.c,1.10,1.11 gusextreme.c,1.10,1.11 gusmax.c,1.11,1.12
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1:/tmp/cvs-serv16068/isa/gus
Modified Files:
gusclassic.c gusextreme.c gusmax.c
Log Message:
fixed the wrong order of object destruction:
a released object is referred after the *_free() call.
Index: gusclassic.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusclassic.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gusclassic.c21 Oct 2002 18:28:22 - 1.10
+++ gusclassic.c14 Aug 2003 11:05:38 - 1.11
@@ -189,8 +189,8 @@
return err;
}
if (gus-max_flag || gus-ess_flag) {
- snd_card_free(card);
snd_printdd(GUS Classic or ACE soundcard was not detected at
0x%lx\n, gus-gf1.port);
+ snd_card_free(card);
return -ENODEV;
}
if ((err = snd_gf1_new_mixer(gus)) 0) {
Index: gusextreme.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusextreme.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gusextreme.c21 Oct 2002 18:28:22 - 1.10
+++ gusextreme.c14 Aug 2003 11:05:38 - 1.11
@@ -284,8 +284,8 @@
return err;
}
if (!gus-ess_flag) {
- snd_card_free(card);
snd_printdd(GUS Extreme soundcard was not detected at 0x%lx\n,
gus-gf1.port);
+ snd_card_free(card);
return -ENODEV;
}
if ((err = snd_es1688_pcm(es1688, 0, NULL)) 0) {
Index: gusmax.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusmax.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gusmax.c23 Apr 2003 10:01:38 - 1.11
+++ gusmax.c14 Aug 2003 11:05:38 - 1.12
@@ -293,8 +293,8 @@
return err;
}
if (!gus-max_flag) {
- snd_card_free(card);
printk(KERN_ERR GUS MAX soundcard was not detected at 0x%lx\n,
gus-gf1.port);
+ snd_card_free(card);
return -ENODEV;
}
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/nm256 nm256.c,1.29,1.30
Update of /cvsroot/alsa/alsa-kernel/pci/nm256
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/nm256
Modified Files:
nm256.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: nm256.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/nm256/nm256.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nm256.c 18 Jun 2003 11:07:21 - 1.29
+++ nm256.c 12 Aug 2003 14:10:16 - 1.30
@@ -276,7 +276,7 @@
#endif
-static struct pci_device_id snd_nm256_ids[] __devinitdata = {
+static struct pci_device_id snd_nm256_ids[] = {
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
{0,},
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/mixart mixart.c,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/pci/mixart
In directory sc8-pr-cvs1:/tmp/cvs-serv27014/mixart
Modified Files:
mixart.c
Log Message:
removed __devinitdata from pci id table.
Index: mixart.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/mixart/mixart.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mixart.c22 Jul 2003 13:39:10 - 1.1
+++ mixart.c12 Aug 2003 15:32:29 - 1.2
@@ -62,7 +62,7 @@
/*
*/
-static struct pci_device_id snd_mixart_ids[] __devinitdata = {
+static struct pci_device_id snd_mixart_ids[] = {
{ 0x1057, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* MC8240 */
{ 0, }
};
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/pdplus pdplus.c,1.12,1.13
Update of /cvsroot/alsa/alsa-driver/pci/pdplus
In directory sc8-pr-cvs1:/tmp/cvs-serv27014/pdplus
Modified Files:
pdplus.c
Log Message:
removed __devinitdata from pci id table.
Index: pdplus.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/pdplus/pdplus.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pdplus.c23 Apr 2003 10:01:21 - 1.12
+++ pdplus.c12 Aug 2003 15:32:30 - 1.13
@@ -6183,7 +6183,7 @@
LEAVE_VOID;
}
-static struct pci_device_id pdplus_ids[] __devinitdata = {
+static struct pci_device_id pdplus_ids[] = {
{
PCI_VENDOR_ID_MARIAN,
PCI_DEVICE_ID_MARIAN_PRODIF_PLUS,
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus interwave.c,1.24,1.25
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/isa/gus
Modified Files:
interwave.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: interwave.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/interwave.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- interwave.c 10 Jun 2003 14:07:20 - 1.24
+++ interwave.c 12 Aug 2003 14:10:11 - 1.25
@@ -138,7 +138,7 @@
#ifdef CONFIG_PNP
-static struct pnp_card_device_id snd_interwave_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_interwave_pnpids[] = {
#ifndef SNDRV_STB
/* Gravis UltraSound Plug Play */
{ .id = GRV0001, .devs = { { .id = GRV } } },
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv28038 Modified Files: ALSA-Configuration.txt Log Message: sync'ed with 2.6 tree - added the description for MAKEDEV.snd. Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ALSA-Configuration.txt 6 Aug 2003 11:13:57 - 1.14 +++ ALSA-Configuration.txt 12 Aug 2003 15:37:42 - 1.15 @@ -27,6 +27,13 @@ isapnptools. +Creating ALSA devices += + +Use the MAKEDEV.snd script located in the directory named scripts +in the linux kernel tree. + + Module parameters = --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci es1968.c,1.48,1.49
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv20026
Modified Files:
es1968.c
Log Message:
- hopefully fixed the capture.
- align the buffers in 4k.
- a bit code clean up.
Index: es1968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- es1968.c6 Aug 2003 17:44:50 - 1.48
+++ es1968.c7 Aug 2003 14:18:56 - 1.49
@@ -439,7 +439,8 @@
/* capture mixing buffer size */
-#define ESM_MIXBUF_SIZE512
+#define ESM_MEM_ALIGN 0x1000
+#define ESM_MIXBUF_SIZE0x400
#define ESM_MODE_PLAY 0
#define ESM_MODE_CAPTURE 1
@@ -977,8 +978,10 @@
/* spin lock held */
inline static void snd_es1968_trigger_apu(es1968_t *esm, int apu, int mode)
{
- /* dma on, no envelopes, filter to all 1s) */
- __apu_set_register(esm, apu, 0, 0x400f | mode);
+ /* set the APU mode */
+ __apu_set_register(esm, apu, 0,
+ (__apu_get_register(esm, apu, 0) 0xff0f) |
+ (mode 4));
}
static void snd_es1968_pcm_start(es1968_t *chip, esschan_t *es)
@@ -1092,12 +1095,12 @@
/* clear routing stuff */
apu_set_register(chip, apu, 11, 0x);
/* dma on, no envelopes, filter to all 1s) */
- // apu_set_register(chip, apu, 0, 0x400F);
+ apu_set_register(chip, apu, 0, 0x400F);
if (es-fmt ESS_FMT_16BIT)
- es-apu_mode[channel] = 0x10; /* 16bit mono */
+ es-apu_mode[channel] = ESM_APU_16BITLINEAR;
else
- es-apu_mode[channel] = 0x30; /* 8bit mono */
+ es-apu_mode[channel] = ESM_APU_8BITLINEAR;
if (es-fmt ESS_FMT_STEREO) {
/* set panning: left or right */
@@ -1107,7 +1110,7 @@
and not the APU Regs 4-5. */
apu_set_register(chip, apu, 10,
0x8F00 | (channel ? 0 : 0x10));
- es-apu_mode[channel] += 0x10; /* stereo */
+ es-apu_mode[channel] += 1; /* stereo */
} else
apu_set_register(chip, apu, 10, 0x8F08);
}
@@ -1137,119 +1140,91 @@
snd_es1968_apu_set_freq(chip, es-apu[1], freq);
}
+
+static void init_capture_apu(es1968_t *chip, esschan_t *es, int channel,
+unsigned int pa, unsigned int bsize,
+int mode, int route)
+{
+ int i, apu = es-apu[channel];
+
+ es-apu_mode[channel] = mode;
+
+ /* set the wavecache control reg */
+ snd_es1968_program_wavecache(chip, es, channel, pa, 1);
+
+ /* Offset to PCMBAR */
+ pa -= chip-dma.addr;
+ pa = 1; /* words */
+
+ /* base offset of dma calcs when reading the pointer
+ on this left one */
+ es-base[channel] = pa 0x;
+ pa |= 0x0040; /* bit 22 - System RAM */
+
+ /* Begin loading the APU */
+ for (i = 0; i 16; i++)
+ apu_set_register(chip, apu, i, 0x);
+
+ /* need to enable subgroups.. and we should probably
+ have different groups for different /dev/dsps.. */
+ apu_set_register(chip, apu, 2, 0x8);
+
+ /* Load the buffer into the wave engine */
+ apu_set_register(chip, apu, 4, ((pa 16) 0xFF) 8);
+ apu_set_register(chip, apu, 5, pa 0x);
+ apu_set_register(chip, apu, 6, (pa + bsize) 0x);
+ apu_set_register(chip, apu, 7, bsize);
+ /* clear effects/env.. */
+ apu_set_register(chip, apu, 8, 0x00F0);
+ /* amplitude now? sure. why not. */
+ apu_set_register(chip, apu, 9, 0x);
+ /* set filter tune, radius, polar pan */
+ apu_set_register(chip, apu, 10, 0x8F08);
+ /* route input */
+ apu_set_register(chip, apu, 11, route);
+ /* dma on, no envelopes, filter to all 1s) */
+ apu_set_register(chip, apu, 0, 0x400F);
+}
+
static void snd_es1968_capture_setup(es1968_t *chip, esschan_t *es,
snd_pcm_runtime_t *runtime)
{
- int apu_step = 2;
- int channel, apu;
- int i, size;
+ int size;
u32 freq;
unsigned long flags;
size = es-dma_size es-wav_shift;
- /* we're given the full size of the buffer, but
- in stereo each channel will only use its half */
- if (es-fmt ESS_FMT_STEREO)
- apu_step = 1;
-
/* APU assignments:
0 = mono/left SRC
1 = right SRC
2 = mono/left Input Mixer
- 3 = right Input Mixer */
- for (channel = 0; channel 4; channel += apu_step) {
- int bsize, route;
[alsa-cvslog] CVS: alsa-lib/src/rawmidi rawmidi_local.h,1.15,1.16 rawmidi_virt.c,1.1,1.2
Update of /cvsroot/alsa/alsa-lib/src/rawmidi
In directory sc8-pr-cvs1:/tmp/cvs-serv13678
Modified Files:
rawmidi_local.h rawmidi_virt.c
Log Message:
- fixed the name from virt to virtual.
- fixed compilation error.
Index: rawmidi_local.h
===
RCS file: /cvsroot/alsa/alsa-lib/src/rawmidi/rawmidi_local.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rawmidi_local.h 29 Jul 2003 17:15:34 - 1.15
+++ rawmidi_local.h 5 Aug 2003 13:54:38 - 1.16
@@ -54,6 +54,6 @@
const char *name, int card, int device, int subdevice,
int mode);
-int snd_rawmidi_virt_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp,
- const char *name, snd_seq_t *seq_handle, int port,
- int merge, int mode);
+int snd_rawmidi_virtual_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp,
+const char *name, snd_seq_t *seq_handle, int port,
+int merge, int mode);
Index: rawmidi_virt.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/rawmidi/rawmidi_virt.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rawmidi_virt.c 29 Jul 2003 17:15:34 - 1.1
+++ rawmidi_virt.c 5 Aug 2003 13:54:39 - 1.2
@@ -51,11 +51,11 @@
snd_seq_event_t out_event;
int pending;
-} snd_rawmidi_virt_t;
+} snd_rawmidi_virtual_t;
-static int snd_rawmidi_virt_close(snd_rawmidi_t *rmidi)
+static int snd_rawmidi_virtual_close(snd_rawmidi_t *rmidi)
{
- snd_rawmidi_virt_t *virt = rmidi-private_data;
+ snd_rawmidi_virtual_t *virt = rmidi-private_data;
virt-open--;
if (virt-open)
return 0;
@@ -66,16 +66,16 @@
return 0;
}
-static int snd_rawmidi_virt_nonblock(snd_rawmidi_t *rmidi, int nonblock)
+static int snd_rawmidi_virtual_nonblock(snd_rawmidi_t *rmidi, int nonblock)
{
- snd_rawmidi_virt_t *virt = rmidi-private_data;
+ snd_rawmidi_virtual_t *virt = rmidi-private_data;
return snd_seq_nonblock(virt-handle, nonblock);
}
-static int snd_rawmidi_virt_info(snd_rawmidi_t *rmidi, snd_rawmidi_info_t * info)
+static int snd_rawmidi_virtual_info(snd_rawmidi_t *rmidi, snd_rawmidi_info_t * info)
{
- // snd_rawmidi_virt_t *virt = rmidi-private_data;
+ // snd_rawmidi_virtual_t *virt = rmidi-private_data;
info-stream = rmidi-stream;
/* FIXME: what values should be there? */
@@ -91,7 +91,7 @@
return 0;
}
-static int snd_rawmidi_virt_input_params(snd_rawmidi_virt_t *virt,
snd_rawmidi_params_t *params)
+static int snd_rawmidi_virtual_input_params(snd_rawmidi_virtual_t *virt,
snd_rawmidi_params_t *params)
{
int err;
@@ -111,7 +111,7 @@
}
-static int snd_rawmidi_virt_output_params(snd_rawmidi_virt_t *virt,
snd_rawmidi_params_t *params)
+static int snd_rawmidi_virtual_output_params(snd_rawmidi_virtual_t *virt,
snd_rawmidi_params_t *params)
{
int err;
@@ -130,28 +130,28 @@
}
-static int snd_rawmidi_virt_params(snd_rawmidi_t *rmidi, snd_rawmidi_params_t *
params)
+static int snd_rawmidi_virtual_params(snd_rawmidi_t *rmidi, snd_rawmidi_params_t *
params)
{
- snd_rawmidi_virt_t *virt = rmidi-private_data;
+ snd_rawmidi_virtual_t *virt = rmidi-private_data;
params-stream = rmidi-stream;
if (rmidi-stream == SND_RAWMIDI_STREAM_INPUT)
- return snd_rawmidi_virt_input_params(virt, params);
+ return snd_rawmidi_virtual_input_params(virt, params);
else
- return snd_rawmidi_virt_output_params(virt, params);
+ return snd_rawmidi_virtual_output_params(virt, params);
}
-static int snd_rawmidi_virt_status(snd_rawmidi_t *rmidi, snd_rawmidi_status_t *
status)
+static int snd_rawmidi_virtual_status(snd_rawmidi_t *rmidi, snd_rawmidi_status_t *
status)
{
- // snd_rawmidi_virt_t *virt = rmidi-private_data;
+ // snd_rawmidi_virtual_t *virt = rmidi-private_data;
memset(status, 0, sizeof(*status));
status-stream = rmidi-stream;
return 0;
}
-static int snd_rawmidi_virt_drop(snd_rawmidi_t *rmidi)
+static int snd_rawmidi_virtual_drop(snd_rawmidi_t *rmidi)
{
- snd_rawmidi_virt_t *virt = rmidi-private_data;
+ snd_rawmidi_virtual_t *virt = rmidi-private_data;
if (rmidi-stream == SND_RAWMIDI_STREAM_OUTPUT) {
snd_seq_drop_output(virt-handle);
snd_midi_event_reset_encode(virt-midi_event);
@@ -164,9 +164,9 @@
return 0;
}
-static int snd_rawmidi_virt_drain(snd_rawmidi_t *rmidi)
+static int snd_rawmidi_virtual_drain(snd_rawmidi_t *rmidi)
{
- snd_rawmidi_virt_t *virt = rmidi-private_data;
+ snd_rawmidi_virtual_t *virt = rmidi-private_data;
int err;
[alsa-cvslog] CVS: alsa-driver Makefile,1.95,1.96
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv28509 Modified Files: Makefile Log Message: - remove binaries in utils directory by make clean. - clean up autoconf cache files. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/Makefile,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- Makefile23 May 2003 10:24:05 - 1.95 +++ Makefile6 Aug 2003 11:13:28 - 1.96 @@ -194,6 +194,7 @@ rm -f `find ../alsa-kernel -name *.rej` rm -f `find ../alsa-kernel -name .#*` rm -f `find ../alsa-kernel -name out.txt` + rm -rf autom4te.cache .PHONY: cvsclean cvsclean: mrproper --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/conf alsa.conf,1.12,1.13
Update of /cvsroot/alsa/alsa-lib/src/conf
In directory sc8-pr-cvs1:/tmp/cvs-serv2462/src/conf
Modified Files:
alsa.conf
Log Message:
- missing changes from virt to virtual rawmidi.
Index: alsa.conf
===
RCS file: /cvsroot/alsa/alsa-lib/src/conf/alsa.conf,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- alsa.conf 29 Jul 2003 17:16:18 - 1.12
+++ alsa.conf 6 Aug 2003 14:46:33 - 1.13
@@ -437,13 +437,13 @@
}
}
-rawmidi.virt {
+rawmidi.virtual {
@args [ MERGE ]
@args.MERGE {
type string
default 1
}
- type virt
+ type virtual
merge $MERGE
}
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emufx.c,1.36,1.37
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1 In directory sc8-pr-cvs1:/tmp/cvs-serv724 Modified Files: emufx.c Log Message: fixed typos. Index: emufx.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- emufx.c 25 Jul 2003 10:39:38 - 1.36 +++ emufx.c 5 Aug 2003 12:42:23 - 1.37 @@ -364,12 +364,12 @@ case EMU10K1_GPR_TRANSLATION_TABLE100: snd_emu10k1_ptr_write(emu, emu-gpr_base + ctl-gpr[i], 0, db_table[val]); break; - case EMU10K1_GRP_TRANSLATION_BASS: + case EMU10K1_GPR_TRANSLATION_BASS: snd_runtime_check((ctl-count % 5) == 0 (ctl-count / 5) == ctl-vcount, change = -EIO; goto __error); for (j = 0; j 5; j++) snd_emu10k1_ptr_write(emu, emu-gpr_base + ctl-gpr[j * ctl-vcount + i], 0, bass_table[val][j]); break; - case EMU10K1_GRP_TRANSLATION_TREBLE: + case EMU10K1_GPR_TRANSLATION_TREBLE: snd_runtime_check((ctl-count % 5) == 0 (ctl-count / 5) == ctl-vcount, change = -EIO; goto __error); for (j = 0; j 5; j++) snd_emu10k1_ptr_write(emu, emu-gpr_base + ctl-gpr[j * ctl-vcount + i], 0, treble_table[val][j]); @@ -1434,7 +1434,7 @@ ctl-min = 0; ctl-max = 40; ctl-value[0] = ctl-value[1] = 20; - ctl-translation = EMU10K1_GRP_TRANSLATION_BASS; + ctl-translation = EMU10K1_GPR_TRANSLATION_BASS; ctl = controls[nctl + 1]; ctl-id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; strcpy(ctl-id.name, Tone Control - Treble); @@ -1443,7 +1443,7 @@ ctl-min = 0; ctl-max = 40; ctl-value[0] = ctl-value[1] = 20; - ctl-translation = EMU10K1_GRP_TRANSLATION_TREBLE; + ctl-translation = EMU10K1_GPR_TRANSLATION_TREBLE; #define BASS_GPR 0x8c #define TREBLE_GPR 0x96 @@ -1946,7 +1946,7 @@ ctl-min = 0; ctl-max = 40; ctl-value[0] = ctl-value[1] = 20; - ctl-translation = EMU10K1_GRP_TRANSLATION_BASS; + ctl-translation = EMU10K1_GPR_TRANSLATION_BASS; ctl = controls[i + 1]; ctl-id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; strcpy(ctl-id.name, Tone Control - Treble); @@ -1955,7 +1955,7 @@ ctl-min = 0; ctl-max = 40; ctl-value[0] = ctl-value[1] = 20; - ctl-translation = EMU10K1_GRP_TRANSLATION_TREBLE; + ctl-translation = EMU10K1_GPR_TRANSLATION_TREBLE; #define BASS_GPR 0x8c #define TREBLE_GPR 0x96 --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci es1968.c,1.46,1.47
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv1088
Modified Files:
es1968.c
Log Message:
- fixed corruption of stream linked list in the interrupt handler.
- clean up the unnecessary atomic_t and spinlocks.
Index: es1968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- es1968.c5 Aug 2003 12:43:10 - 1.46
+++ es1968.c5 Aug 2003 12:45:12 - 1.47
@@ -583,9 +583,8 @@
/* Maestro Stuff */
u16 maestro_map[32];
- atomic_t bobclient; /* active timer instancs */
+ int bobclient; /* active timer instancs */
int bob_freq; /* timer frequency */
- spinlock_t bob_lock;
struct semaphore memory_mutex; /* memory lock */
/* APU states */
@@ -884,13 +883,11 @@
spin_unlock_irqrestore(chip-reg_lock, flags);
}
+/* call with substream spinlock */
static void snd_es1968_bob_inc(es1968_t *chip, int freq)
{
- unsigned long flags;
-
- spin_lock_irqsave(chip-bob_lock, flags);
- atomic_inc(chip-bobclient);
- if (atomic_read(chip-bobclient) == 1) {
+ chip-bobclient++;
+ if (chip-bobclient == 1) {
chip-bob_freq = freq;
snd_es1968_bob_start(chip);
} else if (chip-bob_freq freq) {
@@ -898,35 +895,29 @@
chip-bob_freq = freq;
snd_es1968_bob_start(chip);
}
- spin_unlock_irqrestore(chip-bob_lock, flags);
}
+/* call with substream spinlock */
static void snd_es1968_bob_dec(es1968_t *chip)
{
- unsigned long flags;
-
- spin_lock_irqsave(chip-bob_lock, flags);
- atomic_dec(chip-bobclient);
- if (atomic_read(chip-bobclient) = 0)
+ chip-bobclient--;
+ if (chip-bobclient = 0)
snd_es1968_bob_stop(chip);
else if (chip-bob_freq ESM_BOB_FREQ) {
/* check reduction of timer frequency */
struct list_head *p;
int max_freq = ESM_BOB_FREQ;
- spin_lock(chip-substream_lock);
list_for_each(p, chip-substream_list) {
esschan_t *es = list_entry(p, esschan_t, list);
if (max_freq es-bob_freq)
max_freq = es-bob_freq;
}
- spin_unlock(chip-substream_lock);
if (max_freq != chip-bob_freq) {
snd_es1968_bob_stop(chip);
chip-bob_freq = max_freq;
snd_es1968_bob_start(chip);
}
}
- spin_unlock_irqrestore(chip-bob_lock, flags);
}
static int
@@ -992,13 +983,7 @@
static void snd_es1968_pcm_start(es1968_t *chip, esschan_t *es)
{
- unsigned long flags;
-
- spin_lock_irqsave(chip-reg_lock, flags);
- if (es-running) {
- spin_unlock_irqrestore(chip-reg_lock, flags);
- return;
- }
+ spin_lock(chip-reg_lock);
__apu_set_register(chip, es-apu[0], 5, es-base[0]);
snd_es1968_trigger_apu(chip, es-apu[0], es-apu_mode[0]);
if (es-mode == ESM_MODE_CAPTURE) {
@@ -1013,27 +998,19 @@
snd_es1968_trigger_apu(chip, es-apu[3], es-apu_mode[3]);
}
}
- es-running = 1;
- spin_unlock_irqrestore(chip-reg_lock, flags);
+ spin_unlock(chip-reg_lock);
}
static void snd_es1968_pcm_stop(es1968_t *chip, esschan_t *es)
{
- unsigned long flags;
-
- spin_lock_irqsave(chip-reg_lock, flags);
- if (! es-running) {
- spin_unlock_irqrestore(chip-reg_lock, flags);
- return;
- }
+ spin_lock(chip-reg_lock);
snd_es1968_trigger_apu(chip, es-apu[0], 0);
snd_es1968_trigger_apu(chip, es-apu[1], 0);
if (es-mode == ESM_MODE_CAPTURE) {
snd_es1968_trigger_apu(chip, es-apu[2], 0);
snd_es1968_trigger_apu(chip, es-apu[3], 0);
}
- es-running = 0;
- spin_unlock_irqrestore(chip-reg_lock, flags);
+ spin_unlock(chip-reg_lock);
}
/* set the wavecache control reg */
@@ -1334,30 +1311,28 @@
esschan_t *es = snd_magic_cast(esschan_t, substream-runtime-private_data,
return -ENXIO);
unsigned long flags;
+ spin_lock_irqsave(chip-substream_lock, flags);
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME:
if (es-running)
- return 0;
+ break;
snd_es1968_bob_inc(chip, es-bob_freq);
es-count = 0;
es-hwptr = 0;
snd_es1968_pcm_start(chip, es);
- spin_lock_irqsave(chip-substream_lock, flags);
- list_add(es-list, chip-substream_list);
-
[alsa-cvslog] CVS: alsa-kernel/pci es1968.c,1.45,1.46
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv797
Modified Files:
es1968.c
Log Message:
- rewritten the pm whitelist as a static list.
- added more pci subsystem ids to the whitelist.
Index: es1968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- es1968.c30 Jul 2003 15:35:33 - 1.45
+++ es1968.c5 Aug 2003 12:43:10 - 1.46
@@ -2532,6 +2532,18 @@
return snd_es1968_free(chip);
}
+struct pm_whitelist {
+ unsigned short type;/* chip type */
+ unsigned short vendor; /* subsystem vendor id */
+};
+
+static struct pm_whitelist whitelist[] __devinitdata = {
+ { TYPE_MAESTRO2E, 0x1028 },
+ { TYPE_MAESTRO2E, 0x103c },
+ { TYPE_MAESTRO2E, 0x1179 },
+ { TYPE_MAESTRO2E, 0x14c0 },
+};
+
static int __devinit snd_es1968_create(snd_card_t * card,
struct pci_dev *pci,
int total_bufsize,
@@ -2607,12 +2619,18 @@
pci_set_master(pci);
if (do_pm 1) {
- /* disable power-management if not maestro2e or
-* if not on the whitelist
-*/
+ /* disable power-management if not on the whitelist */
unsigned short vend;
pci_read_config_word(chip-pci, PCI_SUBSYSTEM_VENDOR_ID, vend);
- if (chip-type != TYPE_MAESTRO2E || (vend != 0x1028 vend !=
0x1179)) {
+ for (i = 0; i (int)ARRAY_SIZE(whitelist); i++) {
+ if (chip-type == whitelist[i].type
+ vend == whitelist[i].vendor) {
+ do_pm = 1;
+ break;
+ }
+ }
+ if (do_pm 1) {
+ /* not matched; disabling pm */
printk(KERN_INFO es1968: not attempting power management.\n);
do_pm = 0;
}
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include ac97_codec.h,1.30,1.31
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv15504/include
Modified Files:
ac97_codec.h
Log Message:
- added quirk type AC97_TUNE_AD_SHARING.
- added mask field to snd_ac97_quirk.
- new patch for AD1985. set more config bits for line/mic sharing.
- rewritten quirk table in C99 init style.
- more quirks for intel ICH5/AD1985 boards.
Index: ac97_codec.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ac97_codec.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ac97_codec.h19 Jun 2003 20:15:33 - 1.30
+++ ac97_codec.h30 Jul 2003 10:54:03 - 1.31
@@ -345,13 +345,20 @@
void snd_ac97_resume(ac97_t *ac97);
#endif
-enum { AC97_TUNE_HP_ONLY, AC97_TUNE_SWAP_HP, AC97_TUNE_SWAP_SURROUND };
+/* quirk types */
+enum {
+ AC97_TUNE_HP_ONLY, /* headphone (true line-out) control as master only */
+ AC97_TUNE_SWAP_HP, /* swap headphone and master controls */
+ AC97_TUNE_SWAP_SURROUND, /* swap master and surround controls */
+ AC97_TUNE_AD_SHARING/* for AD1985, turn on OMS bit and use headphone */
+};
struct ac97_quirk {
- unsigned short vendor;
- unsigned short device;
- const char *name;
- int type;
+ unsigned short vendor; /* PCI vendor id */
+ unsigned short device; /* PCI device id */
+ unsigned short mask;/* device id bit mask, 0 = accept all */
+ const char *name; /* name shown as info */
+ int type; /* quirk type above */
};
int snd_ac97_tune_hardware(ac97_t *ac97, struct ac97_quirk *quirk);
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.85,1.86 via82xx.c,1.43,1.44
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv15504/pci
Modified Files:
intel8x0.c via82xx.c
Log Message:
- added quirk type AC97_TUNE_AD_SHARING.
- added mask field to snd_ac97_quirk.
- new patch for AD1985. set more config bits for line/mic sharing.
- rewritten quirk table in C99 init style.
- more quirks for intel ICH5/AD1985 boards.
Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- intel8x0.c 24 Jul 2003 05:53:57 - 1.85
+++ intel8x0.c 30 Jul 2003 10:54:03 - 1.86
@@ -1555,13 +1555,98 @@
};
static struct ac97_quirk ac97_quirks[] __devinitdata = {
- { 0x1028, 0x0126, Dell Optiplex GX260, AC97_TUNE_HP_ONLY },
- { 0x1734, 0x0088, Fujitsu-Siemens D1522, AC97_TUNE_HP_ONLY },
- { 0x10f1, 0x2665, Fujitsu-Siemens Celcius, AC97_TUNE_HP_ONLY },
- { 0x110a, 0x0056, Fujitsu-Siemens Scenic, AC97_TUNE_HP_ONLY },
- { 0x8086, 0x4d44, Intel D850EMV2, AC97_TUNE_HP_ONLY },
- /* { 0x4144, 0x5360, AMD64 Motherboard, AC97_TUNE_HP_ONLY }, */ /* FIXME:
this seems invalid */
- { 0x1043, 0x80b0, ASUS P4PE Mobo, AC97_TUNE_SWAP_SURROUND },
+ {
+ .vendor = 0x1028,
+ .device = 0x0126,
+ .name = Dell Optiplex GX260,
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .vendor = 0x1043,
+ .device =0x80b0,
+ .name = ASUS P4PE Mobo,
+ .type = AC97_TUNE_SWAP_SURROUND
+ },
+ {
+ .vendor = 0x10f1,
+ .device = 0x2665,
+ .name = Fujitsu-Siemens Celcius,
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .vendor = 0x110a,
+ .device = 0x0056,
+ .name = Fujitsu-Siemens Scenic,
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .vendor = 0x11d4,
+ .device = 0x5375,
+ .name = ADI AD1985 (discrete),
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .vendor = 0x1734,
+ .device = 0x0088,
+ .name = Fujitsu-Siemens D1522,
+ .type = AC97_TUNE_HP_ONLY
+ },
+#if 0
+ /* FIXME: this seems invalid */
+ {
+ .vendor = 0x4144,
+ .device = 0x5360,
+ .type = AMD64 Motherboard,
+ .name = AC97_TUNE_HP_ONLY
+ },
+#endif
+ {
+ .vendor = 0x8086,
+ .device = 0x2000,
+ .mask = 0xfff0,
+ .name = Intel ICH5/AD1985 (discrete),
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .vendor = 0x8086,
+ .device = 0x4000,
+ .mask = 0xfff0,
+ .name = Intel ICH5/AD1985,
+ .type = AC97_TUNE_AD_SHARING
+ },
+ {
+ .vendor = 0x8086,
+ .device = 0x4d44,
+ .name = Intel D850EMV2,
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .vendor = 0x8086,
+ .device = 0x6000,
+ .mask = 0xfff0,
+ .name = Intel ICH5/AD1985,
+ .type = AC97_TUNE_AD_SHARING
+ },
+ {
+ .vendor = 0x8086,
+ .device = 0xe000,
+ .mask = 0xfff0,
+ .name = Intel ICH5/AD1985,
+ .type = AC97_TUNE_AD_SHARING
+ },
+ {
+ .vendor = 0x8086,
+ .device = 0xa000,
+ .mask = 0xfff0,
+ .name = Intel ICH5/AD1985 (discrete),
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .vendor = 0x80f3,
+ .device = 0x1043,
+ .name = ASUS ICH5/AD1985,
+ .type = AC97_TUNE_AD_SHARING
+ },
{ } /* terminator */
};
Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- via82xx.c 21 Jul 2003 14:55:22 - 1.43
+++ via82xx.c 30 Jul 2003 10:54:03 - 1.44
@@ -886,9 +886,11 @@
snd_ac97_set_rate(chip-ac97, AC97_PCM_LFE_DAC_RATE, runtime-rate);
snd_ac97_set_rate(chip-ac97, AC97_SPDIF, runtime-rate);
}
+#if 0
if (chip-revision == VIA_REV_8233A)
rbits = 0;
else
+#endif
rbits = (0xf / 48000) * runtime-rate + ((0xf % 48000) *
runtime-rate) / 48000;
snd_assert((rbits ~0xf) == 0, return -EINVAL);
snd_via82xx_channel_reset(chip, viadev);
@@ -928,9 +930,12 @@
fmt = (runtime-format == SNDRV_PCM_FORMAT_S16_LE) ?
VIA_REG_MULTPLAY_FMT_16BIT : VIA_REG_MULTPLAY_FMT_8BIT;
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.99,1.100 ac97_patch.c,1.17,1.18 ac97_patch.h,1.8,1.9
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv15504/pci/ac97
Modified Files:
ac97_codec.c ac97_patch.c ac97_patch.h
Log Message:
- added quirk type AC97_TUNE_AD_SHARING.
- added mask field to snd_ac97_quirk.
- new patch for AD1985. set more config bits for line/mic sharing.
- rewritten quirk table in C99 init style.
- more quirks for intel ICH5/AD1985 boards.
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ac97_codec.c1 Jul 2003 10:07:54 - 1.99
+++ ac97_codec.c30 Jul 2003 10:54:03 - 1.100
@@ -103,7 +103,7 @@
{ 0x41445370, 0x, AD1980,patch_ad1980, NULL },
{ 0x41445372, 0x, AD1981A, patch_ad1881, NULL },
{ 0x41445374, 0x, AD1981B, patch_ad1881, NULL },
-{ 0x41445375, 0x, AD1985,patch_ad1980, NULL },
+{ 0x41445375, 0x, AD1985,patch_ad1985, NULL },
{ 0x414c4300, 0xfff0, RL5306,NULL, NULL },
{ 0x414c4310, 0xfff0, RL5382,NULL, NULL },
{ 0x414c4320, 0xfff0, RL5383,NULL, NULL },
@@ -2235,6 +2235,14 @@
return 0;
}
+static int tune_ad_sharing(ac97_t *ac97)
+{
+ unsigned short scfg;
+ /* Turn on OMS bit to route microphone to back panel */
+ scfg = snd_ac97_read(ac97, AC97_AD_SERIAL_CFG);
+ snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, scfg | 0x0200);
+ return swap_headphone(ac97, 1);
+}
/**
* snd_ac97_tune_hardware - tune up the hardware
@@ -2253,7 +2261,10 @@
snd_assert(quirk, return -EINVAL);
for (; quirk-vendor; quirk++) {
- if (quirk-vendor == ac97-subsystem_vendor quirk-device ==
ac97-subsystem_device) {
+ if (quirk-vendor != ac97-subsystem_vendor)
+ continue;
+ if ((! quirk-mask quirk-device == ac97-subsystem_device) ||
+ quirk-device == (quirk-mask ac97-subsystem_device)) {
snd_printdd(ac97 quirk for %s (%04x:%04x)\n, quirk-name,
ac97-subsystem_vendor, ac97-subsystem_device);
switch (quirk-type) {
case AC97_TUNE_HP_ONLY:
@@ -2262,6 +2273,8 @@
return swap_headphone(ac97, 0);
case AC97_TUNE_SWAP_SURROUND:
return swap_surround(ac97);
+ case AC97_TUNE_AD_SHARING:
+ return tune_ad_sharing(ac97);
}
snd_printk(KERN_ERR invalid quirk type %d for %s\n,
quirk-type, quirk-name);
return -EINVAL;
Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ac97_patch.c26 Jul 2003 09:46:14 - 1.17
+++ ac97_patch.c30 Jul 2003 10:54:03 - 1.18
@@ -759,6 +759,19 @@
return 0;
}
+int patch_ad1985(ac97_t * ac97)
+{
+ unsigned short misc;
+
+ patch_ad1881(ac97);
+ ac97-build_ops = patch_ad1980_build_ops;
+ misc = snd_ac97_read(ac97, AC97_AD_MISC);
+ /* switch front/surround line-out/hp-out */
+ /* center/LFE, surround in High-Z mode */
+ snd_ac97_write_cache(ac97, AC97_AD_MISC, misc | 0x1c28);
+ return 0;
+}
+
static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = {
AC97_SINGLE(Duplicate Front, AC97_ALC650_MULTICH, 0, 1, 0),
AC97_SINGLE(Surround Down Mix, AC97_ALC650_MULTICH, 1, 1, 0),
Index: ac97_patch.h
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ac97_patch.h17 Jun 2003 18:43:32 - 1.8
+++ ac97_patch.h30 Jul 2003 10:54:03 - 1.9
@@ -42,6 +42,7 @@
int patch_ad1885(ac97_t * ac97);
int patch_ad1886(ac97_t * ac97);
int patch_ad1980(ac97_t * ac97);
+int patch_ad1985(ac97_t * ac97);
int patch_alc650(ac97_t * ac97);
int patch_cm9738(ac97_t * ac97);
int patch_cm9739(ac97_t * ac97);
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.86,1.87
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv22821
Modified Files:
intel8x0.c
Log Message:
- improved the probe/resume function.
check only the valid codec bits in chip_init() during resume.
Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- intel8x0.c 30 Jul 2003 10:54:03 - 1.86
+++ intel8x0.c 30 Jul 2003 14:39:38 - 1.87
@@ -523,6 +523,19 @@
/*
* access to AC97 codec via normal i/o (for ICH and SIS7012)
*/
+
+/* return the GLOB_STA bit for the corresponding codec */
+static unsigned int get_ich_codec_bit(intel8x0_t *chip, unsigned int codec)
+{
+ static unsigned int codec_bit[3] = {
+ ICH_PCR, ICH_SCR, ICH_TCR
+ };
+ snd_assert(codec 3, return ICH_PCR);
+ if (chip-device_type == DEVICE_INTEL_ICH4)
+ codec = chip-ac97_sdin[codec];
+ return codec_bit[codec];
+}
+
static int snd_intel8x0_codec_semaphore(intel8x0_t *chip, unsigned int codec)
{
int time;
@@ -534,19 +547,7 @@
/* so we check any */
codec = ICH_PCR | ICH_SCR | ICH_TCR;
} else {
- if (chip-device_type == DEVICE_INTEL_ICH4) {
- switch (chip-ac97_sdin[codec]) {
- case 0: codec = ICH_PCR; break;
- case 1: codec = ICH_SCR; break;
- case 2: codec = ICH_TCR; break;
- }
- } else {
- switch (codec) {
- case 0: codec = ICH_PCR; break;
- case 1: codec = ICH_SCR; break;
- case 2: codec = ICH_TCR; break;
- }
- }
+ codec = get_ich_codec_bit(chip, codec);
}
/* codec ready ? */
@@ -1731,9 +1732,14 @@
}
}
ac97.pci = chip-pci;
- if ((err = snd_ac97_mixer(chip-card, ac97, x97)) 0)
+ if ((err = snd_ac97_mixer(chip-card, ac97, x97)) 0) {
+ /* clear the cold-reset bit for the next chance */
+ if (chip-device_type != DEVICE_ALI)
+ iputdword(chip, ICHREG(GLOB_CNT), igetdword(chip,
ICHREG(GLOB_CNT)) ~ICH_AC97COLD);
return err;
+ }
chip-ac97[0] = x97;
+ /* tune up the primary codec */
snd_ac97_tune_hardware(chip-ac97[0], ac97_quirks);
/* the following three entries are common among all devices */
chip-ichd[ICHD_PCMOUT].ac97 = x97;
@@ -1886,7 +1892,7 @@
schedule_timeout(1);\
} while (0)
-static int snd_intel8x0_ich_chip_init(intel8x0_t *chip)
+static int snd_intel8x0_ich_chip_init(intel8x0_t *chip, int probing)
{
unsigned long end_time;
unsigned int cnt, status, nstatus;
@@ -1915,49 +1921,55 @@
return -EIO;
__ok:
- /* wait for any codec ready status.
-* Once it becomes ready it should remain ready
-* as long as we do not disable the ac97 link.
-*/
- end_time = jiffies + HZ;
- do {
- status = igetdword(chip, ICHREG(GLOB_STA)) (ICH_PCR | ICH_SCR |
ICH_TCR);
- if (status)
- goto __ok1;
- do_delay(chip);
- } while (time_after_eq(end_time, jiffies));
- snd_printk(KERN_ERR codec_ready: codec is not ready [0x%x]\n,
igetdword(chip, ICHREG(GLOB_STA)));
- return -EIO;
-
- __ok1:
- if (status == (ICH_PCR | ICH_SCR | ICH_TCR))
- goto __ok3;
- /* wait for other codecs ready status. No secondary codecs? , ok */
- end_time = jiffies + HZ / 4;
- do {
- nstatus = igetdword(chip, ICHREG(GLOB_STA)) (ICH_PCR | ICH_SCR |
ICH_TCR);
- if (nstatus != status) {
- status = nstatus;
- goto __ok2;
+ if (probing) {
+ /* wait for any codec ready status.
+* Once it becomes ready it should remain ready
+* as long as we do not disable the ac97 link.
+*/
+ end_time = jiffies + HZ;
+ do {
+ status = igetdword(chip, ICHREG(GLOB_STA)) (ICH_PCR |
ICH_SCR | ICH_TCR);
+ if (status)
+ break;
+ do_delay(chip);
+ } while (time_after_eq(end_time, jiffies));
+ if (! status) {
+ /* no codec is found */
+ snd_printk(KERN_ERR codec_ready: codec is not ready
[0x%x]\n, igetdword(chip, ICHREG(GLOB_STA)));
+ return -EIO;
}
- do_delay(chip);
- } while (time_after_eq(end_time, jiffies));
- __ok2:
- if (status == (ICH_PCR |
[alsa-cvslog] CVS: alsa-kernel/pci es1968.c,1.44,1.45
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1:/tmp/cvs-serv1825 Modified Files: es1968.c Log Message: added use_pm to the kernel boot parameter. Index: es1968.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- es1968.c17 Jul 2003 15:21:53 - 1.44 +++ es1968.c30 Jul 2003 15:35:33 - 1.45 @@ -2852,7 +2852,8 @@ total_bufsize, pcm_substreams_p, pcm_substreams_c, -clock +clock, +use_pm */ static int __init alsa_card_es1968_setup(char *str) @@ -2867,7 +2868,8 @@ get_option(str,total_bufsize[nr_dev]) == 2 get_option(str,pcm_substreams_p[nr_dev]) == 2 get_option(str,pcm_substreams_c[nr_dev]) == 2 - get_option(str,clock[nr_dev]) == 2); + get_option(str,clock[nr_dev]) == 2 + get_option(str,use_pm[nr_dev]) == 2); nr_dev++; return 1; } --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/rawmidi rawmidi_virt.c,NONE,1.1 Makefile.am,1.5,1.6 rawmidi_local.h,1.14,1.15 rawmidi_symbols.c,1.2,1.3
Update of /cvsroot/alsa/alsa-lib/src/rawmidi
In directory sc8-pr-cvs1:/tmp/cvs-serv18228
Modified Files:
Makefile.am rawmidi_local.h rawmidi_symbols.c
Added Files:
rawmidi_virt.c
Log Message:
added virtual rawmidi plugin.
--- NEW FILE: rawmidi_virt.c ---
/*
* RawMIDI - Virtual (sequencer mode)
* Copyright (c) 2003 by Takashi Iwai [EMAIL PROTECTED]
*
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include stdio.h
#include stdlib.h
#include unistd.h
#include string.h
#include fcntl.h
#include sys/ioctl.h
#include rawmidi_local.h
#include seq.h
#include seq_midi_event.h
#ifndef PIC
/* entry for static linking */
const char *_snd_module_rawmidi_virt = ;
#endif
typedef struct {
int open;
snd_seq_t *handle;
int port;
snd_midi_event_t *midi_event;
snd_seq_event_t *in_event;
int in_buf_size;
int in_buf_ofs;
char *in_buf_ptr;
char in_tmp_buf[16];
snd_seq_event_t out_event;
int pending;
} snd_rawmidi_virt_t;
static int snd_rawmidi_virt_close(snd_rawmidi_t *rmidi)
{
snd_rawmidi_virt_t *virt = rmidi-private_data;
virt-open--;
if (virt-open)
return 0;
snd_seq_close(virt-handle);
if (virt-midi_event)
snd_midi_event_free(virt-midi_event);
free(virt);
return 0;
}
static int snd_rawmidi_virt_nonblock(snd_rawmidi_t *rmidi, int nonblock)
{
snd_rawmidi_virt_t *virt = rmidi-private_data;
return snd_seq_nonblock(virt-handle, nonblock);
}
static int snd_rawmidi_virt_info(snd_rawmidi_t *rmidi, snd_rawmidi_info_t * info)
{
// snd_rawmidi_virt_t *virt = rmidi-private_data;
info-stream = rmidi-stream;
/* FIXME: what values should be there? */
info-card = 0;
info-device = 0;
info-subdevice = 0;
info-flags = 0;
strcpy(info-id, Virtual);
strcpy(info-name, Virtual RawMIDI);
strcpy(info-subname, Virtual RawMIDI);
info-subdevices_count = 1;
info-subdevices_avail = 0;
return 0;
}
static int snd_rawmidi_virt_input_params(snd_rawmidi_virt_t *virt,
snd_rawmidi_params_t *params)
{
int err;
// snd_rawmidi_drain_input(substream);
if (params-buffer_size sizeof(snd_seq_event_t) ||
params-buffer_size 1024L * 1024L) {
return -EINVAL;
}
if (params-buffer_size != snd_seq_get_input_buffer_size(virt-handle)) {
err = snd_seq_set_input_buffer_size(virt-handle, params-buffer_size);
if (err 0)
return err;
params-buffer_size = snd_seq_get_input_buffer_size(virt-handle);
/* FIXME: input pool size? */
}
return 0;
}
static int snd_rawmidi_virt_output_params(snd_rawmidi_virt_t *virt,
snd_rawmidi_params_t *params)
{
int err;
// snd_rawmidi_drain_output(substream);
if (params-buffer_size sizeof(snd_seq_event_t) ||
params-buffer_size 1024L * 1024L) {
return -EINVAL;
}
if (params-buffer_size != snd_seq_get_output_buffer_size(virt-handle)) {
err = snd_seq_set_output_buffer_size(virt-handle,
params-buffer_size);
if (err 0)
return err;
params-buffer_size = snd_seq_get_output_buffer_size(virt-handle);
}
return 0;
}
static int snd_rawmidi_virt_params(snd_rawmidi_t *rmidi, snd_rawmidi_params_t * params)
{
snd_rawmidi_virt_t *virt = rmidi-private_data;
params-stream = rmidi-stream;
if (rmidi-stream == SND_RAWMIDI_STREAM_INPUT)
return snd_rawmidi_virt_input_params(virt, params);
else
return snd_rawmidi_virt_output_params(virt, params);
}
static int snd_rawmidi_virt_status(snd_rawmidi_t *rmidi, snd_rawmidi_status_t * status)
{
// snd_rawmidi_virt_t *virt = rmidi-private_data;
memset(status, 0, sizeof(*status));
status-stream = rmidi-stream;
return 0;
}
static int snd_rawmidi_virt_drop(snd_rawmidi_t *rmidi)
{
snd_rawmidi_virt_t *virt = rmidi-private_data;
if (rmidi-stream
[alsa-cvslog] CVS: alsa-kernel/include soundfont.h,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1:/tmp/cvs-serv8989/include Modified Files: soundfont.h Log Message: Josef Jeff Sipek [EMAIL PROTECTED]: - fixed sleep in interrupt context. Index: soundfont.h === RCS file: /cvsroot/alsa/alsa-kernel/include/soundfont.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- soundfont.h 29 Apr 2002 14:28:16 - 1.4 +++ soundfont.h 28 Jul 2003 10:09:52 - 1.5 @@ -95,7 +95,6 @@ int zone_locked;/* locked time for zone */ int sample_locked; /* locked time for sample */ snd_sf_callback_t callback; /* callback functions */ - char sf_locked; /* font lock flag */ struct semaphore presets_mutex; spinlock_t lock; snd_util_memhdr_t *memhdr; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/synth/emux soundfont.c,1.7,1.8
Update of /cvsroot/alsa/alsa-kernel/synth/emux
In directory sc8-pr-cvs1:/tmp/cvs-serv8989/synth/emux
Modified Files:
soundfont.c
Log Message:
Josef Jeff Sipek [EMAIL PROTECTED]:
- fixed sleep in interrupt context.
Index: soundfont.c
===
RCS file: /cvsroot/alsa/alsa-kernel/synth/emux/soundfont.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- soundfont.c 31 Jan 2003 15:21:29 - 1.7
+++ soundfont.c 28 Jul 2003 10:09:52 - 1.8
@@ -66,15 +66,11 @@
static int
lock_preset(snd_sf_list_t *sflist, int nonblock)
{
- unsigned long flags;
- spin_lock_irqsave(sflist-lock, flags);
- if (sflist-sf_locked nonblock) {
- spin_unlock_irqrestore(sflist-lock, flags);
- return -EBUSY;
- }
- spin_unlock_irqrestore(sflist-lock, flags);
- down(sflist-presets_mutex);
- sflist-sf_locked = 1;
+ if (nonblock) {
+ if (down_trylock(sflist-presets_mutex))
+ return -EBUSY;
+ } else
+ down(sflist-presets_mutex);
return 0;
}
@@ -86,7 +82,6 @@
unlock_preset(snd_sf_list_t *sflist)
{
up(sflist-presets_mutex);
- sflist-sf_locked = 0;
}
@@ -1356,7 +1351,6 @@
init_MUTEX(sflist-presets_mutex);
spin_lock_init(sflist-lock);
- sflist-sf_locked = 0;
sflist-memhdr = hdr;
if (callback)
@@ -1403,7 +1397,7 @@
/*
* Remove unlocked samples.
- * The soundcard should be silet before calling this function.
+ * The soundcard should be silent before calling this function.
*/
int
snd_soundfont_remove_unlocked(snd_sf_list_t *sflist)
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspmixer - New directory
Update of /cvsroot/alsa/alsa-tools/hdspmixer In directory sc8-pr-cvs1:/tmp/cvs-serv22560/hdspmixer Log Message: Directory /cvsroot/alsa/alsa-tools/hdspmixer added to the repository --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspmixer/pixmaps - New directory
Update of /cvsroot/alsa/alsa-tools/hdspmixer/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv22728/pixmaps Log Message: Directory /cvsroot/alsa/alsa-tools/hdspmixer/pixmaps added to the repository --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspmixer/src - New directory
Update of /cvsroot/alsa/alsa-tools/hdspmixer/src In directory sc8-pr-cvs1:/tmp/cvs-serv22728/src Log Message: Directory /cvsroot/alsa/alsa-tools/hdspmixer/src added to the repository --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools Makefile,1.22,1.23
Update of /cvsroot/alsa/alsa-tools In directory sc8-pr-cvs1:/tmp/cvs-serv23038 Modified Files: Makefile Log Message: added hdspmixer by Thomas Charbonnel Index: Makefile === RCS file: /cvsroot/alsa/alsa-tools/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile22 Jul 2003 13:42:50 - 1.22 +++ Makefile28 Jul 2003 11:32:32 - 1.23 @@ -1,6 +1,6 @@ VERSION = 0.9.6 TOP = . -SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf \ +SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ mixartloader rmedigicontrol sb16_csp seq sscape_ctl vxloader all: --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspmixer .cvsignore,NONE,1.1 AUTHORS,NONE,1.1 COPYING,NONE,1.1 ChangeLog,NONE,1.1 INSTALL,NONE,1.1 Makefile.am,NONE,1.1 NEWS,NONE,1.1 README,NONE,1.1 TODO,NONE,1.1 configure.in,NONE,1.1 cvscompile,NONE,1.1
Update of /cvsroot/alsa/alsa-tools/hdspmixer In directory sc8-pr-cvs1:/tmp/cvs-serv23038/hdspmixer Added Files: .cvsignore AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README TODO configure.in cvscompile Log Message: added hdspmixer by Thomas Charbonnel --- NEW FILE: .cvsignore --- Makefile Makefile.in install-sh missing mkinstalldirs aclocal.m4 configure config.log config.cache config.status depcomp .deps autom4te.cache --- NEW FILE: AUTHORS --- Thomas Charbonnel [EMAIL PROTECTED] --- NEW FILE: COPYING --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The Program, below, refers to any such program or work, and a work based on the Program means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term modification.) Each licensee is addressed as you. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a
[alsa-cvslog] CVS: alsa-tools/hdspconf configure.in,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/hdspconf In directory sc8-pr-cvs1:/tmp/cvs-serv2865 Modified Files: configure.in Log Message: updated to version 1.1 It fixes a small bug + an issue in card detection preventing it to work with hdsp9652 cards. It fixes too FLTK detection in configure. Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configure.in2 Jul 2003 10:21:11 - 1.1 +++ configure.in28 Jul 2003 12:58:10 - 1.2 @@ -1,5 +1,5 @@ AC_INIT(src/hdspconf.cxx) -AM_INIT_AUTOMAKE(hdspconf, 1.0) +AM_INIT_AUTOMAKE(hdspconf, 1.1) AC_PROG_CXX AC_PROG_MAKE_SET @@ -53,7 +53,7 @@ if test $FLTK_CONFIG = no; then AC_MSG_ERROR(no fltk-config is found) fi -FLTK_CXXFLAGS=`$FLTK_CONFIG $fltk_config_args --cxxflags` +FLTK_CXXFLAGS=`$FLTK_CONFIG $fltk_config_args --cxxflags` -fno-exceptions FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags` CXXFLAGS=$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspconf/src hdspconf.cxx,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/hdspconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2865/src
Modified Files:
hdspconf.cxx
Log Message:
updated to version 1.1
It fixes a small bug + an issue in card detection preventing it to work
with hdsp9652 cards. It fixes too FLTK detection in configure.
Index: hdspconf.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/hdspconf.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hdspconf.cxx2 Jul 2003 10:21:11 - 1.1
+++ hdspconf.cxx28 Jul 2003 12:58:10 - 1.2
@@ -134,7 +134,7 @@
HC_XpmRenderer *rme_logo;
HC_AboutText *about_text;
Fl_Group *about_pane;
-char **name;
+char *name;
int card;
int hdsp_cards[4];
int alsa_index[4];
@@ -152,24 +152,26 @@
if (card 0) {
break;
} else {
- snd_card_get_longname(card, name);
- printf(Card %d : %s\n, card, *name);
- if (!strncmp(*name, RME Hammerfall DSP + Multiface, 30)) {
+ snd_card_get_longname(card, name);
+ printf(Card %d : %s\n, card, name);
+ if (!strncmp(name, RME Hammerfall DSP + Multiface, 30)) {
printf(Multiface found !\n);
hdsp_cards[cards] = MULTIFACE;
alsa_index[cards] = card;
cards++;
- } else if (!strncmp(*name, RME Hammerfall DSP + Digiface, 29)) {
+ } else if (!strncmp(name, RME Hammerfall DSP + Digiface, 29)) {
printf(Digiface found !\n);
hdsp_cards[cards] = DIGIFACE;
alsa_index[cards] = card;
cards++;
- } else if (!strncmp(*name, RME HDSP 9652, 13)) {
+ } else if (!strncmp(name, RME Hammerfall HDSP 9652, 24)) {
printf(HDSP 9652 found !\n);
hdsp_cards[cards] = HDSP9652;
alsa_index[cards] = card;
cards++;
- }
+ } else if (!strncmp(name, RME Hammerfall DSP, 18)) {
+ printf(Uninitialized HDSP card found. Use hdsploader to upload
firmware.\n);
+ }
}
}
if (!cards) {
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
