summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge Android RHEADmasterXin Li2020-09-0826-235/+173
|\ | | | | | | | | | | Bug: 168057903 Merged-In: I977fffd03c77413dbec648254a59dfcb1cd23d8f Change-Id: I7bcfedbfc72b862ac06a8953fa522aeef906422d
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2726-235/+173
|/| | | | | | | | | | | Bug: 166295507 Merged-In: Ida7c2f2d77afc1c737b2e3c5c7aed2d90b0bd033 Change-Id: I977fffd03c77413dbec648254a59dfcb1cd23d8f
| * rpr0521: report I2C errors, clean up transfer calls am: 71b6e4d0f3 am: ↵Daniel Jarai2020-07-141-27/+43
| |\ | |/ |/| | | | | | | | | | | c09a457918 Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328934 Change-Id: Ida7c2f2d77afc1c737b2e3c5c7aed2d90b0bd033
* | rpr0521: report I2C errors, clean up transfer calls am: 71b6e4d0f3Daniel Jarai2020-07-141-27/+43
|\ \ | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328934 Change-Id: I33523ecf15f8016618abddba48af72ff950bff8f
| * | rpr0521: report I2C errors, clean up transfer callsDaniel Jarai2020-07-141-27/+43
| | | | | | | | | | | | Change-Id: Ibc4c6348ac493b90b513179f7cea3eed6e82ed34
| | * Merge "nanohub: i2c: fix transfer ID race" am: efce4bfadc am: ade246280dTreehugger Robot2020-07-071-34/+43
| | |\ | |_|/ |/| | | | | | | | | | | Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328935 Change-Id: I6bb6964ed8ce40b6c7cc1a93e88be0219053a1e9
* | | Merge "nanohub: i2c: fix transfer ID race" am: efce4bfadcTreehugger Robot2020-07-071-34/+43
|\| | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328935 Change-Id: Ie3b87ff483a392ec90b0727267c89d362709185e
| * | Merge "nanohub: i2c: fix transfer ID race"android-r-beta-3android-r-beta-2Treehugger Robot2020-07-071-34/+43
| |\ \
| | * | nanohub: i2c: fix transfer ID raceDaniel Jarai2020-06-111-34/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The I2C queue works by maintaining two counters: - "last" is the ID of the last transfer, assigned to new transfers created by calling i2cMasterTxRx, and incremented (getting and incrementing the value is atomic) - "next" is the ID of the next, not necessarily existing transfer; starting with "last + 1", when a transfer finishes, the queue is checked for transfers with the current value, and it's incremented (getting and incrementing the value is atomic) Illustrating this, here's how it normally works: 1. the bus is idle, last=1, next=2 2. i2cMasterTxRx is called, starting transfer A with ID=1, marking the bus busy 3. i2cMasterTxRx is called, enqueuing transfer B with ID=2 4. transfer A finishes; the queue is checked for transfers with ID=next (next=2), picking up and starting transfer B 5. transfer B finishes; the queue is checked for transfers with ID=next (next=3), but as no such transfer exists, the bus is marked idle However, consider the following scenario: 1. the bus is idle, last=1, next=2 2. i2cMasterTxRx is called, setting ID=1 for transfer A, but before starting the transfer, it's interrupted 3. the interrupt also calls i2cMasterTxRx, starting transfer B with ID=2 4. execution returns to the original call, enqueuing transfer A (as the bus is now busy) 5. transfer B finishes; the queue is checked for transfers with ID=next (next=2), but as transfer A has ID=1 in the queue, it's ignored From this point, "last" and "next" aren't in sync anymore, essentially breaking the queue. To fix this, remove "next", and always pick up the transfer with the lowest ID in the queue. This shouldn't have any negative side effect, as the order of the transfers will be preserved, but it fixes this race condition: in the above scenario, transfer A will be picked up after transfer B. Change-Id: I6af55f62037430aa31190bc587a70ae99de2fb3b
| | | * rpr0521: fix driver name in error log am: 4f57e44a62 am: 564da26ad2Daniel Jarai2020-06-111-1/+1
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328938 Change-Id: Ief220e3425a0601e064faf37adabbb1860080237
* | | | rpr0521: fix driver name in error log am: 4f57e44a62Daniel Jarai2020-06-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328938 Change-Id: I3ab2548c0034b0112665318f8d477c40293b1a6a
| * | | rpr0521: fix driver name in error logDaniel Jarai2020-06-111-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8de0ae7c55c964fc69b56953eb5ee19d6a09dfae
| | | * bmi160: allow overriding the SPI bus, speed and CS pin am: 03e747214c am: ↵Daniel Jarai2020-06-111-1/+8
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 2b11d2c450 Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328937 Change-Id: I68a8ef276a13c25876b566b3f8271aecaec85a34
* | | | bmi160: allow overriding the SPI bus, speed and CS pin am: 03e747214cDaniel Jarai2020-06-111-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328937 Change-Id: I1484027da1e5653f63308425c2db1fe91ac53b9c
| * | | bmi160: allow overriding the SPI bus, speed and CS pinDaniel Jarai2020-06-111-1/+8
| | | | | | | | | | | | | | | | Change-Id: I91fec9e53be044d567847debd1e18ccb9f5f1e28
| | | * bmi160: sync getStateName() with enum SensorState am: d512684def am: 890430e1d3Daniel Jarai2020-06-111-1/+1
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328936 Change-Id: Ia17887a3068e9f0d095865410af73fc2e687c8d2
* | | | bmi160: sync getStateName() with enum SensorState am: d512684defDaniel Jarai2020-06-111-1/+1
|\| | | | |/ / |/| | | | | | | | | | | Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1328936 Change-Id: Id52fb7b5190a0b2ba889ce2ec31a397b01b8bbb8
| * | bmi160: sync getStateName() with enum SensorStateDaniel Jarai2020-06-111-1/+1
|/ / | | | | | | | | | | | | getStateName() was out of sync with enum SensorState, generating incorrect logs when DBG_STATE is enabled. Change-Id: I12eb0285da880bf18f787f26148d5e75e421802f
| * Add METADATA to contexthub: Apache2+BSD+LLVM+MIT=NOTICE am: 0143f6cebc am: ↵Bob Badour2020-05-041-0/+3
| |\ | |/ |/| | | | | | | 4be9ff9402 Change-Id: Ie8dde38cb7a249f32ae6d29b6f927f56d8ba0281
* | Add METADATA to contexthub: Apache2+BSD+LLVM+MIT=NOTICE am: 0143f6cebcBob Badour2020-05-041-0/+3
|\ \ | | | | | | | | | Change-Id: I9daa36ed11be1c995b72fb5681c8d48384786de6
| * | Add METADATA to contexthub: Apache2+BSD+LLVM+MIT=NOTICEBob Badour2020-05-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I31d64fdd30f7242b854278ec7b061934725e56c2
| | * [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | stag-aosp-master am: 786473de0f -s ours am skip reason: subject contains skip directive Change-Id: Ia83bf815122f240d4bcb9c4b0ab8d1b1604bb364
* | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \ \ | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: Ia94a46f712a131c556ea409d285c4d232fd9a7b7
| * \ \ DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li2020-03-190-0/+0
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | stag-aosp-master am: cc7dc57f89 Change-Id: I1f17ae24de6e120d4ff22e815619485136988097
| | | * [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: cc7dc57f89 -s ours am skip reason: subject contains skip directive Change-Id: I253c019823a9471bd44eb549f36452e5897d32d1
* | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
|\| | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: If38ffaf3270813d4127f851e36918ebc0b1e8c98
| * | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 675f10e0e1 am: ↵Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | ebc85236f1 Change-Id: Id61121835635d15b7b018cad92398c0ef69cbae6
| | | * [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE ↵Automerger Merge Worker2020-03-060-0/+0
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | am: 675f10e0e1 am: ebc85236f1 -s ours am skip reason: subject contains skip directive Change-Id: I1e2c7b40f8e1c548c963433727e35eb301f0b5ca
* | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 675f10e0e1Automerger Merge Worker2020-03-060-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I806e37e30ea00664ef194f43077b3d1a9c245d70
| * | | Merge stage-aosp-master to aosp-master - DO NOT MERGEandroid-r-preview-4android-r-preview-3android-r-preview-2Bill Yi2020-03-051-3/+6
| |\ \ \ | |/ / / |/| | | | | | | Change-Id: Ifd6c30474342b1ecaf817021c96b4eab549fe57a
| | | * [automerger skipped] DO NOT MERGE - Merge ↵android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devAutomerger Merge Worker2020-01-160-0/+0
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 528f0a7c87 am: 33534773c2 -s ours am skip reason: subject contains skip directive Change-Id: I9572c846109ecf189e271b5fd59edb32ee0176a8
| | * | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Automerger Merge Worker2020-01-160-0/+0
| | |\ \ | |_|/ / |/| | | | | | | | | | | | | | | stage-aosp-master am: 528f0a7c87 Change-Id: Ic45939644d23e8eabe2ae67da4614092e5570750
* | | | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵android10-sidebranchXin Li2020-01-151-3/+6
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | stage-aosp-master Bug: 146167222 Change-Id: Ia93cf5d79217da6d48808cd89b0fb201ef8188c3
| | * [automerger skipped] [ImuCal] Minimal calibration info logging am: ↵Automerger Merge Worker2019-12-180-0/+0
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | 98f1a92c3f am: 8051945f94 -s ours am skip reason: Change-Id I476e04be50b8f324cab5fc0ccd72a825db514e42 with SHA-1 ba4f3429b6 is in history Change-Id: I2b3a101b598e94ef0fa4e6d11a8857558a13784b
| * | [ImuCal] Minimal calibration info logging am: 98f1a92c3fAutomerger Merge Worker2019-12-181-3/+6
| |\ \ | | | | | | | | | | | | Change-Id: I98267ffb262c0dbb5e85319b374122b311dfa55c
| | * | [ImuCal] Minimal calibration info loggingandroid-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid10-qpr3-releaseDavid Jacobs2019-12-181-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - With NANO_SENSOR_CAL_DBG_ENABLED not defined, all log messages are disabled except LOGI in nano_calibration.cc. This reduces the ImuCal's nanoapp memory footprint to reach the padding limits while still providing our minimal calibration logging updates useful for device verification. text data bss dec hex 27316 2600 18712 48628 bdf4 MemSize:0x7fe8 Align:0x1000 Padded:0x8000 Padding:88 MemSize:0x4af0 Align:0x1000 Padded:0x5000 Padding:1296 Total Padded MemSize: 0xd000 (53248) --Original--------------------------- MemSize:0x8288 Align:0x1000 Padded:0x9000 Padding:3448 MemSize:0x4af0 Align:0x1000 Padded:0x5000 Padding:1296 Total Padded MemSize: 0xe000 (57344) Bug: 146219309 Test: Built firmware. Merged-In: I476e04be50b8f324cab5fc0ccd72a825db514e42 Change-Id: I476e04be50b8f324cab5fc0ccd72a825db514e42 (cherry picked from commit ba4f3429b63d1bcb0cb2c72e10ed465022949cf3)
| | | * [ImuCal] Minimal calibration info loggingDavid Jacobs2019-12-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - With NANO_SENSOR_CAL_DBG_ENABLED not defined, all log messages are disabled except LOGI in nano_calibration.cc. This reduces the ImuCal's nanoapp memory footprint to reach the padding limits while still providing our minimal calibration logging updates useful for device verification. text data bss dec hex 27316 2600 18712 48628 bdf4 MemSize:0x7fe8 Align:0x1000 Padded:0x8000 Padding:88 MemSize:0x4af0 Align:0x1000 Padded:0x5000 Padding:1296 Total Padded MemSize: 0xd000 (53248) --Original--------------------------- MemSize:0x8288 Align:0x1000 Padded:0x9000 Padding:3448 MemSize:0x4af0 Align:0x1000 Padded:0x5000 Padding:1296 Total Padded MemSize: 0xe000 (57344) Bug: 146219309 Test: Built firmware. Change-Id: I476e04be50b8f324cab5fc0ccd72a825db514e42
| | | * [ImuCal] Changes log-level for LoadAshCalibration fail messageDavid Jacobs2019-12-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This change aims to reduce confusion with this log message since it is frequently not an error and arises when there is no previous cal data to load (e.g., on first device boot). - This change was migrated from Google3 (284259994). Bug: 145825423 Test: Built firmware. Change-Id: I919a858f920b06eab657df40d4b7947953e42a0b
| | | * device: google: contexthub: fix -Wreorder-init-list am: 5c1466b97d am: ↵Nick Desaulniers2019-11-113-6/+6
| | | |\ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 1a27b954cb am: 1e8d4e0e86 Change-Id: I1b7ae8c43726f685d76cb738ec3c0906440c3ea5
| * | | device: google: contexthub: fix -Wreorder-init-list am: 5c1466b97dNick Desaulniers2019-11-113-6/+6
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | am: 1a27b954cb Change-Id: I24f459dfc477ed0baf12893f35c28df97496e6c8
* | | | device: google: contexthub: fix -Wreorder-init-listandroid-r-preview-1Nick Desaulniers2019-11-113-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 5c1466b97d Change-Id: Id41838f9dfcab38decd5e747c8aecbcb359bd6a7
| * | | | device: google: contexthub: fix -Wreorder-init-listNick Desaulniers2019-11-113-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++20 is stricter about member ordering in designated initializers than C99. Bug: 139945549 Test: mm Change-Id: Ib48ab192a1e7fd7abc7bac7cff8e85c1f825d3b9 Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
| | | | * [automerger skipped] DO NOT MERGE - ↵Xin Li2019-10-300-0/+0
| | | | |\ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: fd60df3ac5 am: c658e63ded -s ours am skip reason: subject contains skip directive Change-Id: I556dbe57a70ae123782e6c56411671f9ad2af016
| | * | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: fd60df3ac5 Change-Id: I632856f80c32c90ff4a79c2401539215a0f50187
* | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: Ic813a24bbb9ef08679d199387c379c0e738a919f
| | | * Remove libhwbinder/libhidltransport deps am: aff4d9543e am: 19faad1b7f am: ↵Steven Moreland2019-10-022-6/+0
| | | |\ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 0b315c1dbb am: ce6ffa2e71 Change-Id: Iae33096ef48b40b1fab60179dc5a24ea16dc7049
| * | | Remove libhwbinder/libhidltransport deps am: aff4d9543e am: 19faad1b7fSteven Moreland2019-10-022-6/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 0b315c1dbb Change-Id: I3c76064eb760f597c213687d55c6489da4b8ffdc
| | * \ \ Remove libhwbinder/libhidltransport deps am: aff4d9543eSteven Moreland2019-10-022-6/+0
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | am: 19faad1b7f Change-Id: I8968d2d74427791fabb498f3f9ee1548bb5ee3a9
* | | | | Remove libhwbinder/libhidltransport depsSteven Moreland2019-10-022-6/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: aff4d9543e Change-Id: I01d97c54ce856dc2fcb1ef026ac85191e350c8b7
| * | | | | Remove libhwbinder/libhidltransport depsndk-sysroot-r21Steven Moreland2019-10-012-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since these were combined into libhidlbase. Bug: 135686713 Test: build only (libhwbinder/libhidltransport are empty) Change-Id: I9b7cdcb5109150de8cc6b17fa707a11d0291ccb5
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-13 08:18:58 +0000