# HG changeset patch
# User punk
# Date 1272470497 14400
# Node ID 220c14f5963c7b8c9715a9d27031f92a3f61bc6a
# Parent  3871f353055131cd67ec1024ae2e7e446878cc11
[svn r26] Not fully connected but passes audio successfully

diff -r 3871f3530551 -r 220c14f5963c modules/bluespec/Pygar/core/AudioCoreRRR.cpp
--- a/modules/bluespec/Pygar/core/AudioCoreRRR.cpp	Wed Apr 28 08:29:04 2010 -0400
+++ b/modules/bluespec/Pygar/core/AudioCoreRRR.cpp	Wed Apr 28 12:01:37 2010 -0400
@@ -92,7 +92,7 @@
 AUDIOCORERRR_SERVER_CLASS::SendProcessedStream(UINT16 control, UINT16 data)
 {
 
-  printf("rlm: SendProcessedStream called,\n");
+  //  printf("rlm: SendProcessedStream called,\n");
   AudioProcessorControl audioProcessorControl = (AudioProcessorControl) control;
   switch(control) {
     case EndOfFile:
@@ -120,7 +120,7 @@
       }
 
       CONNECTED_APPLICATION_CLASS::UpdateSemaphore(); 
-      printf("rlm: writing data to out_hw.pcm\n");
+      //      printf("rlm: writing data to out_hw.pcm\n");
       fwrite(&data, 2,1 , outputFile);
     break;
   }
diff -r 3871f3530551 -r 220c14f5963c modules/bluespec/Pygar/core/AudioCoreSystem.cpp
--- a/modules/bluespec/Pygar/core/AudioCoreSystem.cpp	Wed Apr 28 08:29:04 2010 -0400
+++ b/modules/bluespec/Pygar/core/AudioCoreSystem.cpp	Wed Apr 28 12:01:37 2010 -0400
@@ -82,7 +82,7 @@
       printf("main: %d\n", count);
     count++;
     sem_wait(&throttle);
-    printf("rlm:sending data to processor (%d)\n", count);
+//    printf("rlm:sending data to processor (%d)\n", count);
     clientStub->SendUnprocessedStream(Data,(UINT32)sample);
   } 
 
diff -r 3871f3530551 -r 220c14f5963c modules/bluespec/Pygar/core/Processor.bsv
--- a/modules/bluespec/Pygar/core/Processor.bsv	Wed Apr 28 08:29:04 2010 -0400
+++ b/modules/bluespec/Pygar/core/Processor.bsv	Wed Apr 28 12:01:37 2010 -0400
@@ -21,7 +21,6 @@
 // THE SOFTWARE.
 
 
-
 import Connectable::*;
 import GetPut::*;
 import ClientServer::*;
@@ -573,7 +572,7 @@
 
  // for now, we don't do anything.
   rule connectAudioReqResp;
-    $display("rlm: PROCESSOR copies a datum\n");
+//    $display("rlm: PROCESSOR copies a datum\n");
     outAudioFifo.enq(inAudioFifo.first());
     inAudioFifo.deq;
   endrule
@@ -583,13 +582,14 @@
    rule feedInput;
      let command <- server_stub.acceptRequest_SendUnprocessedStream();
      AudioProcessorControl ctrl = unpack(truncate(command.ctrl));
-      $display("rlm: PROCESSOR: recieved data\n");
      if(ctrl == EndOfFile)
-	begin  
+	begin
+//	  $display("lsp: PROCESSOR received EOF   ");
           inAudioFifo.enq(tagged EndOfFile);
        end
      else 
-       begin
+	begin
+//	  $display("lsp: PROCESSOR received Data   ");
           inAudioFifo.enq(tagged Sample unpack(truncate(command.sample)));
        end
    endrule     
diff -r 3871f3530551 -r 220c14f5963c modules/bluespec/Pygar/core/audioCorePipeline.bsv
--- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Wed Apr 28 08:29:04 2010 -0400
+++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Wed Apr 28 12:01:37 2010 -0400
@@ -86,11 +86,11 @@
      AudioProcessorControl endOfFileTag = EndOfFile;
      AudioProcessorControl sampleTag = Data;
 
-  //   case (pipelineData) matches
- //      tagged EndOfFile: 
+     case (pipelineData) matches
+       tagged EndOfFile: 
        client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(endOfFileTag)),?);
-//       tagged Sample .sample:client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(sampleTag)), zeroExtend(pack(sample)));
-//     endcase
+       tagged Sample .sample:client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(sampleTag)), zeroExtend(pack(sample)));
+     endcase
    endrule
 
 endmodule