OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Gregory Nutt 2020-02-20 08:40:17 -06:00
parent ce43f21b33
commit ac8e9ded59
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/src/samv7/sam_eefc.c
View File

@ -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));
}
/****************************************************************************

2
arch/arm/src/samv7/sam_eefc.h
View File

@ -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

1
arch/arm/src/samv7/sam_progmem.c
View File

@ -58,6 +58,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_SAMV7_PROGMEM_NSECTORS

3
arch/arm/src/samv7/sam_uid.c
View File

@ -27,11 +27,10 @@
#include "sam_eefc.h"
#include "sam_uid.h"
#ifdef CONFIG_BOARDCTL_UNIQUEID
/****************************************************************************
* Pre-processor Definitions
* Public Functions
****************************************************************************/
/****************************************************************************