CpuUid: renamed all references in code to device uid

Author: MikeDK

drivers/DeviceUid.cpp

@@ -14,48 +14,48 @@
  * limitations under the License.
  */
 
-#include "hal/cpu_uid_api.h"
+#include "hal/device_uid_api.h"
 #include "platform/mbed_assert.h"
 #include "platform/CriticalSectionLock.h"
-#include "drivers/CpuUid.h"
+#include "drivers/DeviceUid.h"
 
-#if DEVICE_CPUUID
+#if DEVICE_DEVICEUID
 
 namespace mbed {
 
-uint8_t CpuUid::_uidbuf[MBED_CPU_UID_SIZE] = {0};
-uint8_t* CpuUid::_uidptr = NULL;
-char CpuUid::_strbuf[CPU_UID_STRING_BUFFER_SIZE] = {'\0'};
-char* CpuUid::_strptr = NULL;
-#ifndef MBED_CPU_UID_STR_SIZE_MAX
-const char CpuUid::_hexChars[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+uint8_t DeviceUid::_uidbuf[MBED_DEVICEUID_SIZE] = {0};
+uint8_t* DeviceUid::_uidptr = NULL;
+char DeviceUid::_strbuf[DEVICEUID_STRING_BUFFER_SIZE] = {'\0'};
+char* DeviceUid::_strptr = NULL;
+#ifndef MBED_DEVICEUID_STR_SIZE_MAX
+const char DeviceUid::_hexChars[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 #endif
 
-CpuUid::CpuUid()
+DeviceUid::DeviceUid()
 {
     populate_uid_buf();
 }
 
-void CpuUid::populate_uid_buf()
+void DeviceUid::populate_uid_buf()
 {
     if (_uidptr == NULL) {
         CriticalSectionLock lock;
-        cpu_uid_get_uid(_uidbuf);
+        device_uid_get_uid(_uidbuf);
         _uidptr = _uidbuf;
     }
 }
 
-void CpuUid::populate_str_buf()
+void DeviceUid::populate_str_buf()
 {
     if (_strptr == NULL) {
         CriticalSectionLock lock;
-#ifdef MBED_CPU_UID_STR_SIZE_MAX
-        cpu_uid_get_str(_strbuf);
+#ifdef MBED_DEVICEUID_STR_SIZE_MAX
+        device_uid_get_str(_strbuf);
         _strptr = _strbuf;
 #else
         int pos = 0;
         populate_uid_buf();
-        for (int i = 0; i < MBED_CPU_UID_SIZE; ++i) {
+        for (int i = 0; i < MBED_DEVICEUID_SIZE; ++i) {
             _strbuf[pos++] = _hexChars[_uidptr[i] >> 4];
             _strbuf[pos++] = _hexChars[_uidptr[i] & 0x0F];
         }

drivers/DeviceUid.h

@@ -13,43 +13,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef MBED_CPUUID_H
-#define MBED_CPUUID_H
+#ifndef MBED_DEVICEUID_H
+#define MBED_DEVICEUID_H
 
 #include "platform/platform.h"
 
-#if defined(DEVICE_CPUUID) || defined(DOXYGEN_ONLY)
+#if defined(DEVICE_DEVICEUID) || defined(DOXYGEN_ONLY)
 
-#ifdef MBED_CPU_UID_STR_SIZE_MAX
-#define CPU_UID_STRING_BUFFER_SIZE  MBED_CPU_UID_STR_SIZE_MAX
+#ifdef MBED_DEVICEUID_STR_SIZE_MAX
+#define DEVICEUID_STRING_BUFFER_SIZE  MBED_DEVICEUID_STR_SIZE_MAX
 #else
-#define CPU_UID_STRING_BUFFER_SIZE (MBED_CPU_UID_SIZE * 2 + 1)
+#define DEVICEUID_STRING_BUFFER_SIZE (MBED_DEVICEUID_SIZE * 2 + 1)
 #endif
 
 namespace mbed {
 /** \addtogroup drivers */
 
-/** CPU UID reader class
+/** DEVICE UID reader class
  *
  * @note Synchronization level: Interrupt safe
  * @ingroup drivers
  */
-class CpuUid {
+class DeviceUid {
 public:
-    /** CpuUid constructor
+    /** DeviceUid constructor
      */
-    CpuUid();
+    DeviceUid();
 
-    /** Get size of CPU UID in bytes
+    /** Get size of DEVICE UID in bytes
      * 
-     * @return Size of device's CPU UID in bytes
+     * @return Size of device's DEVICE UID in bytes
      */
     int size()
     {
-        return MBED_CPU_UID_SIZE;
+        return MBED_DEVICEUID_SIZE;
     }
 
-    /** Get CPU UID data pointer
+    /** Get DEVICE UID data pointer
      * 
      * @return Pointer to uid data buffer
      */
@@ -59,13 +59,13 @@ class CpuUid {
         return _uidptr;
     }
 
-    /** Get CPU UID vendor string
+    /** Get DEVICE UID vendor string
      * 
      * @return Pointer to zero terminated uid vendor string
      * 
      * @note
-     * If vendor did not define MBED_CPU_UID_STR_SIZE_MAX, CpuUid driver will
-     * assume the HAL interface function cpu_uid_get_str() is not implemented
+     * If vendor did not define MBED_DEVICEUID_STR_SIZE_MAX, DeviceUid driver will
+     * assume the HAL interface function device_uid_get_str() is not implemented
      * on the target, and instead the driver will construct just an ASCII
      * string out of the uid byte buffer contents.
      * 
@@ -94,13 +94,13 @@ class CpuUid {
 
     /** Overload operator for array subscript
      * 
-     * @param x CPU UID Byte index
+     * @param x DEVICE UID Byte index
      * 
      * @return Byte located at index x
      */
     uint8_t operator[](int x)
     {
-        if (x >= 0 && x < MBED_CPU_UID_SIZE) {
+        if (x >= 0 && x < MBED_DEVICEUID_SIZE) {
             populate_uid_buf();
             return _uidptr[x];
         }
@@ -112,11 +112,11 @@ class CpuUid {
     void populate_uid_buf();
     void populate_str_buf();
 
-    static uint8_t _uidbuf[MBED_CPU_UID_SIZE];
+    static uint8_t _uidbuf[MBED_DEVICEUID_SIZE];
     static uint8_t* _uidptr;
-    static char _strbuf[CPU_UID_STRING_BUFFER_SIZE];
+    static char _strbuf[DEVICEUID_STRING_BUFFER_SIZE];
     static char* _strptr;
-#ifndef MBED_CPU_UID_STR_SIZE_MAX
+#ifndef MBED_DEVICEUID_STR_SIZE_MAX
     static const char _hexChars[16];
 #endif
 };

hal/device_uid_api.h

@@ -15,50 +15,50 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef MBED_CPU_UID_API_H
-#define MBED_CPU_UID_API_H
+#ifndef MBED_DEVICE_UID_API_H
+#define MBED_DEVICE_UID_API_H
 
 #include <stddef.h>
 #include "device.h"
 
-#if DEVICE_CPUUID
+#if DEVICE_DEVICEUID
 
-#ifndef MBED_CPU_UID_SIZE
-#error "CPU UID Vendor implementation must define macro MBED_CPU_UID_SIZE with the uid size in bytes!"
+#ifndef MBED_DEVICEUID_SIZE
+#error "DEVICE UID Vendor implementation must define macro MBED_DEVICEUID_SIZE with the uid size in bytes!"
 #endif
 
-#ifndef MBED_CPU_UID_STR_SIZE_MAX
-#warning "CPU UID max vendor string length not defined! cpu_uid_get_str() HAL interface is disabled!"
+#ifndef MBED_DEVICEUID_STR_SIZE_MAX
+#warning "DEVICE UID max vendor string length not defined! device_uid_get_str() HAL interface is disabled!"
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * \defgroup hal_cpu_uid CPUUID hal functions
+ * \defgroup hal_device_uid DEVICEUID hal functions
  * @{
  */
 
-/** Get CPU UID data bytes
+/** Get DEVICE UID data bytes
  * 
- * @param uid Byte buffer for uid. Must be of size MBED_CPU_UID_SIZE
+ * @param uid Byte buffer for uid. Must be of size MBED_DEVICEUID_SIZE
  *
  */
-void cpu_uid_get_uid(uint8_t *uid);
+void device_uid_get_uid(uint8_t *uid);
 
-#ifdef MBED_CPU_UID_STR_SIZE_MAX
-/** Get UID vendor string
+#ifdef MBED_DEVICEUID_STR_SIZE_MAX
+/** Get DEVICE UID vendor string
  * 
- * @param str Character buffer for vendor specific UID string. Must be of size MBED_CPU_UID_STR_SIZE_MAX
+ * @param str Character buffer for vendor specific UID string. Must be of size MBED_DEVICEUID_STR_SIZE_MAX
  * 
  * @note
  * Implementing this function on target side can be used to provide a vendor specific
  * string describing the contents of the UID.
- * The string length including terminating zero character must not exceed MBED_CPU_UID_STR_SIZE_MAX bytes!
+ * The string length including terminating zero character must not exceed MBED_DEVICEUID_STR_SIZE_MAX bytes!
  * 
  */
-void cpu_uid_get_str(char *str);
+void device_uid_get_str(char *str);
 #endif
 
 /**@}*/

mbed.h

@@ -70,7 +70,7 @@
 #include "drivers/RawSerial.h"
 #include "drivers/UARTSerial.h"
 #include "drivers/FlashIAP.h"
-#include "drivers/CpuUid.h"
+#include "drivers/DeviceUid.h"
 
 // mbed Internal components
 #include "drivers/Timer.h"

targets/TARGET_NORDIC/TARGET_NRF5/device_uid_api.c

@@ -38,14 +38,14 @@
 
 #include "device.h"
 
-#if DEVICE_CPUUID
+#if DEVICE_DEVICEUID
 
 #include "nrf.h"
-#include "cpu_uid_api.h"
+#include "device_uid_api.h"
 
 #define UID_WORDS       2
 
-void cpu_uid_get_uid(uint8_t *uid)
+void device_uid_get_uid(uint8_t *uid)
 {
     int pos = 0;
 

targets/TARGET_STM/device_uid_api.c

@@ -29,7 +29,7 @@
  */
 #include "device.h"
 
-#if DEVICE_CPUUID
+#if DEVICE_DEVICEUID
 
 #include <string.h>
 #if defined(TARGET_STM32F0)
@@ -53,15 +53,15 @@
 #else
 #error "Unsupported STM32 device!"
 #endif
-#include "cpu_uid_api.h"
+#include "device_uid_api.h"
 
 #define UID_WORDS       3
 
-#ifdef MBED_CPU_UID_STR_SIZE_MAX
+#ifdef MBED_DEVICEUID_STR_SIZE_MAX
 static int cpu_uid_itoa(int value, char *sp, int radix);
 #endif
 
-void cpu_uid_get_uid(uint8_t *uid)
+void device_uid_get_uid(uint8_t *uid)
 {
     uint32_t uid_buf[UID_WORDS];
     int pos = 0;
@@ -77,8 +77,8 @@ void cpu_uid_get_uid(uint8_t *uid)
     }
 }
 
-#ifdef MBED_CPU_UID_STR_SIZE_MAX
-void cpu_uid_get_str(char *str)
+#ifdef MBED_DEVICEUID_STR_SIZE_MAX
+void device_uid_get_str(char *str)
 {
     char buffer[16];
     char lot_number[8];

targets/TARGET_Silicon_Labs/TARGET_EFM32/device_uid_api.c

@@ -1,5 +1,5 @@
 /***************************************************************************//**
- * @file cpu_uid_api.c
+ * @file device_uid_api.c
  *******************************************************************************
  * @section License
  * <b>(C) Copyright 2017 Silicon Labs, http://www.silabs.com</b>
@@ -23,18 +23,18 @@
 
 #include "device.h"
 
-#if DEVICE_CPUUID
+#if DEVICE_DEVICEUID
 
 #include "em_system.h"
-#include "cpu_uid_api.h"
+#include "device_uid_api.h"
 
 
-void cpu_uid_get_uid(uint8_t *uid)
+void device_uid_get_uid(uint8_t *uid)
 {
     int pos = 0;
     uint64_t tempuid = SYSTEM_GetUnique();
 
-    for (int i = (MBED_CPU_UID_SIZE - 1); i >= 0; --i) {
+    for (int i = (MBED_DEVICEUID_SIZE - 1); i >= 0; --i) {
         uid[pos++] = (uint8_t)((tempuid >> (i*8)) & 0xFF);
     }
 }