From 30ba0d45780403cebb32137b12616cb33862a210 Mon Sep 17 00:00:00 2001 From: "zhaoyi46@huawei.com" Date: Thu, 5 May 2022 11:23:52 +0800 Subject: [PATCH] modify OH version and interface name Signed-off-by: zhaoyi46@huawei.com --- nfc/nfc_core/v1_0/INfcCallback.idl | 10 ++++----- nfc/nfc_core/v1_0/INfcInterface.idl | 34 ++++++++++++++--------------- nfc/nfc_core/v1_0/NfcTypes.idl | 8 +++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/nfc/nfc_core/v1_0/INfcCallback.idl b/nfc/nfc_core/v1_0/INfcCallback.idl index eec39e73..eeb0c67b 100644 --- a/nfc/nfc_core/v1_0/INfcCallback.idl +++ b/nfc/nfc_core/v1_0/INfcCallback.idl @@ -35,7 +35,7 @@ import ohos.hdi.nfc.nfc_core.v1_0.NfcTypes; /** * @brief Declares callbacks for reporting data and events from the nfc chip to the nfc stack. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ [callback] interface INfcCallback { @@ -44,9 +44,9 @@ import ohos.hdi.nfc.nfc_core.v1_0.NfcTypes; * * @param data Indicates the reporting data from nfc chip. * - * @since 4.0 + * @since 3.2 */ - onData([in] List data); + OnData([in] List data); /** * @brief Defines the function for reporting nfc events from the nfc chip. @@ -55,7 +55,7 @@ import ohos.hdi.nfc.nfc_core.v1_0.NfcTypes; * @param status Indicates the reporting nfc status defined in NfcStatus. For details, * see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 */ - onEvent([in] enum NfcEvent event, [in] enum NfcStatus status); + OnEvent([in] enum NfcEvent event, [in] enum NfcStatus status); } diff --git a/nfc/nfc_core/v1_0/INfcInterface.idl b/nfc/nfc_core/v1_0/INfcInterface.idl index 52efdd49..2b3804a1 100644 --- a/nfc/nfc_core/v1_0/INfcInterface.idl +++ b/nfc/nfc_core/v1_0/INfcInterface.idl @@ -37,7 +37,7 @@ import ohos.hdi.nfc.nfc_core.v1_0.INfcCallback; * disabling an nfc controller, initializing an nfc core, writing NCI data to an nfc driver, starting * configuration for RF discovery of nfc remote endpoints, sending nfc commands to an nfc driver for IO control. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ @@ -49,10 +49,10 @@ interface INfcInterface { * @return Returns 0 if the operation is succeed, otherwise marks the reason of failure. * For details, see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ - open([in] INfcCallback callbackObj, [out] enum NfcStatus status); + Open([in] INfcCallback callbackObj, [out] enum NfcStatus status); /** * @brief Configures the nfc chip after initializing the nfc core. @@ -61,10 +61,10 @@ interface INfcInterface { * @return Returns 0 if the operation is succeed, otherwise marks the reason of failure. * For details, see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ - coreInitialized([in] INfcCallback callbackObj, [out] enum NfcStatus status); + CoreInitialized([in] INfcCallback callbackObj, [out] enum NfcStatus status); /** * @brief Specifically configures the nfc chip before starting RF discovering. @@ -72,10 +72,10 @@ interface INfcInterface { * @return Returns 0 if the operation is succeed, otherwise marks the reason of failure. * For details, see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ - prediscover([out] enum NfcStatus status); + Prediscover([out] enum NfcStatus status); /** * @brief Writes NCI data to the nfc core. @@ -84,10 +84,10 @@ interface INfcInterface { * @return Returns 0 if the operation is succeed, otherwise marks the reason of failure. * For details, see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ - write([in] List data, [out] enum NfcStatus status); + Write([in] List data, [out] enum NfcStatus status); /** * @brief Sets the HDF to allow to send NCI data. @@ -95,10 +95,10 @@ interface INfcInterface { * @return Returns 0 if the operation is succeed, otherwise marks the reason of failure. * For details, see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ - controlGranted([out] enum NfcStatus status); + ControlGranted([out] enum NfcStatus status); /** * @brief Restarts the nfc controller according to each power cycle. @@ -106,10 +106,10 @@ interface INfcInterface { * @return Returns 0if the operation is succeed, otherwise marks the reason of failure. * For details, see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ - powerCycle([out] enum NfcStatus status); + PowerCycle([out] enum NfcStatus status); /** * @brief Disables the nfc controller and releases the resource. @@ -117,10 +117,10 @@ interface INfcInterface { * @return Returns 0 if the operation is succeed, otherwise marks the reason of failure. * For details, see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ - close([out] enum NfcStatus status); + Close([out] enum NfcStatus status); /** * @brief Sends I/O control commands and data from the nfc stack to HDI. @@ -130,8 +130,8 @@ interface INfcInterface { * @return Returns 0 if the operation is succeed, otherwise marks the reason of failure. * For details, see {@link NfcTypes}. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ - ioctl([in] enum NfcCommand cmd, [in] List data, [out] enum NfcStatus status); + Ioctl([in] enum NfcCommand cmd, [in] List data, [out] enum NfcStatus status); } diff --git a/nfc/nfc_core/v1_0/NfcTypes.idl b/nfc/nfc_core/v1_0/NfcTypes.idl index 94dd7d3c..bc1e3fd2 100644 --- a/nfc/nfc_core/v1_0/NfcTypes.idl +++ b/nfc/nfc_core/v1_0/NfcTypes.idl @@ -34,7 +34,7 @@ * unsubscribing from sensor data, enabling or disabling a sensor, setting the sensor data reporting mode, * and setting sensor options such as the accuracy and measurement range. * - * @since 4.0 + * @since 3.2 * @version 1.0 */ @@ -43,7 +43,7 @@ package ohos.hdi.nfc.nfc_core.v1_0; /** * @brief Enumerates return values of the Nfc Event. * - * @since 4.0 + * @since 3.2 */ enum NfcEvent { OPEN_CPLT = 0, @@ -59,7 +59,7 @@ enum NfcEvent { /** * @brief Enumerates return values of the Nfc status. * - * @since 4.0 + * @since 3.2 */ enum NfcStatus { OK = 0, @@ -72,7 +72,7 @@ enum NfcStatus { /** * @brief Enumerates return values of the Nfc command. * - * @since 4.0 + * @since 3.2 */ enum NfcCommand { CMD_INVALID = 0, -- Gitee