From 226f422b1fe5ccdf0bb3c07fa4983ec1615ce066 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 18 Mar 2019 17:21:57 -0700 Subject: [PATCH] altos/stm32f4-disco: Remove scheme This demo doesn't need a lisp interpreter Signed-off-by: Keith Packard --- src/stm32f4-disco/Makefile | 26 ++------------------------ src/stm32f4-disco/ao_disco.c | 27 --------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/src/stm32f4-disco/Makefile b/src/stm32f4-disco/Makefile index de30316c..ca612159 100644 --- a/src/stm32f4-disco/Makefile +++ b/src/stm32f4-disco/Makefile @@ -1,9 +1,5 @@ include ../stm32f4/Makefile-raw.defs -aoschemelib=$(shell pkg-config --variable=aoschemelib ao-scheme) - -include $(aoschemelib)/Makefile-scheme - IDVENDOR=0xfffe IDPRODUCT=0xfffa PRODUCT=stm32f4-disco @@ -17,8 +13,6 @@ INC = \ ao_pins.h \ ao_task.h \ ao_product.h \ - $(SCHEME_HDRS) \ - ao_scheme_const.h \ stm32f4.h \ Makefile @@ -36,10 +30,9 @@ ALTOS_SRC = \ ao_usb_gen.c \ ao_usb_stm32f4.c \ ao_led.c \ - ao_impure.c \ - $(SCHEME_SRCS) + ao_impure.c -CFLAGS = $(STM32F4_CFLAGS) -I$(aoschemelib) +CFLAGS = $(STM32F4_CFLAGS) PROG=stm32f4-disco-$(VERSION) ELF=$(PROG).elf @@ -56,21 +49,6 @@ $(ELF): Makefile $(OBJ) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version Makefile - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -V $(IDVENDOR) -s $(SERIAL) -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - -SCHEME_SCHEME=\ - ao_scheme_basic_syntax.scheme \ - ao_scheme_list.scheme \ - ao_scheme_advanced_syntax.scheme \ - ao_scheme_vector.scheme \ - ao_scheme_string.scheme \ - ao_scheme_char.scheme \ - ao_scheme_number.scheme - -ao_scheme_const.h: ao-scheme-make-const-big $(SCHEME_SCHEME) - $^ -o $@ -d POSIX,PORT,SAVE - distclean: clean clean: diff --git a/src/stm32f4-disco/ao_disco.c b/src/stm32f4-disco/ao_disco.c index ab3c0340..47948a65 100644 --- a/src/stm32f4-disco/ao_disco.c +++ b/src/stm32f4-disco/ao_disco.c @@ -13,34 +13,8 @@ */ #include -#include #include -static void scheme_cmd() { - ao_scheme_read_eval_print(stdin, stdout, false); -} - -static const struct ao_cmds scheme_cmds[] = { - { scheme_cmd, "l\0Run scheme interpreter" }, - { 0, 0 } -}; - -int -_ao_scheme_getc(void) -{ - static uint8_t at_eol; - int c; - - if (at_eol) { - ao_cmd_readline(ao_scheme_read_list ? "- " : "> "); - at_eol = 0; - } - c = (unsigned char) ao_cmd_lex(); - if (c == '\n') - at_eol = 1; - return c; -} - void main(void) { ao_clock_init(); @@ -51,6 +25,5 @@ void main(void) ao_usart_init(); ao_usb_init(); ao_cmd_init(); - ao_cmd_register(scheme_cmds); ao_start_scheduler(); } -- 2.30.2