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

Commit 295f1d7d authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge changes I6596b3b1,Ifd49de59,I42de064a 

am: 1de77f02

Change-Id: I662b5bfb6d214f68918ab8d24e9dd236adef0bd8
parents 560d5f37 1de77f02

system/gd/packet/parser/checksum_def.cc

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
 */



#include "checksum_def.h"



#include "checksum_type_checker.h"

#include "fields/checksum_field.h"

#include "util.h"



ChecksumDef::ChecksumDef(std::string name, std::string include, int size) : CustomFieldDef(name, include, size) {}

system/gd/packet/parser/checksum_def.h

+1 −2
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@ 


#include <iostream>



#include "checksum_type_checker.h"

#include "custom_field_def.h"

#include "fields/checksum_field.h"

#include "fields/packet_field.h"

#include "parse_location.h"

#include "type_def.h"

system/gd/packet/parser/enum_def.cc

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "fields/enum_field.h"

#include "util.h"



EnumDef::EnumDef(std::string name, int size) : TypeDef(name, size){};

EnumDef::EnumDef(std::string name, int size) : TypeDef(name, size) {}



void EnumDef::AddEntry(std::string name, uint32_t value) {

  if (value > util::GetMaxValueForBits(size_)) {

system/gd/packet/parser/enum_gen.cc

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "util.h"



EnumGen::EnumGen(EnumDef e) : e_(e){};

EnumGen::EnumGen(EnumDef e) : e_(e) {}



void EnumGen::GenDefinition(std::ostream& stream) {

  stream << "enum class ";

system/gd/packet/parser/packet_def.cc

+4 −5
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#include "fields/all_fields.h"

#include "util.h"



PacketDef::PacketDef(std::string name, FieldList fields) : ParentDef(name, fields, nullptr){};

PacketDef::PacketDef(std::string name, FieldList fields, PacketDef* parent) : ParentDef(name, fields, parent){};

PacketDef::PacketDef(std::string name, FieldList fields) : ParentDef(name, fields, nullptr) {}

PacketDef::PacketDef(std::string name, FieldList fields, PacketDef* parent) : ParentDef(name, fields, parent) {}



PacketField* PacketDef::GetNewField(const std::string&, ParseLocation) const {

  return nullptr;  // Packets can't be fields
@@ -90,9 +90,8 @@ void PacketDef::GenParserFieldGetter(std::ostream& s, const PacketField* field) 
  auto end_field_offset = GetOffsetForField(field->GetName(), true);



  if (start_field_offset.empty() && end_field_offset.empty()) {

    std::cerr << "Field location for " << field->GetName() << " is ambiguous, "

    ERROR(field) << "Field location for " << field->GetName() << " is ambiguous, "

                 << "no method exists to determine field location from begin() or end().\n";

    abort();

  }



  field->GenGetter(s, start_field_offset, end_field_offset);