##// END OF EJS Templates
rtems_message_queue_urgent is replaced by rtems_message_queue_send...
paul -
r36:303e7beebcc8 default
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.5) on: Tue Oct 8 10:15:40 2013
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Oct 10 08:47:12 2013
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=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=13 -DPRINT_MESSAGES_ON_CONSOLE
13 DEFINES = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=14 -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
16 INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -7,11 +7,11 CONFIG -= qt
7 include(./sparc.pri)
7 include(./sparc.pri)
8
8
9 # flight software version
9 # flight software version
10 SWVERSION=-0-13
10 SWVERSION=-0-14
11 DEFINES += SW_VERSION_N1=0
11 DEFINES += SW_VERSION_N1=0
12 DEFINES += SW_VERSION_N2=0
12 DEFINES += SW_VERSION_N2=0
13 DEFINES += SW_VERSION_N3=0
13 DEFINES += SW_VERSION_N3=0
14 DEFINES += SW_VERSION_N4=13
14 DEFINES += SW_VERSION_N4=14
15
15
16 contains( CONFIG, verbose ) {
16 contains( CONFIG, verbose ) {
17 DEFINES += PRINT_MESSAGES_ON_CONSOLE
17 DEFINES += PRINT_MESSAGES_ON_CONSOLE
@@ -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 2.8.0, 2013-10-08T06:59:51. -->
3 <!-- Written by QtCreator 2.8.0, 2013-10-10T08:42:40. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -1203,7 +1203,6 int send_tm_lfr_tc_exe_success(ccsdsTele
1203 spw_ioctl_send.options = 0;
1203 spw_ioctl_send.options = 0;
1204
1204
1205 // SEND DATA
1205 // SEND DATA
1206 //status = ioctl( fdSPW, SPACEWIRE_IOCTRL_SEND, &spw_ioctl_send );
1207 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send, sizeof(spw_ioctl_send));
1206 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send, sizeof(spw_ioctl_send));
1208 if (status != RTEMS_SUCCESSFUL) {
1207 if (status != RTEMS_SUCCESSFUL) {
1209 PRINTF("in send_tm_lfr_tc_exe_success *** ERR\n")
1208 PRINTF("in send_tm_lfr_tc_exe_success *** ERR\n")
@@ -1246,7 +1245,6 int send_tm_lfr_tc_exe_not_executable(cc
1246 spw_ioctl_send.options = 0;
1245 spw_ioctl_send.options = 0;
1247
1246
1248 // SEND DATA
1247 // SEND DATA
1249 //status = ioctl( fdSPW, SPACEWIRE_IOCTRL_SEND, &spw_ioctl_send );
1250 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send, sizeof(spw_ioctl_send));
1248 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send, sizeof(spw_ioctl_send));
1251 if (status != RTEMS_SUCCESSFUL) {
1249 if (status != RTEMS_SUCCESSFUL) {
1252 PRINTF("in send_tm_lfr_tc_exe_success *** ERR\n")
1250 PRINTF("in send_tm_lfr_tc_exe_success *** ERR\n")
@@ -1287,7 +1285,6 int send_tm_lfr_tc_exe_not_implemented(c
1287 spw_ioctl_send.options = 0;
1285 spw_ioctl_send.options = 0;
1288
1286
1289 // SEND DATA
1287 // SEND DATA
1290 //status = ioctl( fdSPW, SPACEWIRE_IOCTRL_SEND, &spw_ioctl_send );
1291 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send, sizeof(spw_ioctl_send));
1288 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send, sizeof(spw_ioctl_send));
1292 if (status != RTEMS_SUCCESSFUL) {
1289 if (status != RTEMS_SUCCESSFUL) {
1293 PRINTF("in send_tm_lfr_tc_exe_not_implemented *** ERR\n")
1290 PRINTF("in send_tm_lfr_tc_exe_not_implemented *** ERR\n")
@@ -1326,7 +1323,6 int send_tm_lfr_tc_exe_error(ccsdsTeleco
1326 spw_ioctl_send.options = 0;
1323 spw_ioctl_send.options = 0;
1327
1324
1328 // SEND DATA
1325 // SEND DATA
1329 //status = ioctl( fdSPW, SPACEWIRE_IOCTRL_SEND, &spw_ioctl_send );
1330 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send, sizeof(spw_ioctl_send));
1326 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send, sizeof(spw_ioctl_send));
1331 if (status != RTEMS_SUCCESSFUL) {
1327 if (status != RTEMS_SUCCESSFUL) {
1332 PRINTF("in send_tm_lfr_tc_exe_error *** ERR\n")
1328 PRINTF("in send_tm_lfr_tc_exe_error *** ERR\n")
@@ -681,7 +681,7 int send_waveform_CWF(volatile int *wave
681 }
681 }
682 else
682 else
683 {
683 {
684 status = rtems_message_queue_urgent( queue_id, &spw_ioctl_send_CWF, sizeof(spw_ioctl_send_CWF));
684 status = rtems_message_queue_send( queue_id, &spw_ioctl_send_CWF, sizeof(spw_ioctl_send_CWF));
685 if (status != RTEMS_SUCCESSFUL) {
685 if (status != RTEMS_SUCCESSFUL) {
686 printf("%d-%d, ERR %d\n", sid, i, (int) status);
686 printf("%d-%d, ERR %d\n", sid, i, (int) status);
687 ret = LFR_DEFAULT;
687 ret = LFR_DEFAULT;
General Comments 0
You need to be logged in to leave comments. Login now