You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/04/26 21:14:33 UTC
[incubator-nuttx] 02/02: Run files in previous commit through
nxstyle, fixing issues.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit dcd50db5d1bdd4394453a8fea6f4b1fc42bf9674
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sun Apr 26 14:31:37 2020 -0600
Run files in previous commit through nxstyle, fixing issues.
---
arch/z80/src/common/z80_arch.h | 6 +--
arch/z80/src/ez80/z80_mem.h | 6 +--
arch/z80/src/z180/z180_initialstate.c | 39 +++++-----------
arch/z80/src/z180/z80_mem.h | 6 +--
arch/z80/src/z8/z80_mem.h | 53 ++++++++-------------
arch/z80/src/z8/z8_initialstate.c | 39 +++++-----------
arch/z80/src/z80/z80_initialstate.c | 39 +++++-----------
arch/z80/src/z80/z80_mem.h | 6 +--
boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c | 57 +++++++++--------------
boards/z80/z80/z80sim/src/z80_irq.c | 39 +++++-----------
boards/z80/z80/z80sim/src/z80_serial.c | 55 +++++++++-------------
11 files changed, 122 insertions(+), 223 deletions(-)
diff --git a/arch/z80/src/common/z80_arch.h b/arch/z80/src/common/z80_arch.h
index e61d14d..1734841 100644
--- a/arch/z80/src/common/z80_arch.h
+++ b/arch/z80/src/common/z80_arch.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_Z80_SRC_COMMON_UP_ARCH_H
-#define __ARCH_Z80_SRC_COMMON_UP_ARCH_H
+#ifndef __ARCH_Z80_SRC_COMMON_Z80_ARCH_H
+#define __ARCH_Z80_SRC_COMMON_Z80_ARCH_H
/************************************************************************************
* Included Files
@@ -34,4 +34,4 @@
* Pre-processor Definitions
************************************************************************************/
-#endif /* __ARCH_Z80_SRC_COMMON_UP_ARCH_H */
+#endif /* __ARCH_Z80_SRC_COMMON_Z80_ARCH_H */
diff --git a/arch/z80/src/ez80/z80_mem.h b/arch/z80/src/ez80/z80_mem.h
index b21c4ed..1f664f2 100644
--- a/arch/z80/src/ez80/z80_mem.h
+++ b/arch/z80/src/ez80/z80_mem.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_Z80_SRC_EZ80_UP_MEM_H
-#define __ARCH_Z80_SRC_EZ80_UP_MEM_H
+#ifndef __ARCH_Z80_SRC_EZ80_Z80_MEM_H
+#define __ARCH_Z80_SRC_EZ80_Z80_MEM_H
/************************************************************************************
* Included Files
@@ -70,4 +70,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_Z80_SRC_EZ80_UP_MEM_H */
+#endif /* __ARCH_Z80_SRC_EZ80_Z80_MEM_H */
diff --git a/arch/z80/src/z180/z180_initialstate.c b/arch/z80/src/z180/z180_initialstate.c
index 7e19a1e..bafae8a 100644
--- a/arch/z80/src/z180/z180_initialstate.c
+++ b/arch/z80/src/z180/z180_initialstate.c
@@ -1,35 +1,20 @@
/****************************************************************************
* arch/z80/src/z180/z180_initialstate.c
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*
****************************************************************************/
diff --git a/arch/z80/src/z180/z80_mem.h b/arch/z80/src/z180/z80_mem.h
index c55c71e..d39d87d 100644
--- a/arch/z80/src/z180/z80_mem.h
+++ b/arch/z80/src/z180/z80_mem.h
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_Z80_SRC_Z180_UP_MEM_H
-#define __ARCH_Z80_SRC_Z180_UP_MEM_H
+#ifndef __ARCH_Z80_SRC_Z180_Z80_MEM_H
+#define __ARCH_Z80_SRC_Z180_Z80_MEM_H
/************************************************************************************
* Included Files
@@ -72,4 +72,4 @@
extern const uint16_t g_heapbase;
-#endif /* __ARCH_Z80_SRC_Z180_UP_MEM_H */
+#endif /* __ARCH_Z80_SRC_Z180_Z80_MEM_H */
diff --git a/arch/z80/src/z8/z80_mem.h b/arch/z80/src/z8/z80_mem.h
index a93a6f3..c1dad23 100644
--- a/arch/z80/src/z8/z80_mem.h
+++ b/arch/z80/src/z8/z80_mem.h
@@ -1,41 +1,25 @@
/************************************************************************************
* arch/z80/src/z8/z80_mem.h
- * arch/z80/src/chip/z80_mem.h
*
- * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*
************************************************************************************/
-#ifndef __ARCH_Z80_SRC_Z8_UP_MEM_H
-#define __ARCH_Z80_SRC_Z8_UP_MEM_H
+#ifndef __ARCH_Z80_SRC_Z8_Z80_MEM_H
+#define __ARCH_Z80_SRC_Z8_Z80_MEM_H
/************************************************************************************
* Included Files
@@ -58,13 +42,14 @@
*/
#ifndef CONFIG_HEAP1_BASE
- extern far unsigned long far_heapbot;
+extern far unsigned long far_heapbot;
# define CONFIG_HEAP1_BASE ((uint16_t)&far_heapbot)
#endif
#ifndef CONFIG_HEAP1_END
- extern far unsigned long far_stacktop;
-# define CONFIG_HEAP1_END (((uint16_t)&far_stacktop) - CONFIG_IDLETHREAD_STACKSIZE + 1)
+extern far unsigned long far_stacktop;
+# define CONFIG_HEAP1_END \
+ (((uint16_t)&far_stacktop) - CONFIG_IDLETHREAD_STACKSIZE + 1)
#endif
/************************************************************************************
@@ -86,4 +71,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_Z80_SRC_Z8_UP_MEM_H */
+#endif /* __ARCH_Z80_SRC_Z8_Z80_MEM_H */
diff --git a/arch/z80/src/z8/z8_initialstate.c b/arch/z80/src/z8/z8_initialstate.c
index 85eca28..d62c4b9 100644
--- a/arch/z80/src/z8/z8_initialstate.c
+++ b/arch/z80/src/z8/z8_initialstate.c
@@ -1,35 +1,20 @@
/****************************************************************************
* arch/z80/src/z8/z8_initialstate.c
*
- * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*
****************************************************************************/
diff --git a/arch/z80/src/z80/z80_initialstate.c b/arch/z80/src/z80/z80_initialstate.c
index 6a1d6e1..1507f6f 100644
--- a/arch/z80/src/z80/z80_initialstate.c
+++ b/arch/z80/src/z80/z80_initialstate.c
@@ -1,35 +1,20 @@
/****************************************************************************
* arch/z80/src/z80/z80_initialstate.c
*
- * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*
****************************************************************************/
diff --git a/arch/z80/src/z80/z80_mem.h b/arch/z80/src/z80/z80_mem.h
index d7254da..08938b2 100644
--- a/arch/z80/src/z80/z80_mem.h
+++ b/arch/z80/src/z80/z80_mem.h
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_Z80_SRC_COMMON_UP_MEM_H
-#define __ARCH_Z80_SRC_COMMON_UP_MEM_H
+#ifndef __ARCH_Z80_SRC_COMMON_Z80_MEM_H
+#define __ARCH_Z80_SRC_COMMON_Z80_MEM_H
/************************************************************************************
* Included Files
@@ -72,4 +72,4 @@
extern const uint16_t g_heapbase;
-#endif /* __ARCH_Z80_SRC_COMMON_UP_MEM_H */
+#endif /* __ARCH_Z80_SRC_COMMON_Z80_MEM_H */
diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
index b55a7ec..282248a 100644
--- a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
+++ b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
@@ -1,35 +1,20 @@
/****************************************************************************
* boards/z80/ez80/ez80f910200zco/src/ez80_leds.c
*
- * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*
****************************************************************************/
@@ -69,7 +54,7 @@
****************************************************************************/
#if 0
-void up_PBinterrupt(void)
+void ez80_pbinterrupt(void)
{
uint8_t regval;
@@ -82,7 +67,7 @@ void up_PBinterrupt(void)
outp(EZ80_PB_ALT0, regval);
}
-void up_pb1interrupt(void)
+void ez80_pb1interrupt(void)
{
uint8_t regval;
@@ -95,17 +80,19 @@ void up_pb1interrupt(void)
outp(EZ80_PB_ALT0, regval);
}
-void up_pb2interrupt(void)
+void ez80_pb2interrupt(void)
{
uint8_t regval;
- regval = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes before 0611 */
+ regval = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes
+ * before 0611 */
regval |= 7;
outp(EZ80_PB_DR, regval);
regval = inp(EZ80_PB_ALT0);
regval |= 4;
- outp(EZ80_PB_ALT0, regval); /* Clear interrupt flag for eZ80F91 date codes 0611 and after */
+ outp(EZ80_PB_ALT0, regval); /* Clear interrupt flag for eZ80F91 date codes
+ * 0611 and after */
}
#endif
@@ -126,9 +113,9 @@ void board_button_initialize(void)
/* Attach GIO interrupts */
- irq_attach(EZ80_PB_IRQ, up_PBinterrupt, NULL);
- irq_attach(EZ80_PB1_IRQ, up_pb1interrupt, NULL);
- irq_attach(EZ80_PB2_IRQ, up_pb2interrupt, NULL);
+ irq_attach(EZ80_PB_IRQ, ez80_pbinterrupt, NULL);
+ irq_attach(EZ80_PB1_IRQ, ez80_pb1interrupt, NULL);
+ irq_attach(EZ80_PB2_IRQ, ez80_pb2interrupt, NULL);
/* Configure PB0,1,2 as interrupt, rising edge */
diff --git a/boards/z80/z80/z80sim/src/z80_irq.c b/boards/z80/z80/z80sim/src/z80_irq.c
index c0f6d7b..446d0e0 100644
--- a/boards/z80/z80/z80sim/src/z80_irq.c
+++ b/boards/z80/z80/z80sim/src/z80_irq.c
@@ -1,35 +1,20 @@
/****************************************************************************
* boards/z80/z80/z80sim/src/z80_irq.c
*
- * Copyright (C) 2007-2009, 2019 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * 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.
*
****************************************************************************/
diff --git a/boards/z80/z80/z80sim/src/z80_serial.c b/boards/z80/z80/z80sim/src/z80_serial.c
index 6817f02..f7be2ec 100644
--- a/boards/z80/z80/z80sim/src/z80_serial.c
+++ b/boards/z80/z80/z80sim/src/z80_serial.c
@@ -1,35 +1,20 @@
/****************************************************************************
* boards/z80/z80/z80sim/src/z80_serial.c
*
- * Copyright (C) 2007-2009, 2012, 2017 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * 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.
*
****************************************************************************/
@@ -129,7 +114,9 @@ static uart_dev_t g_uartport =
},
&g_uart_ops, /* ops */
NULL, /* priv */
- { NULL } /* pollfds */
+ { /* pollfds */
+ NULL
+ }
};
/****************************************************************************
@@ -168,10 +155,10 @@ static void up_shutdown(FAR struct uart_dev_s *dev)
* Name: up_attach
*
* Description:
- * Configure the UART to operation in interrupt driven mode. This method is
- * called when the serial port is opened. Normally, this is just after the
- * setup() method is called, however, the serial console may operate in a
- * non-interrupt driven mode during the boot phase.
+ * Configure the UART to operation in interrupt driven mode. This method
+ * is called when the serial port is opened. Normally, this is just after
+ * the setup() method is called, however, the serial console may operate
+ * in a non-interrupt driven mode during the boot phase.
*
* RX and TX interrupts are not enabled by the attach method (unless the
* hardware supports multiple levels of interrupt enabling).