Merge branch 'branch-1.7' into debian

10 files changed, 471 insertions, 0 deletions

diff --git a/src/lambdakey-v1.0/.gitignore b/src/lambdakey-v1.0/.gitignore
new file mode 100644
index 00000000..6462d930
--- /dev/null
+++ b/src/lambdakey-v1.0/.gitignore
@@ -0,0 +1,2 @@
+lambdakey-*
+ao_product.h
diff --git a/src/lambdakey-v1.0/Makefile b/src/lambdakey-v1.0/Makefile
new file mode 100644
index 00000000..2609bea3
--- /dev/null
+++ b/src/lambdakey-v1.0/Makefile
@@ -0,0 +1,92 @@
+#
+# AltOS build
+#
+#
+
+include ../stmf0/Makefile.defs
+
+INC = \
+	ao.h \
+	ao_arch.h \
+	ao_arch_funcs.h \
+	ao_boot.h \
+	ao_pins.h \
+	ao_product.h \
+	ao_task.h \
+	ao_lisp.h \
+	ao_lisp_const.h \
+	ao_lisp_os.h \
+	stm32f0.h \
+	Makefile
+
+ALTOS_SRC = \
+	ao_boot_chain.c \
+	ao_interrupt.c \
+	ao_product.c \
+	ao_romconfig.c \
+	ao_cmd.c \
+	ao_config.c \
+	ao_task.c \
+	ao_led.c \
+	ao_dma_stm.c \
+	ao_stdio.c \
+	ao_mutex.c \
+	ao_panic.c \
+	ao_timer.c \
+	ao_usb_stm.c \
+	ao_flash_stm.c \
+	ao_lisp_lex.c \
+	ao_lisp_mem.c \
+	ao_lisp_cons.c \
+	ao_lisp_eval.c \
+	ao_lisp_string.c \
+	ao_lisp_atom.c \
+	ao_lisp_int.c \
+	ao_lisp_poly.c \
+	ao_lisp_builtin.c \
+	ao_lisp_read.c \
+	ao_lisp_rep.c \
+	ao_lisp_frame.c \
+	ao_lisp_error.c \
+	ao_lisp_lambda.c \
+	ao_lisp_save.c \
+	ao_lisp_stack.c \
+	ao_lisp_os_save.c
+
+PRODUCT=LambdaKey-v1.0
+PRODUCT_DEF=-DLAMBDAKEY
+IDPRODUCT=0x000a
+
+CFLAGS = $(PRODUCT_DEF) -I. $(STMF0_CFLAGS) -Os -g
+
+LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Tlambda.ld
+
+PROGNAME=lambdakey-v1.0
+PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
+
+SRC=$(ALTOS_SRC) ao_lambdakey.c
+OBJ=$(SRC:.c=.o)
+
+all: $(PROG) $(HEX)
+
+$(PROG): Makefile $(OBJ) lambda.ld altos.ld
+	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
+
+$(OBJ): $(INC)
+
+ao_product.h: ao-make-product.5c ../Version
+	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+
+load: $(PROG)
+	stm-load $(PROG)
+
+distclean:	clean
+
+clean:
+	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
+	rm -f ao_product.h
+
+install:
+
+uninstall:
diff --git a/src/lambdakey-v1.0/ao_lambdakey.c b/src/lambdakey-v1.0/ao_lambdakey.c
new file mode 100644
index 00000000..8bd344cf
--- /dev/null
+++ b/src/lambdakey-v1.0/ao_lambdakey.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2016 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#include <ao.h>
+#include <ao_lisp.h>
+
+static void lisp_cmd() {
+	ao_lisp_read_eval_print();
+}
+
+static const struct ao_cmds blink_cmds[] = {
+	{ lisp_cmd,	"l\0Run lisp interpreter" },
+	{ 0, 0 }
+};
+
+
+void main(void)
+{
+	ao_led_init(LEDS_AVAILABLE);
+	ao_clock_init();
+	ao_task_init();
+	ao_timer_init();
+	ao_dma_init();
+	ao_usb_init();
+	ao_cmd_init();
+	ao_cmd_register(blink_cmds);
+	ao_start_scheduler();
+}
+
+
diff --git a/src/lambdakey-v1.0/ao_lisp_os.h b/src/lambdakey-v1.0/ao_lisp_os.h
new file mode 100644
index 00000000..1993ac44
--- /dev/null
+++ b/src/lambdakey-v1.0/ao_lisp_os.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2016 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_LISP_OS_H_
+#define _AO_LISP_OS_H_
+
+#include "ao.h"
+
+static inline int
+ao_lisp_getc() {
+	static uint8_t	at_eol;
+	int c;
+
+	if (at_eol) {
+		ao_cmd_readline();
+		at_eol = 0;
+	}
+	c = ao_cmd_lex();
+	if (c == '\n')
+		at_eol = 1;
+	return c;
+}
+
+static inline void
+ao_lisp_os_flush(void)
+{
+	flush();
+}
+
+static inline void
+ao_lisp_abort(void)
+{
+	ao_panic(1);
+}
+
+static inline void
+ao_lisp_os_led(int led)
+{
+	ao_led_set(led);
+}
+
+static inline void
+ao_lisp_os_delay(int delay)
+{
+	ao_delay(AO_MS_TO_TICKS(delay));
+}
+
+#endif
diff --git a/src/lambdakey-v1.0/ao_lisp_os_save.c b/src/lambdakey-v1.0/ao_lisp_os_save.c
new file mode 100644
index 00000000..44138398
--- /dev/null
+++ b/src/lambdakey-v1.0/ao_lisp_os_save.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2016 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#include <ao.h>
+#include <ao_lisp.h>
+#include <ao_flash.h>
+
+extern uint8_t	__flash__[];
+
+/* saved variables to rebuild the heap
+
+   ao_lisp_atoms
+   ao_lisp_frame_global
+ */
+
+int
+ao_lisp_os_save(void)
+{
+	int i;
+
+	for (i = 0; i < AO_LISP_POOL_TOTAL; i += 256) {
+		uint32_t	*dst = (uint32_t *) &__flash__[i];
+		uint32_t	*src = (uint32_t *) &ao_lisp_pool[i];
+
+		ao_flash_page(dst, src);
+	}
+	return 1;
+}
+
+int
+ao_lisp_os_restore_save(struct ao_lisp_os_save *save, int offset)
+{
+	memcpy(save, &__flash__[offset], sizeof (struct ao_lisp_os_save));
+	return 1;
+}
+
+int
+ao_lisp_os_restore(void)
+{
+	memcpy(ao_lisp_pool, __flash__, AO_LISP_POOL_TOTAL);
+	return 1;
+}
diff --git a/src/lambdakey-v1.0/ao_pins.h b/src/lambdakey-v1.0/ao_pins.h
new file mode 100644
index 00000000..2ba79c01
--- /dev/null
+++ b/src/lambdakey-v1.0/ao_pins.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2016 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#define LED_PORT_ENABLE	STM_RCC_AHBENR_IOPBEN
+#define LED_PORT	(&stm_gpiob)
+#define LED_PIN_RED	4
+#define AO_LED_RED	(1 << LED_PIN_RED)
+#define AO_LED_PANIC	AO_LED_RED
+#define AO_CMD_LEN	128
+#define AO_LISP_POOL_TOTAL	3072
+#define AO_LISP_SAVE	1
+#define AO_STACK_SIZE	1024
+
+/* need HSI active to write to flash */
+#define AO_NEED_HSI	1
+
+#define LEDS_AVAILABLE	(AO_LED_RED)
+
+#define AO_POWER_MANAGEMENT	0
+
+/* 48MHz clock based on USB */
+#define AO_HSI48	1
+
+/* HCLK = 48MHz */
+#define AO_AHB_PRESCALER	1
+#define AO_RCC_CFGR_HPRE_DIV	STM_RCC_CFGR_HPRE_DIV_1
+
+/* APB = 48MHz */
+#define AO_APB_PRESCALER	1
+#define AO_RCC_CFGR_PPRE_DIV	STM_RCC_CFGR_PPRE_DIV_1
+
+#define HAS_USB				1
+#define AO_USB_DIRECTIO			0
+#define AO_PA11_PA12_RMP		1
+#define HAS_BEEP			0
+
+#define IS_FLASH_LOADER	0
+
+#endif /* _AO_PINS_H_ */
diff --git a/src/lambdakey-v1.0/flash-loader/.gitignore b/src/lambdakey-v1.0/flash-loader/.gitignore
new file mode 100644
index 00000000..86ebb7f2
--- /dev/null
+++ b/src/lambdakey-v1.0/flash-loader/.gitignore
@@ -0,0 +1,2 @@
+ao_product.h
+lambdakey*
diff --git a/src/lambdakey-v1.0/flash-loader/Makefile b/src/lambdakey-v1.0/flash-loader/Makefile
new file mode 100644
index 00000000..dbded719
--- /dev/null
+++ b/src/lambdakey-v1.0/flash-loader/Makefile
@@ -0,0 +1,8 @@
+#
+# AltOS flash loader build
+#
+#
+
+TOPDIR=../..
+HARDWARE=lambdakey-v1.0
+include $(TOPDIR)/stmf0/Makefile-flash.defs
diff --git a/src/lambdakey-v1.0/flash-loader/ao_pins.h b/src/lambdakey-v1.0/flash-loader/ao_pins.h
new file mode 100644
index 00000000..4b788f67
--- /dev/null
+++ b/src/lambdakey-v1.0/flash-loader/ao_pins.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#include <ao_flash_stm_pins.h>
+
+/* Pin 5 on debug connector */
+
+#define AO_BOOT_PIN			1
+#define AO_BOOT_APPLICATION_GPIO	stm_gpioa
+#define AO_BOOT_APPLICATION_PIN		15
+#define AO_BOOT_APPLICATION_VALUE	1
+#define AO_BOOT_APPLICATION_MODE	AO_EXTI_MODE_PULL_UP
+
+/* USB */
+#define HAS_USB			1
+#define AO_USB_DIRECTIO		0
+#define AO_PA11_PA12_RMP	1
+
+#endif /* _AO_PINS_H_ */
diff --git a/src/lambdakey-v1.0/lambda.ld b/src/lambdakey-v1.0/lambda.ld
new file mode 100644
index 00000000..5de65eb5
--- /dev/null
+++ b/src/lambdakey-v1.0/lambda.ld
@@ -0,0 +1,117 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+MEMORY {
+	rom (rx) :   ORIGIN = 0x08001000, LENGTH = 25K
+	flash (r):   ORIGIN = 0x08007400, LENGTH = 3k
+	ram (!w) :   ORIGIN = 0x20000000, LENGTH = 6k - 128
+	stack (!w) : ORIGIN = 0x20000000 + 6k - 128, LENGTH = 128
+}
+
+INCLUDE registers.ld
+
+EXTERN (stm_interrupt_vector)
+
+SECTIONS {
+	/*
+	 * Rom contents
+	 */
+
+	.interrupt ORIGIN(ram) : AT (ORIGIN(rom)) {
+		__interrupt_start__ = .;
+		__interrupt_rom__ = ORIGIN(rom);
+		*(.interrupt)	/* Interrupt vectors */
+		__interrupt_end__ = .;
+	} > ram
+
+	.text ORIGIN(rom) + 0x100 : {
+		__text_start__ = .;
+
+		/* Ick. What I want is to specify the
+		 * addresses of some global constants so
+		 * that I can find them across versions
+		 * of the application. I can't figure out
+		 * how to make gnu ld do that, so instead
+		 * we just load the two files that include
+		 * these defines in the right order here and
+		 * expect things to 'just work'. Don't change
+		 * the contents of those files, ok?
+		 */
+		ao_romconfig.o(.romconfig*)
+		ao_product.o(.romconfig*)
+
+		*(.text*)	/* Executable code */
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+		*(.rodata*)	/* Constants */
+
+	} > rom
+	__text_end__ = .;
+	
+
+	/* Boot data which must live at the start of ram so that
+	 * the application and bootloader share the same addresses.
+	 * This must be all uninitialized data
+	 */
+	.boot (NOLOAD) : {
+		__boot_start__ = .;
+		*(.boot)
+		. = ALIGN(4);
+		__boot_end__ = .;
+	} >ram
+
+	/* Functions placed in RAM (required for flashing)
+	 *
+	 * Align to 8 bytes as that's what the ARM likes text
+	 * segment alignments to be, and if we don't, then
+	 * we end up with a mismatch between the location in
+	 * ROM and the desired location in RAM. I don't
+	 * entirely understand this, but at least this appears
+	 * to work...
+	 */
+
+	.textram BLOCK(8): {
+		__data_start__ = .;
+		__text_ram_start__ = .;
+		*(.ramtext)
+		__text_ram_end = .;
+	} >ram AT>rom
+
+	/* Data -- relocated to RAM, but written to ROM
+	 */
+	.data : {
+		*(.data)	/* initialized data */
+		. = ALIGN(4);
+		__data_end__ = .;
+	} >ram AT>rom
+
+	.bss : {
+		__bss_start__ = .;
+		*(.bss)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} >ram
+
+	PROVIDE(end = .);
+
+	PROVIDE(__stack__ = ORIGIN(stack) + LENGTH(stack));
+
+	__flash__ = ORIGIN(flash);
+}
+
+ENTRY(start);