1.1 --- a/modules/bluespec/Pygar/core/PathTypes.bsv	Mon May 03 09:53:56 2010 -0400
     1.2 +++ b/modules/bluespec/Pygar/core/PathTypes.bsv	Tue May 04 10:13:53 2010 -0400
     1.3 @@ -1,6 +1,8 @@
     1.4  import Trace::*;
     1.5  import Vector::*;
     1.6  
     1.7 +`include "asim/provides/audio_pipe_types.bsh"
     1.8 +
     1.9  `define MAX_VOICES       4
    1.10  `define MAX_CORES       16
    1.11  `define MAX_PATH_IDS    18
    1.12 @@ -10,9 +12,9 @@
    1.13  
    1.14  typedef Bit#(32) MemAddr;
    1.15  typedef Int#(TLog#(`MAX_PATH_IDS))  PathId;
    1.16 -typedef Int#(24) Sample;
    1.17 +//typedef Int#(16) Sample;
    1.18  typedef Int#(TLog#(`MAX_VOICES)) VoiceId;
    1.19 -
    1.20 +typedef Bit#(8) Volume; // This is arbitrarily set to 8 bits or max val 256
    1.21  
    1.22  //The mixer is identified as PathId 0, path end is max 
    1.23  PathId mixerId = 0;
    1.24 @@ -27,5 +29,13 @@
    1.25    VoiceId   voice;
    1.26    MemAddr   startAddr;
    1.27    CorePath  route;
    1.28 +  Volume    outVol;
    1.29  } FullPath deriving (Bits, Eq);
    1.30  
    1.31 +typedef Maybe#(AudioProcessorUnit) AudioPipeUnit; // deriving (Bits, Eq);
    1.32 +
    1.33 +typedef struct
    1.34 +{
    1.35 +  VoiceId       voice;
    1.36 +  AudioPipeUnit data;
    1.37 +} AudioStream deriving (Bits, Eq);