From commits-return-7145-archive-asf-public=cust-asf.ponee.io@nuttx.apache.org Tue Apr 14 18:53:24 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id CF20218067A for ; Tue, 14 Apr 2020 20:53:23 +0200 (CEST) Received: (qmail 78488 invoked by uid 500); 14 Apr 2020 18:53:23 -0000 Mailing-List: contact commits-help@nuttx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nuttx.apache.org Delivered-To: mailing list commits@nuttx.apache.org Received: (qmail 78411 invoked by uid 99); 14 Apr 2020 18:53:23 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2020 18:53:23 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id D83958B6AA; Tue, 14 Apr 2020 18:53:22 +0000 (UTC) Date: Tue, 14 Apr 2020 18:53:26 +0000 To: "commits@nuttx.apache.org" Subject: [incubator-nuttx] 06/06: Fix nxstyle issue MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: gnutt@apache.org In-Reply-To: <158689040089.24492.2635665985961093089@gitbox.apache.org> References: <158689040089.24492.2635665985961093089@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-nuttx X-Git-Refname: refs/heads/pr789 X-Git-Reftype: branch X-Git-Rev: 3eebb5c5eae221b3addbcd131f6c3cb0a9e0eafe X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200414185322.D83958B6AA@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. gnutt pushed a commit to branch pr789 in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 3eebb5c5eae221b3addbcd131f6c3cb0a9e0eafe Author: Xiang Xiao AuthorDate: Wed Apr 15 01:42:46 2020 +0800 Fix nxstyle issue Signed-off-by: Xiang Xiao --- arch/risc-v/include/rv32im/irq.h | 8 ++++--- arch/risc-v/src/common/up_initialize.c | 3 ++- arch/risc-v/src/common/up_internal.h | 16 ++++++------- arch/risc-v/src/rv32im/up_fpu.S | 43 +++++++++++----------------------- 4 files changed, 29 insertions(+), 41 deletions(-) diff --git a/arch/risc-v/include/rv32im/irq.h b/arch/risc-v/include/rv32im/irq.h index 567a75c..888d160 100644 --- a/arch/risc-v/include/rv32im/irq.h +++ b/arch/risc-v/include/rv32im/irq.h @@ -55,7 +55,7 @@ /* Configuration ************************************************************/ -/* If this is a kernel build, how many nested system calls should we support? */ +/* How many nested system calls should we support? */ #ifndef CONFIG_SYS_NNEST # define CONFIG_SYS_NNEST 2 @@ -66,8 +66,10 @@ #define REG_EPC_NDX 0 /* General pupose registers */ -/* $0: Zero register does not need to be saved */ -/* $1: ra (return address) */ + +/* $0: Zero register does not need to be saved + * $1: ra (return address) + */ #define REG_X1_NDX 1 diff --git a/arch/risc-v/src/common/up_initialize.c b/arch/risc-v/src/common/up_initialize.c index 21b848f..c6c0066 100644 --- a/arch/risc-v/src/common/up_initialize.c +++ b/arch/risc-v/src/common/up_initialize.c @@ -1,7 +1,8 @@ /**************************************************************************** * arch/risc-v/src/common/up_initialize.c * - * Copyright (C) 2007-2010, 2012-2015, 2017 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2010, 2012-2015, 2017 Gregory Nutt. All rights + * reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/arch/risc-v/src/common/up_internal.h b/arch/risc-v/src/common/up_internal.h index 068d05f..4a19946 100644 --- a/arch/risc-v/src/common/up_internal.h +++ b/arch/risc-v/src/common/up_internal.h @@ -142,14 +142,14 @@ EXTERN uint32_t g_intstackalloc; /* Allocated stack base */ EXTERN uint32_t g_intstackbase; /* Initial top of interrupt stack */ #endif -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They + * are not actual uint32_t storage locations! They are only used meaningfully + * in the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -165,12 +165,12 @@ EXTERN uint32_t _ebss; /* End+1 of .bss */ #endif /* __ASSEMBLY__ */ /**************************************************************************** - * Public Functions - ****************************************************************************/ +* Public Function Prototypes + ***************************************************************************/ #ifndef __ASSEMBLY__ -/* Low level initialization provided by board-level logic ******************/ +/* Low level initialization provided by board-level logic *******************/ void up_boot(void); diff --git a/arch/risc-v/src/rv32im/up_fpu.S b/arch/risc-v/src/rv32im/up_fpu.S index f24c867..f2a9766 100644 --- a/arch/risc-v/src/rv32im/up_fpu.S +++ b/arch/risc-v/src/rv32im/up_fpu.S @@ -1,35 +1,20 @@ /************************************************************************************ * arch/risc-v/src/rv32im/up_fpu.S * - * Copyright (C) 2018 Pinecone Inc. All rights reserved. - * Author: Zhang Xiaoqin - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ************************************************************************************/