diff options
author | Chih-hung Hsieh <chh@google.com> | 2016-07-08 17:17:12 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-08 17:17:12 +0000 |
commit | 99e8b227cd00678ce863c04ebde0b8d9a6f7df5c (patch) | |
tree | 09fae00bebc85d4ce30e5365c3dfdef3d4ca35b0 | |
parent | 39e80f29b5253c59429a8d825b0f40aa7f08b860 (diff) | |
parent | 7889f98849ad3913586904e00d91b32cc0ceb75b (diff) | |
download | akm-99e8b227cd00678ce863c04ebde0b8d9a6f7df5c.tar.gz |
Merge \\\\"Fix misc-macro-parentheses warnings in hardware/akm.\\\\" am: b459b8d1de am: 7201e557ef am: 37025e90a3android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releasesecurity-oc-mr1-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-release
am: 7889f98849
Change-Id: I5b8c1756f2d793b75b32d1882eda16c0cf1a1bc3
-rw-r--r-- | AK8975_FS/akmdfs/AK8975Driver.h | 2 | ||||
-rw-r--r-- | AK8975_FS/akmdfs/AKFS_Common.h | 2 | ||||
-rw-r--r-- | AK8975_FS/akmdfs/AKFS_Measure.h | 8 | ||||
-rw-r--r-- | AK8975_FS/libsensors/sensors.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/AK8975_FS/akmdfs/AK8975Driver.h b/AK8975_FS/akmdfs/AK8975Driver.h index 2f226ac..a09610a 100644 --- a/AK8975_FS/akmdfs/AK8975Driver.h +++ b/AK8975_FS/akmdfs/AK8975Driver.h @@ -27,7 +27,7 @@ #define AKD_FALSE 0 /*!< Represents false */ #define AKD_SUCCESS 1 /*!< Represents success.*/ #define AKD_FAIL 0 /*!< Represents fail. */ -#define AKD_ERROR -1 /*!< Represents error. */ +#define AKD_ERROR (-1) /*!< Represents error. */ /*! 0:Don't Output data, 1:Output data */ #define AKD_DBG_DATA 0 diff --git a/AK8975_FS/akmdfs/AKFS_Common.h b/AK8975_FS/akmdfs/AKFS_Common.h index 4b6874d..cd1ed52 100644 --- a/AK8975_FS/akmdfs/AKFS_Common.h +++ b/AK8975_FS/akmdfs/AKFS_Common.h @@ -113,7 +113,7 @@ /***** Dbg Zone Output ***************************************/ #if ENABLE_AKMDEBUG #define AKMDATA(flag, format, ...) \ - ((((int)flag) & g_dbgzone) \ + ((((int)(flag)) & g_dbgzone) \ ? (fprintf(stdout, (format), ##__VA_ARGS__)) \ : ((void)0)) #else diff --git a/AK8975_FS/akmdfs/AKFS_Measure.h b/AK8975_FS/akmdfs/AKFS_Measure.h index c41e363..1f001ac 100644 --- a/AK8975_FS/akmdfs/AKFS_Measure.h +++ b/AK8975_FS/akmdfs/AKFS_Measure.h @@ -23,14 +23,14 @@ #include "AKFS_Compass.h" /*** Constant definition ******************************************************/ -#define AK8975_SELFTEST_MIN_X -100 +#define AK8975_SELFTEST_MIN_X (-100) #define AK8975_SELFTEST_MAX_X 100 -#define AK8975_SELFTEST_MIN_Y -100 +#define AK8975_SELFTEST_MIN_Y (-100) #define AK8975_SELFTEST_MAX_Y 100 -#define AK8975_SELFTEST_MIN_Z -1000 -#define AK8975_SELFTEST_MAX_Z -300 +#define AK8975_SELFTEST_MIN_Z (-1000) +#define AK8975_SELFTEST_MAX_Z (-300) #define CONVERT_ACC(a) ((int)((a) * 720 / 9.8f)) #define CONVERT_MAG(m) ((int)((m) / 0.06f)) diff --git a/AK8975_FS/libsensors/sensors.h b/AK8975_FS/libsensors/sensors.h index 6060e6a..ed33092 100644 --- a/AK8975_FS/libsensors/sensors.h +++ b/AK8975_FS/libsensors/sensors.h @@ -31,7 +31,7 @@ __BEGIN_DECLS /*****************************************************************************/ -#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define ID_A (0) #define ID_M (1) |