##// END OF EJS Templates
Bug 175
paul -
r157:a703b578b7d4 VHDLib206
parent child
Show More
@@ -1,6 +1,6
1 #############################################################################
1 #############################################################################
2 # Makefile for building: bin/fsw
2 # Makefile for building: bin/fsw
3 # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 17 16:15:23 2014
3 # Generated by qmake (2.01a) (Qt 4.8.6) on: Thu Jun 19 07:41:34 2014
4 # Project: fsw-qt.pro
4 # Project: fsw-qt.pro
5 # Template: app
5 # Template: app
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
@@ -10,7 +10,7
10
10
11 CC = sparc-rtems-gcc
11 CC = sparc-rtems-gcc
12 CXX = sparc-rtems-g++
12 CXX = sparc-rtems-g++
13 DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=11 -DPRINT_MESSAGES_ON_CONSOLE
13 DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=12 -DPRINT_MESSAGES_ON_CONSOLE
14 CFLAGS = -pipe -O3 -Wall $(DEFINES)
14 CFLAGS = -pipe -O3 -Wall $(DEFINES)
15 CXXFLAGS = -pipe -O3 -Wall $(DEFINES)
15 CXXFLAGS = -pipe -O3 -Wall $(DEFINES)
16 INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/LFR_basic-parameters
16 INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/LFR_basic-parameters
@@ -11,7 +11,7 SWVERSION=-1-0
11 DEFINES += SW_VERSION_N1=1 # major
11 DEFINES += SW_VERSION_N1=1 # major
12 DEFINES += SW_VERSION_N2=0 # minor
12 DEFINES += SW_VERSION_N2=0 # minor
13 DEFINES += SW_VERSION_N3=0 # patch
13 DEFINES += SW_VERSION_N3=0 # patch
14 DEFINES += SW_VERSION_N4=11 # internal
14 DEFINES += SW_VERSION_N4=12 # internal
15
15
16 contains( CONFIG, debug_tch ) {
16 contains( CONFIG, debug_tch ) {
17 DEFINES += DEBUG_TCH
17 DEFINES += DEBUG_TCH
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by QtCreator 3.0.1, 2014-06-17T07:01:31. -->
3 <!-- Written by QtCreator 3.0.1, 2014-06-19T07:07:23. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -780,7 +780,6 void launch_spectral_matrix( void )
780 LEON_Clear_interrupt( IRQ_SPECTRAL_MATRIX );
780 LEON_Clear_interrupt( IRQ_SPECTRAL_MATRIX );
781 LEON_Unmask_interrupt( IRQ_SPECTRAL_MATRIX );
781 LEON_Unmask_interrupt( IRQ_SPECTRAL_MATRIX );
782 set_run_matrix_spectral( 1 );
782 set_run_matrix_spectral( 1 );
783
784 }
783 }
785
784
786 void launch_spectral_matrix_simu( void )
785 void launch_spectral_matrix_simu( void )
@@ -288,14 +288,14 rtems_task cwf3_task(rtems_task_argument
288 {
288 {
289 PRINTF("send CWF_LONG_F3\n")
289 PRINTF("send CWF_LONG_F3\n")
290 send_waveform_CWF(
290 send_waveform_CWF(
291 (volatile int*) current_ring_node_f3->buffer_address,
291 (volatile int*) ring_node_to_send_cwf_f3->buffer_address,
292 SID_NORM_CWF_LONG_F3, headerCWF_F3, queue_id );
292 SID_NORM_CWF_LONG_F3, headerCWF_F3, queue_id );
293 }
293 }
294 else
294 else
295 {
295 {
296 PRINTF("send CWF_F3 (light)\n")
296 PRINTF("send CWF_F3 (light)\n")
297 send_waveform_CWF3_light(
297 send_waveform_CWF3_light(
298 (volatile int*) current_ring_node_f3->buffer_address,
298 (volatile int*) ring_node_to_send_cwf_f3->buffer_address,
299 headerCWF_F3_light, queue_id );
299 headerCWF_F3_light, queue_id );
300 }
300 }
301
301
General Comments 0
You need to be logged in to leave comments. Login now