]> rtime.felk.cvut.cz Git - rpp-test-sw.git/commitdiff
Dynamic segment buffers added and FIFO RX buffer added for testing.
authorMichal Horn <hornmich@fel.cvut.cz>
Tue, 13 Aug 2013 12:31:33 +0000 (14:31 +0200)
committerMichal Horn <hornmich@fel.cvut.cz>
Tue, 13 Aug 2013 12:31:33 +0000 (14:31 +0200)
commands/cmd_fr_basic_test.c

index 437c62b89ef2d325472a5cf8b8bca8908e21b4bb..85500a2447896936a7ce0125bd87278a65f99cea 100644 (file)
@@ -102,18 +102,18 @@ Fr_TMS570LS_NodeConfigType Fr_node_B_config = {
 };
 
 Fr_TMS570LS_MsgRAMConfig Fr_node_A_msgRAM_config = {
-       .dynSegmentBufferCount = 0,
-       .fifoBufferCount = 0,
-       .secureBuffers = FR_SB_ALL_REC_DISABLED,
+       .dynSegmentBufferCount = 3,
+       .fifoBufferCount = 5,
+       .secureBuffers = FR_SB_RECONFIG_ENABLED,
        .statSegmentBufferCount = 4,
        .syncFramePayloadMultiplexEnabled = 0
 };
 
 Fr_TMS570LS_MsgRAMConfig Fr_node_B_msgRAM_config = {
-       .dynSegmentBufferCount = 0,
-       .fifoBufferCount = 0,
-       .secureBuffers = FR_SB_ALL_REC_DISABLED,
-       .statSegmentBufferCount = 4,
+       .dynSegmentBufferCount = 3,
+       .fifoBufferCount = 5,
+       .secureBuffers = FR_SB_RECONFIG_ENABLED,
+       .statSegmentBufferCount = 5,
        .syncFramePayloadMultiplexEnabled = 0
 };
 
@@ -151,8 +151,8 @@ Fr_TMS570LS_BufferConfigType Fr_node_A_static_buffers_config[] = {
                .payloadPreambleIndicatorTr = FALSE,
                .rejectNullFrames = FALSE,
                .rejectStaticSegment = FALSE,
-               .singleTransmit = FALSE,
-               .slotId = 9
+               .singleTransmit = TRUE,
+               .slotId = 3
        },
        {
                .channel = FR_CHANNEL_AB,
@@ -163,8 +163,8 @@ Fr_TMS570LS_BufferConfigType Fr_node_A_static_buffers_config[] = {
                .payloadPreambleIndicatorTr = FALSE,
                .rejectNullFrames = FALSE,
                .rejectStaticSegment = FALSE,
-               .singleTransmit = FALSE,
-               .slotId = 10
+               .singleTransmit = TRUE,
+               .slotId = 4
        }
 };
 
@@ -202,8 +202,8 @@ Fr_TMS570LS_BufferConfigType Fr_node_B_static_buffers_config[] = {
                .payloadPreambleIndicatorTr = FALSE,
                .rejectNullFrames = FALSE,
                .rejectStaticSegment = FALSE,
-               .singleTransmit = FALSE,
-               .slotId = 10
+               .singleTransmit = TRUE,
+               .slotId = 4
        },
        {
                .channel = FR_CHANNEL_AB,
@@ -214,15 +214,233 @@ Fr_TMS570LS_BufferConfigType Fr_node_B_static_buffers_config[] = {
                .payloadPreambleIndicatorTr = FALSE,
                .rejectNullFrames = FALSE,
                .rejectStaticSegment = FALSE,
+               .singleTransmit = TRUE,
+               .slotId = 3
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = TRUE,
+               .maxPayload = 9,
+               .msgBufferInterrupt = TRUE,
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = FALSE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = TRUE,
+               .slotId = 5
+       }
+};
+
+Fr_TMS570LS_BufferConfigType Fr_node_A_dynamic_buffers_config[] = {
+       {
+               .channel = FR_CHANNEL_A,
+               .cycleCounterFiltering = 0,
+               .isTx = TRUE,
+               .maxPayload = 64,
+               .msgBufferInterrupt = TRUE,
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = FALSE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 9
+       },
+       {
+               .channel = FR_CHANNEL_B,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 32,
+               .msgBufferInterrupt = TRUE,
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = FALSE,
+               .rejectStaticSegment = FALSE,
                .singleTransmit = FALSE,
+               .slotId = 10
+       },
+       {
+               .channel = FR_CHANNEL_A,
+               .cycleCounterFiltering = 0,
+               .isTx = TRUE,
+               .maxPayload = 16,
+               .msgBufferInterrupt = TRUE,
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = FALSE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = TRUE,
+               .slotId = 11
+       }
+};
+
+
+Fr_TMS570LS_BufferConfigType Fr_node_B_dynamic_buffers_config[] = {
+       {
+               .channel = FR_CHANNEL_B,
+               .cycleCounterFiltering = 0,
+               .isTx = TRUE,
+               .maxPayload = 32,
+               .msgBufferInterrupt = TRUE,
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = FALSE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = TRUE,
+               .slotId = 10
+       },
+       {
+               .channel = FR_CHANNEL_A,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 64,
+               .msgBufferInterrupt = TRUE,
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = FALSE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = TRUE,
                .slotId = 9
+       },
+       {
+               .channel = FR_CHANNEL_A,
+               .cycleCounterFiltering = 0,
+               .isTx = TRUE,
+               .maxPayload = 9,
+               .msgBufferInterrupt = TRUE,
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = FALSE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = TRUE,
+               .slotId = 12
+       }
+};
+
+Fr_TMS570LS_BufferConfigType Fr_node_A_fifo_buffers_config[] = {
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 127,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 12
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 127,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 12
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 127,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 12
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 127,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 12
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 127,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 12
+       }
+};
+
+Fr_TMS570LS_BufferConfigType Fr_node_B_fifo_buffers_config[] = {
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 64,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 0     // No Frame is rejected
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 64,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 0     // No Frame is rejected
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 64,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 0     // No Frame is rejected
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 64,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 0     // No Frame is rejected
+       },
+       {
+               .channel = FR_CHANNEL_AB,
+               .cycleCounterFiltering = 0,
+               .isTx = FALSE,
+               .maxPayload = 64,
+               .msgBufferInterrupt = FALSE, // Recomended for FIFO buffers
+               .payloadPreambleIndicatorTr = FALSE,
+               .rejectNullFrames = TRUE,
+               .rejectStaticSegment = FALSE,
+               .singleTransmit = FALSE,
+               .slotId = 0     // No Frame is rejected
        }
 };
 
+
 Fr_ConfigType Fr_config_node_A= {
        .clusterConfiguration = &Fr_cluster_config,
-       .dynamicBufferConfigs = NULL,
-       .fifoBufferConfigs = NULL,
+       .dynamicBufferConfigs = Fr_node_A_dynamic_buffers_config,
+       .fifoBufferConfigs = Fr_node_A_fifo_buffers_config,
        .msgRAMConfig = &Fr_node_A_msgRAM_config,
        .nodeConfiguration = &Fr_node_A_config,
        .staticBufferConfigs = Fr_node_A_static_buffers_config
@@ -230,8 +448,8 @@ Fr_ConfigType Fr_config_node_A= {
 
 Fr_ConfigType Fr_config_node_B= {
        .clusterConfiguration = &Fr_cluster_config,
-       .dynamicBufferConfigs = NULL,
-       .fifoBufferConfigs = NULL,
+       .dynamicBufferConfigs = Fr_node_B_dynamic_buffers_config,
+       .fifoBufferConfigs = Fr_node_B_fifo_buffers_config,
        .msgRAMConfig = &Fr_node_B_msgRAM_config,
        .nodeConfiguration = &Fr_node_B_config,
        .staticBufferConfigs = Fr_node_B_static_buffers_config