t-crest / patmos

Patmos is a time-predictable VLIW processor, and the processor for the T-CREST project
http://patmos.compute.dtu.dk
BSD 2-Clause "Simplified" License
135 stars 72 forks source link

Merge and cleanup TTEthernet code from Maja #48

Closed schoeberl closed 5 years ago

schoeberl commented 5 years ago

There are two merge conflicts that need to be resolved:

both modified:   hardware/config/altde2-all.xml
both modified:   hardware/src/main/scala/io/EthMac.scala

The whole merge adds quite some files:

modified:   c/ethlib/eth_mac_driver.c
modified:   c/ethlib/eth_patmos_io.c
modified:   c/ethlib/eth_patmos_io.h
new file:   c/ethlib/tte.c
new file:   c/ethlib/tte.h
new file:   c/ethlib_tte_demo.c
new file:   c/ethlib_tte_demo_interrupts.c
new file:   c/ethlib_tte_demo_latency.c
new file:   c/ethlib_tte_wcet.c
new file:   hardware/config/altde2-interrupt.xml
new file:   hardware/config/altde2-latency.xml
new file:   hardware/config/default-no-timer.xml
modified:   hardware/ethmac/eth_controller_top.vhdl
new file:   hardware/ethmac/eth_controller_top2.vhdl
new file:   hardware/quartus/altde2-interrupt/patmos.qpf
new file:   hardware/quartus/altde2-interrupt/patmos.qsf
new file:   hardware/quartus/altde2-interrupt/patmos.sdc
new file:   hardware/quartus/altde2-latency/patmos.qpf
new file:   hardware/quartus/altde2-latency/patmos.qsf
new file:   hardware/quartus/altde2-latency/patmos.sdc
new file:   hardware/src/main/scala/io/EthMac2.scala
new file:   hardware/vhdl/patmos_de2-interrupt.vhdl
new file:   hardware/vhdl/patmos_de2-latency.vhdl
new file:   wcet/analyse_wcet.sh
new file:   wcet/config_de2_115.pml