Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc68d5b9 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge changes I6b64dc43,I499835b0 am: b059d4b0 am: fdcad4ce am: 870c7c35 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1525079

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e852814bc557cb5f50360e19c167b99cee4bb30
parents ad0513ed 870c7c35

system/gd/packet/parser/fields/array_field.cc

+5 −0
Original line number Diff line number Diff line
@@ -205,3 +205,8 @@ void ArrayField::GenRustGetter(std::ostream& s, Size start_offset, Size) const { 
  s << "bytes[" << start_offset.bytes() << "..";

  s << start_offset.bytes() + GetSize().bytes() << "].try_into().unwrap();";

}



void ArrayField::GenRustWriter(std::ostream& s, Size start_offset, Size) const {

  s << "&buffer[" << start_offset.bytes() << ".." << start_offset.bytes() + GetSize().bytes()

    << "].copy_from_slice(&self." << GetName() << ");";

}

system/gd/packet/parser/fields/array_field.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ class ArrayField : public PacketField { 


  void GenRustGetter(std::ostream& s, Size start_offset, Size end_offset) const override;



  void GenRustWriter(std::ostream& s, Size start_offset, Size end_offset) const override;



  const std::string name_;



  const PacketField* element_field_{nullptr};

system/gd/packet/parser/fields/body_field.cc

+2 −0
Original line number Diff line number Diff line
@@ -82,3 +82,5 @@ std::string BodyField::GetRustDataType() const { 


void BodyField::GenRustGetter(std::ostream&, Size, Size) const {

}



void BodyField::GenRustWriter(std::ostream&, Size, Size) const {}

system/gd/packet/parser/fields/body_field.h

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ class BodyField : public PacketField { 


  void GenRustGetter(std::ostream& s, Size start_offset, Size end_offset) const override;



  void GenRustWriter(std::ostream& s, Size start_offset, Size end_offset) const override;



  // Body fields can only be dynamically sized.

  const SizeField* size_field_{nullptr};

};

system/gd/packet/parser/fields/checksum_field.cc

+2 −0
Original line number Diff line number Diff line
@@ -66,3 +66,5 @@ void ChecksumField::GenStringRepresentation(std::ostream& s, std::string) const 


void ChecksumField::GenRustGetter(std::ostream&, Size, Size) const {

}



void ChecksumField::GenRustWriter(std::ostream&, Size, Size) const {}