From: mschmitt <mschmitt@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Wed, 20 Sep 2000 19:11:17 +0000 (+0000)
Subject: minor fix for duplicate getchar function
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b011458460963f60d8fe31b6a70ea9da32c255f0;p=fw%2Fsdcc

minor fix for duplicate getchar function


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@389 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/device/examples/startupcode/c.bat b/device/examples/startupcode/c.bat
index 34da5492..4ba9c8ae 100755
--- a/device/examples/startupcode/c.bat
+++ b/device/examples/startupcode/c.bat
@@ -2,10 +2,9 @@ set SDCCFLAGS=--debug --stack-after-data --model-large
 cls
 cd src
 sdcc --version
-sdcc %SDCCFLAGS% -c startup_code.c
-sdcc %SDCCFLAGS% -c cpu_c515a.c
+sdcc %SDCCFLAGS% --compile-only startup_code.c
+sdcc %SDCCFLAGS% --compile-only cpu_c515a.c
 sdcc %SDCCFLAGS% startup_code.rel cpu_c515a.rel
-del c:\tmp\t*.*
 cd ..
 pause
 c.bat
diff --git a/device/examples/startupcode/inc/cpu_c515a.h b/device/examples/startupcode/inc/cpu_c515a.h
index 1c37b834..4607e193 100644
--- a/device/examples/startupcode/inc/cpu_c515a.h
+++ b/device/examples/startupcode/inc/cpu_c515a.h
@@ -37,7 +37,7 @@ extern void SERIALVIAINTERRUPT (void) interrupt SI0_VECTOR;
 #endif
 
 extern void putchar(  char Byte );
-extern unsigned char getchar( void );
+extern char getchar( void );
 extern unsigned char keypressed( void );
 
 #ifdef USE_SYSTEM_TIMER
diff --git a/device/examples/startupcode/src/cpu_c515a.c b/device/examples/startupcode/src/cpu_c515a.c
index 098f6f4b..542f61b5 100644
--- a/device/examples/startupcode/src/cpu_c515a.c
+++ b/device/examples/startupcode/src/cpu_c515a.c
@@ -231,7 +231,7 @@ void putchar(  char Byte )
 /* History     : 00/03    V1.0 Initial Version                      */
 /*                                                                  */
 /********************************************************************/
-unsigned char getchar( void )
+char getchar( void )
 {
     unsigned char c;
     while (!SERIAL_VIA_INTERRUPT_RCNT)
@@ -266,7 +266,7 @@ unsigned char getchar( void )
 /* History     : 00/03    V1.0 Initial Version                      */
 /*                                                                  */
 /********************************************************************/
-unsigned char keypressed( void )
+char keypressed( void )
 {
     unsigned char c;
 
@@ -325,7 +325,7 @@ void putchar(  char Byte )
 /* History     : 00/03    V1.0 Initial Version                      */
 /*                                                                  */
 /********************************************************************/
-unsigned char getchar( void )
+char getchar( void )
 {
     while( !RI ) /* wait for RI==1 */
     {
@@ -350,7 +350,7 @@ unsigned char getchar( void )
 /* History     : 00/03    V1.0 Initial Version                      */
 /*                                                                  */
 /********************************************************************/
-unsigned char keypressed( void )
+char keypressed( void )
 {
     unsigned char c;
 
diff --git a/device/examples/startupcode/src/makefile.dep b/device/examples/startupcode/src/makefile.dep
index 37237eb3..3d934f6f 100644
--- a/device/examples/startupcode/src/makefile.dep
+++ b/device/examples/startupcode/src/makefile.dep
@@ -1,5 +1,13 @@
 startup_code.rel: startup_code.c ../inc/startup_code.h \
   ../inc/..\inc\hardware_description.h ../inc/..\inc\c515a.h \
+  /usr/local/share/include/stdarg.h /usr/local/share/include/stdio.h \
+  /usr/local/share/include/stdlib.h /usr/local/share/include/string.h \
+  /usr/local/share/include/ctype.h /usr/local/share/include/assert.h \
+  /usr/local/share/include/limits.h /usr/local/share/include/malloc.h \
   ../inc/..\inc\cpu_c515a.h
 cpu_c515a.rel: cpu_c515a.c ../inc/hardware_description.h \
-  ../inc/..\inc\c515a.h ../inc/..\inc\cpu_c515a.h
+  ../inc/..\inc\c515a.h /usr/local/share/include/stdarg.h \
+  /usr/local/share/include/stdio.h /usr/local/share/include/stdlib.h \
+  /usr/local/share/include/string.h /usr/local/share/include/ctype.h \
+  /usr/local/share/include/assert.h /usr/local/share/include/limits.h \
+  /usr/local/share/include/malloc.h ../inc/..\inc\cpu_c515a.h