Skip to content

Commit d1874c3

Browse files
bocchinobocchino
authored
Merge pull request #673 from LeStarch/remove-plat-int
Changing port formatting to use proper formatter PRI_FwIndexType
2 parents 5c91ac3 + 5a1e715 commit d1874c3

File tree

72 files changed

+2010
-2010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2010
-2010
lines changed

‎compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ object ComponentCppWriter extends CppWriterUtils {
10731073
s"""|#if FW_OBJECT_NAMES == 1
10741074
|Fw::ObjectName portName;
10751075
|portName.format(
1076-
| "%s_${printName(port)}[%" PRI_PlatformIntType "]",
1076+
| "%s_${printName(port)}[%" PRI_FwIndexType "]",
10771077
| this->m_objName.toChar(),
10781078
| port
10791079
|);

‎compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void ActiveAsyncProductPortsOnlyComponentBase ::
8888
#if FW_OBJECT_NAMES == 1
8989
Fw::ObjectName portName;
9090
portName.format(
91-
"%s_productRecvIn_InputPort[%" PRI_PlatformIntType "]",
91+
"%s_productRecvIn_InputPort[%" PRI_FwIndexType "]",
9292
this->m_objName.toChar(),
9393
port
9494
);
@@ -107,7 +107,7 @@ void ActiveAsyncProductPortsOnlyComponentBase ::
107107
#if FW_OBJECT_NAMES == 1
108108
Fw::ObjectName portName;
109109
portName.format(
110-
"%s_productRequestOut_OutputPort[%" PRI_PlatformIntType "]",
110+
"%s_productRequestOut_OutputPort[%" PRI_FwIndexType "]",
111111
this->m_objName.toChar(),
112112
port
113113
);
@@ -126,7 +126,7 @@ void ActiveAsyncProductPortsOnlyComponentBase ::
126126
#if FW_OBJECT_NAMES == 1
127127
Fw::ObjectName portName;
128128
portName.format(
129-
"%s_productSendOut_OutputPort[%" PRI_PlatformIntType "]",
129+
"%s_productSendOut_OutputPort[%" PRI_FwIndexType "]",
130130
this->m_objName.toChar(),
131131
port
132132
);

‎compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ void ActiveAsyncProductsComponentBase ::
321321
#if FW_OBJECT_NAMES == 1
322322
Fw::ObjectName portName;
323323
portName.format(
324-
"%s_cmdIn_InputPort[%" PRI_PlatformIntType "]",
324+
"%s_cmdIn_InputPort[%" PRI_FwIndexType "]",
325325
this->m_objName.toChar(),
326326
port
327327
);
@@ -345,7 +345,7 @@ void ActiveAsyncProductsComponentBase ::
345345
#if FW_OBJECT_NAMES == 1
346346
Fw::ObjectName portName;
347347
portName.format(
348-
"%s_productRecvIn_InputPort[%" PRI_PlatformIntType "]",
348+
"%s_productRecvIn_InputPort[%" PRI_FwIndexType "]",
349349
this->m_objName.toChar(),
350350
port
351351
);
@@ -369,7 +369,7 @@ void ActiveAsyncProductsComponentBase ::
369369
#if FW_OBJECT_NAMES == 1
370370
Fw::ObjectName portName;
371371
portName.format(
372-
"%s_aliasTypedAsync_InputPort[%" PRI_PlatformIntType "]",
372+
"%s_aliasTypedAsync_InputPort[%" PRI_FwIndexType "]",
373373
this->m_objName.toChar(),
374374
port
375375
);
@@ -393,7 +393,7 @@ void ActiveAsyncProductsComponentBase ::
393393
#if FW_OBJECT_NAMES == 1
394394
Fw::ObjectName portName;
395395
portName.format(
396-
"%s_noArgsAliasStringReturnSync_InputPort[%" PRI_PlatformIntType "]",
396+
"%s_noArgsAliasStringReturnSync_InputPort[%" PRI_FwIndexType "]",
397397
this->m_objName.toChar(),
398398
port
399399
);
@@ -417,7 +417,7 @@ void ActiveAsyncProductsComponentBase ::
417417
#if FW_OBJECT_NAMES == 1
418418
Fw::ObjectName portName;
419419
portName.format(
420-
"%s_noArgsAsync_InputPort[%" PRI_PlatformIntType "]",
420+
"%s_noArgsAsync_InputPort[%" PRI_FwIndexType "]",
421421
this->m_objName.toChar(),
422422
port
423423
);
@@ -441,7 +441,7 @@ void ActiveAsyncProductsComponentBase ::
441441
#if FW_OBJECT_NAMES == 1
442442
Fw::ObjectName portName;
443443
portName.format(
444-
"%s_noArgsGuarded_InputPort[%" PRI_PlatformIntType "]",
444+
"%s_noArgsGuarded_InputPort[%" PRI_FwIndexType "]",
445445
this->m_objName.toChar(),
446446
port
447447
);
@@ -465,7 +465,7 @@ void ActiveAsyncProductsComponentBase ::
465465
#if FW_OBJECT_NAMES == 1
466466
Fw::ObjectName portName;
467467
portName.format(
468-
"%s_noArgsReturnGuarded_InputPort[%" PRI_PlatformIntType "]",
468+
"%s_noArgsReturnGuarded_InputPort[%" PRI_FwIndexType "]",
469469
this->m_objName.toChar(),
470470
port
471471
);
@@ -489,7 +489,7 @@ void ActiveAsyncProductsComponentBase ::
489489
#if FW_OBJECT_NAMES == 1
490490
Fw::ObjectName portName;
491491
portName.format(
492-
"%s_noArgsReturnSync_InputPort[%" PRI_PlatformIntType "]",
492+
"%s_noArgsReturnSync_InputPort[%" PRI_FwIndexType "]",
493493
this->m_objName.toChar(),
494494
port
495495
);
@@ -513,7 +513,7 @@ void ActiveAsyncProductsComponentBase ::
513513
#if FW_OBJECT_NAMES == 1
514514
Fw::ObjectName portName;
515515
portName.format(
516-
"%s_noArgsStringReturnSync_InputPort[%" PRI_PlatformIntType "]",
516+
"%s_noArgsStringReturnSync_InputPort[%" PRI_FwIndexType "]",
517517
this->m_objName.toChar(),
518518
port
519519
);
@@ -537,7 +537,7 @@ void ActiveAsyncProductsComponentBase ::
537537
#if FW_OBJECT_NAMES == 1
538538
Fw::ObjectName portName;
539539
portName.format(
540-
"%s_noArgsSync_InputPort[%" PRI_PlatformIntType "]",
540+
"%s_noArgsSync_InputPort[%" PRI_FwIndexType "]",
541541
this->m_objName.toChar(),
542542
port
543543
);
@@ -561,7 +561,7 @@ void ActiveAsyncProductsComponentBase ::
561561
#if FW_OBJECT_NAMES == 1
562562
Fw::ObjectName portName;
563563
portName.format(
564-
"%s_typedAliasGuarded_InputPort[%" PRI_PlatformIntType "]",
564+
"%s_typedAliasGuarded_InputPort[%" PRI_FwIndexType "]",
565565
this->m_objName.toChar(),
566566
port
567567
);
@@ -585,7 +585,7 @@ void ActiveAsyncProductsComponentBase ::
585585
#if FW_OBJECT_NAMES == 1
586586
Fw::ObjectName portName;
587587
portName.format(
588-
"%s_typedAliasReturnSync_InputPort[%" PRI_PlatformIntType "]",
588+
"%s_typedAliasReturnSync_InputPort[%" PRI_FwIndexType "]",
589589
this->m_objName.toChar(),
590590
port
591591
);
@@ -609,7 +609,7 @@ void ActiveAsyncProductsComponentBase ::
609609
#if FW_OBJECT_NAMES == 1
610610
Fw::ObjectName portName;
611611
portName.format(
612-
"%s_typedAliasStringReturnSync_InputPort[%" PRI_PlatformIntType "]",
612+
"%s_typedAliasStringReturnSync_InputPort[%" PRI_FwIndexType "]",
613613
this->m_objName.toChar(),
614614
port
615615
);
@@ -633,7 +633,7 @@ void ActiveAsyncProductsComponentBase ::
633633
#if FW_OBJECT_NAMES == 1
634634
Fw::ObjectName portName;
635635
portName.format(
636-
"%s_typedAsync_InputPort[%" PRI_PlatformIntType "]",
636+
"%s_typedAsync_InputPort[%" PRI_FwIndexType "]",
637637
this->m_objName.toChar(),
638638
port
639639
);
@@ -657,7 +657,7 @@ void ActiveAsyncProductsComponentBase ::
657657
#if FW_OBJECT_NAMES == 1
658658
Fw::ObjectName portName;
659659
portName.format(
660-
"%s_typedAsyncAssert_InputPort[%" PRI_PlatformIntType "]",
660+
"%s_typedAsyncAssert_InputPort[%" PRI_FwIndexType "]",
661661
this->m_objName.toChar(),
662662
port
663663
);
@@ -681,7 +681,7 @@ void ActiveAsyncProductsComponentBase ::
681681
#if FW_OBJECT_NAMES == 1
682682
Fw::ObjectName portName;
683683
portName.format(
684-
"%s_typedAsyncBlockPriority_InputPort[%" PRI_PlatformIntType "]",
684+
"%s_typedAsyncBlockPriority_InputPort[%" PRI_FwIndexType "]",
685685
this->m_objName.toChar(),
686686
port
687687
);
@@ -705,7 +705,7 @@ void ActiveAsyncProductsComponentBase ::
705705
#if FW_OBJECT_NAMES == 1
706706
Fw::ObjectName portName;
707707
portName.format(
708-
"%s_typedAsyncDropPriority_InputPort[%" PRI_PlatformIntType "]",
708+
"%s_typedAsyncDropPriority_InputPort[%" PRI_FwIndexType "]",
709709
this->m_objName.toChar(),
710710
port
711711
);
@@ -729,7 +729,7 @@ void ActiveAsyncProductsComponentBase ::
729729
#if FW_OBJECT_NAMES == 1
730730
Fw::ObjectName portName;
731731
portName.format(
732-
"%s_typedGuarded_InputPort[%" PRI_PlatformIntType "]",
732+
"%s_typedGuarded_InputPort[%" PRI_FwIndexType "]",
733733
this->m_objName.toChar(),
734734
port
735735
);
@@ -753,7 +753,7 @@ void ActiveAsyncProductsComponentBase ::
753753
#if FW_OBJECT_NAMES == 1
754754
Fw::ObjectName portName;
755755
portName.format(
756-
"%s_typedReturnGuarded_InputPort[%" PRI_PlatformIntType "]",
756+
"%s_typedReturnGuarded_InputPort[%" PRI_FwIndexType "]",
757757
this->m_objName.toChar(),
758758
port
759759
);
@@ -777,7 +777,7 @@ void ActiveAsyncProductsComponentBase ::
777777
#if FW_OBJECT_NAMES == 1
778778
Fw::ObjectName portName;
779779
portName.format(
780-
"%s_typedReturnSync_InputPort[%" PRI_PlatformIntType "]",
780+
"%s_typedReturnSync_InputPort[%" PRI_FwIndexType "]",
781781
this->m_objName.toChar(),
782782
port
783783
);
@@ -801,7 +801,7 @@ void ActiveAsyncProductsComponentBase ::
801801
#if FW_OBJECT_NAMES == 1
802802
Fw::ObjectName portName;
803803
portName.format(
804-
"%s_typedSync_InputPort[%" PRI_PlatformIntType "]",
804+
"%s_typedSync_InputPort[%" PRI_FwIndexType "]",
805805
this->m_objName.toChar(),
806806
port
807807
);
@@ -820,7 +820,7 @@ void ActiveAsyncProductsComponentBase ::
820820
#if FW_OBJECT_NAMES == 1
821821
Fw::ObjectName portName;
822822
portName.format(
823-
"%s_cmdRegOut_OutputPort[%" PRI_PlatformIntType "]",
823+
"%s_cmdRegOut_OutputPort[%" PRI_FwIndexType "]",
824824
this->m_objName.toChar(),
825825
port
826826
);
@@ -839,7 +839,7 @@ void ActiveAsyncProductsComponentBase ::
839839
#if FW_OBJECT_NAMES == 1
840840
Fw::ObjectName portName;
841841
portName.format(
842-
"%s_cmdResponseOut_OutputPort[%" PRI_PlatformIntType "]",
842+
"%s_cmdResponseOut_OutputPort[%" PRI_FwIndexType "]",
843843
this->m_objName.toChar(),
844844
port
845845
);
@@ -858,7 +858,7 @@ void ActiveAsyncProductsComponentBase ::
858858
#if FW_OBJECT_NAMES == 1
859859
Fw::ObjectName portName;
860860
portName.format(
861-
"%s_eventOut_OutputPort[%" PRI_PlatformIntType "]",
861+
"%s_eventOut_OutputPort[%" PRI_FwIndexType "]",
862862
this->m_objName.toChar(),
863863
port
864864
);
@@ -877,7 +877,7 @@ void ActiveAsyncProductsComponentBase ::
877877
#if FW_OBJECT_NAMES == 1
878878
Fw::ObjectName portName;
879879
portName.format(
880-
"%s_prmGetOut_OutputPort[%" PRI_PlatformIntType "]",
880+
"%s_prmGetOut_OutputPort[%" PRI_FwIndexType "]",
881881
this->m_objName.toChar(),
882882
port
883883
);
@@ -896,7 +896,7 @@ void ActiveAsyncProductsComponentBase ::
896896
#if FW_OBJECT_NAMES == 1
897897
Fw::ObjectName portName;
898898
portName.format(
899-
"%s_prmSetOut_OutputPort[%" PRI_PlatformIntType "]",
899+
"%s_prmSetOut_OutputPort[%" PRI_FwIndexType "]",
900900
this->m_objName.toChar(),
901901
port
902902
);
@@ -915,7 +915,7 @@ void ActiveAsyncProductsComponentBase ::
915915
#if FW_OBJECT_NAMES == 1
916916
Fw::ObjectName portName;
917917
portName.format(
918-
"%s_productRequestOut_OutputPort[%" PRI_PlatformIntType "]",
918+
"%s_productRequestOut_OutputPort[%" PRI_FwIndexType "]",
919919
this->m_objName.toChar(),
920920
port
921921
);
@@ -934,7 +934,7 @@ void ActiveAsyncProductsComponentBase ::
934934
#if FW_OBJECT_NAMES == 1
935935
Fw::ObjectName portName;
936936
portName.format(
937-
"%s_productSendOut_OutputPort[%" PRI_PlatformIntType "]",
937+
"%s_productSendOut_OutputPort[%" PRI_FwIndexType "]",
938938
this->m_objName.toChar(),
939939
port
940940
);
@@ -954,7 +954,7 @@ void ActiveAsyncProductsComponentBase ::
954954
#if FW_OBJECT_NAMES == 1
955955
Fw::ObjectName portName;
956956
portName.format(
957-
"%s_textEventOut_OutputPort[%" PRI_PlatformIntType "]",
957+
"%s_textEventOut_OutputPort[%" PRI_FwIndexType "]",
958958
this->m_objName.toChar(),
959959
port
960960
);
@@ -974,7 +974,7 @@ void ActiveAsyncProductsComponentBase ::
974974
#if FW_OBJECT_NAMES == 1
975975
Fw::ObjectName portName;
976976
portName.format(
977-
"%s_timeGetOut_OutputPort[%" PRI_PlatformIntType "]",
977+
"%s_timeGetOut_OutputPort[%" PRI_FwIndexType "]",
978978
this->m_objName.toChar(),
979979
port
980980
);
@@ -993,7 +993,7 @@ void ActiveAsyncProductsComponentBase ::
993993
#if FW_OBJECT_NAMES == 1
994994
Fw::ObjectName portName;
995995
portName.format(
996-
"%s_tlmOut_OutputPort[%" PRI_PlatformIntType "]",
996+
"%s_tlmOut_OutputPort[%" PRI_FwIndexType "]",
997997
this->m_objName.toChar(),
998998
port
999999
);
@@ -1012,7 +1012,7 @@ void ActiveAsyncProductsComponentBase ::
10121012
#if FW_OBJECT_NAMES == 1
10131013
Fw::ObjectName portName;
10141014
portName.format(
1015-
"%s_noArgsOut_OutputPort[%" PRI_PlatformIntType "]",
1015+
"%s_noArgsOut_OutputPort[%" PRI_FwIndexType "]",
10161016
this->m_objName.toChar(),
10171017
port
10181018
);
@@ -1031,7 +1031,7 @@ void ActiveAsyncProductsComponentBase ::
10311031
#if FW_OBJECT_NAMES == 1
10321032
Fw::ObjectName portName;
10331033
portName.format(
1034-
"%s_noArgsReturnOut_OutputPort[%" PRI_PlatformIntType "]",
1034+
"%s_noArgsReturnOut_OutputPort[%" PRI_FwIndexType "]",
10351035
this->m_objName.toChar(),
10361036
port
10371037
);
@@ -1050,7 +1050,7 @@ void ActiveAsyncProductsComponentBase ::
10501050
#if FW_OBJECT_NAMES == 1
10511051
Fw::ObjectName portName;
10521052
portName.format(
1053-
"%s_noArgsStringReturnOut_OutputPort[%" PRI_PlatformIntType "]",
1053+
"%s_noArgsStringReturnOut_OutputPort[%" PRI_FwIndexType "]",
10541054
this->m_objName.toChar(),
10551055
port
10561056
);
@@ -1069,7 +1069,7 @@ void ActiveAsyncProductsComponentBase ::
10691069
#if FW_OBJECT_NAMES == 1
10701070
Fw::ObjectName portName;
10711071
portName.format(
1072-
"%s_typedAliasOut_OutputPort[%" PRI_PlatformIntType "]",
1072+
"%s_typedAliasOut_OutputPort[%" PRI_FwIndexType "]",
10731073
this->m_objName.toChar(),
10741074
port
10751075
);
@@ -1088,7 +1088,7 @@ void ActiveAsyncProductsComponentBase ::
10881088
#if FW_OBJECT_NAMES == 1
10891089
Fw::ObjectName portName;
10901090
portName.format(
1091-
"%s_typedAliasReturnOut_OutputPort[%" PRI_PlatformIntType "]",
1091+
"%s_typedAliasReturnOut_OutputPort[%" PRI_FwIndexType "]",
10921092
this->m_objName.toChar(),
10931093
port
10941094
);
@@ -1107,7 +1107,7 @@ void ActiveAsyncProductsComponentBase ::
11071107
#if FW_OBJECT_NAMES == 1
11081108
Fw::ObjectName portName;
11091109
portName.format(
1110-
"%s_typedAliasReturnStringOut_OutputPort[%" PRI_PlatformIntType "]",
1110+
"%s_typedAliasReturnStringOut_OutputPort[%" PRI_FwIndexType "]",
11111111
this->m_objName.toChar(),
11121112
port
11131113
);
@@ -1126,7 +1126,7 @@ void ActiveAsyncProductsComponentBase ::
11261126
#if FW_OBJECT_NAMES == 1
11271127
Fw::ObjectName portName;
11281128
portName.format(
1129-
"%s_typedOut_OutputPort[%" PRI_PlatformIntType "]",
1129+
"%s_typedOut_OutputPort[%" PRI_FwIndexType "]",
11301130
this->m_objName.toChar(),
11311131
port
11321132
);
@@ -1145,7 +1145,7 @@ void ActiveAsyncProductsComponentBase ::
11451145
#if FW_OBJECT_NAMES == 1
11461146
Fw::ObjectName portName;
11471147
portName.format(
1148-
"%s_typedReturnOut_OutputPort[%" PRI_PlatformIntType "]",
1148+
"%s_typedReturnOut_OutputPort[%" PRI_FwIndexType "]",
11491149
this->m_objName.toChar(),
11501150
port
11511151
);

0 commit comments

Comments
 (0)