Merge "Add new feature to cneFeatureConfig"
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 @@
FMC = 2,
WQE = 3,
NSRM = 4,
+ ATP = 5,
};
#include <cutils/log.h>
@@ -97,6 +98,7 @@
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 @@
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 @@
CneFeatureConfig::CneFeatureConfig():bCne(false),
bFmc(false),
bWqe(false),
- bNsrm(false)
+ bNsrm(false),
+ bAtp(false)
{
}
@@ -125,6 +126,27 @@
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 @@
case WQE:
return bWqe;
break;
+ case ATP:
+ return bAtp;
+ break;
default:
CFC_LOGW("Feature %d not known, returning default", f);
return false;