Merge "PDL: Strengthen CamelCase checks" (5e830f3a) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,6 @@ cc_test {
		],
		host_supported: true,
		srcs: [
		":BluetoothCommonSources",
		":BluetoothPacketSources",
		":BluetoothPacketParserTestPacketTestSources",
		],

system/gd/hci/hci_packets.pdl

+1 −1

Original line number	Diff line number	Diff line
		@@ -2309,7 +2309,7 @@ packet SniffSubratingEvent : EventPacket (event_code = SNIFF_SUBRATING){
		maximum_transmit_latency : 16, // 0x000 - 0xFFFE (0s - 40.9s)
		maximum_receive_latency : 16, // 0x000 - 0xFFFE (0s - 40.9s)
		minimum_remote_timeout : 16, // 0x000 - 0xFFFE (0s - 40.9s)
		MInimumLocalTimeout : 16, // 0x000 - 0xFFFE (0s - 40.9s)
		minimum_local_timeout : 16, // 0x000 - 0xFFFE (0s - 40.9s)
		}

		packet ExtendedInquiryResult : EventPacket (event_code = EXTENDED_INQUIRY_RESULT) {

system/gd/l2cap/l2cap_packets.pdl

+18 −18

Original line number	Diff line number	Diff line
		@@ -58,16 +58,16 @@ packet StandardFrameWithFcs : BasicFrameWithFcs {

		group StandardSupervisoryControl {
		_fixed_ = 0 : 1,
		S : SupervisoryFunction,
		s : SupervisoryFunction,
		_reserved_ : 3,
		R : RetransmissionDisable,
		r : RetransmissionDisable,
		req_seq : 6,
		_reserved_ : 2,
		}

		group StandardInformationControl {
		tx_seq : 6,
		R : RetransmissionDisable,
		r : RetransmissionDisable,
		req_seq : 6,
		sar : SegmentationAndReassembly,
		}
		@@ -91,12 +91,12 @@ packet StandardInformationFrameWithFcs : StandardFrameWithFcs (frame_type = I_FR
		}

		packet StandardInformationStartFrame : StandardInformationFrame (sar = START) {
		L2capSduLength : 16,
		l2cap_sdu_length : 16,
		_payload_,
		}

		packet StandardInformationStartFrameWithFcs : StandardInformationFrameWithFcs (sar = START) {
		L2capSduLength : 16,
		l2cap_sdu_length : 16,
		_payload_,
		}

		@@ -112,17 +112,17 @@ enum Final : 1 {

		group EnhancedSupervisoryControl {
		_fixed_ = 0 : 1,
		S : SupervisoryFunction,
		P : Poll,
		s : SupervisoryFunction,
		p : Poll,
		_reserved_ : 2,
		F : Final,
		f : Final,
		req_seq : 6,
		_reserved_ : 2,
		}

		group EnhancedInformationControl {
		tx_seq : 6,
		F : Final,
		f : Final,
		req_seq : 6,
		sar : SegmentationAndReassembly,
		}
		@@ -146,26 +146,26 @@ packet EnhancedInformationFrameWithFcs : StandardFrameWithFcs (frame_type = I_FR
		}

		packet EnhancedInformationStartFrame : EnhancedInformationFrame (sar = START) {
		L2capSduLength : 16,
		l2cap_sdu_length : 16,
		_payload_,
		}

		packet EnhancedInformationStartFrameWithFcs : EnhancedInformationFrameWithFcs (sar = START) {
		L2capSduLength : 16,
		l2cap_sdu_length : 16,
		_payload_,
		}

		group ExtendedSupervisoryControl {
		F : Final,
		f : Final,
		req_seq : 14,
		S : SupervisoryFunction,
		P : Poll,
		s : SupervisoryFunction,
		p : Poll,
		_reserved_ : 5,
		_reserved_ : 8,
		}

		group ExtendedInformationControl {
		F : Final,
		f : Final,
		req_seq : 14,
		sar : SegmentationAndReassembly,
		tx_seq : 14,
		@@ -190,17 +190,17 @@ packet ExtendedInformationFrameWithFcs : StandardFrameWithFcs (frame_type = I_FR
		}

		packet ExtendedInformationStartFrame : ExtendedInformationFrame (sar = START) {
		L2capSduLength : 16,
		l2cap_sdu_length : 16,
		_payload_,
		}

		packet ExtendedInformationStartFrameWithFcs : ExtendedInformationFrameWithFcs (sar = START) {
		L2capSduLength : 16,
		l2cap_sdu_length : 16,
		_payload_,
		}

		packet FirstLeInformationFrame : BasicFrame {
		L2capSduLength : 16,
		l2cap_sdu_length : 16,
		_payload_,
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		#include "fields/body_field.h"

		BodyField::BodyField(ParseLocation loc) : PacketField(loc, "Body") {}
		BodyField::BodyField(ParseLocation loc) : PacketField(loc, "body") {}

		PacketField::Type BodyField::GetFieldType() const {
		return PacketField::Type::BODY;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,11 +20,11 @@
		int FixedField::unique_id_ = 0;

		FixedField::FixedField(int size, int64_t value, ParseLocation loc)
		: PacketField(loc, "FixedScalar" + std::to_string(unique_id_++)), type_(Type::FIXED_SCALAR), size_(size),
		: PacketField(loc, "fixed_scalar" + std::to_string(unique_id_++)), type_(Type::FIXED_SCALAR), size_(size),
		value_(value) {}

		FixedField::FixedField(EnumDef* enum_def, std::string value, ParseLocation loc)
		: PacketField(loc, "FixedScalar" + std::to_string(unique_id_++)), type_(Type::FIXED_ENUM), enum_(enum_def),
		: PacketField(loc, "fixed_scalar" + std::to_string(unique_id_++)), type_(Type::FIXED_ENUM), enum_(enum_def),
		value_(value) {}

		PacketField::Type FixedField::GetFieldType() const {