diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2014-01-11 01:54:16 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-01-11 01:54:16 -0800 |
commit | 7e5347913df5234af7cdeafb89e1e0acdae34a20 (patch) | |
tree | b282825a92958a0d3c44313a9c44f4a4ed172287 | |
parent | 3a664fa51724a37727dc713d0d77bea70219ab18 (diff) | |
parent | 503a7119df32dd14321997cce30f4729922891d2 (diff) | |
download | android_external_connectivity-7e5347913df5234af7cdeafb89e1e0acdae34a20.tar.gz android_external_connectivity-7e5347913df5234af7cdeafb89e1e0acdae34a20.tar.bz2 android_external_connectivity-7e5347913df5234af7cdeafb89e1e0acdae34a20.zip |
Merge "Add new feature to cneFeatureConfig"cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56staging/cm-12.0-cafstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Istable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-12.0cm-11.0
-rw-r--r-- | cnefeatureconfig/inc/CneFeatureConfig.h | 7 | ||||
-rw-r--r-- | cnefeatureconfig/src/CneFeatureConfig.cpp | 29 |
2 files changed, 33 insertions, 3 deletions
diff --git a/cnefeatureconfig/inc/CneFeatureConfig.h b/cnefeatureconfig/inc/CneFeatureConfig.h index 6af8550..0b1ff6f 100644 --- a/cnefeatureconfig/inc/CneFeatureConfig.h +++ b/cnefeatureconfig/inc/CneFeatureConfig.h @@ -2,7 +2,7 @@ #define CneFeatureConfig_H /*========================================================================= - Copyright (c) 2012, The Linux Foundation. All rights reserved. + Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -39,6 +39,7 @@ enum Feature { FMC = 2, WQE = 3, NSRM = 4, + ATP = 5, }; #include <cutils/log.h> @@ -97,6 +98,7 @@ private: bool bFmc; bool bWqe; bool bNsrm; + bool bAtp; /* Reads the CNE_FEATURE_PROP to determine which features are currently enabled.*/ void readFeature(void); @@ -120,6 +122,9 @@ private: NSRM_CNE = 4, /* CNE feature is prerequisite */ FMC_NSRM_CNE = 5, /* CNE feature is prerequisite */ WQE_NSRM_CNE = 6, /* CNE feature is prerequisite */ + ATP_CNE = 7, /* CNE feature is prerequisite */ + ATP_NSRM_CNE = 8, /* CNE feature is prerequisite */ + ATP_NSRM_WQE_CNE = 9, /* CNE feature is prerequisite */ }; public: diff --git a/cnefeatureconfig/src/CneFeatureConfig.cpp b/cnefeatureconfig/src/CneFeatureConfig.cpp index 58cb797..ad0d460 100644 --- a/cnefeatureconfig/src/CneFeatureConfig.cpp +++ b/cnefeatureconfig/src/CneFeatureConfig.cpp @@ -1,5 +1,5 @@ /*============================================================================== -Copyright (c) 2012, The Linux Foundation. All rights reserved. +Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -66,7 +66,8 @@ bool isFeatureEnabled(int f) CneFeatureConfig::CneFeatureConfig():bCne(false), bFmc(false), bWqe(false), - bNsrm(false) + bNsrm(false), + bAtp(false) { } @@ -125,6 +126,27 @@ void CneFeatureConfig::readFeature(void) { bNsrm = true; break; } + case ATP_CNE: //7 --> CNE enabled. ATP mode. + { + bCne = true; + bAtp = true; + break; + } + case ATP_NSRM_CNE: //8 --> CNE enabled. ATP & NSRM mode. + { + bCne = true; + bAtp = true; + bNsrm = true; + break; + } + case ATP_NSRM_WQE_CNE: //9 --> CNE enabled. ATP WQE & NSRM mode. + { + bCne = true; + bAtp = true; + bNsrm = true; + bWqe = true; + break; + } default: CFC_LOGW("Unknown feature value in property. Features disabled by default"); } @@ -145,6 +167,9 @@ bool CneFeatureConfig::isEnabled(Feature f) { case WQE: return bWqe; break; + case ATP: + return bAtp; + break; default: CFC_LOGW("Feature %d not known, returning default", f); return false; |