Update camsgparser.h to fix CA_SUPPORTED_EDR_MTU_SIZE definition
authorErich Keane <erich.keane@intel.com>
Fri, 1 May 2015 22:07:06 +0000 (15:07 -0700)
committerErich Keane <erich.keane@intel.com>
Fri, 1 May 2015 22:48:50 +0000 (22:48 +0000)
A patch was cherry picked adn the dependency on a previous commit
was not properly noticed.  This patch brings in the correct value
from review 738, so that the server's build will compile and be
correct.

Change-Id: I9b0a032677d1edb443ce3d86075b59d3ac7f87b8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/885
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
resource/csdk/connectivity/inc/camsgparser.h

index 92d8da7..11fcf33 100644 (file)
 
 #ifdef __TIZEN__
 /**
- * @var PLATFORM_IDENTIFIER_BIT
- * @brief Reserved bit to differentiating the platform. Currently not in use.
- */
+ *  * @var PLATFORM_IDENTIFIER_BIT
+ *   * @brief Reserved bit to differentiating the platform. Currently not in use.
+ *    */
 #define PLATFORM_IDENTIFIER_BIT 1
 
 /**
- * @var CA_SUPPORTED_BLE_MTU_SIZE
- * @brief The MTU supported from Tizen platform for LE adapter.
- */
+ *  * @var CA_SUPPORTED_EDR_MTU_SIZE
+ *   * @brief The MTU supported from Tizen platform for EDR adapter.
+ *    */
+#define CA_SUPPORTED_EDR_MTU_SIZE  512
+
+/**
+ *  * @var CA_SUPPORTED_BLE_MTU_SIZE
+ *   * @brief The MTU supported from Tizen platform for LE adapter.
+ *    */
 #define CA_SUPPORTED_BLE_MTU_SIZE  200
-#else // #endif __TIZEN__
 
+#elif __ANDROID__
 /**
- * @var PLATFORM_IDENTIFIER_BIT
- * @brief Reserved bit to differentiating the platform. Currently not in use.
- */
+ *  * @var PLATFORM_IDENTIFIER_BIT
+ *   * @brief Reserved bit to differentiating the platform. Currently not in use.
+ *    */
 #define PLATFORM_IDENTIFIER_BIT 0
 
 /**
- * @var CA_SUPPORTED_BLE_MTU_SIZE
- * @brief The MTU supported from Arduino platform for LE adapter.
- */
+ *  * @var CA_SUPPORTED_EDR_MTU_SIZE
+ *   * @brief The MTU supported from Android platform for EDR adapter.
+ *    */
+#define CA_SUPPORTED_EDR_MTU_SIZE  200
+
+/**
+ *  * @var CA_SUPPORTED_BLE_MTU_SIZE
+ *   * @brief The MTU supported from Android platform for LE adapter.
+ *    */
+#define CA_SUPPORTED_BLE_MTU_SIZE  20
+
+#elif __ARDUINO__
+/**
+ *  * @var PLATFORM_IDENTIFIER_BIT
+ *   * @brief Reserved bit to differentiating the platform. Currently not in use.
+ *    */
+#define PLATFORM_IDENTIFIER_BIT 0
+
+/**
+ *  * @var CA_SUPPORTED_EDR_MTU_SIZE
+ *   * @brief The MTU supported from Arduino platform for EDR adapter.
+ *    */
+#define CA_SUPPORTED_EDR_MTU_SIZE  200
+
+/**
+ *  * @var CA_SUPPORTED_BLE_MTU_SIZE
+ *   * @brief The MTU supported from Arduino platform for LE adapter.
+ *    */
+#define CA_SUPPORTED_BLE_MTU_SIZE  200
+
+#else //Other Platforms
+/**
+ *  * @var PLATFORM_IDENTIFIER_BIT
+ *   * @brief Reserved bit to differentiating the platform. Currently not in use.
+ *    */
+#define PLATFORM_IDENTIFIER_BIT 0
+
+/**
+ *  * @var CA_SUPPORTED_EDR_MTU_SIZE
+ *   * @brief The MTU supported for EDR adapter
+ *    */
+#define CA_SUPPORTED_EDR_MTU_SIZE  200
+
+/**
+ *  * @var CA_SUPPORTED_BLE_MTU_SIZE
+ *   * @brief The MTU supported for BLE adapter
+ *    */
 #define CA_SUPPORTED_BLE_MTU_SIZE  200
-#endif //#endif __ARDUINO__
 
+#endif
 /**
  * @var HEADER_VERSION
  * @brief Current Header version.