You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/02/20 14:41:23 UTC
[incubator-nuttx] branch master updated: Fix coding standard issues
in PR328
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new ac8e9de Fix coding standard issues in PR328
ac8e9de is described below
commit ac8e9ded594751d1e83a53205cdb4bf4919a0ee4
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Thu Feb 20 08:40:17 2020 -0600
Fix coding standard issues in PR328
Run all .c and .h files modified by PR328 through tools/nxstyle and correct all of the complaints from that tool.
---
arch/arm/src/samv7/sam_eefc.c | 13 ++++++++-----
arch/arm/src/samv7/sam_eefc.h | 2 +-
arch/arm/src/samv7/sam_progmem.c | 1 +
arch/arm/src/samv7/sam_uid.c | 3 +--
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/arch/arm/src/samv7/sam_eefc.c b/arch/arm/src/samv7/sam_eefc.c
index 566234a..a9f86ad 100755
--- a/arch/arm/src/samv7/sam_eefc.c
+++ b/arch/arm/src/samv7/sam_eefc.c
@@ -52,6 +52,7 @@
* The page size is 512 bytes. However, the smallest thing that can be
* erased is four pages. We will refer to this as a "cluster".
*/
+
# define SAMV7_LOCK_REGION_SHIFT (13) /* 2**13 = 8*KB = 16 pages */
#else
# error FLASH geometry for this SAMV7 chip not known
@@ -157,10 +158,10 @@ __ramfunc__ int sam_eefc_command(uint32_t cmd, uint32_t arg)
****************************************************************************/
__ramfunc__ int sam_eefc_readsequence(uint32_t start_cmd, uint32_t stop_cmd,
- uint32_t* buffer, size_t bufsize)
+ uint32_t *buffer, size_t bufsize)
{
volatile uint32_t regval;
- uint32_t* flash_data;
+ uint32_t *flash_data;
size_t read_count;
if (buffer == NULL)
@@ -178,7 +179,8 @@ __ramfunc__ int sam_eefc_readsequence(uint32_t start_cmd, uint32_t stop_cmd,
/* Send the Start Read command */
- regval = EEFC_FCR_FCMD(start_cmd) | EEFC_FCR_FARG(FCMD_GETD)| EEFC_FCR_FKEY_PASSWD;
+ regval = EEFC_FCR_FCMD(start_cmd) | EEFC_FCR_FARG(FCMD_GETD) |
+ EEFC_FCR_FKEY_PASSWD;
putreg32(regval, SAM_EEFC_FCR);
/* Wait for the FRDY bit in the Flash Programming Status Register
@@ -202,7 +204,8 @@ __ramfunc__ int sam_eefc_readsequence(uint32_t start_cmd, uint32_t stop_cmd,
/* Send the Stop Read command */
- regval = EEFC_FCR_FCMD(stop_cmd) | EEFC_FCR_FARG(FCMD_GETD) | EEFC_FCR_FKEY_PASSWD;
+ regval = EEFC_FCR_FCMD(stop_cmd) | EEFC_FCR_FARG(FCMD_GETD) |
+ EEFC_FCR_FKEY_PASSWD;
putreg32(regval, SAM_EEFC_FCR);
/* Wait for the FRDY bit in the Flash Programming Status Register
@@ -238,7 +241,7 @@ __ramfunc__ int sam_eefc_readsequence(uint32_t start_cmd, uint32_t stop_cmd,
void sam_eefc_initaccess(uint32_t access_mode, uint32_t wait_status)
{
- sam_eefc_writefmr(access_mode | EEFC_FMR_FWS(wait_status));
+ sam_eefc_writefmr(access_mode | EEFC_FMR_FWS(wait_status));
}
/****************************************************************************
diff --git a/arch/arm/src/samv7/sam_eefc.h b/arch/arm/src/samv7/sam_eefc.h
index b7e8643..3af2299 100755
--- a/arch/arm/src/samv7/sam_eefc.h
+++ b/arch/arm/src/samv7/sam_eefc.h
@@ -96,7 +96,7 @@ __ramfunc__ int sam_eefc_command(uint32_t cmd, uint32_t arg);
****************************************************************************/
__ramfunc__ int sam_eefc_readsequence(uint32_t start_cmd, uint32_t stop_cmd,
- uint32_t* buffer, size_t bufsize);
+ uint32_t *buffer, size_t bufsize);
/****************************************************************************
* Name: sam_eefc_initaccess
diff --git a/arch/arm/src/samv7/sam_progmem.c b/arch/arm/src/samv7/sam_progmem.c
index 1f3efff..3705db4 100644
--- a/arch/arm/src/samv7/sam_progmem.c
+++ b/arch/arm/src/samv7/sam_progmem.c
@@ -58,6 +58,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* Configuration ************************************************************/
#ifndef CONFIG_SAMV7_PROGMEM_NSECTORS
diff --git a/arch/arm/src/samv7/sam_uid.c b/arch/arm/src/samv7/sam_uid.c
index de1c1ee..341b56e 100755
--- a/arch/arm/src/samv7/sam_uid.c
+++ b/arch/arm/src/samv7/sam_uid.c
@@ -27,11 +27,10 @@
#include "sam_eefc.h"
#include "sam_uid.h"
-
#ifdef CONFIG_BOARDCTL_UNIQUEID
/****************************************************************************
- * Pre-processor Definitions
+ * Public Functions
****************************************************************************/
/****************************************************************************