Skip to content

Commit edb3f1b

Browse files
Generalize uses of LinearBufferBase to SerialBufferBase where possible (#4995)
* issue-4335 delete Fw/Types/test/ut/SerializeBufferBaseTester.hpp * issue-4335 rename SerializeBufferBase to LinearBufferBase and run formatter * issue-4985 Reduce uses of LinearBufferBase to SerialBufferBase where possible excluding ones that require changes to FPP code gen and excluding unit tests
1 parent 0b6b31c commit edb3f1b

15 files changed

Lines changed: 19 additions & 19 deletions

File tree

Drv/AsyncByteStreamBufferAdapter/test/ut/AsyncByteStreamBufferAdapterTester.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void AsyncByteStreamBufferAdapterTester ::from_toByteStreamDriver_handler(FwInde
4343
// Tests
4444
// ----------------------------------------------------------------------
4545

46-
void AsyncByteStreamBufferAdapterTester ::random_fill(Fw::LinearBufferBase& buffer, U32 max_size) {
46+
void AsyncByteStreamBufferAdapterTester ::random_fill(Fw::SerialBufferBase& buffer, U32 max_size) {
4747
U32 random_size = STest::Pick::lowerUpper(0, max_size);
4848
// buffer.resetSer();
4949
for (U32 i = 0; i < random_size; i++) {

Drv/AsyncByteStreamBufferAdapter/test/ut/AsyncByteStreamBufferAdapterTester.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class AsyncByteStreamBufferAdapterTester final : public AsyncByteStreamBufferAda
6464
//! Initialize components
6565
void initComponents();
6666

67-
void random_fill(Fw::LinearBufferBase& buffer, U32 max_size);
67+
void random_fill(Fw::SerialBufferBase& buffer, U32 max_size);
6868

6969
private:
7070
// ----------------------------------------------------------------------

Drv/ByteStreamBufferAdapter/test/ut/ByteStreamBufferAdapterTester.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Drv::ByteStreamStatus ByteStreamBufferAdapterTester ::from_toByteStreamDriver_ha
4242
// Tests
4343
// ----------------------------------------------------------------------
4444

45-
void ByteStreamBufferAdapterTester ::random_fill(Fw::LinearBufferBase& buffer, U32 max_size) {
45+
void ByteStreamBufferAdapterTester ::random_fill(Fw::SerialBufferBase& buffer, U32 max_size) {
4646
U32 random_size = STest::Pick::lowerUpper(0, max_size);
4747
// buffer.resetSer();
4848
for (U32 i = 0; i < random_size; i++) {

Drv/ByteStreamBufferAdapter/test/ut/ByteStreamBufferAdapterTester.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ByteStreamBufferAdapterTester final : public ByteStreamBufferAdapterGTestB
6969
void initComponents();
7070

7171
//! Fill buffer with random data
72-
void random_fill(Fw::LinearBufferBase& buffer, U32 max_size);
72+
void random_fill(Fw::SerialBufferBase& buffer, U32 max_size);
7373

7474
private:
7575
// ----------------------------------------------------------------------

Fw/Log/AmpcsEvrLogPacket.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class AmpcsEvrLogPacket : public ComPacket {
2525

2626
SerializeStatus serializeTo(SerialBufferBase& buffer,
2727
Fw::Endianness mode = Fw::Endianness::BIG) const override; //!< serialize contents
28-
SerializeStatus deserializeFrom(LinearBufferBase& buffer, Fw::Endianness mode = Fw::Endianness::BIG);
28+
SerializeStatus deserializeFrom(SerialBufferBase& buffer, Fw::Endianness mode = Fw::Endianness::BIG);
2929

3030
void setTaskName(U8* taskName, U8 len);
3131
void setId(U32 eventID);

Svc/Ccsds/AosFramer/AosFramer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void AosFramer ::pack_packet(Fw::Buffer& data, const ComCfg::FrameContext& conte
340340
}
341341
}
342342

343-
void AosFramer ::serialize_idle_spp_packet(Fw::LinearBufferBase& serializer, U16 length) {
343+
void AosFramer ::serialize_idle_spp_packet(Fw::SerialBufferBase& serializer, U16 length) {
344344
// APID to use for this Idle Packet
345345
constexpr U16 idleApid = static_cast<U16>(ComCfg::Apid::SPP_IDLE_PACKET);
346346

Svc/Ccsds/AosFramer/AosFramer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class AosFramer final : public AosFramerComponentBase {
137137
//! (minus optional CRC)
138138
void fill_with_idle_packet(AosVc& vc, const ComCfg::FrameContext& context);
139139

140-
void serialize_idle_spp_packet(Fw::LinearBufferBase& serializer, U16 length);
140+
void serialize_idle_spp_packet(Fw::SerialBufferBase& serializer, U16 length);
141141

142142
//! Fill out the Transfer Frame Primary Header (4.1.2)
143143
void setup_header(const ComCfg::FrameContext& context);

Svc/Ccsds/TmFramer/TmFramer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void TmFramer ::dataReturnIn_handler(FwIndexType portNum,
105105
this->m_bufferState = BufferOwnershipState::OWNED;
106106
}
107107

108-
void TmFramer ::fill_with_idle_packet(Fw::LinearBufferBase& serializer) {
108+
void TmFramer ::fill_with_idle_packet(Fw::SerialBufferBase& serializer) {
109109
constexpr U16 endIndex = ComCfg::TmFrameFixedSize - TMTrailer::SERIALIZED_SIZE;
110110
constexpr U16 idleApid = static_cast<U16>(ComCfg::Apid::SPP_IDLE_PACKET);
111111
const U16 startIndex = static_cast<U16>(serializer.getSize());

Svc/Ccsds/TmFramer/TmFramer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class TmFramer final : public TmFramerComponentBase {
9292
//! Fill the frame buffer with an Idle Packet to complete the frame data field
9393
//! as per CCSDS TM Protocol paragraph 4.2.2.5. Idle packet is inserted at the
9494
//! start_index index of the frame buffer, and fills it up to the end minus CRC
95-
void fill_with_idle_packet(Fw::LinearBufferBase& serializer);
95+
void fill_with_idle_packet(Fw::SerialBufferBase& serializer);
9696

9797
// ----------------------------------------------------------------------
9898
// Members

Svc/CmdSequencer/test/ut/SequenceFiles/FPrime/Headers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void serialize(U32 dataSize,
2323
U32 numRecords,
2424
FwTimeBaseStoreType timeBase,
2525
FwTimeContextStoreType timeContext,
26-
Fw::LinearBufferBase& destBuffer) {
26+
Fw::SerialBufferBase& destBuffer) {
2727
ASSERT_EQ(Fw::FW_SERIALIZE_OK, destBuffer.serializeFrom(dataSize));
2828
ASSERT_EQ(Fw::FW_SERIALIZE_OK, destBuffer.serializeFrom(numRecords));
2929
ASSERT_EQ(Fw::FW_SERIALIZE_OK, destBuffer.serializeFrom(timeBase));

0 commit comments

Comments
 (0)