# HG changeset patch
# User punk
# Date 1272428462 14400
# Node ID cffe0829ce148f14f044a5d01c2fabff2eaf424a
# Parent  a346d9e5118a1b7b36e05ef798232fc60ecd3e4d
[svn r22] compiles with memclient commented out

diff -r a346d9e5118a -r cffe0829ce14 modules/bluespec/Pygar/core/Processor.bsv
--- a/modules/bluespec/Pygar/core/Processor.bsv	Tue Apr 27 23:43:41 2010 -0400
+++ b/modules/bluespec/Pygar/core/Processor.bsv	Wed Apr 28 00:21:02 2010 -0400
@@ -599,13 +599,13 @@
   // Methods
 
   interface Client imem_client;
-    interface Get request  = toGet(instReqQ);
-    interface Put response = toPut(instRespQ);
+    interface Get request  = fifoToGet(instReqQ);
+    interface Put response = fifoToPut(instRespQ);
   endinterface
 
   interface Client dmem_client;
-    interface Get request  = toGet(dataReqQ);
-    interface Put response = toPut(dataRespQ);
+    interface Get request  = fifoToGet(dataReqQ);
+    interface Put response = fifoToPut(dataRespQ);
   endinterface
 
   interface Get statsEn_get = toGet(asReg(cp0_statsEn));
@@ -620,10 +620,7 @@
 //    endmethod
 //  endinterface
      
-
-     interface Get sampleOutput = fifoToGet(outAudioFifo);
-
-
+  interface Get sampleOutput = fifoToGet(outAudioFifo);
 
 endmodule
 
diff -r a346d9e5118a -r cffe0829ce14 modules/bluespec/Pygar/core/audioCore.bsv
--- a/modules/bluespec/Pygar/core/audioCore.bsv	Tue Apr 27 23:43:41 2010 -0400
+++ b/modules/bluespec/Pygar/core/audioCore.bsv	Wed Apr 28 00:21:02 2010 -0400
@@ -40,9 +40,7 @@
 `include "asim/provides/processor.bsh"
 `include "asim/provides/audio_pipe_types.bsh"
 
-
-
-interface AudioCore;
+interface Core;
 
   // Interface from core to main memory
    interface Client#(MainMemReq,MainMemResp) mmem_client;
@@ -51,7 +49,7 @@
       
 endinterface
 
-module   [CONNECTED_MODULE]  mkCore( AudioCore );
+module   [CONNECTED_MODULE]  mkCore( Core );
 
   // Instantiate the modules
 
@@ -64,8 +62,8 @@
 
   mkConnection( proc.statsEn_get,   icache.statsEn_put );
   mkConnection( proc.statsEn_get,   dcache.statsEn_put );
-  mkConnection( proc.imem_client,   icache.proc_server );
-  mkConnection( proc.dmem_client,   dcache.proc_server );
+//  mkConnection( proc.imem_client,   icache.proc_server );
+//  mkConnection( proc.dmem_client,   dcache.proc_server );
   mkConnection( icache.mmem_client, marb.cache0_server );
   mkConnection( dcache.mmem_client, marb.cache1_server );