diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2015-10-20 12:30:28 -0500 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-01-17 22:40:56 +0100 |
| commit | 92d1d0897f8d191f9c0d3ed5eef3e836bcf1ac12 (patch) | |
| tree | 1b8b5db1ba3a5ce33c54c71deca7f63562e13eed | |
| parent | 9256a3232a2c13b03ac2d6f35cd8106c9248c311 (diff) | |
| download | device_samsung_tuna-92d1d0897f8d191f9c0d3ed5eef3e836bcf1ac12.zip device_samsung_tuna-92d1d0897f8d191f9c0d3ed5eef3e836bcf1ac12.tar.gz device_samsung_tuna-92d1d0897f8d191f9c0d3ed5eef3e836bcf1ac12.tar.bz2 | |
nfc: Build with -Wall -Werror.
Change-Id: I405d9d10a72db8c4ad0328f46d0dd2c82f18f74d
| -rw-r--r-- | nfc/Android.mk | 1 | ||||
| -rw-r--r-- | nfc/nfc_hw.c | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nfc/Android.mk b/nfc/Android.mk index 39ca331..3001be3 100644 --- a/nfc/Android.mk +++ b/nfc/Android.mk @@ -21,6 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SRC_FILES := nfc_hw.c LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := -Wall -Werror LOCAL_CFLAGS += -D$(TARGET_DEVICE) include $(BUILD_SHARED_LIBRARY) diff --git a/nfc/nfc_hw.c b/nfc/nfc_hw.c index cd26be5..295bcab 100644 --- a/nfc/nfc_hw.c +++ b/nfc/nfc_hw.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include <stdlib.h> #include <errno.h> #include <string.h> @@ -23,7 +24,7 @@ static uint8_t pn544_eedata_settings[][4] = { // DIFFERENTIAL_ANTENNA // RF Settings - {0x00,0x9B,0xD1,0x0D} // Tx consumption higher than 0x0D (average 50mA) + {0x00,0x9B,0xD1,0x0D} // Tx consumption higher than 0x0D (average 50mA) ,{0x00,0x9B,0xD2,0x24} // GSP setting for this threshold ,{0x00,0x9B,0xD3,0x0A} // Tx consumption higher than 0x0A (average 40mA) ,{0x00,0x9B,0xD4,0x22} // GSP setting for this threshold @@ -88,16 +89,16 @@ static uint8_t pn544_eedata_settings[][4] = { ,{0x00,0x98,0xA2,0x08} // Set to 0x08 as required by [digital] (default value: 09) //SE GPIO - ,{0x00, 0x98, 0x93, 0x40} + ,{0x00,0x98,0x93,0x40} // Set NFCT ATQA - ,{0x00, 0x98, 0x7D, 0x02} - ,{0x00, 0x98, 0x7E, 0x00} + ,{0x00,0x98,0x7D,0x02} + ,{0x00,0x98,0x7E,0x00} // Enable CEA detection mechanism - ,{0x00, 0x9F, 0xC8, 0x01} + ,{0x00,0x9F,0xC8,0x01} // Set NFC-F poll RC=0x00 - ,{0x00, 0x9F, 0x9A, 0x00} + ,{0x00,0x9F,0x9A,0x00} // Setting for EMD support for ISO 14443-4 Reader ,{0x00,0x9F,0x09,0x00} // 0x00 - Disable EMD support, 0x01 - Enable EMD support }; |