[alsa-cvslog] CVS: alsa-driver Makefile,1.96,1.97 Makefile.conf.in,1.53,1.54
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv19721 Modified Files: Makefile Makefile.conf.in Log Message: added more documents. removed the obsolete snd_seq_port_subscribe_set_voices(). Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/Makefile,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- Makefile6 Aug 2003 11:13:28 - 1.96 +++ Makefile22 Oct 2003 14:23:59 - 1.97 @@ -155,6 +155,10 @@ elif [ -d $(DESTDIR)/etc/init.d ]; then \ install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsasound $(DESTDIR)/etc/init.d/alsasound; \ fi + mkdir -p $(DESTDIR)$(bindir) + install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsaconf $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(mandir)/man8 + install -m 644 -g $(IGROUP) -o $(IUSER) utils/alsaconf.8 $(DESTDIR)$(mandir)/man8 .PHONY: check-snd-prefix check-snd-prefix: Index: Makefile.conf.in === RCS file: /cvsroot/alsa/alsa-driver/Makefile.conf.in,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- Makefile.conf.in7 Apr 2003 09:51:23 - 1.53 +++ Makefile.conf.in22 Oct 2003 14:23:59 - 1.54 @@ -16,8 +16,11 @@ mainsrcdir = @srcdir@ MAINSRCDIR = @SRCDIR@ prefix = @prefix@ +exec_prefix= @exec_prefix@ sysconfdir = @sysconfdir@ +bindir = @bindir@ sbindir= @sbindir@ +mandir = @mandir@ moddir = @moddir@ moddir_tree= @moddir_tree@ c_opts = @c_opts@ --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/include seq.h,1.50,1.51 seqmid.h,1.14,1.15
Update of /cvsroot/alsa/alsa-lib/include
In directory sc8-pr-cvs1:/tmp/cvs-serv20260/include
Modified Files:
seq.h seqmid.h
Log Message:
added more documents.
removed the obsolete snd_seq_port_subscribe_set_voices().
Index: seq.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/seq.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- seq.h 25 Jul 2003 17:24:13 - 1.50
+++ seq.h 22 Oct 2003 14:25:55 - 1.51
@@ -46,13 +46,14 @@
/** Sequencer handle */
typedef struct _snd_seq snd_seq_t;
-/** Allocate and initialize array on stack \internal */
+#ifndef DOC_HIDDEN
#define SND_ALLOCA(type,ptr) \
do {\
assert(ptr);\
*ptr = (type##_t *)alloca(type##_sizeof());\
memset(*ptr, 0, type##_sizeof());\
} while (0)
+#endif
/**
* sequencer opening stream types
@@ -315,7 +316,6 @@
void snd_seq_port_subscribe_set_sender(snd_seq_port_subscribe_t *info, const
snd_seq_addr_t *addr);
void snd_seq_port_subscribe_set_dest(snd_seq_port_subscribe_t *info, const
snd_seq_addr_t *addr);
void snd_seq_port_subscribe_set_queue(snd_seq_port_subscribe_t *info, int q);
-void snd_seq_port_subscribe_set_voices(snd_seq_port_subscribe_t *info, unsigned int
voices);
void snd_seq_port_subscribe_set_exclusive(snd_seq_port_subscribe_t *info, int val);
void snd_seq_port_subscribe_set_time_update(snd_seq_port_subscribe_t *info, int val);
void snd_seq_port_subscribe_set_time_real(snd_seq_port_subscribe_t *info, int val);
Index: seqmid.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/seqmid.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- seqmid.h12 Mar 2002 20:14:33 - 1.14
+++ seqmid.h22 Oct 2003 14:25:55 - 1.15
@@ -42,6 +42,8 @@
/**
* \brief initialize event record
* \param ev event record pointer
+ *
+ * This macro clears the given event record pointer to the default status.
*/
#define snd_seq_ev_clear(ev) \
memset(ev, 0, sizeof(snd_seq_event_t))
@@ -51,6 +53,10 @@
* \param ev event record
* \param c destination client id
* \param p destination port id
+ *
+ * This macro sets the client and port id numbers to the given event record.
+ *
+ * \sa snd_seq_ev_set_subs()
*/
#define snd_seq_ev_set_dest(ev,c,p) \
((ev)->dest.client = (c), (ev)->dest.port = (p))
@@ -58,6 +64,10 @@
/**
* \brief set broadcasting to subscribers
* \param ev event record
+ *
+ * This macro sets the destination as the subscribers.
+ *
+ * \sa snd_seq_ev_set_dest()
*/
#define snd_seq_ev_set_subs(ev) \
((ev)->dest.client = SND_SEQ_ADDRESS_SUBSCRIBERS,\
@@ -66,6 +76,10 @@
/**
* \brief set broadcasting to all clients/ports
* \param ev event record
+ *
+ * This macro sets the destination as the broadcasting.
+ *
+ * \sa snd_seq_ev_set_dest()
*/
#define snd_seq_ev_set_broadcast(ev) \
((ev)->dest.client = SND_SEQ_ADDRESS_BROADCAST,\
@@ -75,6 +89,8 @@
* \brief set the source port
* \param ev event record
* \param p source port id
+ *
+ * This macro sets the source port id number.
*/
#define snd_seq_ev_set_source(ev,p) \
((ev)->source.port = (p))
@@ -82,6 +98,11 @@
/**
* \brief set direct passing mode (without queued)
* \param ev event instance
+ *
+ * This macro sets the event to the direct passing mode
+ * to be delivered immediately without queueing.
+ *
+ * \sa snd_seq_ev_schedule_tick(), snd_seq_ev_schedule_real()
*/
#define snd_seq_ev_set_direct(ev) \
((ev)->queue = SND_SEQ_QUEUE_DIRECT)
@@ -92,6 +113,11 @@
* \param q queue id to schedule
* \param relative relative time-stamp if non-zero
* \param ttick tick time-stamp to be delivered
+ *
+ * This macro sets the scheduling of the event in the
+ * MIDI tick mode.
+ *
+ * \sa snd_seq_ev_schedule_real(), snd_seq_ev_set_direct()
*/
#define snd_seq_ev_schedule_tick(ev, q, relative, ttick) \
((ev)->flags &= ~(SND_SEQ_TIME_STAMP_MASK | SND_SEQ_TIME_MODE_MASK),\
@@ -106,6 +132,11 @@
* \param q queue id to schedule
* \param relative relative time-stamp if non-zero
* \param rtime time-stamp to be delivered
+ *
+ * This macro sets the scheduling of the event in the
+ * realtime mode.
+ *
+ * \sa snd_seq_ev_schedule_tick(), snd_seq_ev_set_direct()
*/
#define snd_seq_ev_schedule_real(ev, q, relative, rtime) \
((ev)->flags &= ~(SND_SEQ_TIME_STAMP_MASK | SND_SEQ_TIME_MODE_MASK),\
@@ -128,6 +159,8 @@
* \param ev event instance
*
* Sets the event length mode as fixed size.
+ *
+ * \sa snd_seq_ev_set_variable(), snd_seq_ev_set_varusr()
*/
#define snd_seq_ev_set_fixed(ev) \
((ev)->flags &= ~SND_SEQ_EVENT_LENGTH_MASK,\
@@ -140,6 +173,8 @@
* \param dataptr pointer of the external data
*
* Sets the event length mode as variable length and stores the data.
+ *
+ * \sa snd_seq_ev_set_fixed(), snd_seq_ev_set_varusr()
[alsa-cvslog] CVS: alsa-driver Rules.make,1.32,1.33
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv20065 Modified Files: Rules.make Log Message: don't overwrite the versioned symbols (only for 2.2/2.4 kernels, e.g. suse9.0) Index: Rules.make === RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Rules.make 16 Sep 2003 15:08:52 - 1.32 +++ Rules.make 22 Oct 2003 14:25:06 - 1.33 @@ -235,12 +235,14 @@ $(MODINCL)/$(MODPREFIX)%.ver: %.c @if [ ! -r $(MODINCL)/$(MODPREFIX)$*.stamp -o $(MODINCL)/$(MODPREFIX)$*.stamp -ot $< ]; then \ + if [ ! -f $(CONFIG_SND_KERNELDIR)/include/linux/modules/$*.stamp ]; then \ echo '$(CC) -D__KERNEL__ $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $<'; \ echo '| $(GENKSYMS) $(genksyms_smp_prefix) > [EMAIL PROTECTED]'; \ $(CC) -D__KERNEL__ $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $< \ | $(GENKSYMS) $(genksyms_smp_prefix) > [EMAIL PROTECTED]; \ if [ -r $@ ] && cmp -s $@ [EMAIL PROTECTED]; then echo $@ is unchanged; rm -f [EMAIL PROTECTED]; \ else echo mv [EMAIL PROTECTED] $@; mv -f [EMAIL PROTECTED] $@; fi; \ + fi; \ fi; touch $(MODINCL)/$(MODPREFIX)$*.stamp $(addprefix $(MODINCL)/$(MODPREFIX),$(export-objs:.o=.ver)): $(TOPDIR)/include/config.h $(TOPDIR)/include/config1.h --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core pcm_lib.c,1.45,1.46
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv4570
Modified Files:
pcm_lib.c
Log Message:
- don't print debug messages for low count of periods
- added right path for one period to the update pointer routine (interrupt)
Index: pcm_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_lib.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pcm_lib.c 6 Oct 2003 12:19:10 - 1.45
+++ pcm_lib.c 22 Oct 2003 09:32:20 - 1.46
@@ -173,15 +173,21 @@
snd_pcm_sframes_t delta;
pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
+ if (runtime->period_size == runtime->buffer_size)
+ goto __next_buf;
new_hw_ptr = runtime->hw_ptr_base + pos;
hw_ptr_interrupt = runtime->hw_ptr_interrupt + runtime->period_size;
delta = hw_ptr_interrupt - new_hw_ptr;
if (delta > 0) {
if ((snd_pcm_uframes_t)delta < runtime->buffer_size / 2) {
- snd_printd(KERN_ERR "Unexpected hw_pointer value (stream = %i,
delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n", substream->stream,
(long) delta, runtime->buffer_size / 2);
+#ifdef CONFIG_SND_DEBUG
+ if (runtime->periods > 1)
+ snd_printd(KERN_ERR "Unexpected hw_pointer value [1]
(stream = %i, delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n",
substream->stream, (long) delta, runtime->buffer_size / 2);
+#endif
return 0;
}
+ __next_buf:
runtime->hw_ptr_base += runtime->buffer_size;
if (runtime->hw_ptr_base == runtime->boundary)
runtime->hw_ptr_base = 0;
@@ -213,7 +219,10 @@
delta = old_hw_ptr - new_hw_ptr;
if (delta > 0) {
if ((snd_pcm_uframes_t)delta < runtime->buffer_size / 2) {
- snd_printd(KERN_ERR "Unexpected hw_pointer value (stream = %i,
delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n", substream->stream,
(long) delta, runtime->buffer_size / 2);
+#ifdef CONFIG_SND_DEBUG
+ if (runtime->periods > 2)
+ snd_printd(KERN_ERR "Unexpected hw_pointer value [2]
(stream = %i, delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n",
substream->stream, (long) delta, runtime->buffer_size / 2);
+#endif
return 0;
}
runtime->hw_ptr_base += runtime->buffer_size;
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/sb emu8000.c,1.18,1.19 sb16_csp.c,1.10,1.11
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1:/tmp/cvs-serv10022/isa/sb
Modified Files:
emu8000.c sb16_csp.c
Log Message:
- added support for user control elements (untested)
- fixed locking for snd_ctl_remove() function
Index: emu8000.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emu8000.c 12 Aug 2003 14:27:30 - 1.18
+++ emu8000.c 21 Oct 2003 17:40:14 - 1.19
@@ -1044,8 +1044,10 @@
__error:
for (i = 0; i < EMU8000_NUM_CONTROLS; i++) {
+ down_write(&card->controls_rwsem);
if (emu->controls[i])
snd_ctl_remove(card, emu->controls[i]);
+ up_write(&card->controls_rwsem);
}
return err;
}
Index: sb16_csp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16_csp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sb16_csp.c 30 May 2003 12:28:35 - 1.10
+++ sb16_csp.c 21 Oct 2003 17:40:14 - 1.11
@@ -1059,10 +1059,12 @@
card = p->chip->card;
+ down_write(&card->controls_rwsem);
if (p->qsound_switch)
snd_ctl_remove(card, p->qsound_switch);
if (p->qsound_space)
snd_ctl_remove(card, p->qsound_space);
+ up_write(&card->controls_rwsem);
/* cancel pending transfer of QSound parameters */
spin_lock_irqsave (&p->q_lock, flags);
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
