Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Minor and cosmetic changes from initial 16z (v2) bringup

Browse Source
This commit is contained in:
Gregory Nutt
2014-04-24 15:55:53 -06:00
parent e887473bde
commit 31ede44671
5 changed files with 419 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/z16/src/z16f/chip.h
+2 -2
View File
@@ -450,7 +450,7 @@
#define Z16F_UARTCTL1_DEPOL _HX8(08) /* Bit 3: Driver Enable Polarity */ #define Z16F_UARTCTL1_DEPOL _HX8(08) /* Bit 3: Driver Enable Polarity */
#define Z16F_UARTCTL1_BRGCTL _HX8(04) /* Bit 2: Baud Rate Generator Control */ #define Z16F_UARTCTL1_BRGCTL _HX8(04) /* Bit 2: Baud Rate Generator Control */
#define Z16F_UARTCTL1_RDAIRQ _HX8(02) /* Bit 1: Receive Data Interrupt Enable */ #define Z16F_UARTCTL1_RDAIRQ _HX8(02) /* Bit 1: Receive Data Interrupt Enable */
#define Z16F_UARTCTL1_IREN _HX8(01) /* Bit 0: Infrared Encoder/Decoder Eanble */ #define Z16F_UARTCTL1_IREN _HX8(01) /* Bit 0: Infrared Encoder/Decoder Enable */
/* UART0/1 Mode Status/Select Register Bit Definitions ******************************/ /* UART0/1 Mode Status/Select Register Bit Definitions ******************************/
@@ -589,7 +589,7 @@
* Interpretation depends on timer mode */ * Interpretation depends on timer mode */
#define Z16F_TIMERCTL0_RELOAD _HX8(00) /* Interrupt occurs on reload or capture */ #define Z16F_TIMERCTL0_RELOAD _HX8(00) /* Interrupt occurs on reload or capture */
#define Z16F_TIMERCTL0_IDISABLED _HX8(40) /* Disabled */ #define Z16F_TIMERCTL0_IDISABLED _HX8(40) /* Disabled */
#define Z16F_TIMERCTL0_IINACTIVE _HX8(40) /* Interrrupt occurs on inactive gate edge */ #define Z16F_TIMERCTL0_IINACTIVE _HX8(40) /* Interrupt occurs on inactive gate edge */
#define Z16F_TIMERCTL0_ICAPTURE _HX8(40) /* Interrupt occurs on capture */ #define Z16F_TIMERCTL0_ICAPTURE _HX8(40) /* Interrupt occurs on capture */
#define Z16F_TIMERCTL0_IRELOAD _HX8(60) /* Interrupt occurs on reload */ #define Z16F_TIMERCTL0_IRELOAD _HX8(60) /* Interrupt occurs on reload */
#define Z16F_TIMERCTL0_CASCADE _HX8(10) /* Bit 4: Timer is cascaded */ #define Z16F_TIMERCTL0_CASCADE _HX8(10) /* Bit 4: Timer is cascaded */
configs/16z/tools/dopatch.sh
+3 -2
View File
@@ -34,11 +34,12 @@
# #
############################################################################ ############################################################################
USAGE="${0} \$PWD" USAGE="${0} [-R] \$PWD"
WD=`pwd` WD=`pwd`
TOOLDIR=${WD}/configs/16z/tools TOOLDIR=${WD}/configs/16z/tools
ME=${TOOLDIR}/dopatch.sh ME=${TOOLDIR}/dopatch.sh
PATCH=${TOOLDIR}/zneo-zdsii-5_0_1-variadic-func-fix.patch PATCH=${TOOLDIR}/zneo-zdsii-5_0_1-variadic-func-fix.patch
ARGS=${1}
if [ ! -x ${ME} ]; then if [ ! -x ${ME} ]; then
echo "ERROR: This script must be executed from the top-level NuttX directory" echo "ERROR: This script must be executed from the top-level NuttX directory"
@@ -55,5 +56,5 @@ fi
cd .. || \ cd .. || \
{ echo "ERROR: failed to CD to the parent directory"; exit 1; } { echo "ERROR: failed to CD to the parent directory"; exit 1; }
cat ${PATCH} | patch -p1 || \ cat ${PATCH} | patch ${ARGS} -p1 || \
{ echo "ERROR: patch failed" ; exit 1; } { echo "ERROR: patch failed" ; exit 1; }
configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c
index ba7dbe7..b9f9991 100644 index ba7dbe7..45e4ab1 100644
--- a/apps/nshlib/nsh_console.c --- a/apps/nshlib/nsh_console.c
+++ b/apps/nshlib/nsh_console.c +++ b/apps/nshlib/nsh_console.c
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
@@ -113,7 +113,7 @@ index ba7dbe7..b9f9991 100644
+ return ret; + return ret;
+} +}
diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h
index c78362f..59bd8d7 100644 index c78362f..207f9b9 100644
--- a/apps/nshlib/nsh_console.h --- a/apps/nshlib/nsh_console.h
+++ b/apps/nshlib/nsh_console.h +++ b/apps/nshlib/nsh_console.h
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
configs/z16f2800100zcog/tools/dopatch.sh
+3 -2
View File
@@ -34,11 +34,12 @@
# #
############################################################################ ############################################################################
USAGE="${0} \$PWD" USAGE="${0} [-R] \$PWD"
WD=`pwd` WD=`pwd`
TOOLDIR=${WD}/configs/z16f2800100zcog/tools TOOLDIR=${WD}/configs/z16f2800100zcog/tools
ME=${TOOLDIR}/dopatch.sh ME=${TOOLDIR}/dopatch.sh
PATCH=${TOOLDIR}/zneo-zdsii-5_0_1-variadic-func-fix.patch PATCH=${TOOLDIR}/zneo-zdsii-5_0_1-variadic-func-fix.patch
ARGS=${1}
if [ ! -x ${ME} ]; then if [ ! -x ${ME} ]; then
echo "ERROR: This script must be executed from the top-level NuttX directory" echo "ERROR: This script must be executed from the top-level NuttX directory"
@@ -55,5 +56,5 @@ fi
cd .. || \ cd .. || \
{ echo "ERROR: failed to CD to the parent directory"; exit 1; } { echo "ERROR: failed to CD to the parent directory"; exit 1; }
cat ${PATCH} | patch -p1 || \ cat ${PATCH} | patch ${ARGS} -p1 || \
{ echo "ERROR: patch failed" ; exit 1; } { echo "ERROR: patch failed" ; exit 1; }
configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c
index ba7dbe7..b9f9991 100644 index ba7dbe7..45e4ab1 100644
--- a/apps/nshlib/nsh_console.c --- a/apps/nshlib/nsh_console.c
+++ b/apps/nshlib/nsh_console.c +++ b/apps/nshlib/nsh_console.c
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
@@ -113,7 +113,7 @@ index ba7dbe7..b9f9991 100644
+ return ret; + return ret;
+} +}
diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h
index c78362f..59bd8d7 100644 index c78362f..207f9b9 100644
--- a/apps/nshlib/nsh_console.h --- a/apps/nshlib/nsh_console.h
+++ b/apps/nshlib/nsh_console.h +++ b/apps/nshlib/nsh_console.h
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@