Mercurial > pygar

changeset 25:220c14f5963c pygar svn.26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn r26] Not fully connected but passes audio successfully
author punk
date Wed, 28 Apr 2010 12:01:37 -0400
parents 3871f3530551
children f5dfbe28fa59
files modules/bluespec/Pygar/core/AudioCoreRRR.cpp modules/bluespec/Pygar/core/AudioCoreSystem.cpp modules/bluespec/Pygar/core/Processor.bsv modules/bluespec/Pygar/core/audioCorePipeline.bsv
diffstat 4 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/modules/bluespec/Pygar/core/AudioCoreRRR.cpp	Wed Apr 28 08:29:04 2010 -0400
     1.2 +++ b/modules/bluespec/Pygar/core/AudioCoreRRR.cpp	Wed Apr 28 12:01:37 2010 -0400
     1.3 @@ -92,7 +92,7 @@
     1.4  AUDIOCORERRR_SERVER_CLASS::SendProcessedStream(UINT16 control, UINT16 data)
     1.5  {
     1.6  
     1.7 -  printf("rlm: SendProcessedStream called,\n");
     1.8 +  //  printf("rlm: SendProcessedStream called,\n");
     1.9    AudioProcessorControl audioProcessorControl = (AudioProcessorControl) control;
    1.10    switch(control) {
    1.11      case EndOfFile:
    1.12 @@ -120,7 +120,7 @@
    1.13        }
    1.14  
    1.15        CONNECTED_APPLICATION_CLASS::UpdateSemaphore(); 
    1.16 -      printf("rlm: writing data to out_hw.pcm\n");
    1.17 +      //      printf("rlm: writing data to out_hw.pcm\n");
    1.18        fwrite(&data, 2,1 , outputFile);
    1.19      break;
    1.20    }

     2.1 --- a/modules/bluespec/Pygar/core/AudioCoreSystem.cpp	Wed Apr 28 08:29:04 2010 -0400
     2.2 +++ b/modules/bluespec/Pygar/core/AudioCoreSystem.cpp	Wed Apr 28 12:01:37 2010 -0400
     2.3 @@ -82,7 +82,7 @@
     2.4        printf("main: %d\n", count);
     2.5      count++;
     2.6      sem_wait(&throttle);
     2.7 -    printf("rlm:sending data to processor (%d)\n", count);
     2.8 +//    printf("rlm:sending data to processor (%d)\n", count);
     2.9      clientStub->SendUnprocessedStream(Data,(UINT32)sample);
    2.10    } 
    2.11  

     3.1 --- a/modules/bluespec/Pygar/core/Processor.bsv	Wed Apr 28 08:29:04 2010 -0400
     3.2 +++ b/modules/bluespec/Pygar/core/Processor.bsv	Wed Apr 28 12:01:37 2010 -0400
     3.3 @@ -21,7 +21,6 @@
     3.4  // THE SOFTWARE.
     3.5  
     3.6  
     3.7 -
     3.8  import Connectable::*;
     3.9  import GetPut::*;
    3.10  import ClientServer::*;
    3.11 @@ -573,7 +572,7 @@
    3.12  
    3.13   // for now, we don't do anything.
    3.14    rule connectAudioReqResp;
    3.15 -    $display("rlm: PROCESSOR copies a datum\n");
    3.16 +//    $display("rlm: PROCESSOR copies a datum\n");
    3.17      outAudioFifo.enq(inAudioFifo.first());
    3.18      inAudioFifo.deq;
    3.19    endrule
    3.20 @@ -583,13 +582,14 @@
    3.21     rule feedInput;
    3.22       let command <- server_stub.acceptRequest_SendUnprocessedStream();
    3.23       AudioProcessorControl ctrl = unpack(truncate(command.ctrl));
    3.24 -      $display("rlm: PROCESSOR: recieved data\n");
    3.25       if(ctrl == EndOfFile)
    3.26 -	begin  
    3.27 +	begin
    3.28 +//	  $display("lsp: PROCESSOR received EOF   ");
    3.29            inAudioFifo.enq(tagged EndOfFile);
    3.30         end
    3.31       else 
    3.32 -       begin
    3.33 +	begin
    3.34 +//	  $display("lsp: PROCESSOR received Data   ");
    3.35            inAudioFifo.enq(tagged Sample unpack(truncate(command.sample)));
    3.36         end
    3.37     endrule     

     4.1 --- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Wed Apr 28 08:29:04 2010 -0400
     4.2 +++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Wed Apr 28 12:01:37 2010 -0400
     4.3 @@ -86,11 +86,11 @@
     4.4       AudioProcessorControl endOfFileTag = EndOfFile;
     4.5       AudioProcessorControl sampleTag = Data;
     4.6  
     4.7 -  //   case (pipelineData) matches
     4.8 - //      tagged EndOfFile: 
     4.9 +     case (pipelineData) matches
    4.10 +       tagged EndOfFile: 
    4.11         client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(endOfFileTag)),?);
    4.12 -//       tagged Sample .sample:client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(sampleTag)), zeroExtend(pack(sample)));
    4.13 -//     endcase
    4.14 +       tagged Sample .sample:client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(sampleTag)), zeroExtend(pack(sample)));
    4.15 +     endcase
    4.16     endrule
    4.17  
    4.18  endmodule