From a829a039492b56fb0f7d14e0134067cb77601ba3 Mon Sep 17 00:00:00 2001
From: Yoshi Huang <allstars.chh@mozilla.com>
Date: Wed, 15 Oct 2014 15:47:42 +0800
Subject: [PATCH] Bug 1073421 - B2G NFC: remove NDEF_Formatable and
 NDEF_Writable. r=smaug, dimi

---
 dom/nfc/gonk/NfcGonkMessage.h |  2 +-
 dom/nfc/nsNfc.js              | 16 ----------------
 dom/webidl/MozNFCTag.webidl   |  2 --
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/dom/nfc/gonk/NfcGonkMessage.h b/dom/nfc/gonk/NfcGonkMessage.h
index 1d1ce597989b..395c38d2ff40 100644
--- a/dom/nfc/gonk/NfcGonkMessage.h
+++ b/dom/nfc/gonk/NfcGonkMessage.h
@@ -8,7 +8,7 @@
 namespace mozilla {
 
 #define NFCD_MAJOR_VERSION 1
-#define NFCD_MINOR_VERSION 11
+#define NFCD_MINOR_VERSION 12
 
 enum NfcRequest {
   ConfigReq = 0,
diff --git a/dom/nfc/nsNfc.js b/dom/nfc/nsNfc.js
index 38d871ee6ed2..19bb05ef56a1 100644
--- a/dom/nfc/nsNfc.js
+++ b/dom/nfc/nsNfc.js
@@ -31,20 +31,6 @@ function MozNFCTag() {
   this._nfcContentHelper = Cc["@mozilla.org/nfc/content-helper;1"]
                              .getService(Ci.nsINfcContentHelper);
   this.session = null;
-
-  // Map WebIDL declared enum map names to integer
-  this._techTypesMap = [];
-  this._techTypesMap['NFC_A'] = 0;
-  this._techTypesMap['NFC_B'] = 1;
-  this._techTypesMap['NFC_ISO_DEP'] = 2;
-  this._techTypesMap['NFC_F'] = 3;
-  this._techTypesMap['NFC_V'] = 4;
-  this._techTypesMap['NDEF'] = 5;
-  this._techTypesMap['NDEF_FORMATABLE'] = 6;
-  this._techTypesMap['MIFARE_CLASSIC'] = 7;
-  this._techTypesMap['MIFARE_ULTRALIGHT'] = 8;
-  this._techTypesMap['NFC_BARCODE'] = 9;
-  this._techTypesMap['P2P'] = 10;
 }
 MozNFCTag.prototype = {
   _nfcContentHelper: null,
@@ -55,8 +41,6 @@ MozNFCTag.prototype = {
     this.session = aSessionToken;
   },
 
-  _techTypesMap: null,
-
   // NFCTag interface:
   readNDEF: function readNDEF() {
     return this._nfcContentHelper.readNDEF(this._window, this.session);
diff --git a/dom/webidl/MozNFCTag.webidl b/dom/webidl/MozNFCTag.webidl
index dbee9dd17d4e..319a98cb2c6e 100644
--- a/dom/webidl/MozNFCTag.webidl
+++ b/dom/webidl/MozNFCTag.webidl
@@ -10,8 +10,6 @@
 
 enum NFCTechType {
   "NDEF",
-  "NDEF_WRITABLE",
-  "NDEF_FORMATABLE",
   "P2P",
   "NFC_A",
   "NFC_B",