NFC: Added NFC option.

- NFC option is added to mobile, wearable profile

Change-Id: I99c8a8c96ef7f0e23c7ec280c976a5812e27985c
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java
index b222320..a471763 100644 (file)
--- a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java
+++ b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java
@@ -324,10 +324,10 @@ public class Launcher implements ILauncher {
                        }
 
                        // for nfc
-//                     if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_NFC))) {
-//                             cmd.add("-device");
-//                             cmd.add("virtio-nfc-pci");
-//                     }
+                       if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_NFC))) {
+                               cmd.add("-device");
+                               cmd.add("virtio-nfc-pci");
+                       }
 
                        // for battery
                        cmd.add("-device");

diff --git a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
index 961beb1..af8af6e 100644 (file)
--- a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
+++ b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
@@ -66,6 +66,7 @@ public class Launcher implements ILauncher {
        // Option names in vm_config.xml
        // Add if need.
        public static final String OPT_DEVICE = "device";
+       public static final String OPT_NFC = "nfc";
        public static final String OPT_BATTERY = "battery";
        public static final String OPT_CAMERA = "camera";
        public static final String OPT_HWKEY = "hwkey";
@@ -315,12 +316,12 @@ public class Launcher implements ILauncher {
                        // for battery
                        cmd.add("-device");
                        cmd.add("virtio-power-pci");
-                       /*
-                       if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_BATTERY))) {
+
+                       // for nfc
+                       if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_NFC))) {
                                cmd.add("-device");
-                               cmd.add("virtio-power-pci");
+                               cmd.add("virtio-nfc-pci");
                        }
-                       */
 
                        // for sensor (accel, geo, gyro, light, proxi, haptic, pressure, ultra violet, heart rate meter)
                        OptionType sensor = property.getPropertyValue().getAdvancedOption(OPT_SENSOR);
@@ -428,11 +429,7 @@ public class Launcher implements ILauncher {
                        } else {
                                cmd.add("virtio-touchscreen-pci");
                        }
-/*
-                       // for nfc
-                       cmd.add("-device");
-                       cmd.add("virtio-nfc-pci");
-*/
+/
                } else {    // ARM part of cmd
                        cmd.add("-drive");
                        cmd.add("file=" + property.getConfiguration().getBaseInformation().getDiskImage().getCurrentDiskImage().getValue()+ ",id=virtio-blk,if=none");

diff --git a/template/w-x86-standard-template.xml b/template/w-x86-standard-template.xml
index 44073a8..9ac7fc4 100644 (file)
--- a/template/w-x86-standard-template.xml
+++ b/template/w-x86-standard-template.xml
@@ -61,6 +61,7 @@
                        <item type="checkbox" name="hrm" title="Heartbeat Rate"/>
                </item>
                <item type="checkLabel" name="device" title="Device">
+                       <item type="checkbox" name="nfc" title="NFC"/>
                        <item type="checkbox" name="camera" title="Camera"/>
 <!--                   <item type="checkbox" name="battery" title="Battery"/> -->
 <!--                   <item type="checkbox" name="swap" title="Swap Image"> -->

diff --git a/template/x86-standard-template.xml b/template/x86-standard-template.xml
index e650f2c..b49e87a 100644 (file)
--- a/template/x86-standard-template.xml
+++ b/template/x86-standard-template.xml
@@ -60,7 +60,7 @@
                        <item type="checkbox" name="hrm" title="Heartbeat Rate"/>
                </item>
                <item type="checkLabel" name="device" title="Device">
-       <!--            <item type="checkbox" name="nfc" title="NFC"/> -->
+                       <item type="checkbox" name="nfc" title="NFC"/>
                        <item type="checkbox" name="camera" title="Camera"/>
 <!--                   <item type="checkbox" name="battery" title="Battery"/> -->
 <!--                   <item type="checkbox" name="swap" title="Swap Image"> -->