fixed conflict with Madison commit

This commit is contained in:
Michele 2022-03-03 17:54:29 +01:00
parent d64afd8c50
commit a4889ae844
1 changed files with 2 additions and 3 deletions

View File

@ -226,9 +226,8 @@ namespace tmpl {
} }
template<pint N, pint M, pint ACK_STRENGTH> template<pint N, pint M,pint address_size, pint ACK_STRENGTH>
defproc encoder2D(a1of1 x[N]; a1of1 y[M] ;avMx1of2<X> addr; bool! out_a; power supply) defproc encoder2D(a1of1 x[N]; a1of1 y[M] ;avMx1of2<address_size> addr; power supply; bool reset_B) {
{
// Reset buffers // Reset buffers
bool _reset_BX,_reset_BXX[H]; bool _reset_BX,_reset_BXX[H];
BUF_X1 reset_buf(.a=reset_B, .y=_reset_BX,.vdd=supply.vdd,.vss=supply.vss); BUF_X1 reset_buf(.a=reset_B, .y=_reset_BX,.vdd=supply.vdd,.vss=supply.vss);