[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.3,1.4 prodigy.c,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1:/tmp/cvs-serv17530
Modified Files:
aureon.c prodigy.c
Log Message:
fixes by Apostolos Dimitromanolakis <[EMAIL PROTECTED]>:
- fixed the pop noise at the start up of aureon boards.
- update of prodigy driver (modifed by ti).
Index: aureon.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aureon.c1 Sep 2003 09:20:56 - 1.3
+++ aureon.c24 Nov 2003 18:29:54 - 1.4
@@ -185,7 +185,7 @@
if (nvol <= 0x1a && ovol <= 0x1a)
change = 0;
else
- wm_put(ice, idx, nvol | 0x100);
+ wm_put(ice, idx, nvol | 0x180); /* update on zero detect */
}
snd_ice1712_restore_gpio_status(ice);
return change;
@@ -366,9 +366,15 @@
static int __devinit aureon_init(ice1712_t *ice)
{
static unsigned short wm_inits[] = {
+ /* These come first to reduce init pop noise */
+ 0x1b, 0x000,/* ADC Mux */
+ 0x1c, 0x009,/* Out Mux1 */
+ 0x1d, 0x009,/* Out Mux2 */
+
+ 0x18, 0x000,/* All power-up */
+
0x16, 0x122,/* I2S, normal polarity, 24bit */
0x17, 0x022,/* 256fs, slave mode */
- 0x18, 0x000,/* All power-up */
0x00, 0,/* DAC1 analog mute */
0x01, 0,/* DAC2 analog mute */
0x02, 0,/* DAC3 analog mute */
@@ -393,9 +399,6 @@
0x15, 0x000,/* no deemphasis, no ZFLG */
0x19, 0x000,/* -12dB ADC/L */
0x1a, 0x000,/* -12dB ADC/R */
- 0x1b, 0x000,/* ADC Mux */
- 0x1c, 0x009,/* Out Mux1 */
- 0x1d, 0x009,/* Out Mux2 */
};
static unsigned short cs_inits[] = {
0x0441, /* RUN */
Index: prodigy.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/prodigy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prodigy.c 13 Nov 2003 13:34:06 - 1.2
+++ prodigy.c 24 Nov 2003 18:29:56 - 1.3
@@ -5,6 +5,11 @@
* Copyright (c) 2003 Dimitromanolakis Apostolos <[EMAIL PROTECTED]>
* based on the aureon.c code (c) 2003 by Takashi Iwai <[EMAIL PROTECTED]>
*
+ * version 0.82: Stable / not all features work yet (no communication with AC97
secondary)
+ * added 64x/128x oversampling switch (should be 64x only for 96khz)
+ * fixed some recording labels (still need to check the rest)
+ * recording is working probably thanks to correct wm8770 initialization
+ *
* version 0.5: Initial release:
* working: analog output, mixer, headphone amplifier switch
* not working: prety much everything else, at least i could verify that
@@ -42,12 +47,14 @@
* if they show better response than DAC analog volumes, we can use them
* instead.
*
- * - Prodigy boards are equipped with AC97 codec, too. it's used to do
+ * - Prodigy boards are equipped with AC97 STAC9744 chip , too. it's used to do
* the analog mixing but not easily controllable (it's not connected
* directly from envy24ht chip). so let's leave it as it is.
*
*/
+#define REVISION 0.82b
+
#include
#include
#include
@@ -61,18 +68,20 @@
#include "prodigy.h"
-static void prodigy_set_headphone_amp(ice1712_t *ice, int enable)
+static int prodigy_set_headphone_amp(ice1712_t *ice, int enable)
{
- unsigned int tmp = snd_ice1712_gpio_read(ice);
+ unsigned int tmp, tmp2;
- tmp &= ~ PRODIGY_HP_AMP_EN;
- if(enable)
+ tmp2 = tmp = snd_ice1712_gpio_read(ice);
+ if (enable)
tmp |= PRODIGY_HP_AMP_EN;
else
tmp &= ~ PRODIGY_HP_AMP_EN;
-
-
- snd_ice1712_gpio_write(ice, tmp);
+ if (tmp != tmp2) {
+ snd_ice1712_gpio_write(ice, tmp);
+ return 1;
+ }
+ return 0;
}
@@ -192,18 +201,115 @@
{
ice1712_t *ice = snd_kcontrol_chip(kcontrol);
- /*snd_printk("Prodigy set headphone amplifier:
%d\n",ucontrol->value.integer.value[0]);*/
- prodigy_set_headphone_amp(ice,ucontrol->value.integer.value[0]);
- return 1;
+ return prodigy_set_headphone_amp(ice,ucontrol->value.integer.value[0]);
+}
+
+
+
+#define PRODIGY_CON_DEEMP \
+{\
+.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+.name = "DAC De-emphasis", \
+.info = prodigy_deemp_info, \
[alsa-cvslog] CVS: alsa-tools/hdspmixer/src HDSPMixerCard.cxx,1.3,1.4 HDSPMixerCard.h,1.3,1.4 HDSPMixerFader.cxx,1.1,1.2 HDSPMixerMaster.cxx,1.1,1.2 HDSPMixerMeter.cxx,1.2,1.3 HDSPMixerOutput.cxx,1.3,1.4 HDSPMixerOutput.h,1.3,1.4 HDSPMixerPan.cxx,1.1,1.2 HDSPMixerSelector.cxx,1.3,1.4 HDSPMixerSelector.h,1.3,1.4 HDSPMixerView.cxx,1.1,1.2 HDSPMixerWindow.cxx,1.3,1.4 Makefile.am,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/hdspmixer/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15125/src
Modified Files:
HDSPMixerCard.cxx HDSPMixerCard.h HDSPMixerFader.cxx
HDSPMixerMaster.cxx HDSPMixerMeter.cxx HDSPMixerOutput.cxx
HDSPMixerOutput.h HDSPMixerPan.cxx HDSPMixerSelector.cxx
HDSPMixerSelector.h HDSPMixerView.cxx HDSPMixerWindow.cxx
Makefile.am
Log Message:
- updated to version 1.6
- fixed compile warnings
- corrects preset 7 for H9632 cards
Index: HDSPMixerCard.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerCard.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HDSPMixerCard.cxx 24 Nov 2003 14:48:21 - 1.3
+++ HDSPMixerCard.cxx 24 Nov 2003 18:17:05 - 1.4
@@ -19,9 +19,76 @@
*/
#pragma implementation
-#define HDSPMIXER_DEFINE_MAPPINGS
#include "HDSPMixerCard.h"
+static char channel_map_df_ss[26] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+18, 19, 20, 21, 22, 23, 24, 25
+};
+
+static char channel_map_mf_ss[26] = {
+0, 1, 2, 3, 4, 5, 6, 7,
+16, 17, 18, 19, 20, 21, 22, 23,
+24, 25,
+-1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char meter_map_ds[26] = {
+0, 1, 2, 3, 8, 9, 10, 11, 16, 17, 18, 19,
+24, 25,
+-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_ds[26] = {
+1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23,
+24, 25,
+-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char dest_map_mf_ss[10] = {
+0, 2, 4, 6, 16, 18, 20, 22, 24, 26
+};
+
+static char dest_map_ds[8] = {
+0, 2, 8, 10, 16, 18, 24, 26
+};
+
+static char dest_map_df_ss[14] = {
+0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26
+};
+
+static char dest_map_h9652_ss[13] = {
+0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24
+};
+
+static char dest_map_h9652_ds[7] = {
+0, 2, 8, 10, 16, 18, 24
+};
+
+static char dest_map_h9632_ss[8] = {
+0, 2, 4, 6, 8, 10, 12, 14
+};
+
+static char dest_map_h9632_ds[6] = {
+0, 2, 8, 10, 12, 14
+};
+
+static char dest_map_h9632_qs[4] = {
+8, 10, 12, 14
+};
+
+static char channel_map_h9632_ss[16] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+};
+
+static char channel_map_h9632_ds[12] = {
+0, 1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15
+};
+
+static char channel_map_h9632_qs[8] = {
+8, 9, 10, 11, 12, 13, 14, 15
+};
+
static void alsactl_cb(snd_async_handler_t *handler)
{
int err, clock_value;
@@ -76,12 +143,7 @@
int HDSPMixerCard::getAutosyncSpeed()
{
-/* FIXME : this is over simplistic, there are lots of crooked cases
- It should always be possible to do what one wants executing the
- proper sequence of actions, though.
-*/
-
-int err, external_rate;
+int err, rate;
snd_ctl_elem_value_t *elemval;
snd_ctl_elem_id_t * elemid;
snd_ctl_t *handle;
@@ -92,24 +154,22 @@
return -1;
}
-snd_ctl_elem_id_set_name(elemid, "External Rate");
-snd_ctl_elem_id_set_numid(elemid, 17);
-snd_ctl_elem_id_set_interface(elemid, SND_CTL_ELEM_IFACE_PCM);
+snd_ctl_elem_id_set_name(elemid, "System Sample Rate");
+snd_ctl_elem_id_set_numid(elemid, 16);
+snd_ctl_elem_id_set_interface(elemid, SND_CTL_ELEM_IFACE_HWDEP);
snd_ctl_elem_id_set_device(elemid, 0);
snd_ctl_elem_id_set_subdevice(elemid, 0);
snd_ctl_elem_id_set_index(elemid, 0);
snd_ctl_elem_value_set_id(elemval, elemid);
snd_ctl_elem_read(handle, elemval);
-external_rate = snd_ctl_elem_value_get_enumerated(elemval, 0);
+rate = snd_ctl_elem_value_get_integer(elemval, 0);
snd_ctl_close(handle);
-if (external_rate > 2 && external_rate < 6) {
- return 1;
-} else if (external_rate > 6) {
+if (rate > 96000) {
return 2;
-} else if (external_rate <= 2) {
- return 0;
+} else if (rate > 48000) {
+ return 1;
}
return 0;
}
@@ -189,7 +249,7 @@
}
void HDSPMixerCard::getAeb() {
-int err, i;
+int err;
snd_hwdep_t *hw;
snd_hwdep_info_t *info;
snd_hwdep_info_alloca(&info);
Index: HDSPMixerCard.h
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerCard.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HDSPMixerCard.h 24 Nov 2003 14:48:21 - 1.3
+++ HDSPMixerCard.h 24 Nov 2003 18:17:05 - 1.4
@@ -26,9 +26,6 @@
#include
#include
#include
-#ifdef HDSPMIXER_DEFINE_MAPPINGS
-#include "mappings.h"
-#endif
#include "defines.h"
#include "HDSPMixerWindow.h"
Index: HDSPMixerFader.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerFader.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HDSPMixerFader.cxx 28 J
[alsa-cvslog] CVS: alsa-tools/hdspmixer NEWS,1.3,1.4 configure.in,1.4,1.5
Update of /cvsroot/alsa/alsa-tools/hdspmixer In directory sc8-pr-cvs1:/tmp/cvs-serv15125 Modified Files: NEWS configure.in Log Message: - updated to version 1.6 - fixed compile warnings - corrects preset 7 for H9632 cards Index: NEWS === RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/NEWS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NEWS24 Nov 2003 14:48:21 - 1.3 +++ NEWS24 Nov 2003 18:17:05 - 1.4 @@ -1,3 +1,8 @@ +Version 1.6 (24/11/2003): +* Fixes compilation warnings +* AutoSync sample rate detection scheme changed +* Fixes default preset 7 for H9632 cards + Version 1.5 (21/11/2003): * Added a .desktop file * H9632 bug fixes (thanks to Pentti Ala-Vannesluoma) Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configure.in24 Nov 2003 14:48:21 - 1.4 +++ configure.in24 Nov 2003 18:17:05 - 1.5 @@ -1,5 +1,5 @@ AC_INIT(src/hdspmixer.cxx) -AM_INIT_AUTOMAKE(hdspmixer, 1.5) +AM_INIT_AUTOMAKE(hdspmixer, 1.6) AC_PROG_CXX AC_PROG_MAKE_SET --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspconf/src labels.cxx,NONE,1.1 labels.h,NONE,1.1 HC_Aeb.cxx,1.1,1.2 HC_AutoSyncRef.cxx,1.2,1.3 HC_AutoSyncRef.h,1.1,1.2 HC_BreakoutCable.cxx,1.1,1.2 HC_ClockSource.cxx,1.2,1.3 HC_ClockSource.h,1.2,1.3 HC_InputLevel.cxx,1.1,1.2 HC_OutputLevel.cxx,1.1,1.2 HC_Phones.cxx,1.1,1.2 HC_PrefSyncRef.cxx,1.2,1.3 HC_SpdifFreq.h,1.1,1.2 HC_SpdifIn.cxx,1.2,1.3 HC_SystemClock.h,1.1,1.2 Makefile.am,1.2,1.3 hdspconf.cxx,1.3,1.4
Update of /cvsroot/alsa/alsa-tools/hdspconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14965/src
Modified Files:
HC_Aeb.cxx HC_AutoSyncRef.cxx HC_AutoSyncRef.h
HC_BreakoutCable.cxx HC_ClockSource.cxx HC_ClockSource.h
HC_InputLevel.cxx HC_OutputLevel.cxx HC_Phones.cxx
HC_PrefSyncRef.cxx HC_SpdifFreq.h HC_SpdifIn.cxx
HC_SystemClock.h Makefile.am hdspconf.cxx
Added Files:
labels.cxx labels.h
Log Message:
- updated to version 1.4
fixed compile warnings.
--- NEW FILE: labels.cxx ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "labels.h"
char *card_names[5] = {
"Digiface",
"Multiface",
"HDSP9652",
"HDSP9632",
"Undefined",
};
char *freqs[10] = {
"32.0 kHz",
"44.1 kHz",
"48.0 kHz",
"64.0 kHz",
"88.2 kHz",
"96.0 kHz",
"-",
"128.0 kHz",
"176.4 kHz",
"192.0 kHz",
};
char *ref[7] = {
"Word Clock",
"ADAT Sync",
"SPDIF",
"-",
"ADAT1",
"ADAT2",
"ADAT3"
};
char *lock_status[3] = {
"No Lock",
"Lock",
"Sync"
};
--- NEW FILE: labels.h ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef LABELS_H
#define LABELS_H
extern char *card_names[5];
extern char *freqs[10];
extern char *ref[7];
extern char *lock_status[3];
#endif
Index: HC_Aeb.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_Aeb.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_Aeb.cxx 3 Nov 2003 19:09:32 - 1.1
+++ HC_Aeb.cxx 24 Nov 2003 18:16:27 - 1.2
@@ -57,7 +57,6 @@
HC_Aeb::HC_Aeb(int x, int y, int w, int h):Fl_Group(x, y, w, h, "AEB")
{
- int i = 0;
lock = 0;
box(FL_ENGRAVED_FRAME);
label("AEB");
Index: HC_AutoSyncRef.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_AutoSyncRef.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HC_AutoSyncRef.cxx 3 Nov 2003 19:09:32 - 1.2
+++ HC_AutoSyncRef.cxx 24 Nov 2003 18:16:27 - 1.3
@@ -20,9 +20,7 @@
#pragma implementation
#include "HC_AutoSyncRef.h"
-
-extern char *freqs[10];
-extern char *ref[7];
+#include "labels.h"
HC_AutoSyncRef::HC_AutoSyncRef(int x, int y, int w, int h):Fl_Widget(x, y, w, h,
"AutoSync Ref.")
{
Index: HC_AutoSyncRef.h
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_AutoSyncRef.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_AutoSyncRef.h2 Jul 2003 10:21:11 - 1.1
+++ HC_AutoSyncRef.h24 Nov 2003 18:16:27 - 1.2
@@ -26,6 +26,7 @@
#include
#include
#include "HC_CardPane.h"
+#include "labels.h"
class HC_CardPane;
Index: HC_BreakoutCable.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_BreakoutCable.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_BreakoutCable.cxx3 Nov 2003 19:09:32 - 1.1
+++ HC_BreakoutCable.cxx24 Nov 2003 18:16:27 - 1.2
@@ -57,7 +57,6 @@
HC_BreakoutCable::HC_BreakoutCable(int x, int y, int w, int h):Fl_Group(x, y, w, h,
"Breakout Cable")
{
- int i = 0;
lock = 0;
box(FL_ENGRAVED_FRAME);
label(
[alsa-cvslog] CVS: alsa-tools/hdspconf ChangeLog,1.2,1.3 configure.in,1.4,1.5
Update of /cvsroot/alsa/alsa-tools/hdspconf In directory sc8-pr-cvs1:/tmp/cvs-serv14965 Modified Files: ChangeLog configure.in Log Message: - updated to version 1.4 fixed compile warnings. Index: ChangeLog === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 3 Nov 2003 19:09:32 - 1.2 +++ ChangeLog 24 Nov 2003 18:16:26 - 1.3 @@ -1,2 +1,8 @@ +Version 1.4 (24/11/2003) : +* Fix compilation warnings + +Version 1.3 (21/11/2003) : +* Added a .desktop file and icon + Version 1.2 (01/11/2003) : * added support for HDSP 9652 and HDSP 9632 specific features Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configure.in24 Nov 2003 14:47:28 - 1.4 +++ configure.in24 Nov 2003 18:16:26 - 1.5 @@ -1,5 +1,5 @@ AC_INIT(src/hdspconf.cxx) -AM_INIT_AUTOMAKE(hdspconf, 1.3) +AM_INIT_AUTOMAKE(hdspconf, 1.4) AC_PROG_CXX AC_PROG_MAKE_SET --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core pcm.c,1.34,1.35
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv21459
Modified Files:
pcm.c
Log Message:
- clear the status record before calling snd_pcm_status() in proc read.
this will prevent to show bogus values when status = OPEN.
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pcm.c 23 Oct 2003 14:34:52 - 1.34
+++ pcm.c 24 Nov 2003 16:20:42 - 1.35
@@ -371,6 +371,7 @@
snd_iprintf(buffer, "closed\n");
return;
}
+ memset(&status, 0, sizeof(status));
err = snd_pcm_status(substream, &status);
if (err < 0) {
snd_iprintf(buffer, "error %d\n", err);
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/vx vx_pcm.c,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/drivers/vx In directory sc8-pr-cvs1:/tmp/cvs-serv9263/drivers/vx Modified Files: vx_pcm.c Log Message: - added hw_constraint to align 4bytes. this will solve the 24bit problem on vx222. Index: vx_pcm.c === RCS file: /cvsroot/alsa/alsa-kernel/drivers/vx/vx_pcm.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vx_pcm.c23 May 2003 16:00:43 - 1.1 +++ vx_pcm.c24 Nov 2003 15:27:28 - 1.2 @@ -611,6 +611,10 @@ runtime->hw.period_bytes_min = chip->ibl.size; runtime->private_data = pipe; + /* align to 4 bytes (otherwise will be problematic when 24bit is used) */ + snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 4); + snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 4); + return 0; } @@ -1014,6 +1018,10 @@ runtime->hw = vx_pcm_capture_hw; runtime->hw.period_bytes_min = chip->ibl.size; runtime->private_data = pipe; + + /* align to 4 bytes (otherwise will be problematic when 24bit is used) */ + snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 4); + snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 4); return 0; } --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspmixer/src HDSPMixerCard.cxx,1.2,1.3 HDSPMixerCard.h,1.2,1.3 HDSPMixerOutput.cxx,1.2,1.3 HDSPMixerOutput.h,1.2,1.3 HDSPMixerSelector.cxx,1.2,1.3 HDSPMixerSelector.h,1.2,1.3 HDSPMixerWindow.cxx,1.2,1.3 mappings.h,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/hdspmixer/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1453/hdspmixer/src
Modified Files:
HDSPMixerCard.cxx HDSPMixerCard.h HDSPMixerOutput.cxx
HDSPMixerOutput.h HDSPMixerSelector.cxx HDSPMixerSelector.h
HDSPMixerWindow.cxx mappings.h
Log Message:
- fixed H9632 problem.
- added desktop file and icon
new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.
- fixed compile warnings.
Index: HDSPMixerCard.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerCard.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HDSPMixerCard.cxx 3 Nov 2003 19:10:39 - 1.2
+++ HDSPMixerCard.cxx 24 Nov 2003 14:48:21 - 1.3
@@ -19,6 +19,7 @@
*/
#pragma implementation
+#define HDSPMIXER_DEFINE_MAPPINGS
#include "HDSPMixerCard.h"
static void alsactl_cb(snd_async_handler_t *handler)
@@ -110,6 +111,7 @@
} else if (external_rate <= 2) {
return 0;
}
+return 0;
}
int HDSPMixerCard::getSpeed()
@@ -168,7 +170,12 @@
snprintf(name, 6, "hw:%i", card_id);
h9632_aeb.aebi = 0;
h9632_aeb.aebo = 0;
-if (type == H9632) getAeb();
+if (type == H9632) {
+ getAeb();
+ playbacks_offset = 16;
+} else {
+ playbacks_offset = 26;
+}
speed_mode = getSpeed();
if (speed_mode < 0) {
fprintf(stderr, "Error trying to determine speed mode for card %s,
exiting.\n", name);
@@ -195,6 +202,7 @@
snd_hwdep_close(hw);
return;
}
+snd_hwdep_close(hw);
}
void HDSPMixerCard::adjustSettings() {
@@ -255,32 +263,30 @@
lineouts = 0;
break;
case 2:
+ /* should never happen */
break;
}
} else if (type == H9632) {
- /* FIXME : mapping values are my first guess here
- this needs to be tested
- */
switch (speed_mode) {
case 0:
- channels = 12 + (h9632_aeb.aebi || h9632_aeb.aebo) ? 4 : 0;
+ channels = 12 + ((h9632_aeb.aebi || h9632_aeb.aebo) ? 4 : 0);
channel_map = channel_map_h9632_ss;
dest_map = dest_map_h9632_ss;
meter_map = channel_map_h9632_ss;
lineouts = 0;
break;
case 1:
- channels = 8 + (h9632_aeb.aebi || h9632_aeb.aebo) ? 4 : 0;
+ channels = 8 + ((h9632_aeb.aebi || h9632_aeb.aebo) ? 4 : 0);
channel_map = channel_map_h9632_ds;
dest_map = dest_map_h9632_ds;
- meter_map = meter_map_h9632_ds;
+ meter_map = channel_map_h9632_ds;
lineouts = 0;
break;
case 2:
- channels = 4 + (h9632_aeb.aebi || h9632_aeb.aebo) ? 4 : 0;
+ channels = 4 + ((h9632_aeb.aebi || h9632_aeb.aebo) ? 4 : 0);
channel_map = channel_map_h9632_qs;
dest_map = dest_map_h9632_qs;
- meter_map = dest_map_h9632_qs;
+ meter_map = channel_map_h9632_qs;
lineouts = 0;
break;
}
@@ -355,13 +361,20 @@
basew->inputs->empty_aebi[i]->hide();
basew->playbacks->empty_aebo[i]->show();
basew->outputs->empty_aebo[i]->show();
- }
+ }
+ for (int i = channels-4; i < channels; ++i) {
+ basew->playbacks->strips[i]->hide();
+ basew->outputs->strips[i]->hide();
+ }
} else if (h9632_aeb.aebo && !h9632_aeb.aebi) {
for (int i = 0; i < 2; ++i) {
basew->inputs->empty_aebi[i]->show();
basew->playbacks->empty_aebo[i]->hide();
basew->outputs->empty_aebo[i]->hide();
}
+ for (int i = channels-4; i < channels; ++i) {
+ basew->inputs->strips[i]->hide();
+ }
} else {
for (int i = 0; i < 2; ++i) {
basew->inputs->empty_aebi[i]->hide();
Index: HDSPMixerCard.h
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerCard.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HDSPMixerCard.h 3 Nov 2003 19:10:39 - 1.2
+++ HDSPMixerCard.h 24 Nov 2003 14:48:21 - 1.3
@@ -26,7 +26,9 @@
#include
#include
#include
+#ifdef HDSPMIXER_DEFINE_MAPPINGS
#include "mappings.h"
+#endif
#include "defines.h"
#include "HDSPMixerWindow.h"
@@ -47,6 +49,7 @@
char *dest_map;
char *meter_map;
int speed_mode;
+int playbacks_offset;
void setMode(int mode);
int initializeCard(HDSPMixerWindow *w);
int getSpeed();
Index: HDSPMixerOutput.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerOutput.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HDSPMixerOutput.cxx 3 Nov 2003 19:10:39 -
[alsa-cvslog] CVS: alsa-tools/hdspmixer/pixmaps hdspmixer.png,NONE,1.1 Makefile.am,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/hdspmixer/pixmaps
In directory sc8-pr-cvs1:/tmp/cvs-serv1453/hdspmixer/pixmaps
Modified Files:
Makefile.am
Added Files:
hdspmixer.png
Log Message:
- fixed H9632 problem.
- added desktop file and icon
new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.
- fixed compile warnings.
--- NEW FILE: hdspmixer.png ---
PNG
Z -¤
ZX0 Þx)Xe¶ÿo½òÂ`PMrf
Ñ rÓêîîªÊÊzgåûæͼ÷÷æ£Èjd£*ãF_|ç\ùïù TÃC#¥´þ6»Ï¿d2 síÞJ~Dxñ¼¡-Ñ9=f2°´ºAÉíá1©Ð\úgÇ-Ü{÷!ã83ä)pqÔd0¸q÷6§ÆCzãIâÑ=?%{ïÜ'îíöÛxm÷I&cÔñXßÚÀ 7Äüê=^?Æ1¹Ê2¦ì*o¨
MpÂ!Ñé)Võ%÷w
, ºgçäãÁñ
v?âñÛë<åâøb<æ¢yÈd°Qø§·]FÝ ÅIÄÞóø;uß~¸M÷äq·MÍóØûúÄ1÷®¹»Ç±J§Ù æ ííDÞÝ.pcÕG,Dg§xaHsï
¯÷¾æÃ|Îdàzï?|kWyòù?ðâÅ l¢
w¾Ke%Ï×òòÇ'$"¹\ï{¸cme
·WBUòù ¹À§T*±¹¹NFi
Ä*Þ++« 6ê
3rp& vd1Áó|[EMAIL PROTECTED] nè"F3T
&rpv]ÄPp ÈÅNÀQAjÁÄNâ¢BÞ7pàDG\èYÜs§dÿø¦çg稦ØRÀáæÛ CMT-iY
AàS©T ûC [EMAIL PROTECTED]|ÑïvAÔfy©Ìë×Øûæ
áphjSR©L©Tääø$ÿÎÖ[]_ÃívÚ¼Ù}q xÂÙÅ
O¹^!øæoðóÁv¯K½ZãÞÝ»t»]NOð|N¯Ë
©-UÙ¸¶ÅáaÖy ×siµÛF#JÅßýÎãLvq ÚÝáhÄím*ËUGM:m Ïá¼uUËöµmv®_ewX<[EMAIL
PROTECTED]@7""ÄIÆó¦{ÂÓþ£($IHÆI ó¢wÌðpRx<±ñDyr¾Ç«þ Ñd«([EMAIL
PROTECTED] ò3À$UE3æHªMõTAµ0RM"(±ÂØ([EMAIL PROTECTED]Ú
6+n1ó s.DtêÇ<¨))L×»¼!v
ÈÇÒqÑ4ïcÄìÑ¡¦å&Fp} Tñ^Ñ3×q²ø¹ ÷«2*פçl#®ï ª?¯âôò5¸çãø9¬UQ
ùE#ë%W\b<ɪx¿( r¸Käq¼ØB¥»FüYL>0"äòEÂá«Jådä0Áu4 \paÔRÚ_ǾI(UJ¸®ëúãã¨R~¾Z¥T)ã¹ ^#¬µÔmck%Üv«ÍþþQyôÓAp;´/Úìï7#H@,[EMAIL
PROTECTED]<I4áøèÓî)ÖUÈ)Þ
G.
&¡3L¯
s?ôY®×pýº¿ÝEZE¨¼Y" Oèwû ì7è>ê!!Hh¸v ss{n»ËÞé £[Qzë8ØÅÆÖYÝþ £í¼¾Ãzk î¿Ê:{Dw#d$xG.%¯D29;9çu¼K² ëÂçj*q½Îaó+-«°d)칺~·^¯ñÞûï0aCG øJeÖÖVyïýw1äA|¡º^¡T*råÊ&^Þ#öâô\àUßçÆÍ *2±NÁPJ¸ÏÛ,µÄb!ÎMÃæê&ù|Û·o²Ü¯¦÷Ðesc|>ÏwÞfDÍÎÞ Í
ä¿þ·¿Ôå5|ÏѸë:4äs9?
Ï#ƤWÜ°¿·KµV£P( ìÚýô®_½Áe< ³¾±ÁA£Á[oßão~ø×ܹyÓs<ÏãwÞáç|ÂöõmZç§<¸wÆÁ!£ÑG Ñï÷9<>Àm]´¾
L&4÷ üÆ~Éd±%
GAqÒyå ÙÄu ¢hB'øïùaHwÔçå7¯#ÆÑ\>1ÇqG¯_¿"-ýÁý]Æã1Ç
ú>{JLÆO´Û ¾yó0 ùìWÒévFýAOûïþÆVã¢(Âó<®\ÝD¥ßÒïÒ7+
ïR¯.!bèõCáÏó¢1ç²½sp0¢ÝîÒë÷)Kô{=?`mµBl
0èv{i6»]êõe+´/ºX«
ÃÙûà\>`©#¢hÌhḨRV0
\b±ÈÞÁ>6Mz½
|\P 8>=¦qÐ ÛëpÑnËåYZªØæá(¤Ûë0
8âRÍîO¿xï¹ 6q\qåb|®ZÈçsìîïѺhB\×£T(á¹>a8äõo89=a)
8·îÜúóFóx2ÆøXµôº GL&c\×ÁóÜlL8;?£uÑÊ&ÄǪÇu8h Ðn_à8BÇ$FmÂy«ÅÙùY:v$<×aOã³³SÎÏÏ#\'=8M&cÔ&4
L_E#þNÜ«ù
Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/pixmaps/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 28 Jul 2003 11:32:32 - 1.1
+++ Makefile.am 24 Nov 2003 14:48:21 - 1.2
@@ -1 +1,4 @@
-EXTRA_DIST = $(wildcard *.xpm)
+pixmapdir = $(PIXMAP_DIR)
+pixmap_DATA = hdspmixer.png
+
+EXTRA_DIST = $(wildcard *.xpm) hdspmixer.png
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspmixer hdspmixer.desktop,NONE,1.1 Makefile.am,1.1,1.2 NEWS,1.2,1.3 configure.in,1.3,1.4
Update of /cvsroot/alsa/alsa-tools/hdspmixer
In directory sc8-pr-cvs1:/tmp/cvs-serv1453/hdspmixer
Modified Files:
Makefile.am NEWS configure.in
Added Files:
hdspmixer.desktop
Log Message:
- fixed H9632 problem.
- added desktop file and icon
new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.
- fixed compile warnings.
--- NEW FILE: hdspmixer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=HDSPMixer
Comment=Hammerfall DSP matrix mixer control GUI
Exec=hdspmixer
FilePattern=hdspmixer
Icon=hdspmixer.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;
Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 28 Jul 2003 11:32:32 - 1.1
+++ Makefile.am 24 Nov 2003 14:48:21 - 1.2
@@ -1,4 +1,8 @@
+EXTRA_DIST = hdspmixer.desktop
SUBDIRS = src pixmaps
+
+desktopdir = $(DESKTOP_DIR)
+desktop_DATA = hdspmixer.desktop
alsa-dist: distdir
@rm -rf ../distdir/hdspmixer
Index: NEWS
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NEWS3 Nov 2003 19:10:38 - 1.2
+++ NEWS24 Nov 2003 14:48:21 - 1.3
@@ -1,3 +1,8 @@
+Version 1.5 (21/11/2003):
+* Added a .desktop file
+* H9632 bug fixes (thanks to Pentti Ala-Vannesluoma)
+* Fixes presets handling for H9632 cards
+
Version 1.4 (01/11/2003):
* Adds support for H9632 cards
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in3 Nov 2003 19:10:38 - 1.3
+++ configure.in24 Nov 2003 14:48:21 - 1.4
@@ -1,12 +1,12 @@
AC_INIT(src/hdspmixer.cxx)
-AM_INIT_AUTOMAKE(hdspmixer, 1.4)
+AM_INIT_AUTOMAKE(hdspmixer, 1.5)
AC_PROG_CXX
AC_PROG_MAKE_SET
AC_STDC_HEADERS
AC_PATH_X
-AM_PATH_ALSA(0.9.0)
+AM_PATH_ALSA(1.0.0)
dnl kernel header files
AC_MSG_CHECKING(for kernel header files)
@@ -32,7 +32,7 @@
[soundbasedir="$withval"], [soundbasedir="$kerneldir"])
if test "$soundbasedir" != "" -a -r "$soundbasedir/sound" ; then
ALSA_CFLAGS="$ALSA_CFLAGS -I$soundbasedir"
- CFLAGS="$CFLAGS -I$soundbasedir"
+ CXXFLAGS="$CXXFLAGS -I$soundbasedir"
AC_MSG_RESULT($ALSA_CFLAGS)
else
if test "x$prefix" != xNONE; then
@@ -42,13 +42,33 @@
fi
if test -z "$soundbasedir" -a -r "$aprefix/include/sound"; then
ALSA_CFLAGS="$ALSA_CFLAGS -I$aprefix/include"
-CFLAGS="$CFLAGS -I$aprefix/include"
+CXXFLAGS="$CXXFLAGS -I$aprefix/include"
AC_MSG_RESULT($ALSA_CFLAGS)
else
AC_MSG_RESULT("not specified - using C compiler defaults")
fi
fi
+dnl desktop install
+AC_ARG_WITH(desktop-dir,
+ [ --with-desktop-dir specify the path to install desktop file],
+ [desktopdir="$withval"], [desktopdir=""])
+if test -z "$desktopdir"; then
+ desktopdir=$datadir/applications
+fi
+DESKTOP_DIR="$desktopdir"
+AC_SUBST(DESKTOP_DIR)
+
+AC_ARG_WITH(pixmap-dir,
+ [ --with-pixmap-dir specify the path to install desktop pixmap file],
+ [pixmapdir="$withval"], [pixmapdir=""])
+if test -z "$pixmapdir"; then
+ pixmapdir=$datadir/pixmaps
+fi
+PIXMAP_DIR="$pixmapdir"
+AC_SUBST(PIXMAP_DIR)
+
+dnl library check
AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
if test "$FLTK_CONFIG" = "no"; then
AC_MSG_ERROR(fltk-config is required)
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspconf/pixmaps hdspconf.png,NONE,1.1 Makefile.am,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/hdspconf/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv1264/hdspconf/pixmaps Modified Files: Makefile.am Added Files: hdspconf.png Log Message: - added desktop file and icon new options --with-desktop-dir and --with-pixmap-dir. - fixed CXXFLAGS for soundbase option. --- NEW FILE: hdspconf.png --- PNG Ïs¨Ð+ð ð΢÷5?òÅé·ÝA°nÓË(ìÝ÷=]UÛҺѤù 5)c#"&É 9HG`è U1¡«8ËÔW'JòG°~Ëvئ*¥âiJ1]×Às¥b¼à LÀ4YN *®×M¥X"!Gã1&H QU]×PRT¸#YýuËvÍN»sëóÏÿyàBʪ~i©ÿC(¬pÌp5JãájÂ0lðh²fJó°aZZ;êëêFäÃ!p<[EMAIL PROTECTED]|úÙcytÕZ<ºjíIÅ nª EUi¨0*&h¾3¹ Þ:*GÏÈgrPKV¾RĶ9í3O2¥áâÑo8ö#3 \~ùàa½Èu ¶TÖpèP/\ÛËhM<[EMAIL PROTECTED]@ÃÖ·cµMOZ縮Û4P)´MX ÓS%f_ðÝo¾øqò a FcMí-CܳðYZ¿Ö I»ÍHt¨·È1ÍQ9BytuuCW5ä´âPÓ± 3Lk Ë% Çó¹i 3+öe.Íd »Þ|[EMAIL PROTECTED] ²¼Î±-øH4ÖTפ@>ì¡(LÇNf²V¾}Éãíü,¡Ï ®. õ/o;¼Ç ÷àg#v¿»Ù3íó¡0ø²ªbÏî=Èfð(ÂðàXÖ©%&¢ñygÑÒwÇëûÕ$ÈâÇC à»`ÆæÅð$)°`úUº'ÜÌõ'Æ9ÿ¨¿o=cßëº~»çyÕbad:AŲÁq/Gâ©Ú¶¡ÃZAé Ì Ç -9÷ o¿û`÷¾c(Ãib$ùçÑ_½xÚiרÞÌ VmÚ^zå+÷ j£t¤jë¯^43û¹$»vӬݴå¨ÿMY°¼áº9KBÿjìÿPù$ô`ù Index: Makefile.am === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/pixmaps/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 2 Jul 2003 10:21:11 - 1.1 +++ Makefile.am 24 Nov 2003 14:47:28 - 1.2 @@ -1 +1,4 @@ -EXTRA_DIST = $(wildcard *.xpm) +pixmapdir = $(PIXMAP_DIR) +pixmap_DATA = hdspconf.png + +EXTRA_DIST = $(wildcard *.xpm) hdspconf.png --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspconf hdspconf.desktop,NONE,1.1 Makefile.am,1.2,1.3 configure.in,1.3,1.4
Update of /cvsroot/alsa/alsa-tools/hdspconf
In directory sc8-pr-cvs1:/tmp/cvs-serv1264/hdspconf
Modified Files:
Makefile.am configure.in
Added Files:
hdspconf.desktop
Log Message:
- added desktop file and icon
new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.
--- NEW FILE: hdspconf.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=HDSPConf
Comment=Hammerfall DSP control application
Exec=hdspconf
FilePattern=hdspconf
Icon=hdspconf.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;
Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 14 Jul 2003 14:49:16 - 1.2
+++ Makefile.am 24 Nov 2003 14:47:28 - 1.3
@@ -1,4 +1,8 @@
+EXTRA_DIST = hdspconf.desktop
SUBDIRS = src pixmaps
+
+desktopdir = $(DESKTOP_DIR)
+desktop_DATA = hdspconf.desktop
alsa-dist: distdir
@rm -rf ../distdir/hdspconf
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in3 Nov 2003 19:09:32 - 1.3
+++ configure.in24 Nov 2003 14:47:28 - 1.4
@@ -1,12 +1,12 @@
AC_INIT(src/hdspconf.cxx)
-AM_INIT_AUTOMAKE(hdspconf, 1.2)
+AM_INIT_AUTOMAKE(hdspconf, 1.3)
AC_PROG_CXX
AC_PROG_MAKE_SET
AC_STDC_HEADERS
AC_PATH_X
-AM_PATH_ALSA(0.9.0)
+AM_PATH_ALSA(1.0.0)
dnl kernel header files
AC_MSG_CHECKING(for kernel header files)
@@ -32,7 +32,7 @@
[soundbasedir="$withval"], [soundbasedir="$kerneldir"])
if test "$soundbasedir" != "" -a -r "$soundbasedir/sound" ; then
ALSA_CFLAGS="$ALSA_CFLAGS -I$soundbasedir"
- CFLAGS="$CFLAGS -I$soundbasedir"
+ CXXFLAGS="$CXXFLAGS -I$soundbasedir"
AC_MSG_RESULT($ALSA_CFLAGS)
else
if test "x$prefix" != xNONE; then
@@ -42,13 +42,33 @@
fi
if test -z "$soundbasedir" -a -r "$aprefix/include/sound"; then
ALSA_CFLAGS="$ALSA_CFLAGS -I$aprefix/include"
-CFLAGS="$CFLAGS -I$aprefix/include"
+CXXFLAGS="$CXXFLAGS -I$aprefix/include"
AC_MSG_RESULT($ALSA_CFLAGS)
else
AC_MSG_RESULT("not specified - using C compiler defaults")
fi
fi
+dnl desktop install
+AC_ARG_WITH(desktop-dir,
+ [ --with-desktop-dir specify the path to install desktop file],
+ [desktopdir="$withval"], [desktopdir=""])
+if test -z "$desktopdir"; then
+ desktopdir=$datadir/applications
+fi
+DESKTOP_DIR="$desktopdir"
+AC_SUBST(DESKTOP_DIR)
+
+AC_ARG_WITH(pixmap-dir,
+ [ --with-pixmap-dir specify the path to install desktop pixmap file],
+ [pixmapdir="$withval"], [pixmapdir=""])
+if test -z "$pixmapdir"; then
+ pixmapdir=$datadir/pixmaps
+fi
+PIXMAP_DIR="$pixmapdir"
+AC_SUBST(PIXMAP_DIR)
+
+dnl library check
AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
if test "$FLTK_CONFIG" = "no"; then
AC_MSG_ERROR(no fltk-config is found)
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/conf/cards CMI8738-MC6.conf,1.6,1.7
Update of /cvsroot/alsa/alsa-lib/src/conf/cards In directory sc8-pr-cvs1:/tmp/cvs-serv12973 Modified Files: CMI8738-MC6.conf Log Message: - fixed the 5.1 output device. Index: CMI8738-MC6.conf === RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/CMI8738-MC6.conf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CMI8738-MC6.conf7 Nov 2003 19:39:16 - 1.6 +++ CMI8738-MC6.conf24 Nov 2003 12:58:07 - 1.7 @@ -59,7 +59,7 @@ -CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.front.0" +CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.surround40.0" --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/usb usbaudio.c,1.70,1.71
Update of /cvsroot/alsa/alsa-kernel/usb
In directory sc8-pr-cvs1:/tmp/cvs-serv1213
Modified Files:
usbaudio.c
Log Message:
fix by Clemens Ladisch <[EMAIL PROTECTED]>:
- don't clear active_mask bits until it's clear that the URB is _not_
resubmitted, to prevent a race with unlinking
- initialize active_mask and unlink_mask each time before URBs are
started
- don't call sleeping functions in trigger callback
Index: usbaudio.c
===
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- usbaudio.c 20 Nov 2003 16:08:26 - 1.70
+++ usbaudio.c 24 Nov 2003 11:52:24 - 1.71
@@ -573,21 +573,18 @@
snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
snd_usb_substream_t *subs = ctx->subs;
snd_pcm_substream_t *substream = ctx->subs->pcm_substream;
- int err;
+ int err = 0;
- clear_bit(ctx->index, &subs->active_mask);
- clear_bit(ctx->index, &subs->unlink_mask);
- if (subs->running && subs->ops.retire(subs, substream->runtime, urb))
- return;
- if (! subs->running) /* can be stopped during retire callback */
- return;
- if ((err = subs->ops.prepare(subs, substream->runtime, urb)) < 0 ||
+ if ((subs->running && subs->ops.retire(subs, substream->runtime, urb)) ||
+ ! subs->running || /* can be stopped during retire callback */
+ (err = subs->ops.prepare(subs, substream->runtime, urb)) < 0 ||
(err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
- snd_printd(KERN_ERR "cannot submit urb (err = %d)\n", err);
- snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
- return;
+ clear_bit(ctx->index, &subs->active_mask);
+ if (err < 0) {
+ snd_printd(KERN_ERR "cannot submit urb (err = %d)\n", err);
+ snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+ }
}
- set_bit(ctx->index, &subs->active_mask);
}
@@ -599,21 +596,18 @@
snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
snd_usb_substream_t *subs = ctx->subs;
snd_pcm_substream_t *substream = ctx->subs->pcm_substream;
- int err;
+ int err = 0;
- clear_bit(ctx->index + 16, &subs->active_mask);
- clear_bit(ctx->index + 16, &subs->unlink_mask);
- if (subs->running && subs->ops.retire_sync(subs, substream->runtime, urb))
- return;
- if (! subs->running) /* can be stopped during retire callback */
- return;
- if ((err = subs->ops.prepare_sync(subs, substream->runtime, urb)) < 0 ||
+ if ((subs->running && subs->ops.retire_sync(subs, substream->runtime, urb)) ||
+ ! subs->running || /* can be stopped during retire callback */
+ (err = subs->ops.prepare_sync(subs, substream->runtime, urb)) < 0 ||
(err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
- snd_printd(KERN_ERR "cannot submit sync urb (err = %d)\n", err);
- snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
- return;
+ clear_bit(ctx->index + 16, &subs->active_mask);
+ if (err < 0) {
+ snd_printd(KERN_ERR "cannot submit sync urb (err = %d)\n",
err);
+ snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+ }
}
- set_bit(ctx->index + 16, &subs->active_mask);
}
@@ -694,9 +688,11 @@
}
}
+ subs->active_mask = 0;
+ subs->unlink_mask = 0;
subs->running = 1;
for (i = 0; i < subs->nurbs; i++) {
- if ((err = usb_submit_urb(subs->dataurb[i].urb, GFP_KERNEL)) < 0) {
+ if ((err = usb_submit_urb(subs->dataurb[i].urb, GFP_ATOMIC)) < 0) {
snd_printk(KERN_ERR "cannot submit datapipe for urb %d, err =
%d\n", i, err);
goto __error;
}
@@ -704,7 +700,7 @@
}
if (subs->syncpipe) {
for (i = 0; i < SYNC_URBS; i++) {
- if ((err = usb_submit_urb(subs->syncurb[i].urb, GFP_KERNEL)) <
0) {
+ if ((err = usb_submit_urb(subs->syncurb[i].urb, GFP_ATOMIC)) <
0) {
snd_printk(KERN_ERR "cannot submit syncpipe for urb
%d, err = %d\n", i, err);
goto __error;
}
@@ -843,8 +839,6 @@
subs->hwptr_done = 0;
subs->transfer_sched = 0;
subs->transfer_done = 0;
- subs->active_mask = 0;
- subs->unlink_mask = 0;
/* calculate the max. size of packet */
maxsize = ((subs->freqmax + 0x3fff) * (frame_bits >> 3)) >> 14;
@@ -1282,9 +1276,6 @@
/* some unit conversions in runtime */
subs->maxframesize = bytes_to_frames(run
[alsa-cvslog] CVS: alsa-utils/alsaconf alsaconf.in,1.4,1.5
Update of /cvsroot/alsa/alsa-utils/alsaconf In directory sc8-pr-cvs1:/tmp/cvs-serv32306 Modified Files: alsaconf.in Log Message: fix by Fernando Pablo Lopez-Lezcano <[EMAIL PROTECTED]>: Included is a patch that fixes alsaconf to work correctly under fedora core 1. Otherwise alsaconf happily creates a modules.conf file that only contains the alsa configuration and nothing else (a path in the if's that does not create a $TMP file before the alsa configuration process starts). Index: alsaconf.in === RCS file: /cvsroot/alsa/alsa-utils/alsaconf/alsaconf.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- alsaconf.in 17 Nov 2003 18:32:52 - 1.4 +++ alsaconf.in 24 Nov 2003 11:42:24 - 1.5 @@ -24,8 +24,10 @@ distribution="suse" elif [ -f /etc/debian_version ]; then distribution="debian" -elif [ -f /etc/redhat-release ]; then +elif [ -f /etc/redhat-release -a `grep -c "Red Hat" /etc/redhat-release 2>/dev/null` != 0 ]; then distribution="redhat" +elif [ -f /etc/fedora-release -a `grep -c "Fedora" /etc/fedora-release 2>/dev/null` != 0 ]; then + distribution="fedora" else distribution="unknown" fi @@ -546,10 +548,8 @@ SOUND_CORE="snd" fi -if [ "$distribution" = "redhat" ] ; then -if grep -q "Red Hat" /etc/redhat-release >/dev/null 2>&1 ; then - remove_ac_block < $cfgfile | remove_sndconfig_block | uniq > $TMP -fi +if [ "$distribution" = "redhat" -o "$distribution" = "fedora" ] ; then +remove_ac_block < $cfgfile | remove_sndconfig_block | uniq > $TMP else remove_ac_block < $cfgfile | remove_y2_block | uniq > $TMP fi --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.48,1.49
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1:/tmp/cvs-serv31688/pci/rme9652
Modified Files:
hdsp.c
Log Message:
fix by Thomas Charbonnel <[EMAIL PROTECTED]>:
The attach patch fixes problems with speed modes for H9632 cards (many
thanks to Pentti Ala-Vannesluoma for testing the driver and helping
finding bugs), and the AutoSync mode issue (for all cards) reported by
Anders Torger at the end of september.
Index: hdsp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- hdsp.c 7 Nov 2003 18:42:59 - 1.48
+++ hdsp.c 24 Nov 2003 11:39:16 - 1.49
@@ -1109,16 +1109,17 @@
rate_bits = HDSP_Frequency176_4KHz;
break;
case 192000:
- if (current_rate != 192000) {
+ if (current_rate < 128000) {
reject_if_open = 1;
}
rate_bits = HDSP_Frequency192KHz;
+ break;
default:
return -EINVAL;
}
if (reject_if_open && (hdsp->capture_pid >= 0 || hdsp->playback_pid >= 0)) {
- snd_printk ("cannot change between single- and double-speed mode
(capture PID = %d, playback PID = %d)\n",
+ snd_printk ("cannot change speed mode (capture PID = %d, playback PID
= %d)\n",
hdsp->capture_pid,
hdsp->playback_pid);
return -EBUSY;
@@ -2102,9 +2103,11 @@
switch (mode) {
case HDSP_CLOCK_SOURCE_AUTOSYNC:
if (hdsp_external_sample_rate(hdsp) != 0) {
- hdsp->control_register &= ~HDSP_ClockModeMaster;
- hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
- return 0;
+ if (!hdsp_set_rate(hdsp, hdsp_external_sample_rate(hdsp), 1)) {
+ hdsp->control_register &= ~HDSP_ClockModeMaster;
+ hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
+ return 0;
+ }
}
return -1;
case HDSP_CLOCK_SOURCE_INTERNAL_32KHZ:
@@ -4189,30 +4192,37 @@
static int snd_hdsp_hw_rule_in_channels(snd_pcm_hw_params_t *params,
snd_pcm_hw_rule_t *rule)
{
- unsigned int list[2];
hdsp_t *hdsp = rule->private;
snd_interval_t *c = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
if (hdsp->io_type == H9632) {
+ unsigned int list[3];
list[0] = hdsp->qs_in_channels;
+ list[1] = hdsp->ds_in_channels;
+ list[2] = hdsp->ss_in_channels;
+ return snd_interval_list(c, 3, list, 0);
} else {
+ unsigned int list[2];
list[0] = hdsp->ds_in_channels;
+ list[1] = hdsp->ss_in_channels;
+ return snd_interval_list(c, 2, list, 0);
}
- list[1] = hdsp->ss_in_channels;
- return snd_interval_list(c, 2, list, 0);
}
static int snd_hdsp_hw_rule_out_channels(snd_pcm_hw_params_t *params,
snd_pcm_hw_rule_t *rule)
{
- unsigned int list[2];
+ unsigned int list[3];
hdsp_t *hdsp = rule->private;
snd_interval_t *c = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
if (hdsp->io_type == H9632) {
list[0] = hdsp->qs_out_channels;
+ list[1] = hdsp->ds_out_channels;
+ list[2] = hdsp->ss_out_channels;
+ return snd_interval_list(c, 3, list, 0);
} else {
list[0] = hdsp->ds_out_channels;
+ list[1] = hdsp->ss_out_channels;
}
- list[1] = hdsp->ss_out_channels;
return snd_interval_list(c, 2, list, 0);
}
@@ -4229,7 +4239,7 @@
.integer = 1,
};
return snd_interval_refine(c, &t);
- } else if (r->min > 48000) {
+ } else if (r->min > 48000 && r->max <= 96000) {
snd_interval_t t = {
.min = hdsp->ds_in_channels,
.max = hdsp->ds_in_channels,
@@ -4260,7 +4270,7 @@
.integer = 1,
};
return snd_interval_refine(c, &t);
- } else if (r->min > 48000) {
+ } else if (r->min > 48000 && r->max <= 96000) {
snd_interval_t t = {
.min = hdsp->ds_out_channels,
.max = hdsp->ds_out_channels,
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? S
[alsa-cvslog] CVS: alsa-driver/include compat_22.h,1.53,1.54
Update of /cvsroot/alsa/alsa-driver/include In directory sc8-pr-cvs1:/tmp/cvs-serv26162/include Modified Files: compat_22.h Log Message: fixed typos. Index: compat_22.h === RCS file: /cvsroot/alsa/alsa-driver/include/compat_22.h,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- compat_22.h 20 Nov 2003 10:47:30 - 1.53 +++ compat_22.h 24 Nov 2003 11:08:42 - 1.54 @@ -289,8 +289,8 @@ int snd_pci_compat_set_dma_mask(struct pci_dev *, unsigned long mask); void * snd_pci_compat_get_driver_data (struct pci_dev *dev); void snd_pci_compat_set_driver_data (struct pci_dev *dev, void *driver_data); -int snd_pci_compat_pci_request_region(struct pci_dev *pdev, int bar, char *res_name); -void snd_pci_compat_release_region(struct pci_dev *pci, int bar); +int snd_pci_compat_request_region(struct pci_dev *pdev, int bar, char *res_name); +void snd_pci_compat_release_region(struct pci_dev *pdev, int bar); int snd_pci_compat_request_regions(struct pci_dev *pdev, char *res_name); void snd_pci_compat_release_regions(struct pci_dev *pdev); --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/acore pci_compat_22.c,1.6,1.7
Update of /cvsroot/alsa/alsa-driver/acore
In directory sc8-pr-cvs1:/tmp/cvs-serv26162/acore
Modified Files:
pci_compat_22.c
Log Message:
fixed typos.
Index: pci_compat_22.c
===
RCS file: /cvsroot/alsa/alsa-driver/acore/pci_compat_22.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pci_compat_22.c 20 Nov 2003 10:47:30 - 1.6
+++ pci_compat_22.c 24 Nov 2003 11:08:41 - 1.7
@@ -343,7 +343,7 @@
/*
*/
-int snd_pci_compat_pci_request_region(struct pci_dev *pdev, int bar, char *res_name)
+int snd_pci_compat_request_region(struct pci_dev *pdev, int bar, char *res_name)
{
int flags;
@@ -371,7 +371,7 @@
return -EBUSY;
}
-void snd_pci_compat_release_region(struct pci_dev *pci, int bar)
+void snd_pci_compat_release_region(struct pci_dev *pdev, int bar)
{
int flags;
if (pci_resource_len(pdev, bar) == 0)
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils cvscompile,1.9,1.10
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1:/tmp/cvs-serv30905 Modified Files: cvscompile Log Message: Use global alsa.m4 configuration Index: cvscompile === RCS file: /cvsroot/alsa/alsa-utils/cvscompile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cvscompile 1 May 2003 08:28:15 - 1.9 +++ cvscompile 24 Nov 2003 08:13:37 - 1.10 @@ -1,6 +1,6 @@ #!/bin/bash -if test -d ../alsa-lib/utils; then +if test -d ../alsa-lib/utils && ! test -r `aclocal --print-ac-dir`/alsa.m4; then alsa_m4_flags="-I ../alsa-lib/utils" fi aclocal $alsa_m4_flags $ACLOCAL_FLAGS --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver Makefile,1.100,1.101
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv29294 Modified Files: Makefile Log Message: Uros Bizjak <[EMAIL PROTECTED]> fixes Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/Makefile,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- Makefile13 Nov 2003 17:41:15 - 1.100 +++ Makefile24 Nov 2003 08:04:14 - 1.101 @@ -125,7 +125,7 @@ @if [ -L /dev/snd ]; then \ echo "The ALSA devices were removed from /proc/asound/dev directory." ; \ echo "Creating static device entries in /dev/snd." ; \ - $(TOPDIR)/snddevices ; \ + $(SND_TOPDIR)/snddevices ; \ fi cat WARNING @@ -173,7 +173,7 @@ .PHONY: check-snd-prefix check-snd-prefix: @ if [ x"$(DESTDIR)" = x ]; then \ - if modprobe -c | grep -s -q snd_; then \ + if /sbin/modprobe -c | grep -s -q snd_; then \ echo;\ echo " = WARNING =";\ echo;\ --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ 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.114,1.115 ac97_pcm.c,1.3,1.4
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv28955
Modified Files:
ac97_codec.c ac97_pcm.c
Log Message:
Clemens Ladisch <[EMAIL PROTECTED]>
fix compiler warnings
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ac97_codec.c20 Nov 2003 16:00:01 - 1.114
+++ ac97_codec.c24 Nov 2003 08:02:10 - 1.115
@@ -1793,7 +1793,7 @@
if (!ac97_is_audio(ac97) && !ac97_is_modem(ac97)) {
if (!(ac97->scaps & (AC97_SCAP_SKIP_AUDIO|AC97_SCAP_SKIP_MODEM)))
- snd_printk(KERN_ERR "AC'97 %d access error (not audio or modem
codec)\n", ac97->num, ac97->id);
+ snd_printk(KERN_ERR "AC'97 %d access error (not audio or modem
codec)\n", ac97->num);
snd_ac97_free(ac97);
return -EACCES;
}
Index: ac97_pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_pcm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ac97_pcm.c 20 Nov 2003 15:59:32 - 1.3
+++ ac97_pcm.c 24 Nov 2003 08:02:10 - 1.4
@@ -377,7 +377,8 @@
const struct ac97_pcm *pcms)
{
int i, j, k;
- struct ac97_pcm *pcm, *rpcms, *rpcm;
+ const struct ac97_pcm *pcm;
+ struct ac97_pcm *rpcms, *rpcm;
unsigned short avail_slots[2][4];
unsigned short all_slots[2][4];
unsigned char rate_table[2][4];
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
