Skip to contentSkip to conversation

hdsp.c code

DISCUSSION Orm Finnendahl 2 participants 3 messages Sep 3, 2002

lore
Share & tools
lore
#0 lore raw

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;

=======

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

#1 lore raw

At Tue, 3 Sep 2002 10:56:21 +0200,

Quoted 5 lines · Orm Finnendahl

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

#2 lore raw

Am Dienstag, den 03. September 2002 um 12:18:17 Uhr (+0200) schrieb Takashi Iwai:

Quoted 2 lines

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