HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r25:68625add1e50

commit before release

paul@pc-solar1.lab-lpp.local -

r25:68625add1e50 default

parent child

Context file:

r25:68625add1e50

Collapse all files

FSW-qt/Makefile +7 -7

             #############################################################################
-            # Makefile for building: bin/fsw
+            # Makefile for building: bin/fsw-gsa
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Jun 28 07:59:21 2013
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Jul 5 12:17:39 2013
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             CC            = sparc-rtems-gcc
             CXX           = sparc-rtems-g++
-            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=5 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=6 -DPRINT_MESSAGES_ON_CONSOLE -DGSA
             CFLAGS        = -pipe -O3 -Wall $(DEFINES)
             CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header
             		/usr/lib64/qt4/mkspecs/features/lex.prf \
             		/usr/lib64/qt4/mkspecs/features/include_source_dir.prf \
             		fsw-qt.pro
-            QMAKE_TARGET  = fsw
+            QMAKE_TARGET  = fsw-gsa
             DESTDIR       = bin/
-            TARGET        = bin/fsw
+            TARGET        = bin/fsw-gsa
             first: all
             ####### Implicit rules
             	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             dist:
-            	@$(CHK_DIR_EXISTS) obj/fsw1.0.0 || $(MKDIR) obj/fsw1.0.0
+            	@$(CHK_DIR_EXISTS) obj/fsw-gsa1.0.0 || $(MKDIR) obj/fsw-gsa1.0.0
-            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/fsw1.0.0/ && (cd `dirname obj/fsw1.0.0` && $(TAR) fsw1.0.0.tar fsw1.0.0 && $(COMPRESS) fsw1.0.0.tar) && $(MOVE) `dirname obj/fsw1.0.0`/fsw1.0.0.tar.gz . && $(DEL_FILE) -r obj/fsw1.0.0
+            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/fsw-gsa1.0.0/ && (cd `dirname obj/fsw-gsa1.0.0` && $(TAR) fsw-gsa1.0.0.tar fsw-gsa1.0.0 && $(COMPRESS) fsw-gsa1.0.0.tar) && $(MOVE) `dirname obj/fsw-gsa1.0.0`/fsw-gsa1.0.0.tar.gz . && $(DEL_FILE) -r obj/fsw-gsa1.0.0
             clean:compiler_clean

FSW-qt/bin/fsw-gsa binary modified 0 0

NO CONTENT: modified file, binary diff hidden

FSW-qt/fsw-qt.pro +1 -1

             TEMPLATE = app
             # CONFIG += console v8 sim
             # CONFIG options = verbose *** cpu_usage_report *** gsa
-            CONFIG += console verbose
+            CONFIG += console verbose gsa
             CONFIG -= qt
             include(./sparc.pri)

FSW-qt/fsw-qt.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2013-07-05T07:07:58. -->
+            <!-- Written by Qt Creator 2.4.1, 2013-07-05T13:31:36. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/fsw_init.h +1 -1

             void init_housekeeping_parameters( void );
             int spacewire_configure_link( void );
-            int spacewire_try_to_start(void);
+            int spacewire_wait_for_link(void);
             void spacewire_set_NP(unsigned char val, unsigned int regAddr); // No Port force
             void spacewire_set_RE(unsigned char val, unsigned int regAddr); // RMAP Enable
             void spacewire_compute_stats_offsets();

header/fsw_misc.h +1 -1

             void update_spacewire_statistics();
             // SERIAL LINK
-            int send_console_outputs_on_serial_port( void );
+            int send_console_outputs_on_apbuart_port( void );
             int set_apbuart_scaler_reload_register(unsigned int regs, unsigned int value);
             // RTEMS TASKS

header/fsw_params.h +1 -1

             #define REGS_ADDR_WAVEFORM_PICKER 0x80000f20
             #define APBUART_CTRL_REG_MASK_DB 0xfffff7ff
-            #define APBUART_SCALER_RELOAD_VALUE 0x00000050      // 25 MHz => about 38400
+            #define APBUART_SCALER_RELOAD_VALUE 0x00000050      // 25 MHz => about 38400 (0x50)
             //**********
             // IRQ LINES

header/grlib_regs.h +30 -23

             #define NB_GPTIMER 3
             struct apbuart_regs_str{
                 volatile unsigned int data;
                 volatile unsigned int status;
                 volatile unsigned int ctrl;
                 volatile unsigned int scaler;
                 volatile unsigned int fifoDebug;
             };
-            struct timer_regs_str
+            struct ahbuart_regs_str{
+                volatile unsigned int unused;
+                volatile unsigned int status;
+                volatile unsigned int ctrl;
+                volatile unsigned int scaler;
+            };
+            struct timer_regs_str
             {
                 volatile unsigned int counter;
                 volatile unsigned int reload;
                 volatile unsigned int ctrl;
                 volatile unsigned int unused;
             };
             typedef struct timer_regs_str timer_regs_t;
             struct gptimer_regs_str
+            {
                 volatile unsigned int scaler_value;
                 volatile unsigned int scaler_reload;
                 volatile unsigned int conf;
                 volatile unsigned int unused0;
                 timer_regs_t timer[NB_GPTIMER];
             };
             typedef struct gptimer_regs_str gptimer_regs_t;
             struct spectral_matrices_regs_str{
                 volatile int ctrl;
                 volatile int address0;
                 volatile int address1;
             };
             typedef struct spectral_matrices_regs_str spectral_matrices_regs_t;
             struct time_management_regs_str{
                 volatile int ctrl; // bit 0 forces the load of the coarse_time_load value and resets the fine_time
                 volatile int coarse_time_load;
                 volatile int coarse_time;
                 volatile int fine_time;
             };
             typedef struct time_management_regs_str time_management_regs_t;
             struct waveform_picker_regs_str{

src/fsw_init.c +29 -27

@@ -63,7 +63,7 rtems_task Init( rtems_task_argument ign
63	PRINTF("***************************\n")	63	PRINTF("***************************\n")
64	PRINTF("\n\n")	64	PRINTF("\n\n")
65		65
66	//send_console_outputs_on_~~serial~~_port();	66	//send_console_outputs_on_apbuart_port();
67	set_apbuart_scaler_reload_register(REGS_ADDR_APBUART, APBUART_SCALER_RELOAD_VALUE);	67	set_apbuart_scaler_reload_register(REGS_ADDR_APBUART, APBUART_SCALER_RELOAD_VALUE);
68		68
69	initLookUpTableForCRC(); // in tc_handler.h	69	initLookUpTableForCRC(); // in tc_handler.h
@@ -145,35 +145,37 rtems_task spiq_task(rtems_task_argument
145		145
146	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4; // get the current mode	146	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4; // get the current mode
147		147
148	//****************	148	status = spacewire_wait_for_link();
149	// STOP THE SYSTEM	149
150	spacewire_compute_stats_offsets();	150	if (status != RTEMS_SUCCESSFUL)
151	stop_current_mode();	151	{
152	if (rtems_task_suspend(Task_id[TASKID_RECV])!=RTEMS_SUCCESSFUL) { // suspend RECV task	152	//****************
153	PRINTF("in SPIQ *** Error suspending RECV Task\n")	153	// STOP THE SYSTEM
154	}	154	spacewire_compute_stats_offsets();
155	if (rtems_task_suspend(Task_id[TASKID_HOUS])!=RTEMS_SUCCESSFUL) { // suspend HOUS task	155	stop_current_mode();
156	PRINTF("in SPIQ *** Error suspending HOUS Task\n")	156	if (rtems_task_suspend(Task_id[TASKID_RECV])!=RTEMS_SUCCESSFUL) { // suspend RECV task
157	}	157	PRINTF("in SPIQ *** Error suspending RECV Task\n")
		158	}
		159	if (rtems_task_suspend(Task_id[TASKID_HOUS])!=RTEMS_SUCCESSFUL) { // suspend HOUS task
		160	PRINTF("in SPIQ *** Error suspending HOUS Task\n")
		161	}
158		162
159	//***************************	163	//***************************
160	// RESTART THE SPACEWIRE LINK	164	// RESTART THE SPACEWIRE LINK
161	status = spacewire_try_to_start();
162	if (status != RTEMS_SUCCESSFUL) {
163	spacewire_configure_link();	165	spacewire_configure_link();
164	}
165		166
166	//*******************	167	//*******************
167	// RESTART THE SYSTEM	168	// RESTART THE SYSTEM
168	//ioctl(fdSPW, SPACEWIRE_IOCTRL_CLR_STATISTICS); // clear statistics	169	//ioctl(fdSPW, SPACEWIRE_IOCTRL_CLR_STATISTICS); // clear statistics
169	status = rtems_task_restart( Task_id[TASKID_HOUS], 1 );	170	status = rtems_task_restart( Task_id[TASKID_HOUS], 1 );
170	if (status != RTEMS_SUCCESSFUL) {	171	if (status != RTEMS_SUCCESSFUL) {
171	PRINTF1("in SPIQ * Error restarting HOUS Task * code %d\n", status)	172	PRINTF1("in SPIQ * Error restarting HOUS Task * code %d\n", status)
		173	}
		174	if (rtems_task_restart(Task_id[TASKID_RECV], 1) != RTEMS_SUCCESSFUL) { // restart RECV task
		175	PRINTF("in SPIQ *** Error restarting RECV Task\n")
		176	}
		177	//enter_mode(lfrMode, NULL); // enter the mode that was running before the SpaceWire interruption
172	}	178	}
173	if (rtems_task_restart(Task_id[TASKID_RECV], 1) != RTEMS_SUCCESSFUL) { // restart RECV task
174	PRINTF("in SPIQ *** Error restarting RECV Task\n")
175	}
176	//enter_mode(lfrMode, NULL); // enter the mode that was running before the SpaceWire interruption
177	}	179	}
178	}	180	}
179		181
@@ -446,7 +448,7 int spacewire_configure_link( void )
446	return RTEMS_SUCCESSFUL;	448	return RTEMS_SUCCESSFUL;
447	}	449	}
448		450
449	int spacewire_~~try_to_start~~(void)	451	int spacewire_wait_for_link(void)
450	{	452	{
451	unsigned int i;	453	unsigned int i;
452	int linkStatus;	454	int linkStatus;

src/fsw_misc.c +2 -2

             }
-            int send_console_outputs_on_serial_port( void ) // Send the console outputs on the serial port
+            int send_console_outputs_on_apbuart_port( void ) // Send the console outputs on the apbuart port
             {
                 struct apbuart_regs_str *apbuart_regs = (struct apbuart_regs_str *) REGS_ADDR_APBUART;
                 struct apbuart_regs_str *apbuart_regs = (struct apbuart_regs_str *) regs;
                 apbuart_regs->scaler = value;
-                PRINTF1("OK  *** COM port scaler reload register set to %x\n", value)
+                PRINTF1("OK  *** apbuart port scaler reload register set to 0x%x\n", value)
                 return 0;
             }

src/wf_handler.c +1 -1

                     // NORMAL
                     case(LFR_MODE_NORMAL):
                         if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
-                            PRINTF("ERR *** in waveforms_isr *** error sending event to WFRM\n");
+                            PRINTF("ERR *** in waveforms_isr *** error sending event to WFRM\n")
                         }
                         break;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages