##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » DEV_PLE
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/DEV_PLE

Bug 104
paul -
r144:9cb6e909f6ec VHDLib206
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 #############################################################################
2 2 # Makefile for building: bin/fsw
3 # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 10 20:58:59 2014
3 # Generated by qmake (2.01a) (Qt 4.8.6) on: Thu Jun 12 08:10:29 2014
4 4 # Project: fsw-qt.pro
5 5 # Template: app
6 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 11 CC = sparc-rtems-gcc
12 12 CXX = sparc-rtems-g++
13 DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=8 -DPRINT_MESSAGES_ON_CONSOLE
13 DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=9 -DPRINT_MESSAGES_ON_CONSOLE
14 14 CFLAGS = -pipe -O3 -Wall $(DEFINES)
15 15 CXXFLAGS = -pipe -O3 -Wall $(DEFINES)
16 16 INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/LFR_basic-parameters
Show file before | Show file after | Hide comments
@@ -119,6 +119,7 typedef struct ring_node
119 119
120 120 #define REGS_ADDR_SPECTRAL_MATRIX 0x80000f00
121 121 #define REGS_ADDR_WAVEFORM_PICKER 0x80000f50
122 #define REGS_ADDR_VHDL_VERSION 0x80000ff0
122 123
123 124 #define APBUART_CTRL_REG_MASK_DB 0xfffff7ff
124 125 #define APBUART_CTRL_REG_MASK_TE 0x00000002
Show file before | Show file after | Hide comments
@@ -71,6 +71,8 rtems_task Init( rtems_task_argument ign
71 71 *
72 72 */
73 73
74 unsigned char *vhdlVersion;
75
74 76 reset_local_time();
75 77
76 78 rtems_cpu_usage_reset();
@@ -92,6 +94,12 rtems_task Init( rtems_task_argument ign
92 94 PRINTF1("%d." , SW_VERSION_N2)
93 95 PRINTF1("%d." , SW_VERSION_N3)
94 96 PRINTF1("%d **\n", SW_VERSION_N4)
97
98 vhdlVersion = (unsigned char *) (REGS_ADDR_VHDL_VERSION);
99 PRINTF("** VHDL **\n")
100 PRINTF1("** %d.", vhdlVersion[1])
101 PRINTF1("%d." , vhdlVersion[2])
102 PRINTF1("%d **\n", vhdlVersion[3])
95 103 PRINTF("*************************\n")
96 104 PRINTF("\n\n")
97 105
Show file before | Show file after | Hide comments
@@ -318,7 +318,7 void init_housekeeping_parameters( void
318 318 housekeeping_packet.lfr_sw_version[2] = SW_VERSION_N3;
319 319 housekeeping_packet.lfr_sw_version[3] = SW_VERSION_N4;
320 320 // init fpga version
321 parameters = (unsigned char *) (REGS_ADDR_WAVEFORM_PICKER + 0xb0);
321 parameters = (unsigned char *) (REGS_ADDR_VHDL_VERSION);
322 322 housekeeping_packet.lfr_fpga_version[0] = parameters[1]; // n1
323 323 housekeeping_packet.lfr_fpga_version[1] = parameters[2]; // n2
324 324 housekeeping_packet.lfr_fpga_version[2] = parameters[3]; // n3
General Comments 0
You need to be logged in to leave comments. Login now