Merge branch 'tom-multichannel-softpll'
Conflicts: wrc_main.c
Showing
- Makefile 2 additions, 2 deletionsMakefile
- include/hw/softpll_regs.h 0 additions, 268 deletionsinclude/hw/softpll_regs.h
- include/spll_defs.h 5 additions, 3 deletionsinclude/spll_defs.h
- include/wrc.h 0 additions, 1 deletioninclude/wrc.h
- monitor/monitor.c 8 additions, 5 deletionsmonitor/monitor.c
- softpll/hw/softpll_regs.h 58 additions, 63 deletionssoftpll/hw/softpll_regs.h
- softpll/softpll.mk 7 additions, 0 deletionssoftpll/softpll.mk
- softpll/softpll_ng.c 288 additions, 254 deletionssoftpll/softpll_ng.c
- softpll/softpll_ng.h 107 additions, 19 deletionssoftpll/softpll_ng.h
- softpll/spll_common.c 157 additions, 0 deletionssoftpll/spll_common.c
- softpll/spll_common.h 42 additions, 145 deletionssoftpll/spll_common.h
- softpll/spll_external.c 165 additions, 0 deletionssoftpll/spll_external.c
- softpll/spll_external.h 25 additions, 152 deletionssoftpll/spll_external.h
- softpll/spll_helper.c 100 additions, 0 deletionssoftpll/spll_helper.c
- softpll/spll_helper.h 22 additions, 90 deletionssoftpll/spll_helper.h
- softpll/spll_main.c 204 additions, 0 deletionssoftpll/spll_main.c
- softpll/spll_main.h 22 additions, 181 deletionssoftpll/spll_main.h
- softpll/spll_ptracker.c 96 additions, 0 deletionssoftpll/spll_ptracker.c
- softpll/spll_ptracker.h 20 additions, 81 deletionssoftpll/spll_ptracker.h
Please register or sign in to comment