]>
rtime.felk.cvut.cz Git - pes-rpp/rpp-lib.git/commit
Merge branches 'master' and 'rm48/master'
I.e. merge RPP target with all Eaton targets.
Conflicts:
Debug/GNUmakefile
Makefile
Makefile.var
POSIX/GNUmakefile
apps/rpp-test-suite/Debug/GNUmakefile
apps/rpp-test-suite/Makefile.var
apps/rpp-test-suite/POSIX/GNUmakefile
apps/rpp-test-suite/main.c
apps/rpp-test-suite/src/_tms570_rpp/main.c
apps/rpp-test-suite/src/aout.c
apps/rpp-test-suite/src/din.c
apps/rpp-test-suite/src/hbr.c
apps/rpp-test-suite/src/lout.c
apps/rpp-test-suite/src/main.c
apps/rpp-test-suite/src/mout.c
apps/rpp-test-suite/src/sdr.c
common.mk
rpp/include/drv/_rm48_hdk/adc.h
rpp/include/drv/_tms570_rpp/adc.h
rpp/include/drv/adc.h
rpp/include/drv/drv.h
rpp/include/drv/fr_tms570.h
rpp/include/hal/_tms570_rpp/gpio_def.h
rpp/include/hal/_tms570_rpp/port_def.h
rpp/include/hal/hal.h
rpp/include/rpp/_rm48_hdk/adc.h
rpp/include/rpp/_tms570_rpp/adc.h
rpp/include/rpp/adc.h
rpp/include/rpp/rpp.h
rpp/include/sys/sys.h
rpp/src/drv/_rm48_hdk/adc.c
rpp/src/drv/_tms570_rpp/adc.c
rpp/src/drv/adc.c
rpp/src/drv/fr_tms570.c
rpp/src/hal/_tms570_rpp/gpio_def.c
rpp/src/hal/_tms570_rpp/port_def.c
rpp/src/rpp/_rm48_hdk/adc.c
rpp/src/rpp/_tms570_rpp/adc.c
rpp/src/rpp/adc.c
rpp/src/rpp/irc.c
rpp/src/sys/_rm48_hdk/ti_drv_adc.c
rpp/src/sys/_tms570_hdk/sys_startup.c
rpp/src/sys/_tms570_rpp/notification.c
rpp/src/sys/_tms570_rpp/sys_startup.c
rpp/src/sys/_tms570_rpp/ti_drv_adc.c
rpp/src/sys/sys_startup.c
rpp/src/sys/ti_drv_adc.c
31 files changed: