anchor.diff:          ps7.irq.f2p({19'b0, v});
       endmethod
       interface i2c = ps7.i2c;
  +   interface s_axi_acp = cons(ps7.s_axi_acp, nil);
   endmodule
  +
  +`ifdef USE_ACP
  +typedef 1 NumAcp;
  +`else
  +typedef 0 NumAcp;
  +`endif
   
   instance ConnectableWithTrace#(PS7, ConnectalTop#(32,64,ipins,nMasters), BscanTop);
      module mkConnectionWithTrace#(PS7 ps7, ConnectalTop#(32,64,ipins,nMasters) top, BscanTop bscan)(Empty);
  
positive.code:       Axi3Slave#(32,32,12) ctrl <- mkAxiDmaSlave(top.slave);
        mkConnectionWithTrace(ps7.m_axi_gp[0].client, ctrl, bscan);
  
        module mkAxiMasterConnection#(Integer i)(Axi3Master#(32,64,6));
  	 let m_axi <- mkAxiDmaMaster(top.masters[i]);
  	 mkConnection(m_axi, ps7.s_axi_hp[i].server);
  	 return m_axi;
        endmodule
        Vector#(nMasters, Axi3Master#(32,64,6)) m_axis <- genWithM(mkAxiMasterConnection);
  
     endmodule
  endinstance
  
negative.code:     interface Vector#(2, AxiMasterCommon#(32,32,12))     m_axi_gp;
      interface Vector#(2, AxiSlaveCommon#(32,32,6,Empty)) s_axi_gp;
      interface Vector#(4, AxiSlaveCommon#(32,64,6,HPType))   s_axi_hp;
      interface Vector#(1, AxiSlaveCommon#(32,64,3,ACPType))   s_axi_acp;
      method Action                             interrupt(Bit#(1) v);
      interface Vector#(4, Clock) fclkclk;
      interface Vector#(4, Reset) fclkreset;
  