| commit | e236c5bb70c26d478b2c5dc16457548c9753b290 | [log] [tgz] |
|---|---|---|
| author | William Escande <wescande@google.com> | Mon Nov 11 21:45:41 2024 +0000 |
| committer | Copybara-Service <copybara-worker@google.com> | Mon Nov 11 13:46:55 2024 -0800 |
| tree | a09dfbbf9753f2c47dfd1af3857858bf8b961324 | |
| parent | 1ee41928f4ba4270164ef3215216aadb0d810d35 [diff] |
Merge changes I8175344d,Ic26c9b03 into main * changes: cpplint: fix and enable readability/check cpplint: fix and enable whitespace/blank_line GitOrigin-RevId: d02482c2e76f85c9efba863907c50b5d66601ad2 Change-Id: I527dbe1662535996c4985a79d10c02e99b7aa32f
diff --git a/system/embdrv/sbc/decoder/include/oi_bt_spec.h b/system/embdrv/sbc/decoder/include/oi_bt_spec.h index c0091cb..26c8d18 100644 --- a/system/embdrv/sbc/decoder/include/oi_bt_spec.h +++ b/system/embdrv/sbc/decoder/include/oi_bt_spec.h
@@ -140,7 +140,6 @@ OI_LINK_KEY_TYPE_UNAUTHENTICATED = 4, /* Unauthenticated */ OI_LINK_KEY_TYPE_AUTHENTICATED = 5, /* Authenticated */ OI_LINK_KEY_TYPE_CHANGED_COMBO = 6 /* Changed */ - } OI_BT_LINK_KEY_TYPE; /* Number of bytes allocated for a PIN (personal indentification number) */
diff --git a/system/embdrv/sbc/decoder/include/oi_status.h b/system/embdrv/sbc/decoder/include/oi_status.h index 28d9f04..b91809f 100644 --- a/system/embdrv/sbc/decoder/include/oi_status.h +++ b/system/embdrv/sbc/decoder/include/oi_status.h
@@ -684,7 +684,6 @@ status. (Only to be used for special cases involving OI_SLOG_ERROR() and OI_SLOG_WARNING().) */ - } OI_STATUS; /* Remember to update the #define below when new reserved blocks are added to
diff --git a/system/embdrv/sbc/encoder/include/sbc_encoder.h b/system/embdrv/sbc/encoder/include/sbc_encoder.h index 4c8d2c6..d225b5d 100644 --- a/system/embdrv/sbc/encoder/include/sbc_encoder.h +++ b/system/embdrv/sbc/encoder/include/sbc_encoder.h
@@ -186,7 +186,6 @@ uint16_t FrameHeader; uint8_t Format; /* Default to be SBC_FORMAT_GENERAL for SBC if not assigned. Assigning to SBC_FORMAT_MSBC for mSBC */ - } SBC_ENC_PARAMS; #ifdef __cplusplus