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:31 UTC
[incubator-nuttx] branch master updated (de4c9e0 -> dcd50db)
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from de4c9e0 README.txt: Improve links to Windows kconfig-frontends
new a0fdda6 arch/z80: Fix z80 file naming
new dcd50db Run files in previous commit through nxstyle, fixing issues.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/z80/src/.gitignore | 2 +-
.../{up_allocateheap.c => z80_allocateheap.c} | 10 +--
arch/z80/src/common/{up_arch.h => z80_arch.h} | 8 +-
arch/z80/src/common/{up_assert.c => z80_assert.c} | 4 +-
.../src/common/{up_blocktask.c => z80_blocktask.c} | 2 +-
.../common/{up_createstack.c => z80_createstack.c} | 4 +-
arch/z80/src/common/z80_doirq.c | 2 +-
arch/z80/src/common/{up_exit.c => z80_exit.c} | 2 +-
arch/z80/src/common/{up_idle.c => z80_idle.c} | 2 +-
.../common/{up_initialize.c => z80_initialize.c} | 4 +-
...p_interruptcontext.c => z80_interruptcontext.c} | 2 +-
arch/z80/src/common/{up_mdelay.c => z80_mdelay.c} | 2 +-
arch/z80/src/common/{up_puts.c => z80_puts.c} | 2 +-
.../{up_releasepending.c => z80_releasepending.c} | 2 +-
.../{up_releasestack.c => z80_releasestack.c} | 2 +-
...{up_reprioritizertr.c => z80_reprioritizertr.c} | 2 +-
.../src/common/{up_stackdump.c => z80_stackdump.c} | 4 +-
.../common/{up_stackframe.c => z80_stackframe.c} | 2 +-
arch/z80/src/common/{up_udelay.c => z80_udelay.c} | 2 +-
.../common/{up_unblocktask.c => z80_unblocktask.c} | 2 +-
.../src/common/{up_usestack.c => z80_usestack.c} | 2 +-
arch/z80/src/ez80/Make.defs | 14 ++--
arch/z80/src/ez80/ez80_initialstate.c | 2 +-
arch/z80/src/ez80/ez80_rtc.c | 2 +-
arch/z80/src/ez80/ez80_rtc_lowerhalf.c | 2 +-
arch/z80/src/ez80/ez80_spi.c | 2 +-
arch/z80/src/ez80/{up_mem.h => z80_mem.h} | 8 +-
arch/z80/src/z180/Make.defs | 10 +--
arch/z80/src/z180/z180_initialstate.c | 41 ++++------
arch/z80/src/z180/{up_mem.h => z80_mem.h} | 6 +-
arch/z80/src/z8/Make.defs | 10 +--
arch/z80/src/z8/up_mem.h | 89 ----------------------
arch/z80/src/{ez80/up_mem.h => z8/z80_mem.h} | 21 ++---
arch/z80/src/z8/z8_initialstate.c | 41 ++++------
arch/z80/src/z80/Make.defs | 10 +--
arch/z80/src/z80/z80_initialstate.c | 41 ++++------
arch/z80/src/z80/{up_mem.h => z80_mem.h} | 6 +-
boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c | 59 ++++++--------
boards/z80/z180/p112/src/.gitignore | 2 +-
boards/z80/z80/z80sim/src/.gitignore | 2 +-
boards/z80/z80/z80sim/src/z80_irq.c | 41 ++++------
boards/z80/z80/z80sim/src/z80_serial.c | 57 ++++++--------
42 files changed, 178 insertions(+), 352 deletions(-)
rename arch/z80/src/common/{up_allocateheap.c => z80_allocateheap.c} (94%)
rename arch/z80/src/common/{up_arch.h => z80_arch.h} (89%)
rename arch/z80/src/common/{up_assert.c => z80_assert.c} (98%)
rename arch/z80/src/common/{up_blocktask.c => z80_blocktask.c} (99%)
rename arch/z80/src/common/{up_createstack.c => z80_createstack.c} (98%)
rename arch/z80/src/common/{up_exit.c => z80_exit.c} (99%)
rename arch/z80/src/common/{up_idle.c => z80_idle.c} (98%)
rename arch/z80/src/common/{up_initialize.c => z80_initialize.c} (98%)
rename arch/z80/src/common/{up_interruptcontext.c => z80_interruptcontext.c} (97%)
rename arch/z80/src/common/{up_mdelay.c => z80_mdelay.c} (98%)
rename arch/z80/src/common/{up_puts.c => z80_puts.c} (98%)
rename arch/z80/src/common/{up_releasepending.c => z80_releasepending.c} (98%)
rename arch/z80/src/common/{up_releasestack.c => z80_releasestack.c} (98%)
rename arch/z80/src/common/{up_reprioritizertr.c => z80_reprioritizertr.c} (99%)
rename arch/z80/src/common/{up_stackdump.c => z80_stackdump.c} (97%)
rename arch/z80/src/common/{up_stackframe.c => z80_stackframe.c} (99%)
rename arch/z80/src/common/{up_udelay.c => z80_udelay.c} (99%)
rename arch/z80/src/common/{up_unblocktask.c => z80_unblocktask.c} (99%)
rename arch/z80/src/common/{up_usestack.c => z80_usestack.c} (99%)
copy arch/z80/src/ez80/{up_mem.h => z80_mem.h} (93%)
rename arch/z80/src/z180/{up_mem.h => z80_mem.h} (96%)
delete mode 100644 arch/z80/src/z8/up_mem.h
rename arch/z80/src/{ez80/up_mem.h => z8/z80_mem.h} (80%)
rename arch/z80/src/z80/{up_mem.h => z80_mem.h} (96%)
[incubator-nuttx] 02/02: Run files in previous commit through
nxstyle, fixing issues.
Posted by ag...@apache.org.
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).
[incubator-nuttx] 01/02: arch/z80: Fix z80 file naming
Posted by ag...@apache.org.
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 a0fdda698c504093078d771d558a59d736e952af
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sun Apr 26 13:49:33 2020 -0600
arch/z80: Fix z80 file naming
Modify file naming to conform on the Naming conventions of https://cwiki.apache.org/confluence/display/NUTTX/Naming+FAQ
This commit only address the file naming convention. There is still nonconformant function naming.
---
arch/z80/src/.gitignore | 2 +-
.../src/common/{up_allocateheap.c => z80_allocateheap.c} | 10 +++++-----
arch/z80/src/common/{up_arch.h => z80_arch.h} | 2 +-
arch/z80/src/common/{up_assert.c => z80_assert.c} | 4 ++--
arch/z80/src/common/{up_blocktask.c => z80_blocktask.c} | 2 +-
.../z80/src/common/{up_createstack.c => z80_createstack.c} | 4 ++--
arch/z80/src/common/z80_doirq.c | 2 +-
arch/z80/src/common/{up_exit.c => z80_exit.c} | 2 +-
arch/z80/src/common/{up_idle.c => z80_idle.c} | 2 +-
arch/z80/src/common/{up_initialize.c => z80_initialize.c} | 4 ++--
.../{up_interruptcontext.c => z80_interruptcontext.c} | 2 +-
arch/z80/src/common/{up_mdelay.c => z80_mdelay.c} | 2 +-
arch/z80/src/common/{up_puts.c => z80_puts.c} | 2 +-
.../common/{up_releasepending.c => z80_releasepending.c} | 2 +-
.../src/common/{up_releasestack.c => z80_releasestack.c} | 2 +-
.../common/{up_reprioritizertr.c => z80_reprioritizertr.c} | 2 +-
arch/z80/src/common/{up_stackdump.c => z80_stackdump.c} | 4 ++--
arch/z80/src/common/{up_stackframe.c => z80_stackframe.c} | 2 +-
arch/z80/src/common/{up_udelay.c => z80_udelay.c} | 2 +-
.../z80/src/common/{up_unblocktask.c => z80_unblocktask.c} | 2 +-
arch/z80/src/common/{up_usestack.c => z80_usestack.c} | 2 +-
arch/z80/src/ez80/Make.defs | 14 +++++++-------
arch/z80/src/ez80/ez80_initialstate.c | 2 +-
arch/z80/src/ez80/ez80_rtc.c | 2 +-
arch/z80/src/ez80/ez80_rtc_lowerhalf.c | 2 +-
arch/z80/src/ez80/ez80_spi.c | 2 +-
arch/z80/src/ez80/{up_mem.h => z80_mem.h} | 2 +-
arch/z80/src/z180/Make.defs | 10 +++++-----
arch/z80/src/z180/z180_initialstate.c | 2 +-
arch/z80/src/z180/{up_mem.h => z80_mem.h} | 0
arch/z80/src/z8/Make.defs | 10 +++++-----
arch/z80/src/z8/{up_mem.h => z80_mem.h} | 4 ++--
arch/z80/src/z8/z8_initialstate.c | 2 +-
arch/z80/src/z80/Make.defs | 10 +++++-----
arch/z80/src/z80/z80_initialstate.c | 2 +-
arch/z80/src/z80/{up_mem.h => z80_mem.h} | 0
boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c | 2 +-
boards/z80/z180/p112/src/.gitignore | 2 +-
boards/z80/z80/z80sim/src/.gitignore | 2 +-
boards/z80/z80/z80sim/src/z80_irq.c | 2 +-
boards/z80/z80/z80sim/src/z80_serial.c | 2 +-
41 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/arch/z80/src/.gitignore b/arch/z80/src/.gitignore
index 3db121e..6aabefb 100644
--- a/arch/z80/src/.gitignore
+++ b/arch/z80/src/.gitignore
@@ -1,6 +1,6 @@
/Make.dep
/.depend
-/up_mem.h
+/z80_mem.h
/asm_mem.h
/board
/chip
diff --git a/arch/z80/src/common/up_allocateheap.c b/arch/z80/src/common/z80_allocateheap.c
similarity index 94%
rename from arch/z80/src/common/up_allocateheap.c
rename to arch/z80/src/common/z80_allocateheap.c
index 6fde6e1..7d396f3 100644
--- a/arch/z80/src/common/up_allocateheap.c
+++ b/arch/z80/src/common/z80_allocateheap.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_allocateheap.c
+ * arch/z80/src/common/z80_allocateheap.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,16 +32,16 @@
#include <nuttx/kmalloc.h>
#include <nuttx/mm/mm.h>
-#include "up_arch.h"
+#include "z80_arch.h"
#include "z80_internal.h"
#ifdef SDCC
/* For the SDCC toolchain, the arch/z80/src/Makefile will parse the map file
* to determine how much memory is available for the heap. This parsed data
- * is provided via the auto-generated file up_mem.h
+ * is provided via the auto-generated file z80_mem.h
*/
-# include "up_mem.h"
+# include "z80_mem.h"
#else
/* For other toolchains, the architecture must provide a header file in the
@@ -49,7 +49,7 @@
* in the configuration file )
*/
-# include "chip/up_mem.h"
+# include "chip/z80_mem.h"
#endif
/****************************************************************************
diff --git a/arch/z80/src/common/up_arch.h b/arch/z80/src/common/z80_arch.h
similarity index 97%
rename from arch/z80/src/common/up_arch.h
rename to arch/z80/src/common/z80_arch.h
index 70137c6..e61d14d 100644
--- a/arch/z80/src/common/up_arch.h
+++ b/arch/z80/src/common/z80_arch.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/z80/src/common/up_arch.h
+ * arch/z80/src/common/z80_arch.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/z80_assert.c
similarity index 98%
rename from arch/z80/src/common/up_assert.c
rename to arch/z80/src/common/z80_assert.c
index 007af17..dfd6248 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/z80_assert.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_assert.c
+ * arch/z80/src/common/z80_assert.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -36,7 +36,7 @@
#include <nuttx/usb/usbdev_trace.h>
#include "chip.h"
-#include "up_arch.h"
+#include "z80_arch.h"
#include "sched/sched.h"
#include "z80_internal.h"
diff --git a/arch/z80/src/common/up_blocktask.c b/arch/z80/src/common/z80_blocktask.c
similarity index 99%
rename from arch/z80/src/common/up_blocktask.c
rename to arch/z80/src/common/z80_blocktask.c
index 74d8f67..2eb5bc1 100644
--- a/arch/z80/src/common/up_blocktask.c
+++ b/arch/z80/src/common/z80_blocktask.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_blocktask.c
+ * arch/z80/src/common/z80_blocktask.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_createstack.c b/arch/z80/src/common/z80_createstack.c
similarity index 98%
rename from arch/z80/src/common/up_createstack.c
rename to arch/z80/src/common/z80_createstack.c
index 46e45e9..3f62467 100644
--- a/arch/z80/src/common/up_createstack.c
+++ b/arch/z80/src/common/z80_createstack.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_createstack.c
+ * arch/z80/src/common/z80_createstack.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#include "up_arch.h"
+#include "z80_arch.h"
#include "z80_internal.h"
/****************************************************************************
diff --git a/arch/z80/src/common/z80_doirq.c b/arch/z80/src/common/z80_doirq.c
index 72ad8a0..5ee0c89 100644
--- a/arch/z80/src/common/z80_doirq.c
+++ b/arch/z80/src/common/z80_doirq.c
@@ -26,7 +26,7 @@
#include <stdint.h>
#include <assert.h>
-#include "up_arch.h"
+#include "z80_arch.h"
#include <nuttx/irq.h>
#include <nuttx/arch.h>
diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/z80_exit.c
similarity index 99%
rename from arch/z80/src/common/up_exit.c
rename to arch/z80/src/common/z80_exit.c
index 4ed1dfc..ee6e708 100644
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/z80_exit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_exit.c
+ * arch/z80/src/common/z80_exit.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_idle.c b/arch/z80/src/common/z80_idle.c
similarity index 98%
rename from arch/z80/src/common/up_idle.c
rename to arch/z80/src/common/z80_idle.c
index 81519f7..0d9a4bf 100644
--- a/arch/z80/src/common/up_idle.c
+++ b/arch/z80/src/common/z80_idle.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_idle.c
+ * arch/z80/src/common/z80_idle.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/z80_initialize.c
similarity index 98%
rename from arch/z80/src/common/up_initialize.c
rename to arch/z80/src/common/z80_initialize.c
index c4ca44f..8672d6f 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/z80_initialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_initialize.c
+ * arch/z80/src/common/z80_initialize.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -43,7 +43,7 @@
#include <arch/board/board.h>
#include "chip/switch.h"
-#include "up_arch.h"
+#include "z80_arch.h"
#include "z80_internal.h"
/****************************************************************************
diff --git a/arch/z80/src/common/up_interruptcontext.c b/arch/z80/src/common/z80_interruptcontext.c
similarity index 97%
rename from arch/z80/src/common/up_interruptcontext.c
rename to arch/z80/src/common/z80_interruptcontext.c
index 9ae008d..62407cc 100644
--- a/arch/z80/src/common/up_interruptcontext.c
+++ b/arch/z80/src/common/z80_interruptcontext.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_interruptcontext.c
+ * arch/z80/src/common/z80_interruptcontext.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_mdelay.c b/arch/z80/src/common/z80_mdelay.c
similarity index 98%
rename from arch/z80/src/common/up_mdelay.c
rename to arch/z80/src/common/z80_mdelay.c
index 62d1a1c..f9cc975 100644
--- a/arch/z80/src/common/up_mdelay.c
+++ b/arch/z80/src/common/z80_mdelay.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_mdelay.c
+ * arch/z80/src/common/z80_mdelay.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_puts.c b/arch/z80/src/common/z80_puts.c
similarity index 98%
rename from arch/z80/src/common/up_puts.c
rename to arch/z80/src/common/z80_puts.c
index c2e7358..64b197f 100644
--- a/arch/z80/src/common/up_puts.c
+++ b/arch/z80/src/common/z80_puts.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_puts.c
+ * arch/z80/src/common/z80_puts.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_releasepending.c b/arch/z80/src/common/z80_releasepending.c
similarity index 98%
rename from arch/z80/src/common/up_releasepending.c
rename to arch/z80/src/common/z80_releasepending.c
index 75239ba..bf8a821 100644
--- a/arch/z80/src/common/up_releasepending.c
+++ b/arch/z80/src/common/z80_releasepending.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_releasepending.c
+ * arch/z80/src/common/z80_releasepending.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_releasestack.c b/arch/z80/src/common/z80_releasestack.c
similarity index 98%
rename from arch/z80/src/common/up_releasestack.c
rename to arch/z80/src/common/z80_releasestack.c
index 00864a3..2342186 100644
--- a/arch/z80/src/common/up_releasestack.c
+++ b/arch/z80/src/common/z80_releasestack.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_releasestack.c
+ * arch/z80/src/common/z80_releasestack.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_reprioritizertr.c b/arch/z80/src/common/z80_reprioritizertr.c
similarity index 99%
rename from arch/z80/src/common/up_reprioritizertr.c
rename to arch/z80/src/common/z80_reprioritizertr.c
index a812361..0d38509 100644
--- a/arch/z80/src/common/up_reprioritizertr.c
+++ b/arch/z80/src/common/z80_reprioritizertr.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_reprioritizertr.c
+ * arch/z80/src/common/z80_reprioritizertr.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/z80_stackdump.c
similarity index 97%
rename from arch/z80/src/common/up_stackdump.c
rename to arch/z80/src/common/z80_stackdump.c
index 6fe696b..189c5a9 100644
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/z80_stackdump.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_stackdump.c
+ * arch/z80/src/common/z80_stackdump.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -27,7 +27,7 @@
#include <stdint.h>
#include <debug.h>
-#include "up_arch.h"
+#include "z80_arch.h"
#include "sched/sched.h"
#include "z80_internal.h"
diff --git a/arch/z80/src/common/up_stackframe.c b/arch/z80/src/common/z80_stackframe.c
similarity index 99%
rename from arch/z80/src/common/up_stackframe.c
rename to arch/z80/src/common/z80_stackframe.c
index 1fd880b..5c0c20e 100644
--- a/arch/z80/src/common/up_stackframe.c
+++ b/arch/z80/src/common/z80_stackframe.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_stackframe.c
+ * arch/z80/src/common/z80_stackframe.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_udelay.c b/arch/z80/src/common/z80_udelay.c
similarity index 99%
rename from arch/z80/src/common/up_udelay.c
rename to arch/z80/src/common/z80_udelay.c
index ff2be69..ec69c00 100644
--- a/arch/z80/src/common/up_udelay.c
+++ b/arch/z80/src/common/z80_udelay.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_udelay.c
+ * arch/z80/src/common/z80_udelay.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_unblocktask.c b/arch/z80/src/common/z80_unblocktask.c
similarity index 99%
rename from arch/z80/src/common/up_unblocktask.c
rename to arch/z80/src/common/z80_unblocktask.c
index e2edf4d..f9b6bc9 100644
--- a/arch/z80/src/common/up_unblocktask.c
+++ b/arch/z80/src/common/z80_unblocktask.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_unblocktask.c
+ * arch/z80/src/common/z80_unblocktask.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/common/up_usestack.c b/arch/z80/src/common/z80_usestack.c
similarity index 99%
rename from arch/z80/src/common/up_usestack.c
rename to arch/z80/src/common/z80_usestack.c
index 60bbb96..90c53b5 100644
--- a/arch/z80/src/common/up_usestack.c
+++ b/arch/z80/src/common/z80_usestack.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/z80/src/common/up_usestack.c
+ * arch/z80/src/common/z80_usestack.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/ez80/Make.defs b/arch/z80/src/ez80/Make.defs
index 7afa337..3d9791d 100644
--- a/arch/z80/src/ez80/Make.defs
+++ b/arch/z80/src/ez80/Make.defs
@@ -22,15 +22,15 @@ HEAD_ASRC =
HEAD_SSRC =
CMN_SSRCS =
-CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c
-CMN_CSRCS += up_releasestack.c up_interruptcontext.c up_blocktask.c
-CMN_CSRCS += up_unblocktask.c up_exit.c up_releasepending.c
-CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c z80_doirq.c
-CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c
-CMN_CSRCS += up_puts.c
+CMN_CSRCS = z80_initialize.c z80_allocateheap.c z80_createstack.c
+CMN_CSRCS += z80_releasestack.c z80_interruptcontext.c z80_blocktask.c
+CMN_CSRCS += z80_unblocktask.c z80_exit.c z80_releasepending.c
+CMN_CSRCS += z80_reprioritizertr.c z80_idle.c z80_assert.c z80_doirq.c
+CMN_CSRCS += z80_mdelay.c z80_stackframe.c z80_udelay.c z80_usestack.c
+CMN_CSRCS += z80_puts.c
ifeq ($(CONFIG_ARCH_STACKDUMP),y)
-CMN_CSRCS += up_stackdump.c
+CMN_CSRCS += z80_stackdump.c
endif
CHIP_ASRCS = ez80_startup.asm ez80_io.asm ez80_irqsave.asm
diff --git a/arch/z80/src/ez80/ez80_initialstate.c b/arch/z80/src/ez80/ez80_initialstate.c
index 845db9d..d6d0573 100644
--- a/arch/z80/src/ez80/ez80_initialstate.c
+++ b/arch/z80/src/ez80/ez80_initialstate.c
@@ -30,7 +30,7 @@
#include "chip.h"
#include "z80_internal.h"
-#include "up_arch.h"
+#include "z80_arch.h"
/****************************************************************************
* Public Functions
diff --git a/arch/z80/src/ez80/ez80_rtc.c b/arch/z80/src/ez80/ez80_rtc.c
index 666288a..220fa27 100644
--- a/arch/z80/src/ez80/ez80_rtc.c
+++ b/arch/z80/src/ez80/ez80_rtc.c
@@ -38,7 +38,7 @@
#include <arch/io.h>
#include "chip.h"
-#include "up_arch.h"
+#include "z80_arch.h"
#include "ez80_rtc.h"
#include <arch/board/board.h>
diff --git a/arch/z80/src/ez80/ez80_rtc_lowerhalf.c b/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
index 18a0ca6..9729866 100644
--- a/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
+++ b/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
@@ -32,7 +32,7 @@
#include <nuttx/arch.h>
#include <nuttx/timers/rtc.h>
-#include "up_arch.h"
+#include "z80_arch.h"
#include "chip.h"
#include "ez80_rtc.h"
diff --git a/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c
index ff92ac5..f0229b9 100644
--- a/arch/z80/src/ez80/ez80_spi.c
+++ b/arch/z80/src/ez80/ez80_spi.c
@@ -37,7 +37,7 @@
#include <arch/io.h>
#include "z80_internal.h"
-#include "up_arch.h"
+#include "z80_arch.h"
#include "chip.h"
diff --git a/arch/z80/src/ez80/up_mem.h b/arch/z80/src/ez80/z80_mem.h
similarity index 98%
rename from arch/z80/src/ez80/up_mem.h
rename to arch/z80/src/ez80/z80_mem.h
index e4d1b59..b21c4ed 100644
--- a/arch/z80/src/ez80/up_mem.h
+++ b/arch/z80/src/ez80/z80_mem.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/z80/src/ez80/up_mem.h
+ * arch/z80/src/ez80/z80_mem.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/z80/src/z180/Make.defs b/arch/z80/src/z180/Make.defs
index 2da78c5..f44427d 100644
--- a/arch/z80/src/z180/Make.defs
+++ b/arch/z80/src/z180/Make.defs
@@ -42,11 +42,11 @@ endif
endif
CMN_ASRCS =
-CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_createstack.c
-CMN_CSRCS += z80_doirq.c up_exit.c up_idle.c up_initialize.c
-CMN_CSRCS += up_interruptcontext.c up_mdelay.c up_releasepending.c
-CMN_CSRCS += up_releasestack.c up_stackframe.c up_reprioritizertr.c
-CMN_CSRCS += up_unblocktask.c up_udelay.c up_usestack.c
+CMN_CSRCS = z80_allocateheap.c z80_assert.c z80_blocktask.c z80_createstack.c
+CMN_CSRCS += z80_doirq.c z80_exit.c z80_idle.c z80_initialize.c
+CMN_CSRCS += z80_interruptcontext.c z80_mdelay.c z80_releasepending.c
+CMN_CSRCS += z80_releasestack.c z80_stackframe.c z80_reprioritizertr.c
+CMN_CSRCS += z80_unblocktask.c z80_udelay.c z80_usestack.c
CHIP_ASRCS = z180_restoreusercontext.asm z180_saveusercontext.asm
CHIP_ASRCS += z180_vectcommon.asm
diff --git a/arch/z80/src/z180/z180_initialstate.c b/arch/z80/src/z180/z180_initialstate.c
index 4f4b4fe..7e19a1e 100644
--- a/arch/z80/src/z180/z180_initialstate.c
+++ b/arch/z80/src/z180/z180_initialstate.c
@@ -44,7 +44,7 @@
#include "chip.h"
#include "z80_internal.h"
-#include "up_arch.h"
+#include "z80_arch.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/z80/src/z180/up_mem.h b/arch/z80/src/z180/z80_mem.h
similarity index 100%
rename from arch/z80/src/z180/up_mem.h
rename to arch/z80/src/z180/z80_mem.h
diff --git a/arch/z80/src/z8/Make.defs b/arch/z80/src/z8/Make.defs
index 023e5bb..10212d9 100644
--- a/arch/z80/src/z8/Make.defs
+++ b/arch/z80/src/z8/Make.defs
@@ -36,11 +36,11 @@
HEAD_SSRC = z8_head.S
CMN_SSRCS =
-CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c
-CMN_CSRCS += up_releasestack.c up_interruptcontext.c up_blocktask.c
-CMN_CSRCS += up_unblocktask.c up_exit.c up_releasepending.c
-CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c z80_doirq.c
-CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c
+CMN_CSRCS = z80_initialize.c z80_allocateheap.c z80_createstack.c
+CMN_CSRCS += z80_releasestack.c z80_interruptcontext.c z80_blocktask.c
+CMN_CSRCS += z80_unblocktask.c z80_exit.c z80_releasepending.c
+CMN_CSRCS += z80_reprioritizertr.c z80_idle.c z80_assert.c z80_doirq.c
+CMN_CSRCS += z80_mdelay.c z80_stackframe.c z80_udelay.c z80_usestack.c
CHIP_SSRCS = z8_vector.S z8_saveusercontext.S z8_restorecontext.S
CHIP_CSRCS = z8_initialstate.c z8_irq.c z8_saveirqcontext.c
diff --git a/arch/z80/src/z8/up_mem.h b/arch/z80/src/z8/z80_mem.h
similarity index 98%
rename from arch/z80/src/z8/up_mem.h
rename to arch/z80/src/z8/z80_mem.h
index 08812a1..a93a6f3 100644
--- a/arch/z80/src/z8/up_mem.h
+++ b/arch/z80/src/z8/z80_mem.h
@@ -1,6 +1,6 @@
/************************************************************************************
- * arch/z80/src/z8/up_mem.h
- * arch/z80/src/chip/up_mem.h
+ * 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>
diff --git a/arch/z80/src/z8/z8_initialstate.c b/arch/z80/src/z8/z8_initialstate.c
index 342bcf4..85eca28 100644
--- a/arch/z80/src/z8/z8_initialstate.c
+++ b/arch/z80/src/z8/z8_initialstate.c
@@ -46,7 +46,7 @@
#include "chip.h"
#include "z80_internal.h"
-#include "up_arch.h"
+#include "z80_arch.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/z80/src/z80/Make.defs b/arch/z80/src/z80/Make.defs
index 531ca00..f1044aa 100644
--- a/arch/z80/src/z80/Make.defs
+++ b/arch/z80/src/z80/Make.defs
@@ -43,11 +43,11 @@ endif
CMN_ASRCS =
-CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c
-CMN_CSRCS += up_releasestack.c up_interruptcontext.c up_blocktask.c
-CMN_CSRCS += up_unblocktask.c up_exit.c up_releasepending.c
-CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c z80_doirq.c
-CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c
+CMN_CSRCS = z80_initialize.c z80_allocateheap.c z80_createstack.c
+CMN_CSRCS += z80_releasestack.c z80_interruptcontext.c z80_blocktask.c
+CMN_CSRCS += z80_unblocktask.c z80_exit.c z80_releasepending.c
+CMN_CSRCS += z80_reprioritizertr.c z80_idle.c z80_assert.c z80_doirq.c
+CMN_CSRCS += z80_mdelay.c z80_stackframe.c z80_udelay.c z80_usestack.c
CHIP_ASRCS = z80_saveusercontext.asm z80_restoreusercontext.asm
diff --git a/arch/z80/src/z80/z80_initialstate.c b/arch/z80/src/z80/z80_initialstate.c
index d42ce6f..6a1d6e1 100644
--- a/arch/z80/src/z80/z80_initialstate.c
+++ b/arch/z80/src/z80/z80_initialstate.c
@@ -44,7 +44,7 @@
#include "chip.h"
#include "z80_internal.h"
-#include "up_arch.h"
+#include "z80_arch.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/z80/src/z80/up_mem.h b/arch/z80/src/z80/z80_mem.h
similarity index 100%
rename from arch/z80/src/z80/up_mem.h
rename to arch/z80/src/z80/z80_mem.h
diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
index e125d21..b55a7ec 100644
--- a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
+++ b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
@@ -45,7 +45,7 @@
#include <nuttx/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "z80_arch.h"
#include "z80_internal.h"
/****************************************************************************
diff --git a/boards/z80/z180/p112/src/.gitignore b/boards/z80/z180/p112/src/.gitignore
index 04b280c..d5d4331 100644
--- a/boards/z80/z180/p112/src/.gitignore
+++ b/boards/z80/z180/p112/src/.gitignore
@@ -1,6 +1,6 @@
/Make.dep
/.depend
-/up_mem.h
+/z80_mem.h
/*.sym
/*.asm
/*.rel
diff --git a/boards/z80/z80/z80sim/src/.gitignore b/boards/z80/z80/z80sim/src/.gitignore
index 04b280c..d5d4331 100644
--- a/boards/z80/z80/z80sim/src/.gitignore
+++ b/boards/z80/z80/z80sim/src/.gitignore
@@ -1,6 +1,6 @@
/Make.dep
/.depend
-/up_mem.h
+/z80_mem.h
/*.sym
/*.asm
/*.rel
diff --git a/boards/z80/z80/z80sim/src/z80_irq.c b/boards/z80/z80/z80sim/src/z80_irq.c
index 3efee0f..c0f6d7b 100644
--- a/boards/z80/z80/z80sim/src/z80_irq.c
+++ b/boards/z80/z80/z80sim/src/z80_irq.c
@@ -41,7 +41,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "z80_arch.h"
#include "z80_internal.h"
/****************************************************************************
diff --git a/boards/z80/z80/z80sim/src/z80_serial.c b/boards/z80/z80/z80sim/src/z80_serial.c
index 0c6f373..6817f02 100644
--- a/boards/z80/z80/z80sim/src/z80_serial.c
+++ b/boards/z80/z80/z80sim/src/z80_serial.c
@@ -51,7 +51,7 @@
#include <nuttx/arch.h>
#include <nuttx/serial/serial.h>
-#include "up_arch.h"
+#include "z80_arch.h"
#include "z80_internal.h"
#ifdef USE_SERIALDRIVER