diff options
32 files changed, 476 insertions, 264 deletions
diff --git a/nci/jni/CondVar.cpp b/nci/jni/CondVar.cpp index 1156344..e69cc46 100644 --- a/nci/jni/CondVar.cpp +++ b/nci/jni/CondVar.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: CondVar.cpp -** -** Description: Encapsulate a condition variable for thread synchronization. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Encapsulate a condition variable for thread synchronization. + */ #include "CondVar.h" #include "NfcJniUtil.h" diff --git a/nci/jni/CondVar.h b/nci/jni/CondVar.h index eca17aa..c286d5c 100644 --- a/nci/jni/CondVar.h +++ b/nci/jni/CondVar.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: CondVar.h -** -** Description: Encapsulate a condition variable for thread synchronization. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Encapsulate a condition variable for thread synchronization. + */ #pragma once #include <pthread.h> @@ -79,4 +88,4 @@ public: private: pthread_cond_t mCondition; -};
\ No newline at end of file +}; diff --git a/nci/jni/DataQueue.cpp b/nci/jni/DataQueue.cpp index ab94734..caa2575 100644 --- a/nci/jni/DataQueue.cpp +++ b/nci/jni/DataQueue.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: DataQueue.cpp -** -** Description: Store data bytes in a variable-size queue. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Store data bytes in a variable-size queue. + */ #include "DataQueue.h" diff --git a/nci/jni/DataQueue.h b/nci/jni/DataQueue.h index 4bb6bda..bfd415c 100644 --- a/nci/jni/DataQueue.h +++ b/nci/jni/DataQueue.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: DataQueue.h -** -** Description: Store data bytes in a variable-size queue. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Store data bytes in a variable-size queue. + */ #pragma once #include "NfcJniUtil.h" diff --git a/nci/jni/HostAidRouter.cpp b/nci/jni/HostAidRouter.cpp index 5b32608..0b511f8 100644 --- a/nci/jni/HostAidRouter.cpp +++ b/nci/jni/HostAidRouter.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: HostAidRouter.cpp -** -** Description: Manage listen-mode AID routing to the host. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Manage listen-mode AID routing to the host. + */ #include "OverrideLog.h" #include "HostAidRouter.h" #include "config.h" diff --git a/nci/jni/HostAidRouter.h b/nci/jni/HostAidRouter.h index 409df93..f653aa9 100644 --- a/nci/jni/HostAidRouter.h +++ b/nci/jni/HostAidRouter.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: HostAidRouter.h -** -** Description: Manage listen-mode AID routing to the host. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Manage listen-mode AID routing to the host. + */ #pragma once #include "SyncEvent.h" #include "NfcJniUtil.h" diff --git a/nci/jni/IMPORTANT_LICENSE b/nci/jni/IMPORTANT_LICENSE new file mode 100644 index 0000000..2cc9a94 --- /dev/null +++ b/nci/jni/IMPORTANT_LICENSE @@ -0,0 +1,50 @@ + +Copyright (C) 1999-2012 Broadcom Corporation + +This license applies to all underlying Broadcom proprietary code and all +changes thereto committed to the AOSP on or before the +commit eec15a2576fe8c6abf986996d6be20ae5b6afcfe ("Proprietary Files"). + +In addition, this license applies to all Broadcom proprietary code that is NOT +governed by the Apache License, Version 2.0, unless you originally licensed +such Broadcom proprietary code under a license from Broadcom ("Broadcom SLA"). +If you have a Broadcom SLA, the terms and conditions of such SLA will continue +to govern your use of the Broadcom proprietary code, including without +limitation, the Proprietary Files. + +These Proprietary Files are the proprietary software of Broadcom Corporation +and/or its licensors, and may only be duplicated or distributed (through +multiple tiers) for internal evaluation purposes ("Authorized License"). Any +commercial redistribution of the Proprietary Files is strictly prohibited. + +Except as set forth in this Authorized License, Broadcom grants no license +(express or implied), right to use, or waiver of any kind with respect to the +Authorized Files, and Broadcom expressly reserves all rights in and to the +Authorized Files and all intellectual property rights therein. + +Except as expressly set forth in the Authorized License, + +1. These Proprietary Files, including its structure, sequence and organization, + constitutes the valuable trade secrets of Broadcom, and you shall use all + reasonable efforts to protect the confidentiality thereof, and to use this + information only for internal evaluation purposes. + +2. TO THE MAXIMUM EXTENT PERMITTED BY LAW, THESE PROPRIETARY FILES ARE PROVIDED + "AS IS" AND WITH ALL FAULTS AND BROADCOM MAKES NO PROMISES, REPRESENTATIONS + OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH + RESPECT TO THE PROPRIETARY FILES. BROADCOM SPECIFICALLY DISCLAIMS ANY AND + ALL IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS + FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET + ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. YOU ASSUME THE + ENTIRE RISK ARISING OUT OF YOUR USE OF THE PROPRIETARY FILES UNDER THE + AUTHORIZED LICENSE. IF YOU VIOLATE THE AUTHORIZED LICENSE, THIS LICENSE WILL + BE IMMEDIATELY RESCINDED AND TERMINATED. + +3. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL BROADCOM OR ITS + LICENSORS BE LIABLE FOR (i) CONSEQUENTIAL, INCIDENTAL, SPECIAL, INDIRECT, OR + EXEMPLARY DAMAGES WHATSOEVER ARISING OUT OF OR IN ANY WAY RELATING TO YOUR + USE OF OR INABILITY TO USE THE PROPRIETARY FILES EVEN IF BROADCOM HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES; OR (ii) ANY AMOUNT IN EXCESS OF + THE AMOUNT ACTUALLY PAID FOR THE PROPRIETARY FILES ITSELF OR U.S. $1, + WHICHEVER IS GREATER. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY + FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY. diff --git a/nci/jni/IntervalTimer.cpp b/nci/jni/IntervalTimer.cpp index 304fa7e..f71ca8e 100644 --- a/nci/jni/IntervalTimer.cpp +++ b/nci/jni/IntervalTimer.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: IntervalTimer.cpp -** -** Description: Asynchronous interval timer. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Asynchronous interval timer. + */ #include "IntervalTimer.h" #include "OverrideLog.h" diff --git a/nci/jni/IntervalTimer.h b/nci/jni/IntervalTimer.h index e3ec1c6..66e345d 100644 --- a/nci/jni/IntervalTimer.h +++ b/nci/jni/IntervalTimer.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: IntervalTimer.h -** -** Description: Asynchronous interval timer. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Asynchronous interval timer. + */ #include <time.h> diff --git a/nci/jni/JavaClassConstants.h b/nci/jni/JavaClassConstants.h index fb71757..64244c3 100644 --- a/nci/jni/JavaClassConstants.h +++ b/nci/jni/JavaClassConstants.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/Mutex.cpp b/nci/jni/Mutex.cpp index 6ccb87b..c0b12c0 100644 --- a/nci/jni/Mutex.cpp +++ b/nci/jni/Mutex.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: Mutex.cpp -** -** Description: Encapsulate a mutex for thread synchronization. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Encapsulate a mutex for thread synchronization. + */ #include "Mutex.h" #include "NfcJniUtil.h" diff --git a/nci/jni/Mutex.h b/nci/jni/Mutex.h index 1b500ee..45f42de 100644 --- a/nci/jni/Mutex.h +++ b/nci/jni/Mutex.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: Mutex.h -** -** Description: Encapsulate a mutex for thread synchronization. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Encapsulate a mutex for thread synchronization. + */ #pragma once #include <pthread.h> diff --git a/nci/jni/NativeLlcpConnectionlessSocket.cpp b/nci/jni/NativeLlcpConnectionlessSocket.cpp index a278844..ecc57e3 100644 --- a/nci/jni/NativeLlcpConnectionlessSocket.cpp +++ b/nci/jni/NativeLlcpConnectionlessSocket.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/NativeLlcpServiceSocket.cpp b/nci/jni/NativeLlcpServiceSocket.cpp index c4a655e..e1c2bb5 100644 --- a/nci/jni/NativeLlcpServiceSocket.cpp +++ b/nci/jni/NativeLlcpServiceSocket.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/NativeLlcpSocket.cpp b/nci/jni/NativeLlcpSocket.cpp index f5daff0..74a59b9 100644 --- a/nci/jni/NativeLlcpSocket.cpp +++ b/nci/jni/NativeLlcpSocket.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index fcab063..c3e76fa 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp index d4281ce..e7352c5 100755 --- a/nci/jni/NativeNfcTag.cpp +++ b/nci/jni/NativeNfcTag.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2011 Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -798,22 +797,6 @@ static jbyteArray nativeNfcTag_doTransceive (JNIEnv *e, jobject o, jbyteArray da } NfcTag& natTag = NfcTag::getInstance (); - if (natTag.mNumTechList >= 2 && natTag.mTechList[0] == TARGET_TYPE_ISO14443_3A) - { - if (natTag.mTechList[1] == TARGET_TYPE_MIFARE_CLASSIC) - { - // MifareClassic tag, we do not support transceive for this - if (statusTargetLost) - { - targetLost = e->GetIntArrayElements (statusTargetLost, 0); - if (targetLost) - *targetLost = 2; //causes NFC service to throw IOException - e->ReleaseIntArrayElements (statusTargetLost, targetLost, 0); - } - ALOGD ("%s: transceive not supported for MifareClassic tag", __FUNCTION__); - return NULL; - } - } // get input buffer and length from java call buf = (uint8_t *) e->GetByteArrayElements (data, NULL); diff --git a/nci/jni/NativeP2pDevice.cpp b/nci/jni/NativeP2pDevice.cpp index 216edb1..57f9dad 100644 --- a/nci/jni/NativeP2pDevice.cpp +++ b/nci/jni/NativeP2pDevice.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2011 Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/NativeSecureElement.cpp b/nci/jni/NativeSecureElement.cpp index 9fa27e3..8379162 100755 --- a/nci/jni/NativeSecureElement.cpp +++ b/nci/jni/NativeSecureElement.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/NfcJniUtil.cpp b/nci/jni/NfcJniUtil.cpp index 7619f30..9921cae 100755 --- a/nci/jni/NfcJniUtil.cpp +++ b/nci/jni/NfcJniUtil.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/NfcJniUtil.h b/nci/jni/NfcJniUtil.h index 90f2cab..8caa0b8 100755 --- a/nci/jni/NfcJniUtil.h +++ b/nci/jni/NfcJniUtil.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/nci/jni/NfcTag.cpp b/nci/jni/NfcTag.cpp index ed140f6..e996fdd 100755 --- a/nci/jni/NfcTag.cpp +++ b/nci/jni/NfcTag.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: NfcTag.cpp -** -** Description: Tag-reading, tag-writing operations. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Tag-reading, tag-writing operations. + */ #include "OverrideLog.h" #include "NfcTag.h" #include "JavaClassConstants.h" @@ -249,16 +258,15 @@ void NfcTag::discoverTechnologies (tNFA_ACTIVATED& activationData) rfDetail.rf_tech_param.param.pa.sel_rsp == 0x18 || rfDetail.rf_tech_param.param.pa.sel_rsp == 0x08) { - //Mifare Ultralight or mifare Classic - mNumTechList++; - mTechHandles [mNumTechList] = rfDetail.rf_disc_id; - mTechLibNfcTypes [mNumTechList] = rfDetail.protocol; - //save the stack's data structure for interpretation later - memcpy (&(mTechParams[mNumTechList]), &(rfDetail.rf_tech_param), sizeof(rfDetail.rf_tech_param)); if (rfDetail.rf_tech_param.param.pa.sel_rsp == 0) + { + mNumTechList++; + mTechHandles [mNumTechList] = rfDetail.rf_disc_id; + mTechLibNfcTypes [mNumTechList] = rfDetail.protocol; + //save the stack's data structure for interpretation later + memcpy (&(mTechParams[mNumTechList]), &(rfDetail.rf_tech_param), sizeof(rfDetail.rf_tech_param)); mTechList [mNumTechList] = TARGET_TYPE_MIFARE_UL; //is TagTechnology.MIFARE_ULTRALIGHT by Java API - else - mTechList [mNumTechList] = TARGET_TYPE_MIFARE_CLASSIC; //is TagTechnology.MIFARE_CLASSIC by Java API + } } } break; @@ -357,13 +365,14 @@ void NfcTag::discoverTechnologies (tNFA_DISC_RESULT& discoveryData) case NFC_PROTOCOL_T2T: mTechList [mNumTechList] = TARGET_TYPE_ISO14443_3A; //is TagTechnology.NFC_A by Java API //type-2 tags are identitical to Mifare Ultralight, so Ultralight is also discovered - mNumTechList++; - mTechHandles [mNumTechList] = discovery_ntf.rf_disc_id; - mTechLibNfcTypes [mNumTechList] = discovery_ntf.protocol; if (discovery_ntf.rf_tech_param.param.pa.sel_rsp == 0) + { + // mifare Ultralight + mNumTechList++; + mTechHandles [mNumTechList] = discovery_ntf.rf_disc_id; + mTechLibNfcTypes [mNumTechList] = discovery_ntf.protocol; mTechList [mNumTechList] = TARGET_TYPE_MIFARE_UL; //is TagTechnology.MIFARE_ULTRALIGHT by Java API - else - mTechList [mNumTechList] = TARGET_TYPE_MIFARE_CLASSIC; //is TagTechnology.MIFARE_CLASSIC by Java API + } //save the stack's data structure for interpretation later memcpy (&(mTechParams[mNumTechList]), &(discovery_ntf.rf_tech_param), sizeof(discovery_ntf.rf_tech_param)); diff --git a/nci/jni/NfcTag.h b/nci/jni/NfcTag.h index 276a649..76a6bb7 100755 --- a/nci/jni/NfcTag.h +++ b/nci/jni/NfcTag.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: NfcTag.h -** -** Description: Tag-reading, tag-writing operations. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Tag-reading, tag-writing operations. + */ #pragma once #include "SyncEvent.h" diff --git a/nci/jni/PeerToPeer.cpp b/nci/jni/PeerToPeer.cpp index 78132b8..13b5a60 100644 --- a/nci/jni/PeerToPeer.cpp +++ b/nci/jni/PeerToPeer.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: PeerToPeer.cpp -** -** Description: Communicate with a peer using NFC-DEP, LLCP, SNEP. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Communicate with a peer using NFC-DEP, LLCP, SNEP. + */ #include "OverrideLog.h" #include "PeerToPeer.h" #include "NfcJniUtil.h" diff --git a/nci/jni/PeerToPeer.h b/nci/jni/PeerToPeer.h index 951b69e..3e8ffec 100644 --- a/nci/jni/PeerToPeer.h +++ b/nci/jni/PeerToPeer.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: PeerToPeer.h -** -** Description: Communicate with a peer using NFC-DEP, LLCP, SNEP. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Communicate with a peer using NFC-DEP, LLCP, SNEP. + */ #pragma once #include <utils/RefBase.h> #include <utils/StrongPointer.h> diff --git a/nci/jni/PowerSwitch.cpp b/nci/jni/PowerSwitch.cpp index 11d1abe..6c1df71 100755 --- a/nci/jni/PowerSwitch.cpp +++ b/nci/jni/PowerSwitch.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: PowerSwitch.cpp -** -** Description: Adjust the controller's power states. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Adjust the controller's power states. + */ #include "OverrideLog.h" #include "PowerSwitch.h" #include "NfcJniUtil.h" diff --git a/nci/jni/PowerSwitch.h b/nci/jni/PowerSwitch.h index 2e6b604..5c939ee 100755 --- a/nci/jni/PowerSwitch.h +++ b/nci/jni/PowerSwitch.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: PowerSwitch.h -** -** Description: Adjust the controller's power states. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Adjust the controller's power states. + */ #pragma once #include "nfa_api.h" #include "SyncEvent.h" diff --git a/nci/jni/RouteDataSet.cpp b/nci/jni/RouteDataSet.cpp index 8985a90..1458776 100644 --- a/nci/jni/RouteDataSet.cpp +++ b/nci/jni/RouteDataSet.cpp @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: RouteDataSet.cpp -** -** Description: Import and export general routing data using a XML file. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Import and export general routing data using a XML file. + */ #include "OverrideLog.h" #include "RouteDataSet.h" #include "libxml/xmlmemory.h" diff --git a/nci/jni/RouteDataSet.h b/nci/jni/RouteDataSet.h index 63c88e4..d937dec 100644 --- a/nci/jni/RouteDataSet.h +++ b/nci/jni/RouteDataSet.h @@ -1,13 +1,22 @@ -/***************************************************************************** -** -** Name: RouteDataSet.h -** -** Description: Import and export general routing data using a XML file. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Import and export general routing data using a XML file. + */ #pragma once #include "NfcJniUtil.h" #include "nfa_api.h" diff --git a/nci/jni/SecureElement.cpp b/nci/jni/SecureElement.cpp index 5008998..b67ee66 100755 --- a/nci/jni/SecureElement.cpp +++ b/nci/jni/SecureElement.cpp @@ -1,14 +1,23 @@ -/***************************************************************************** -** -** Name: SecureElement.cpp -** -** Description: Communicate with secure elements that are attached -** to the NFC controller. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Communicate with secure elements that are attached to the NFC + * controller. + */ #include <semaphore.h> #include <errno.h> #include "OverrideLog.h" @@ -1915,7 +1924,7 @@ bool SecureElement::routeToDefault () if (mCurrentRouteSelection == DefaultRoute) { - ALOGE ("%s: already default route", fn); + ALOGD ("%s: already default route", fn); return true; } diff --git a/nci/jni/SecureElement.h b/nci/jni/SecureElement.h index bfa54cc..b887513 100755 --- a/nci/jni/SecureElement.h +++ b/nci/jni/SecureElement.h @@ -1,14 +1,23 @@ -/***************************************************************************** -** -** Name: SecureElement.h -** -** Description: Communicate with secure elements that are attached -** to the NFC controller. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Communicate with secure elements that are attached to the NFC + * controller. + */ #pragma once #include "SyncEvent.h" #include "DataQueue.h" diff --git a/nci/jni/SyncEvent.h b/nci/jni/SyncEvent.h index 146b3ce..5fd389e 100644 --- a/nci/jni/SyncEvent.h +++ b/nci/jni/SyncEvent.h @@ -1,14 +1,22 @@ -/***************************************************************************** -** -** Name: SyncEvent.h -** -** Description: Synchronize two or more threads using a condition variable -** and a mutex. -** -** Copyright (c) 2012, Broadcom Corp., All Rights Reserved. -** Proprietary and confidential. -** -*****************************************************************************/ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Synchronize two or more threads using a condition variable and a mutex. + */ #pragma once #include "CondVar.h" #include "Mutex.h" |