changeset 520:bfddfecc52b2

target-utils: removed duplicated mygetchar.c modules from individual programs
author Mychaela Falconia <falcon@freecalypso.org>
date Mon, 03 Jun 2019 00:40:13 +0000
parents f9d2ce6591b7
children 6604403aa212
files target-utils/buzplayer/Makefile target-utils/buzplayer/mygetchar.c target-utils/c139-lldbg/Makefile target-utils/c139-lldbg/mygetchar.c target-utils/c139explore/Makefile target-utils/c139explore/mygetchar.c target-utils/calversion/Makefile target-utils/calversion/mygetchar.c target-utils/flash-boot-test/Makefile target-utils/flash-boot-test/mygetchar.c target-utils/helloapp/Makefile target-utils/helloapp/mygetchar.c target-utils/loadagent/Makefile target-utils/loadagent/mygetchar.c target-utils/pirexplore/Makefile target-utils/pirexplore/mygetchar.c
diffstat 16 files changed, 10 insertions(+), 180 deletions(-) [+]
line wrap: on
line diff
--- a/target-utils/buzplayer/Makefile	Sun Jun 02 23:59:12 2019 +0000
+++ b/target-utils/buzplayer/Makefile	Mon Jun 03 00:40:13 2019 +0000
@@ -7,7 +7,7 @@
 INSTDIR=/opt/freecalypso/target-bin
 
 PROG=	buzplayer
-OBJS=	crt0.o cmdtab.o main.o melentry.o melplay.o mygetchar.o timer.o
+OBJS=	crt0.o cmdtab.o main.o melentry.o melplay.o timer.o
 LIBS=	../libcommon/libcommon.a ../libprintf/libprintf.a ../libbase/libbase.a \
 	../libc/libc.a
 LIBGCC=	`${CC} -print-file-name=libgcc.a`
--- a/target-utils/buzplayer/mygetchar.c	Sun Jun 02 23:59:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * The interactive command entry (editing) function in libcommon
- * will call mygetchar() for its character input.  It is supposed
- * to be a blocking wait for input, but in some programs other
- * processing can be done while waiting - for example, check for
- * keypad presses as well.  This is the basic version which waits
- * for serial input and nothing else.
- */
-
-extern int serial_in_poll();
-
-int
-mygetchar()
-{
-	register int c;
-
-	do
-		c = serial_in_poll();
-	while (c < 0);
-	return c;
-}
--- a/target-utils/c139-lldbg/Makefile	Sun Jun 02 23:59:12 2019 +0000
+++ b/target-utils/c139-lldbg/Makefile	Mon Jun 03 00:40:13 2019 +0000
@@ -5,7 +5,7 @@
 OBJCOPY=arm-elf-objcopy
 
 PROG=	lldbg
-OBJS=	entry.o cmdtab.o entryinfo.o main.o mygetchar.o uartbase.o
+OBJS=	entry.o cmdtab.o entryinfo.o main.o uartbase.o
 LIBS=	../libcommon/libcommon.a ../libprintf/libprintf.a ../libbase/libbase.a \
 	../libc/libc.a
 LIBGCC=	`${CC} -print-file-name=libgcc.a`
--- a/target-utils/c139-lldbg/mygetchar.c	Sun Jun 02 23:59:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * The interactive command entry (editing) function in libcommon
- * will call mygetchar() for its character input.  It is supposed
- * to be a blocking wait for input, but in some programs other
- * processing can be done while waiting - for example, check for
- * keypad presses as well.  This is the basic version which waits
- * for serial input and nothing else.
- */
-
-extern int serial_in_poll();
-
-int
-mygetchar()
-{
-	register int c;
-
-	do
-		c = serial_in_poll();
-	while (c < 0);
-	return c;
-}
--- a/target-utils/c139explore/Makefile	Sun Jun 02 23:59:12 2019 +0000
+++ b/target-utils/c139explore/Makefile	Mon Jun 03 00:40:13 2019 +0000
@@ -7,8 +7,7 @@
 INSTDIR=/opt/freecalypso/target-bin
 
 PROG=	c139explore
-OBJS=	crt0.o backlight.o cmdtab.o dac.o lcd.o main.o mygetchar.o uartbase.o \
-	uwire.o
+OBJS=	crt0.o backlight.o cmdtab.o dac.o lcd.o main.o uartbase.o uwire.o
 LIBS=	../libcommon/libcommon.a ../libprintf/libprintf.a ../libbase/libbase.a \
 	../libc/libc.a
 LIBGCC=	`${CC} -print-file-name=libgcc.a`
--- a/target-utils/c139explore/mygetchar.c	Sun Jun 02 23:59:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * The interactive command entry (editing) function in libcommon
- * will call mygetchar() for its character input.  It is supposed
- * to be a blocking wait for input, but in some programs other
- * processing can be done while waiting - for example, check for
- * keypad presses as well.  This is the basic version which waits
- * for serial input and nothing else.
- */
-
-extern int serial_in_poll();
-
-int
-mygetchar()
-{
-	register int c;
-
-	do
-		c = serial_in_poll();
-	while (c < 0);
-	return c;
-}
--- a/target-utils/calversion/Makefile	Sun Jun 02 23:59:12 2019 +0000
+++ b/target-utils/calversion/Makefile	Mon Jun 03 00:40:13 2019 +0000
@@ -7,7 +7,7 @@
 INSTDIR=/opt/freecalypso/target-bin
 
 PROG=	calversion
-OBJS=	crt0.o cmdtab.o dsp_bringup.o main.o mygetchar.o
+OBJS=	crt0.o cmdtab.o dsp_bringup.o main.o
 LIBS=	../libcommon/libcommon.a ../libprintf/libprintf.a ../libbase/libbase.a \
 	../libc/libc.a
 LIBGCC=	`${CC} -print-file-name=libgcc.a`
--- a/target-utils/calversion/mygetchar.c	Sun Jun 02 23:59:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * The interactive command entry (editing) function in libcommon
- * will call mygetchar() for its character input.  It is supposed
- * to be a blocking wait for input, but in some programs other
- * processing can be done while waiting - for example, check for
- * keypad presses as well.  This is the basic version which waits
- * for serial input and nothing else.
- */
-
-extern int serial_in_poll();
-
-int
-mygetchar()
-{
-	register int c;
-
-	do
-		c = serial_in_poll();
-	while (c < 0);
-	return c;
-}
--- a/target-utils/flash-boot-test/Makefile	Sun Jun 02 23:59:12 2019 +0000
+++ b/target-utils/flash-boot-test/Makefile	Mon Jun 03 00:40:13 2019 +0000
@@ -4,8 +4,7 @@
 LD=	arm-elf-ld
 OBJCOPY=arm-elf-objcopy
 
-OBJS=	vectors.o crt0.o cmdtab.o main.o mygetchar.o uartbase.o uartinit.o \
-	watchdog.o
+OBJS=	vectors.o crt0.o cmdtab.o main.o uartbase.o uartinit.o watchdog.o
 LIBS=	../libcommon/libcommon.a ../libprintf/libprintf.a ../libbase/libbase.a \
 	../libc/libc.a
 LIBGCC=	`${CC} -print-file-name=libgcc.a`
--- a/target-utils/flash-boot-test/mygetchar.c	Sun Jun 02 23:59:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * The interactive command entry (editing) function in libcommon
- * will call mygetchar() for its character input.  It is supposed
- * to be a blocking wait for input, but in some programs other
- * processing can be done while waiting - for example, check for
- * keypad presses as well.  This is the basic version which waits
- * for serial input and nothing else.
- */
-
-extern int serial_in_poll();
-
-int
-mygetchar()
-{
-	register int c;
-
-	do
-		c = serial_in_poll();
-	while (c < 0);
-	return c;
-}
--- a/target-utils/helloapp/Makefile	Sun Jun 02 23:59:12 2019 +0000
+++ b/target-utils/helloapp/Makefile	Mon Jun 03 00:40:13 2019 +0000
@@ -4,9 +4,9 @@
 LD=	arm-elf-ld
 OBJCOPY=arm-elf-objcopy
 
-BOOTROM_OBJS=	crt0.o cmdtab.o main-bootrom.o mygetchar.o
-IRDA_OBJS=	crt0.o cmdtab.o main-fixeduart.o mygetchar.o uartbase-irda.o
-MODEM_OBJS=	crt0.o cmdtab.o main-fixeduart.o mygetchar.o uartbase-modem.o
+BOOTROM_OBJS=	crt0.o cmdtab.o main-bootrom.o
+IRDA_OBJS=	crt0.o cmdtab.o main-fixeduart.o uartbase-irda.o
+MODEM_OBJS=	crt0.o cmdtab.o main-fixeduart.o uartbase-modem.o
 
 LIBS=	../libcommon/libcommon.a ../libprintf/libprintf.a ../libbase/libbase.a \
 	../libc/libc.a
--- a/target-utils/helloapp/mygetchar.c	Sun Jun 02 23:59:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * The interactive command entry (editing) function in libcommon
- * will call mygetchar() for its character input.  It is supposed
- * to be a blocking wait for input, but in some programs other
- * processing can be done while waiting - for example, check for
- * keypad presses as well.  This is the basic version which waits
- * for serial input and nothing else.
- */
-
-extern int serial_in_poll();
-
-int
-mygetchar()
-{
-	register int c;
-
-	do
-		c = serial_in_poll();
-	while (c < 0);
-	return c;
-}
--- a/target-utils/loadagent/Makefile	Sun Jun 02 23:59:12 2019 +0000
+++ b/target-utils/loadagent/Makefile	Mon Jun 03 00:40:13 2019 +0000
@@ -7,7 +7,7 @@
 INSTDIR=/opt/freecalypso/target-bin
 
 PROG=	loadagent
-OBJS=	crt0.o cmdtab.o main.o mygetchar.o
+OBJS=	crt0.o cmdtab.o main.o
 LIBS=	../libload/libload.a ../libcommon/libcommon.a ../libprintf/libprintf.a \
 	../libbase/libbase.a ../libc/libc.a
 LIBGCC=	`${CC} -print-file-name=libgcc.a`
--- a/target-utils/loadagent/mygetchar.c	Sun Jun 02 23:59:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * The interactive command entry (editing) function in libcommon
- * will call mygetchar() for its character input.  It is supposed
- * to be a blocking wait for input, but in some programs other
- * processing can be done while waiting - for example, check for
- * keypad presses as well.  This is the basic version which waits
- * for serial input and nothing else.
- */
-
-extern int serial_in_poll();
-
-int
-mygetchar()
-{
-	register int c;
-
-	do
-		c = serial_in_poll();
-	while (c < 0);
-	return c;
-}
--- a/target-utils/pirexplore/Makefile	Sun Jun 02 23:59:12 2019 +0000
+++ b/target-utils/pirexplore/Makefile	Mon Jun 03 00:40:13 2019 +0000
@@ -7,7 +7,7 @@
 INSTDIR=/opt/freecalypso/target-bin
 
 PROG=	pirexplore
-OBJS=	crt0.o cmdtab.o ffsparam.o flashid.o lcd.o main.o mygetchar.o rtc.o
+OBJS=	crt0.o cmdtab.o ffsparam.o flashid.o lcd.o main.o rtc.o
 LIBS=	../libtiffs/libtiffs.a ../libcommon/libcommon.a \
 	../libprintf/libprintf.a ../libbase/libbase.a ../libc/libc.a
 LIBGCC=	`${CC} -print-file-name=libgcc.a`
--- a/target-utils/pirexplore/mygetchar.c	Sun Jun 02 23:59:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * The interactive command entry (editing) function in libcommon
- * will call mygetchar() for its character input.  It is supposed
- * to be a blocking wait for input, but in some programs other
- * processing can be done while waiting - for example, check for
- * keypad presses as well.  This is the basic version which waits
- * for serial input and nothing else.
- */
-
-extern int serial_in_poll();
-
-int
-mygetchar()
-{
-	register int c;
-
-	do
-		c = serial_in_poll();
-	while (c < 0);
-	return c;
-}