Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove product-specific fields from device info

The following fields have been removed from the nyx_device_info interface
as they should be reconfigurable without requiring a different build:

  NYX_DEVICE_INFO_CARRIER
  NYX_DEVICE_INFO_DM_*
  NYX_DEVICE_INFO_PART_NUMBER
  NYX_DEVICE_INFO_PRODUCT_SKU
  NYX_DEVICE_INFO_PRODUCTION_NAME
  NYX_DEVICE_INFO_PRODUCT_NAME_SHORT
  NYX_DEVICE_INFO_PRODUCT_NAME_BRANDED

Open-webOS-DCO-1.0-Signed-off-by: Sapna Todwal <sapna.todwal@palm.com>
Open-webOS-DCO-1.0-Signed-off-by: Keith Derrick <keith.derrick@palm.com>

Change-Id: I75ea4da92fe816daae3c2a0e5b11b21b197670c5
  • Loading branch information...
commit 03e2e39deddf6d8be15b6e25f8fdc887b977d2b3 1 parent 8fb0dcf
Keith Derrick authored
View
11 include/public/nyx/client/nyx_device_info.h
@@ -60,11 +60,16 @@ NYX_API_EXPORT nyx_error_t nyx_device_info_get_hardware_id(nyx_device_handle_t h
*
* @param[in] handle - handle to the device
* @param[in] type - type of information to retrieve
- * @param[out] dest - location into which the string information is copied; it will always be NULL-terminated
+ *
+ * @param[out] dest - location into which the string information is copied;
+ * it will always be NUL-terminated
+ *
* @param[in] dest_len - length of destination string (non-zero)
*
- * @return error code (NYX_ERROR_NONE if operation is successful);
- * returns NYX_ERROR_VALUE_OUT_OF_RANGE if 'dest_len' is too small.
+ * @return error code
+ * - NYX_ERROR_NONE if operation is successful
+ * - NYX_ERROR_VALUE_OUT_OF_RANGE if 'dest_len' is too small to hold the
+ * return value, including a terminating NUL.
*/
NYX_API_EXPORT nyx_error_t nyx_device_info_get_info(nyx_device_handle_t handle, nyx_device_info_type_t type, char* dest, size_t dest_len);
View
17 include/public/nyx/common/nyx_device_info_common.h
@@ -42,30 +42,27 @@ typedef enum {
NYX_DEVICE_INFO_BATT_RSP,
NYX_DEVICE_INFO_BOARD_TYPE,
NYX_DEVICE_INFO_BT_ADDR,
- NYX_DEVICE_INFO_CARRIER,
+
+ /**
+ * The value of WEBOS_TARGET_MACHINE for the device, as provided by
+ * cmake-modules-webos.
+ */
NYX_DEVICE_INFO_DEVICE_NAME,
- NYX_DEVICE_INFO_DM_CL_AUTH_NAME,
- NYX_DEVICE_INFO_DM_CL_AUTH_PW,
- NYX_DEVICE_INFO_DM_CL_NONCE,
- NYX_DEVICE_INFO_DM_SETS,
- NYX_DEVICE_INFO_DM_SVR_AUTH_PW,
- NYX_DEVICE_INFO_DM_SVR_NONCE,
+
NYX_DEVICE_INFO_HARDWARE_REVISION,
NYX_DEVICE_INFO_INSTALLER,
NYX_DEVICE_INFO_KEYBOARD_TYPE,
NYX_DEVICE_INFO_LAST_RESET_TYPE,
NYX_DEVICE_INFO_MODEM_PRESENT,
NYX_DEVICE_INFO_NDUID,
- NYX_DEVICE_INFO_PART_NUMBER,
NYX_DEVICE_INFO_PRODUCT_ID,
- NYX_DEVICE_INFO_PRODUCT_SKU,
- NYX_DEVICE_INFO_PRODUCTION_NAME,
NYX_DEVICE_INFO_RADIO_TYPE,
NYX_DEVICE_INFO_RAM_SIZE,
NYX_DEVICE_INFO_SERIAL_NUMBER,
NYX_DEVICE_INFO_STORAGE_FREE,
NYX_DEVICE_INFO_STORAGE_SIZE,
NYX_DEVICE_INFO_WIFI_ADDR,
+
NYX_DEVICE_INFO_END
} nyx_device_info_type_t;
View
3  include/public/nyx/module/nyx_device_device_info_internal.h
@@ -37,7 +37,8 @@ typedef struct {
char* nduid_str;
char* serial_number;
char* hardware_revision;
- char* product_sku;
+ char* ram_size_str;
+ char* storage_size_str;
} nyx_device_info_device_t;
#endif /* _NYX_DEVICE_DEVICE_INFO_INTERNAL_H_ */
Please sign in to comment.
Something went wrong with that request. Please try again.