Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cosmetic changes from review of last PR

Browse Source
This commit is contained in:
Gregory Nutt
2016-10-14 17:39:21 -06:00
parent f2ebb6d2a0
commit 5b46ce4889
5 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/kinetis/kinetis_uid.c
+15 -13
View File
@@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* arch/arm/src/kinetis/kinetis_uid.c * arch/arm/src/kinetis/kinetis_uid.c
* *
* Copyright (C) 2016 Neil Hancock. All rights reserved. * Copyright (C) 2016 Neil Hancock. All rights reserved.
@@ -30,11 +30,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@@ -44,25 +44,27 @@
#ifdef CONFIG_BOARDCTL_UNIQUEID #ifdef CONFIG_BOARDCTL_UNIQUEID
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/****************************************************************************
* Name: kinetis_get_uniqueid
****************************************************************************/
void kinetis_get_uniqueid(uint8_t *uniqueid) void kinetis_get_uniqueid(uint8_t *uniqueid)
{ {
int i;
uint32_t *unique_u32; uint32_t *unique_u32;
int i;
unique_u32 = (uint32_t *)uniqueid; unique_u32 = (uint32_t *)uniqueid;
/* /* Copy into buffer LS first, which in the Kinetis is the highest memory */
* Copy into buffer LS first, which in the Kinetis is the highest memory
*/
for (i = 0; i < (KINETIS_UID_SIZE/sizeof(uint32_t)); i++) for (i = 0; i < (KINETIS_UID_SIZE / sizeof(uint32_t)); i++)
{ {
unique_u32[i] = *((uint32_t*)(KINETIS_SIM_UIDL)-i); unique_u32[i] = *((uint32_t*)(KINETIS_SIM_UIDL) - i);
} }
} }
#endif /* CONFIG_BOARDCTL_UNIQUEID */ #endif /* CONFIG_BOARDCTL_UNIQUEID */
arch/arm/src/kinetis/kinetis_uid.h
+14 -7
View File
@@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* arch/arm/src/kinetis/kinetis_uid.h * arch/arm/src/kinetis/kinetis_uid.h
* *
* Copyright (C) 2016 Neil Hancock. All rights reserved. * Copyright (C) 2016 Neil Hancock. All rights reserved.
@@ -30,20 +30,27 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_UID_H #ifndef __ARCH_ARM_SRC_KINETIS_UID_H
#define __ARCH_ARM_SRC_KINETIS_UID_H #define __ARCH_ARM_SRC_KINETIS_UID_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <stdint.h> #include <stdint.h>
/************************************************************************************ /****************************************************************************
* Public Function Prototypes * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
#define KINETIS_UID_SIZE 16 #define KINETIS_UID_SIZE 16
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
void kinetis_get_uniqueid(uint8_t *uniqueid); void kinetis_get_uniqueid(uint8_t *uniqueid);
#endif /* __ARCH_ARM_SRC_KINETIS_UID_H */ #endif /* __ARCH_ARM_SRC_KINETIS_UID_H */
configs/freedom-k64f/src/Makefile
+1
View File
@@ -76,4 +76,5 @@ endif
ifeq ($(CONFIG_BOARDCTL_UNIQUEID),y) ifeq ($(CONFIG_BOARDCTL_UNIQUEID),y)
CSRCS += k64_uid.c CSRCS += k64_uid.c
endif endif
include $(TOPDIR)/configs/Board.mk include $(TOPDIR)/configs/Board.mk
configs/freedom-k64f/src/k64_uid.c
+14 -10
View File
@@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* configs/freedom-k64/src/kinetis_uid.c * configs/freedom-k64/src/kinetis_uid.c
* *
* Copyright (C) 2016 Neil Hancock. All rights reserved. * Copyright (C) 2016 Neil Hancock. All rights reserved.
@@ -30,11 +30,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@@ -45,19 +45,23 @@
#include <nuttx/board.h> #include <nuttx/board.h>
/************************************************************************************ #if defined(CONFIG_BOARDCTL_UNIQUEID)
/****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
#ifndef OK #ifndef OK
# define OK 0 # define OK 0
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
#if defined(CONFIG_BOARDCTL_UNIQUEID) /****************************************************************************
* Name: board_uniqueid
****************************************************************************/
int board_uniqueid(FAR uint8_t *uniqueid) int board_uniqueid(FAR uint8_t *uniqueid)
{ {
@@ -70,4 +74,4 @@ int board_uniqueid(FAR uint8_t *uniqueid)
return OK; return OK;
} }
#endif #endif /* CONFIG_BOARDCTL_UNIQUEID */
configs/freedom-k64f/src/k64_userleds.c
+2 -1
View File
@@ -107,4 +107,5 @@ void board_userled_all(uint8_t ledset)
kinetis_gpiowrite(GPIO_LED_G, (ledset & BOARD_LED_G_BIT) == 0); kinetis_gpiowrite(GPIO_LED_G, (ledset & BOARD_LED_G_BIT) == 0);
kinetis_gpiowrite(GPIO_LED_B, (ledset & BOARD_LED_B_BIT) == 0); kinetis_gpiowrite(GPIO_LED_B, (ledset & BOARD_LED_B_BIT) == 0);
} }
#endif
#endif /* CONFIG_ARCH_LEDS */