* hdsp.c code
@ 2002-09-03 8:56 Orm Finnendahl
2002-09-03 10:18 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Orm Finnendahl @ 2002-09-03 8:56 UTC (permalink / raw)
To: Paul Davis, alsa-devel
Hi,
In the current cvs checkpout of hdsp.c code there seem to be some
leftovers starting line 2874:
<...>
} else {
hdsp->type = Digiface;
<<<<<<< hdsp.c
hdsp->card_name = "RME Hammerfall DSP (Digiface)";
hdsp->ss_channels = DIGIFACE_SS_CHANNELS;
hdsp->ds_channels = DIGIFACE_DS_CHANNELS;
=======
>>>>>>> 1.10
}
hdsp_write (hdsp, HDSP_jtagReg, HDSP_S_PROGRAM);
<...>
I just got rid of the offending lines and hope that's o.k.
--
Orm
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: hdsp.c code 2002-09-03 8:56 hdsp.c code Orm Finnendahl @ 2002-09-03 10:18 ` Takashi Iwai 2002-09-03 10:47 ` Orm Finnendahl 0 siblings, 1 reply; 3+ messages in thread From: Takashi Iwai @ 2002-09-03 10:18 UTC (permalink / raw) To: Orm Finnendahl; +Cc: Paul Davis, alsa-devel At Tue, 3 Sep 2002 10:56:21 +0200, Orm Finnendahl wrote: > > Hi, > > In the current cvs checkpout of hdsp.c code there seem to be some > leftovers starting line 2874: mine looks ok. perhaps it's a result of merge. please try to remove the while file hdsp.c and check it out again. Takashi ------------------------------------------------------- This sf.net email is sponsored by: OSDN - Tired of that same old cell phone? Get a new here for FREE! https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: hdsp.c code 2002-09-03 10:18 ` Takashi Iwai @ 2002-09-03 10:47 ` Orm Finnendahl 0 siblings, 0 replies; 3+ messages in thread From: Orm Finnendahl @ 2002-09-03 10:47 UTC (permalink / raw) To: alsa-devel Am Dienstag, den 03. September 2002 um 12:18:17 Uhr (+0200) schrieb Takashi Iwai: > mine looks ok. perhaps it's a result of merge. > please try to remove the while file hdsp.c and check it out again. yep. It's o.k. now. -- Orm ------------------------------------------------------- This sf.net email is sponsored by: OSDN - Tired of that same old cell phone? Get a new here for FREE! https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2002-09-03 10:47 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2002-09-03 8:56 hdsp.c code Orm Finnendahl 2002-09-03 10:18 ` Takashi Iwai 2002-09-03 10:47 ` Orm Finnendahl
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.