Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

corrected core_rst_n that was used instead of core_rst for the counting of the number of macrocycles and the counting of crc errors

The comment reflects only on the generated html file; no source code change

corrected core_rst_n that was used instead of core_rst for the counting of the number of macrocycles and the counting of crc errors

corrected core_rst_n that was used instead of core_rst for the counting of the number of macrocycles and the counting of crc errors

- updated gitignore to allow for wbgen2 html

WIP: added 2 more rx status bits: one activated upon CTRL byte reception and one upon detection of more bytes than the max frame size

version in CHARM

Conflicts:
	.gitmodules
	ip_cores/general-cores
	ip_cores/gn4124-core
	ip_cores/wr-cores
	rtl/fmc_masterFIP_core.vhd
	rtl/fmc_masterFIP_mezz.vhd
	rtl/fmc_masterfip_csr.vhd
	rtl/masterFIP_pkg.vhd
	rtl/masterfip_rx.vhd
	rtl/masterfip_tx.vhd
	rtl/wbgen/fmc_masterfip_csr.wb
	sim/spec/data_vectors/masterFIP_test.vec
	sim/spec/testbench/tb_masterFIP.vhd
	syn/spec/spec_masterfip_mt.xise
	top/spec/spec_masterFIP.ucf
	top/spec/spec_masterFIP.vhd

added more bits to tx and rx bytes counters so as to be compatible with the PTS that needs to send 1024 bytes.

removed sw folder; changed general-cores branch (tom-proposed-master-feb28; unused IOBs set to floating; clean up counters