From: Keith Packard Date: Mon, 7 May 2018 16:53:52 +0000 (-0700) Subject: Merge branch 'mpusb' X-Git-Tag: 1.8.6~1^2~60 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=1f56dc30a31e3d5c833f73ec9cd31f548a80e154;hp=feb881a24250bd7e71ec8ccef0099d4b4a0df519 Merge branch 'mpusb' --- diff --git a/src/mpusb-v3.0/.gitignore b/src/mpusb-v3.0/.gitignore new file mode 100644 index 00000000..7c1cb599 --- /dev/null +++ b/src/mpusb-v3.0/.gitignore @@ -0,0 +1,2 @@ +ao_product.h +mpusb-v3.0-* diff --git a/src/mpusb-v3.0/Makefile b/src/mpusb-v3.0/Makefile new file mode 100644 index 00000000..96156741 --- /dev/null +++ b/src/mpusb-v3.0/Makefile @@ -0,0 +1,68 @@ +# +# 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_whiten.h \ + stm32f0.h \ + Makefile + +ALTOS_SRC = \ + ao_boot_chain.c \ + ao_interrupt.c \ + ao_product.c \ + ao_romconfig.c \ + ao_cmd.c \ + ao_dma_stm.c \ + ao_task.c \ + ao_stdio.c \ + ao_panic.c \ + ao_timer.c \ + ao_mutex.c \ + ao_usb_stm.c \ + ao_power.c \ + ao_gpio.c \ + ao_serial_stm.c + +PRODUCT=MicroPeakUSB-v3.0 +PRODUCT_DEF=-DMPUSB +IDPRODUCT=0x002b + +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -Os -g + +PROGNAME=mpusb-v3.0 +PROG=$(PROGNAME)-$(VERSION).elf +HEX=$(PROGNAME)-$(VERSION).ihx + +SRC=$(ALTOS_SRC) ao_mpusb.c +OBJ=$(SRC:.c=.o) + +all: $(PROG) $(HEX) + +$(PROG): Makefile $(OBJ) altos.ld + $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + +ao_product.h: ao-make-product.5c ../Version + $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ + +$(OBJ): $(INC) + +distclean: clean + +clean: + rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx + rm -f ao_product.h + +install: + +uninstall: diff --git a/src/mpusb-v3.0/ao_mpusb.c b/src/mpusb-v3.0/ao_mpusb.c new file mode 100644 index 00000000..dc30e197 --- /dev/null +++ b/src/mpusb-v3.0/ao_mpusb.c @@ -0,0 +1,61 @@ +/* + * Copyright © 2012 Keith Packard + * + * 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. + */ + +#include +#include + +static struct ao_task ao_report_task; + +static void +ao_report(void) +{ + int c; + ao_up_set_speed(AO_SERIAL_SPEED_9600); + for (;;) { + ao_arch_block_interrupts(); + c = _ao_up_pollchar(); + ao_arch_release_interrupts(); + if (c == AO_READ_AGAIN) { + flush(); + c = ao_up_getchar(); + } + putchar(c); + } +} + +int +main(void) +{ + ao_clock_init(); + + ao_task_init(); + + ao_timer_init(); + + ao_serial_init(); + + ao_dma_init(); + + ao_cmd_init(); + + ao_usb_init(); + + ao_add_task(&ao_report_task, ao_report, "report"); + + ao_start_scheduler(); + return 0; +} diff --git a/src/mpusb-v3.0/ao_pins.h b/src/mpusb-v3.0/ao_pins.h new file mode 100644 index 00000000..3e79aad3 --- /dev/null +++ b/src/mpusb-v3.0/ao_pins.h @@ -0,0 +1,67 @@ +/* + * Copyright © 2012 Keith Packard + * + * 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. + */ + +/* Using TeleMetrum v1.9 board */ + +#ifndef _AO_PINS_H_ +#define _AO_PINS_H_ + +#define HAS_TASK_QUEUE 1 + +#define IS_FLASH_LOADER 0 + +#define AO_POWER_MANAGEMENT 1 + +/* 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_EEPROM 0 +#define USE_INTERNAL_FLASH 0 +#define USE_STORAGE_CONFIG 0 +#define USE_EEPROM_CONFIG 0 + +#define HAS_BEEP 0 + +#define HAS_USB 1 +#define AO_USB_DIRECTIO 0 +#define AO_PA11_PA12_RMP 1 + +#define HAS_SPI_0 0 + +#define LOW_LEVEL_DEBUG 0 + +#define HAS_SERIAL_2 1 +#define USE_SERIAL_2_STDIN 0 +#define SERIAL_2_PA2_PA3 1 +#define SERIAL_2_SWAP 0 +#define USE_SERIAL_2_FLOW 0 +#define USE_SERIAL_2_SW_FLOW 0 + +#define ao_up_getchar ao_serial2_getchar +#define ao_up_putchar ao_serial2_putchar +#define _ao_up_pollchar _ao_serial2_pollchar +#define ao_up_set_speed ao_serial2_set_speed + +#endif /* _AO_PINS_H_ */ diff --git a/src/mpusb-v3.0/flash-loader/.gitignore b/src/mpusb-v3.0/flash-loader/.gitignore new file mode 100644 index 00000000..1f8b3545 --- /dev/null +++ b/src/mpusb-v3.0/flash-loader/.gitignore @@ -0,0 +1,2 @@ +ao_product.h +mpusb* diff --git a/src/mpusb-v3.0/flash-loader/Makefile b/src/mpusb-v3.0/flash-loader/Makefile new file mode 100644 index 00000000..8d0f9e42 --- /dev/null +++ b/src/mpusb-v3.0/flash-loader/Makefile @@ -0,0 +1,7 @@ +# +# AltOS flash loader build +# + +TOPDIR=../.. +HARDWARE=mpusb-v3.0 +include $(TOPDIR)/stmf0/Makefile-flash.defs diff --git a/src/mpusb-v3.0/flash-loader/ao_pins.h b/src/mpusb-v3.0/flash-loader/ao_pins.h new file mode 100644 index 00000000..7feb9362 --- /dev/null +++ b/src/mpusb-v3.0/flash-loader/ao_pins.h @@ -0,0 +1,34 @@ +/* + * Copyright © 2013 Keith Packard + * + * 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_PINS_H_ +#define _AO_PINS_H_ + +#include + +/* Debug port PA15 (pin 23) */ + +#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 + +#define AO_USB_DIRECTIO 0 +#define AO_PA11_PA12_RMP 1 + +#endif /* _AO_PINS_H_ */ diff --git a/src/stmf0/ao_arch_funcs.h b/src/stmf0/ao_arch_funcs.h index 56a3bc75..96c033f9 100644 --- a/src/stmf0/ao_arch_funcs.h +++ b/src/stmf0/ao_arch_funcs.h @@ -171,10 +171,12 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s #define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<