[alsa-cvslog] CVS: alsa-kernel/pci cmipci.c,1.32,1.33
Update of /cvsroot/alsa/alsa-kernel/pci In directory usw-pr-cvs1:/tmp/cvs-serv15520 Modified Files: cmipci.c Log Message: added Mic As Center/LFE switch for model 039 or later. Index: cmipci.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- cmipci.c15 Aug 2002 12:13:07 - 1.32 +++ cmipci.c12 Sep 2002 08:56:58 - 1.33 @@ -257,6 +257,7 @@ #define CM_REG_MISC0x27 #define CM_XGPO1 0x20 // #define CM_XGPBIO 0x04 +#define CM_MIC_CENTER_LFE 0x04/* mic as center/lfe out? (model 039 or +later?) */ #define CM_SPDIF_INVERSE 0x04/* spdif input phase inverse (model 037) */ #define CM_SPDVALID0x02/* spdif input valid check */ #define CM_DMAUTO 0x01 @@ -2257,6 +2258,7 @@ DEFINE_MIXER_SWITCH(Line-In As Bass, line_bass), DEFINE_MIXER_SWITCH(IEC958 In Select, spdif_in_sel2), DEFINE_MIXER_SWITCH(IEC958 In Phase Inverse, spdi_phase2), + DEFINE_MIXER_SWITCH(Mic As Center/LFE, spdi_phase), /* same bit as +spdi_phase */ }; /* card control switches */ --- 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/rme9652 hammerfall_mem.c,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652 In directory usw-pr-cvs1:/tmp/cvs-serv17372/pci/rme9652 Modified Files: hammerfall_mem.c Log Message: removed unnecessary check for pci_alloc_consistent() hack. Index: hammerfall_mem.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hammerfall_mem.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hammerfall_mem.c19 Jun 2002 08:52:11 - 1.2 +++ hammerfall_mem.c12 Sep 2002 09:03:28 - 1.3 @@ -93,11 +93,6 @@ undesirable. */ -/* remove hack for pci_alloc_consistent to avoid dependecy on snd module */ -#ifdef HACK_PCI_ALLOC_CONSISTENT -#undef pci_alloc_consistent -#endif - static void *hammerfall_malloc_pages(struct pci_dev *pci, unsigned long size, dma_addr_t *dmaaddr) --- 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 insert,1.104,1.105
Update of /cvsroot/alsa/alsa-driver/utils In directory usw-pr-cvs1:/tmp/cvs-serv27981 Modified Files: insert Log Message: Fixed via insert Index: insert === RCS file: /cvsroot/alsa/alsa-driver/utils/insert,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- insert 26 Aug 2002 10:56:51 - 1.104 +++ insert 12 Sep 2002 09:39:50 - 1.105 @@ -357,12 +357,12 @@ insert snd-pdplus.o restore prodif-plus.conf ;; - via686*|via) + via686*|via8233*|via) basic insert snd-ac97-codec.o insert snd-mpu401-uart.o -insert snd-via686.o snd_mpu_port=0x330 -restore via686.conf +insert snd-via82xx.o snd_mpu_port=0x330 +restore via82xx.conf ;; ymfpci|yamaha) basic --- 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.6,1.7
Update of /cvsroot/alsa/alsa-kernel/usb
In directory usw-pr-cvs1:/tmp/cvs-serv7257/usb
Modified Files:
usbaudio.c
Log Message:
clean up and fixed the parser of audio streams.
now a pcm stream is created per endpoint instead of per interface.
either a playback or a capture is created at each time.
(for this, snd_pcm_stream_new() is exported now.)
m-audio devices will have less pcm streams than the older version,
but this is CORRECT. don't worry :)
Index: usbaudio.c
===
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- usbaudio.c 10 Sep 2002 13:03:59 - 1.6
+++ usbaudio.c 12 Sep 2002 15:24:05 - 1.7
@@ -105,6 +105,7 @@
struct list_head list;
snd_pcm_format_t format;/* format type */
int channels; /* # channels */
+ int iface; /* interface number */
unsigned char altsetting; /* corresponding alternate setting */
unsigned char altset_idx; /* array index of altenate setting */
unsigned char attributes; /* corresponding attributes of cs endpoint */
@@ -136,7 +137,9 @@
snd_usb_stream_t *stream;
struct usb_device *dev;
snd_pcm_substream_t *pcm_substream;
- int interface; /* Interface number, -1 means not used */
+ int direction; /* playback or capture */
+ int interface; /* current interface */
+ int endpoint; /* assigned endpoint */
unsigned int format; /* USB data format */
unsigned int datapipe; /* the data i/o pipe */
unsigned int syncpipe; /* 1 - async out or adaptive in */
@@ -492,6 +495,23 @@
/*
+ */
+static struct snd_urb_ops audio_urb_ops[2] = {
+ {
+ .prepare = prepare_playback_urb,
+ .retire = retire_playback_urb,
+ .prepare_sync = prepare_playback_sync_urb,
+ .retire_sync = retire_playback_sync_urb,
+ },
+ {
+ .prepare = prepare_capture_urb,
+ .retire = retire_capture_urb,
+ .prepare_sync = prepare_capture_sync_urb,
+ .retire_sync = retire_capture_sync_urb,
+ },
+};
+
+/*
* complete callback from data urb
*/
static void snd_complete_urb(struct urb *urb)
@@ -738,7 +758,7 @@
static int init_substream_urbs(snd_usb_substream_t *subs, snd_pcm_runtime_t *runtime)
{
int maxsize, n, i;
- int is_playback = subs-pcm_substream-stream == SNDRV_PCM_STREAM_PLAYBACK;
+ int is_playback = subs-direction == SNDRV_PCM_STREAM_PLAYBACK;
int npacks[MAX_URBS], total_packs;
/* calculate the frequency in 10.14 format */
@@ -907,7 +927,7 @@
struct audioformat *fmt;
unsigned int ep, attr;
unsigned char data[3];
- int is_playback = subs-pcm_substream-stream == SNDRV_PCM_STREAM_PLAYBACK;
+ int is_playback = subs-direction == SNDRV_PCM_STREAM_PLAYBACK;
int err;
fmt = find_format(subs, runtime);
@@ -917,7 +937,7 @@
return -EINVAL;
}
- iface = config-interface[subs-interface];
+ iface = config-interface[fmt-iface];
alts = iface-altsetting[fmt-altset_idx];
snd_assert(alts-bAlternateSetting == fmt-altsetting, return -EINVAL);
@@ -927,6 +947,7 @@
subs-datapipe = usb_sndisocpipe(dev, ep);
else
subs-datapipe = usb_rcvisocpipe(dev, ep);
+ subs-interface = fmt-iface;
subs-format = fmt-altset_idx;
subs-syncpipe = subs-syncinterval = 0;
subs-maxpacksize = alts-endpoint[0].wMaxPacketSize;
@@ -1126,6 +1147,7 @@
snd_pcm_runtime_t *runtime = substream-runtime;
snd_usb_substream_t *subs = as-substream[direction];
+ subs-interface = -1;
runtime-hw = *hw;
runtime-private_data = subs;
subs-pcm_substream = substream;
@@ -1139,7 +1161,8 @@
snd_usb_stream_t *as = snd_pcm_substream_chip(substream);
snd_usb_substream_t *subs = as-substream[direction];
release_substream_urbs(subs);
- usb_set_interface(subs-dev, subs-interface, 0);
+ if (subs-interface = 0)
+ usb_set_interface(subs-dev, subs-interface, 0);
subs-pcm_substream = NULL;
return 0;
}
@@ -1286,290 +1309,6 @@
/*
- * intialize the substream instance.
- */
-
-static void init_substream(snd_usb_stream_t *stream, snd_usb_substream_t *subs,
- int iface_no, int is_input,
- unsigned char *buffer, int buflen)
-{
- struct usb_device *dev;
- struct usb_config_descriptor *config;
- struct usb_interface *iface;
- struct usb_interface_descriptor *alts;
- int i, pcm_format, altno;
- int format, channels, format_type, nr_rates;
- struct
[alsa-cvslog] CVS: alsa-kernel/include pcm.h,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/include In directory usw-pr-cvs1:/tmp/cvs-serv9031/include Modified Files: pcm.h Log Message: exported snd_pcm_new_stream(). with this function, a stream can be added later to the existing pcm. Index: pcm.h === RCS file: /cvsroot/alsa/alsa-kernel/include/pcm.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pcm.h 6 Aug 2002 07:28:27 - 1.13 +++ pcm.h 12 Sep 2002 15:25:44 - 1.14 @@ -460,6 +460,7 @@ int snd_pcm_new(snd_card_t * card, char *id, int device, int playback_count, int capture_count, snd_pcm_t **rpcm); +int snd_pcm_new_stream(snd_pcm_t *pcm, int stream, int substream_count); int snd_pcm_notify(snd_pcm_notify_t *notify, int nfree); --- 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 pcm.c,1.16,1.17
Update of /cvsroot/alsa/alsa-kernel/core
In directory usw-pr-cvs1:/tmp/cvs-serv9031/core
Modified Files:
pcm.c
Log Message:
exported snd_pcm_new_stream(). with this function, a stream can be
added later to the existing pcm.
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pcm.c 13 Aug 2002 16:13:34 - 1.16
+++ pcm.c 12 Sep 2002 15:25:44 - 1.17
@@ -541,12 +541,10 @@
return 0;
}
-static int snd_pcm_new_stream(snd_pcm_t *pcm,
- snd_pcm_str_t *pstr,
- int substream_count,
- int stream)
+int snd_pcm_new_stream(snd_pcm_t *pcm, int stream, int substream_count)
{
int idx, err;
+ snd_pcm_str_t *pstr = pcm-streams[stream];
snd_pcm_substream_t *substream, *prev;
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
@@ -614,11 +612,11 @@
if (id) {
strncpy(pcm-id, id, sizeof(pcm-id) - 1);
}
- if ((err = snd_pcm_new_stream(pcm, pcm-streams[SNDRV_PCM_STREAM_PLAYBACK],
playback_count, SNDRV_PCM_STREAM_PLAYBACK)) 0) {
+ if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK, playback_count))
+ 0) {
snd_pcm_free(pcm);
return err;
}
- if ((err = snd_pcm_new_stream(pcm, pcm-streams[SNDRV_PCM_STREAM_CAPTURE],
capture_count, SNDRV_PCM_STREAM_CAPTURE)) 0) {
+ if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count))
+0) {
snd_pcm_free(pcm);
return err;
}
@@ -974,6 +972,7 @@
EXPORT_SYMBOL(snd_pcm_lock);
EXPORT_SYMBOL(snd_pcm_devices);
EXPORT_SYMBOL(snd_pcm_new);
+EXPORT_SYMBOL(snd_pcm_new_stream);
EXPORT_SYMBOL(snd_pcm_notify);
EXPORT_SYMBOL(snd_pcm_open_substream);
EXPORT_SYMBOL(snd_pcm_release_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 Makefile,1.76,1.77
Update of /cvsroot/alsa/alsa-driver In directory usw-pr-cvs1:/tmp/cvs-serv25806 Modified Files: Makefile Log Message: don't call depmod if $DESTDIR is set. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/Makefile,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- Makefile9 Aug 2002 10:28:43 - 1.76 +++ Makefile12 Sep 2002 16:03:47 - 1.77 @@ -117,7 +117,7 @@ done \ fi -ifeq ($(DESTDIR)$(CONFIG_SND_KERNELDIR)/System.map,$(wildcard $(DESTDIR)$(CONFIG_SND_KERNELDIR)/System.map)) +ifeq ($(CONFIG_SND_KERNELDIR)/System.map,$(wildcard +$(CONFIG_SND_KERNELDIR)/System.map)) SYSTEM_MAP_OPT = -F $(CONFIG_SND_KERNELDIR)/System.map endif @@ -131,8 +131,6 @@ @for d in $(SUBDIRS); do if ! $(MAKE) -C $$d modules_install; then exit 1; fi; done ifeq ($(DESTDIR),) -/sbin/depmod -a $(kaversion) $(SYSTEM_MAP_OPT) -else - -/sbin/depmod -a -b $(DESTDIR)/ $(SYSTEM_MAP_OPT) $(kaversion) endif .PHONY: install-scripts --- 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 Makefile,1.77,1.78
Update of /cvsroot/alsa/alsa-driver In directory usw-pr-cvs1:/tmp/cvs-serv9582 Modified Files: Makefile Log Message: get depmod back. -F option doesn't include $DESTDIR. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/Makefile,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- Makefile12 Sep 2002 16:03:47 - 1.77 +++ Makefile12 Sep 2002 16:46:26 - 1.78 @@ -131,6 +131,8 @@ @for d in $(SUBDIRS); do if ! $(MAKE) -C $$d modules_install; then exit 1; fi; done ifeq ($(DESTDIR),) -/sbin/depmod -a $(kaversion) $(SYSTEM_MAP_OPT) +else + -/sbin/depmod -a -b $(DESTDIR)/ $(SYSTEM_MAP_OPT) $(kaversion) endif .PHONY: install-scripts --- 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
