HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r338:f3be7fb04b63

alignment added to variables initialized by memset...

paul -

r338:f3be7fb04b63 R3++

parent child

Context file:

r338:f3be7fb04b63

Collapse all files

header/tc_load_dump_parameters.h +1 0

             // KCOEFFICIENTS
             int set_sy_lfr_kcoeff(ccsdsTelecommandPacket_t *TC , rtems_id queue_id);
             void copyFloatByChar( unsigned char *destination, unsigned char *source );
+            void copyInt32ByChar( unsigned char *destination, unsigned char *source );
             void floatToChar( float value, unsigned char* ptr);
             void init_parameter_dump( void );

src/fsw_spacewire.c +1 -1

                  */
                 int len;
-                ccsdsTelecommandPacket_t currentTC;
+                ccsdsTelecommandPacket_t __attribute__((aligned(4))) currentTC;
                 unsigned char computed_CRC[ BYTES_PER_CRC ];
                 unsigned char currentTC_LEN_RCV[ BYTES_PER_PKT_LEN ];
                 unsigned char destinationID;

src/processing/avf0_prc0.c +4 -4

                 rtems_status_code status;
                 rtems_id queue_id;
                 rtems_id queue_id_q_p0;
-                bp_packet_with_spare    packet_norm_bp1;
+                bp_packet_with_spare    __attribute__((aligned(4))) packet_norm_bp1;
-                bp_packet               packet_norm_bp2;
+                bp_packet               __attribute__((aligned(4))) packet_norm_bp2;
-                bp_packet               packet_sbm_bp1;
+                bp_packet               __attribute__((aligned(4))) packet_sbm_bp1;
-                bp_packet               packet_sbm_bp2;
+                bp_packet               __attribute__((aligned(4))) packet_sbm_bp2;
                 ring_node               *current_ring_node_to_send_asm_f0;
                 float nbSMInASMNORM;
                 float nbSMInASMSBM;

src/processing/avf1_prc1.c +4 -4

                 rtems_status_code status;
                 rtems_id queue_id_send;
                 rtems_id queue_id_q_p1;
-                bp_packet_with_spare    packet_norm_bp1;
+                bp_packet_with_spare    __attribute__((aligned(4))) packet_norm_bp1;
-                bp_packet               packet_norm_bp2;
+                bp_packet               __attribute__((aligned(4))) packet_norm_bp2;
-                bp_packet               packet_sbm_bp1;
+                bp_packet               __attribute__((aligned(4))) packet_sbm_bp1;
-                bp_packet               packet_sbm_bp2;
+                bp_packet               __attribute__((aligned(4))) packet_sbm_bp2;
                 ring_node               *current_ring_node_to_send_asm_f1;
                 float nbSMInASMNORM;
                 float nbSMInASMSBM;

src/processing/avf2_prc2.c +2 -2

                 rtems_status_code status;
                 rtems_id queue_id_send;
                 rtems_id queue_id_q_p2;
-                bp_packet                   packet_norm_bp1;
+                bp_packet                   __attribute__((aligned(4))) packet_norm_bp1;
-                bp_packet                   packet_norm_bp2;
+                bp_packet                   __attribute__((aligned(4))) packet_norm_bp2;
                 ring_node                   *current_ring_node_to_send_asm_f2;
                 float nbSMInASMNORM;

src/tc_handler.c +11 -5

                 int result;
                 rtems_status_code status;       // RTEMS status code
-                ccsdsTelecommandPacket_t TC;    // TC sent to the ACTN task
+                ccsdsTelecommandPacket_t __attribute__((aligned(4))) TC;    // TC sent to the ACTN task
                 size_t size;                    // size of the incoming TC packet
                 unsigned char subtype;          // subtype of the current TC packet
                 unsigned char time[BYTES_PER_TIME];
                 unsigned int transitionCoarseTime;
                 unsigned char * bytePosPtr;
+                printf("(0)\n");
                 bytePosPtr = (unsigned char *) &TC->packetID;
+                printf("(1)\n");
                 requestedMode = bytePosPtr[ BYTE_POS_CP_MODE_LFR_SET ];
-                transitionCoarseTime_ptr = (unsigned int *) ( &bytePosPtr[ BYTE_POS_CP_LFR_ENTER_MODE_TIME ] );
+                printf("(2)\n");
-                transitionCoarseTime = (*transitionCoarseTime_ptr) & COARSE_TIME_MASK;
+                copyInt32ByChar( &transitionCoarseTime, &bytePosPtr[ BYTE_POS_CP_LFR_ENTER_MODE_TIME ] );
+                printf("(3)\n");
+                transitionCoarseTime = transitionCoarseTime & COARSE_TIME_MASK;
+                printf("(4)\n");
                 status = check_mode_value( requestedMode );
+                printf("(5)\n");
                 if ( status != LFR_SUCCESSFUL )     // the mode value is inconsistent
                 {
                 status = RTEMS_UNSATISFIED;
+                printf("hop\n");
                 switch( lfrCurrentMode )
                 {
                 case LFR_MODE_STANDBY:

src/tc_load_dump_parameters.c +8 0

                 destination[BYTE_3] = source[BYTE_3];
             }
+            void copyInt32ByChar( unsigned char *destination, unsigned char *source )
+            {
+                destination[BYTE_0] = source[BYTE_0];
+                destination[BYTE_1] = source[BYTE_1];
+                destination[BYTE_2] = source[BYTE_2];
+                destination[BYTE_3] = source[BYTE_3];
+            }
             void floatToChar( float value, unsigned char* ptr)
             {
                 unsigned char* valuePtr;

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