diff --git a/ports/stm32f10x/Makefile b/ports/stm32f10x/Makefile new file mode 100644 index 0000000..2a02553 --- /dev/null +++ b/ports/stm32f10x/Makefile @@ -0,0 +1,209 @@ +#+-------------------------------------------------------------------------------------------------+ +#| GNU Make script for STM32F103xG microcontroller | +#+-------------------------------------------------------------------------------------------------+ +TARGET=bacnet + +BACNET_DIR = ../.. +BACNET_CORE = $(BACNET_DIR)/src +BACNET_DEMO = $(BACNET_DIR)/demo +BACNET_INCLUDE = $(BACNET_DIR)/include +BACNET_OBJECT = $(BACNET_DIR)/demo/object +BACNET_HANDLER = $(BACNET_DIR)/demo/handler +PLATFORM_DIR = . +LIBRARY_STM32 = ./drivers/src +LIBRARY_STM32_INCLUDES = ./drivers/inc +LIBRARY_CMSIS = ./CMSIS + +INCLUDES = -I$(PLATFORM_DIR) +INCLUDES += -I$(LIBRARY_STM32_INCLUDES) +INCLUDES += -I$(LIBRARY_CMSIS) +INCLUDES += -I$(BACNET_INCLUDE) +INCLUDES += -I$(BACNET_OBJECT) +INCLUDES += -I$(BACNET_HANDLER) + +PLATFORM_SRC = \ + $(PLATFORM_DIR)/main.c \ + $(PLATFORM_DIR)/automac.c \ + $(PLATFORM_DIR)/bacnet.c \ + $(PLATFORM_DIR)/bo.c \ + $(PLATFORM_DIR)/device.c \ + $(PLATFORM_DIR)/dlmstp.c \ + $(PLATFORM_DIR)/led.c \ + $(PLATFORM_DIR)/rs485.c \ + $(PLATFORM_DIR)/stm32f10x_it.c \ + $(PLATFORM_DIR)/system_stm32f10x.c \ + $(PLATFORM_DIR)/timer.c \ + $(PLATFORM_DIR)/timer_sys.c + +DEMO_SRC = \ + $(BACNET_DEMO)/handler/h_dcc.c \ + $(BACNET_DEMO)/handler/h_npdu.c \ + $(BACNET_DEMO)/handler/h_rd.c \ + $(BACNET_DEMO)/handler/h_rp.c \ + $(BACNET_DEMO)/handler/h_rpm.c \ + $(BACNET_DEMO)/handler/h_whohas.c \ + $(BACNET_DEMO)/handler/h_whois.c \ + $(BACNET_DEMO)/handler/h_wp.c \ + $(BACNET_DEMO)/handler/noserv.c \ + $(BACNET_DEMO)/handler/s_iam.c \ + $(BACNET_DEMO)/handler/s_ihave.c \ + $(BACNET_DEMO)/handler/txbuf.c + +BACNET_SRC = \ + $(BACNET_CORE)/abort.c \ + $(BACNET_CORE)/apdu.c \ + $(BACNET_CORE)/bacaddr.c \ + $(BACNET_CORE)/bacapp.c \ + $(BACNET_CORE)/bacdcode.c \ + $(BACNET_CORE)/bacerror.c \ + $(BACNET_CORE)/bacint.c \ + $(BACNET_CORE)/bacreal.c \ + $(BACNET_CORE)/bacstr.c \ + $(BACNET_CORE)/crc.c \ + $(BACNET_CORE)/dcc.c \ + $(BACNET_CORE)/fifo.c \ + $(BACNET_CORE)/iam.c \ + $(BACNET_CORE)/ihave.c \ + $(BACNET_CORE)/lighting.c \ + $(BACNET_CORE)/memcopy.c \ + $(BACNET_CORE)/npdu.c \ + $(BACNET_CORE)/proplist.c \ + $(BACNET_CORE)/rd.c \ + $(BACNET_CORE)/reject.c \ + $(BACNET_CORE)/ringbuf.c \ + $(BACNET_CORE)/rp.c \ + $(BACNET_CORE)/rpm.c \ + $(BACNET_CORE)/whohas.c \ + $(BACNET_CORE)/whois.c \ + $(BACNET_CORE)/wp.c + +STM32_SRC = \ + $(LIBRARY_STM32)/stm32f10x_adc.c \ + $(LIBRARY_STM32)/stm32f10x_bkp.c \ + $(LIBRARY_STM32)/stm32f10x_can.c \ + $(LIBRARY_STM32)/stm32f10x_cec.c \ + $(LIBRARY_STM32)/stm32f10x_crc.c \ + $(LIBRARY_STM32)/stm32f10x_dac.c \ + $(LIBRARY_STM32)/stm32f10x_dbgmcu.c \ + $(LIBRARY_STM32)/stm32f10x_dma.c \ + $(LIBRARY_STM32)/stm32f10x_exti.c \ + $(LIBRARY_STM32)/stm32f10x_flash.c \ + $(LIBRARY_STM32)/stm32f10x_fsmc.c \ + $(LIBRARY_STM32)/stm32f10x_gpio.c \ + $(LIBRARY_STM32)/stm32f10x_i2c.c \ + $(LIBRARY_STM32)/stm32f10x_iwdg.c \ + $(LIBRARY_STM32)/stm32f10x_misc.c \ + $(LIBRARY_STM32)/stm32f10x_pwr.c \ + $(LIBRARY_STM32)/stm32f10x_rcc.c \ + $(LIBRARY_STM32)/stm32f10x_rtc.c \ + $(LIBRARY_STM32)/stm32f10x_sdio.c \ + $(LIBRARY_STM32)/stm32f10x_spi.c \ + $(LIBRARY_STM32)/stm32f10x_tim.c \ + $(LIBRARY_STM32)/stm32f10x_usart.c \ + $(LIBRARY_STM32)/stm32f10x_wwdg.c \ + $(LIBRARY_STM32)/syscalls.c + +CSRC = $(PLATFORM_SRC) +CSRC += $(DEMO_SRC) +CSRC += $(BACNET_SRC) +CSRC += $(STM32_SRC) + +ASRC = $(LIBRARY_CMSIS)/gcc_ride7/startup_stm32f10x_xl.s + +#Set the toolchain command names (only the ones needed are defined) +PREFIX ?= arm-none-eabi- + +CC = $(PREFIX)gcc +OBJCOPY = $(PREFIX)objcopy +OBJDUMP = $(PREFIX)objdump +AR = $(PREFIX)ar +SIZE = $(PREFIX)size + +LDSCRIPT = $(PLATFORM_DIR)/stm32f10x.ld + +MCU_FLAGS = -mcpu=cortex-m3 +MCU_FLAGS += -mthumb -mabi=aapcs +MCU_FLAGS += -mno-thumb-interwork +MCU_FLAGS += -DUSE_STDPERIPH_DRIVER +MCU_FLAGS += -DSTM32F10X_CL +MCU_FLAGS += -DHSE_VALUE=25000000 + +OPTIMIZE_FLAGS := -Os -ggdb +OPTIMIZE_FLAGS += -DNDEBUG + +BACNET_FLAGS = -DBACDL_MSTP=1 +BACNET_FLAGS += -DBACAPP_ALL +BACNET_FLAGS += -DMAX_APDU=480 +BACNET_FLAGS += -DBIG_ENDIAN=0 +BACNET_FLAGS += -DMAX_TSM_TRANSACTIONS=0 +BACNET_FLAGS += -DMAX_CHARACTER_STRING_BYTES=64 +BACNET_FLAGS += -DMAX_OCTET_STRING_BYTES=64 + +CFLAGS += $(MCU_FLAGS) +CFLAGS += $(OPTIMIZE_FLAGS) +CFLAGS += $(BACNET_FLAGS) +CFLAGS += $(INCLUDES) +# enable garbage collection of unused functions and data to shrink binary +CFLAGS += -ffunction-sections -fdata-sections -fno-strict-aliasing +# function calls will not use any special __builtin_xx to allow debug/linking +CFLAGS += -fno-builtin +# place uninitialized global variables in the data section of the object file. +CFLAGS += -fno-common +# enable all relevant warnings +CFLAGS += -Wall +# don't warn about missing braces since GCC is over-achiever for this +CFLAGS += -Wno-missing-braces + +# -Wa, Pass comma-separated on to the assembler +AFLAGS = -Wa,-ahls,-mapcs-32,-adhlns=$(<:.s=.lst) + +#Set the linker flags +# -Wl, Pass comma-separated on to the linker +LIBRARIES=-lc,-lgcc,-lm +LDFLAGS = -nostartfiles +LDFLAGS += -Wl,-nostdlib,-Map=$(TARGET).map,$(LIBRARIES),-T$(LDSCRIPT) +# dead code removal +LDFLAGS += -Wl,--gc-sections,-static +CPFLAGS = --output-target=binary +ODFLAGS = -x --syms + +AOBJ = $(ASRC:.s=.o) +COBJ = $(CSRC:.c=.o) + +all: $(TARGET).bin $(TARGET).elf + $(OBJDUMP) $(ODFLAGS) $(TARGET).elf > $(TARGET).dmp + $(SIZE) $(TARGET).elf + +$(TARGET).bin: $(TARGET).elf + $(OBJCOPY) $(TARGET).elf $(CPFLAGS) $(TARGET).bin + +$(TARGET).elf: $(COBJ) $(AOBJ) Makefile + $(CC) $(CFLAGS) $(AOBJ) $(COBJ) $(LDFLAGS) -o $@ + +# allow a single file to be unoptimized for debugging purposes +#dlmstp.o: +# $(CC) -c $(CFLAGS) $*.c -o $@ +# +#main.o: +# $(CC) -c $(CFLAGS) $*.c -o $@ +# +#$(BACNET_CORE)/npdu.o: +# $(CC) -c $(CFLAGS) $*.c -o $@ +# +#$(BACNET_CORE)/apdu.o: +# $(CC) -c $(CFLAGS) $*.c -o $@ + +.c.o: + $(CC) -c $(OPTIMIZATION) $(CFLAGS) $*.c -o $@ + +.s.o: + $(CC) -c $(AFLAGS) $*.s -o $@ + +.PHONY: clean +clean: + -rm -rf $(COBJ) $(AOBJ) $(COREOBJ) + -rm -rf $(TARGET).elf $(TARGET).bin $(TARGET).dmp $(TARGET).map + -rm -rf *.lst + +## Other dependencies +-include $(shell mkdir dep 2>/dev/null) $(wildcard dep/*) diff --git a/ports/stm32f10x/bacnet.ewp b/ports/stm32f10x/bacnet.ewp index 382d060..d44a9a3 100644 --- a/ports/stm32f10x/bacnet.ewp +++ b/ports/stm32f10x/bacnet.ewp @@ -1995,6 +1995,9 @@ $PROJ_DIR$\..\..\src\npdu.c + + $PROJ_DIR$\..\..\src\proplist.c + $PROJ_DIR$\..\..\src\rd.c diff --git a/ports/stm32f10x/device.c b/ports/stm32f10x/device.c index 56c1cfd..f4cc985 100644 --- a/ports/stm32f10x/device.c +++ b/ports/stm32f10x/device.c @@ -262,21 +262,6 @@ bool Device_Write_Property( return status; } -static unsigned property_list_count( - const int *pList) -{ - unsigned property_count = 0; - - if (pList) { - while (*pList != -1) { - property_count++; - pList++; - } - } - - return property_count; -} - /* for a given object type, returns the special property list */ void Device_Objects_Property_List( BACNET_OBJECT_TYPE object_type, @@ -636,7 +621,7 @@ int Device_Read_Property_Local( return 0; } apdu = rpdata->application_data; - switch (rpdata->object_property) { + switch ((int)rpdata->object_property) { case PROP_DESCRIPTION: characterstring_init_ansi(&char_string, "BACnet Development Kit"); apdu_len = @@ -839,7 +824,7 @@ bool Device_Write_Property_Local( wp_data->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; return false; } - switch (wp_data->object_property) { + switch ((int)wp_data->object_property) { case PROP_OBJECT_IDENTIFIER: if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { if ((value.type.Object_Id.type == OBJECT_DEVICE) && diff --git a/ports/stm32f10x/drivers/src/syscalls.c b/ports/stm32f10x/drivers/src/syscalls.c new file mode 100644 index 0000000..121622c --- /dev/null +++ b/ports/stm32f10x/drivers/src/syscalls.c @@ -0,0 +1,157 @@ +/* + * + * Atollic TrueSTUDIO Minimal System calls file + * + * For more information about which c-functions + * need which of these lowlevel functions + * please consult the Newlib libc-manual + * + * */ +#include +#include +#include +#include +#include +#include +#include +#include + +#undef errno +extern int errno; +extern int __io_putchar(int ch); + +register char * stack_ptr asm("sp"); + +char *__env[1] = { 0 }; +char **environ = __env; + +void initialise_monitor_handles() +{ +} + +int _getpid(void) +{ + return 1; +} + +int _kill(int pid, int sig) +{ + errno = EINVAL; + return -1; +} + +void _exit (int status) +{ + _kill(status, -1); + while (1) {} /* Make sure we hang here */ +} + +int _write(int file, char *ptr, int len) +{ + int todo; + + for (todo = 0; todo < len; todo++) + { + __io_putchar( *ptr++ ); + } + + /* Implement your write code here, this is used by puts and printf for example */ + return len; +} + +caddr_t _sbrk(int incr) +{ + extern char end asm("end"); + static char *heap_end; + char *prev_heap_end; + + if (heap_end == 0) + heap_end = &end; + + prev_heap_end = heap_end; + if (heap_end + incr > stack_ptr) + { +// write(1, "Heap and stack collision\n", 25); +// abort(); + errno = ENOMEM; + return (caddr_t) -1; + } + + heap_end += incr; + + return (caddr_t) prev_heap_end; +} + +int _close(int file) +{ + return -1; +} + + +int _fstat(int file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _isatty(int file) +{ + return 1; +} + +int _lseek(int file, int ptr, int dir) +{ + return 0; +} + +int _read(int file, char *ptr, int len) +{ + return 0; +} + +int _open(char *path, int flags, ...) +{ + /* Pretend like we always fail */ + return -1; +} + +int _wait(int *status) +{ + errno = ECHILD; + return -1; +} + +int _unlink(char *name) +{ + errno = ENOENT; + return -1; +} + +int _times(struct tms *buf) +{ + return -1; +} + +int _stat(char *file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _link(char *old, char *new) +{ + errno = EMLINK; + return -1; +} + +int _fork(void) +{ + errno = EAGAIN; + return -1; +} + +int _execve(char *name, char **argv, char **env) +{ + errno = ENOMEM; + return -1; +} diff --git a/ports/stm32f10x/stm32f10x.ld b/ports/stm32f10x/stm32f10x.ld new file mode 100644 index 0000000..04bbb96 --- /dev/null +++ b/ports/stm32f10x/stm32f10x.ld @@ -0,0 +1,68 @@ +MEMORY +{ + sram (W!RX) : ORIGIN = 0x20000000, LENGTH = 96k + flash (RX) : ORIGIN = 0x08000000, LENGTH = 1024k +} + +SECTIONS +{ + .text : + { + . = ALIGN(4); + _text = .; + PROVIDE(stext = .); + KEEP(*(.isr_vector)) + KEEP(*(.init)) + *(.text .text.*) + *(.rodata .rodata.*) + *(.gnu.linkonce.t.*) + *(.glue_7) + *(.glue_7t) + *(.gcc_except_table) + *(.gnu.linkonce.r.*) + . = ALIGN(4); + _etext = .; + _sidata = _etext; + PROVIDE(etext = .); + _fini = . ; + *(.fini) + + } >flash + + .data : AT (_etext) + { + . = ALIGN(4); + _sdata = .; + *(.ramfunc .ramfunc.* .fastrun .fastrun.*) + *(.data .data.*) + *(.gnu.linkonce.d.*) + . = ALIGN(4); + _edata = .; + } >sram + + .ARM.extab : + { + *(.ARM.extab*) + } >sram + + __exidx_start = .; + .ARM.exidx : + { + *(.ARM.exidx*) + } >sram + __exidx_end = .; + + .bss (NOLOAD) : { + . = ALIGN(4); + /* This is used by the startup in order to initialize the .bss secion */ + _sbss = .; + *(.bss .bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + . = ALIGN(4); + _ebss = .; + } >sram + + end = .; + PROVIDE( _estack = 0x20010000 ); +}