Another full update of current work

5 files changed, 147 insertions, 37 deletions

diff --git a/examples/usartecho/Makefile b/examples/usartecho/Makefile
new file mode 100644
index 0000000..900fe09
--- /dev/null
+++ b/examples/usartecho/Makefile
@@ -0,0 +1,64 @@
+MAKEFLAGS += --no-builtin-rules
+PROJNAME = usartecho
+
+SRC = echo.c
+
+OBJ = $(patsubst %.c,%.o,$(SRC)) # This creates list of *.o files from *.c
+
+.PHONY: all
+ifneq ("$(wildcard config)","") # Checking if configuration exists
+all: $(PROJNAME).hex
+	@echo Now you can flash $< to your chip.
+else
+all: help
+endif
+
+# Edit here help like you ever want
+.PHONY: help
+help:
+	@echo  "AVR-IOE USART echo example"
+	@echo  " all         - Build example"
+	@echo  " config      - Start configuration program"
+	@echo  " menuconfig  - NCurses based configuration program"
+	@echo  " help        - Prints this text"
+	@echo  " clean       - Removing all object files generated from source files"
+
+.PHONY: clean
+clean:
+	@echo " CLEAN OBJ"
+	@$(RM) $(OBJ)
+	@echo " CLEAN $(PROJNAME).elf $(PROJNAME).hex"
+	@$(RM) $(PROJNAME).elf $(PROJNAME).hex
+	@$(MAKE) -C ../.. clean
+
+# Building targets are available only if configuration is generated
+ifneq ("$(wildcard config)","")
+-include config
+# If you want change some standard CFLAGS, change them in configuration not here.
+# Add here only options that should not be applied to avr-ioe also.
+CFLAGS = -I../../include -mmcu=$(MMCU) -imacros ../../.config.h \
+	 $(shell echo $(CONFCFLAGS)) $(shell echo -DF_CPU=$(F_CPU)000L)
+
+$(PROJNAME).elf: ../../libioe.a
+$(PROJNAME).elf: $(OBJ)
+	@echo " LD       $@"
+	@avr-gcc -Os -mmcu=$(MMCU) $^ -o $@ -L../.. -lioe
+
+$(PROJNAME).hex: $(PROJNAME).elf
+	@echo " OBJCOPY  $@"
+	@avr-objcopy -O ihex -R .eeprom $< $@
+
+$(OBJ): %.o: %.c ../../libioe.a
+	@echo " CC       $@"
+	@avr-gcc $(CFLAGS) -c -o $@ $<
+
+../../libioe.a: config
+	@CONFIG=$$(readlink -f config) $(MAKE) -C ../.. libioe.a
+endif
+
+config:
+	@CONFIG=$$(readlink -f config) $(MAKE) -C ../.. config
+
+.PHONY: menuconfig
+menuconfig:
+	@CONFIG=$$(readlink -f config) $(MAKE) -C ../.. menuconfig
diff --git a/examples/usartecho/config b/examples/usartecho/config
new file mode 100644
index 0000000..052a5c4
--- /dev/null
+++ b/examples/usartecho/config
@@ -0,0 +1,41 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# AVR-IOE configuration
+#
+MMCU=atmega328p
+ATMEGA328P=y
+# ATTINY85 is not set
+F_CPU=16000
+
+#
+# Compilation options
+#
+GNUTOOLCHAIN_PREFIX=avr-
+CONFCFLAGS=-Os -ffunction-sections -fdata-sections -fshort-enums -Wall
+MCUSUPPORT_IOPORTS=y
+# CONFIG_IOPORTS is not set
+MCUSUPPORT_PCINT0=y
+MCUSUPPORT_PCINT1=y
+MCUSUPPORT_PCINT2=y
+MCUSUPPORT_SPI=y
+# CONFIG_SPI is not set
+MCUSUPPORT_USART=y
+CONFIG_USART=y
+CONFIG_USART_BAUD=115200
+USART_PARITY_C_NONE=y
+# USART_PARITY_C_ODD is not set
+# USART_PARITY_C_EVEN is not set
+CONFIG_USART_PARITY=USART_PARITY_NONE
+CONFIG_USART_DATABITS=8
+USART_STOPBIT_C_SINGLE=y
+# USART_STOPBIT_C_DOUBLE is not set
+CONFIG_USART_STOPBIT=USART_STOPBIT_SINGLE
+CONFIG_USART_OUTPUT_BUFFER=y
+CONFIG_USART_OUTBUFFER_SIZE=64
+USART_OUTBUFFER_MODE_C_BLOCK=y
+# USART_OUTBUFFER_MODE_C_OVERWRITE is not set
+# USART_OUTBUFFER_MODE_C_DROP is not set
+CONFIG_USART_OUTBUFFER_MODE=0
+# CONFIG_USART_INPUT_BUFFER is not set
+CONFIG_USART_INBUFFER_SIZE=32
+CONFIG_USART_INBUFFER_MODE=0
diff --git a/examples/usartecho/config.orig b/examples/usartecho/config.orig
new file mode 100644
index 0000000..8bc1db9
--- /dev/null
+++ b/examples/usartecho/config.orig
@@ -0,0 +1,41 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# AVR-IOE configuration
+#
+MMCU="atmega328p"
+ATMEGA328P=y
+# ATTINY85 is not set
+F_CPU=16000
+
+#
+# Compilation options
+#
+GNUTOOLCHAIN_PREFIX="avr-"
+CONFCFLAGS="-Os -ffunction-sections -fdata-sections -fshort-enums -Wall"
+MCUSUPPORT_IOPORTS=y
+# CONFIG_IOPORTS is not set
+MCUSUPPORT_PCINT0=y
+MCUSUPPORT_PCINT1=y
+MCUSUPPORT_PCINT2=y
+MCUSUPPORT_SPI=y
+# CONFIG_SPI is not set
+MCUSUPPORT_USART=y
+CONFIG_USART=y
+CONFIG_USART_BAUD=115200
+USART_PARITY_C_NONE=y
+# USART_PARITY_C_ODD is not set
+# USART_PARITY_C_EVEN is not set
+CONFIG_USART_PARITY="USART_PARITY_NONE"
+CONFIG_USART_DATABITS=8
+USART_STOPBIT_C_SINGLE=y
+# USART_STOPBIT_C_DOUBLE is not set
+CONFIG_USART_STOPBIT="USART_STOPBIT_SINGLE"
+CONFIG_USART_OUTPUT_BUFFER=y
+CONFIG_USART_OUTBUFFER_SIZE=64
+USART_OUTBUFFER_MODE_C_BLOCK=y
+# USART_OUTBUFFER_MODE_C_OVERWRITE is not set
+# USART_OUTBUFFER_MODE_C_DROP is not set
+CONFIG_USART_OUTBUFFER_MODE=0
+# CONFIG_USART_INPUT_BUFFER is not set
+CONFIG_USART_INBUFFER_SIZE=32
+CONFIG_USART_INBUFFER_MODE=0
diff --git a/examples/usartecho/echo.c b/examples/usartecho/echo.c
index 12b88f6..d685750 100644
--- a/examples/usartecho/echo.c
+++ b/examples/usartecho/echo.c
@@ -1,7 +1,7 @@
 #include <avr/io.h>
 #include <util/delay.h>
 #include <string.h>
-#include "../../usart.h"
+#include <usart.h>
 
 void rec(uint8_t data) {
     if (data == '\r') {
diff --git a/examples/usartecho/makefile b/examples/usartecho/makefile
deleted file mode 100644
index 15254c6..0000000
--- a/examples/usartecho/makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-MAKEFLAGS += --no-builtin-rules
-
-MMCU = atmega328p
-F_CPU = 16000000L
-IOE_PREFIX = ../..
-IOE_SHORTOUTPUT=y
-IOE_CFLAGS = -Os -fshort-enums -Wall \
-			 -DF_CPU=$(F_CPU) -mmcu=$(MMCU) \
-			 -DCONFIG_IOE_USART \
-			 -DCONFIG_IOE_USART_OUTBUFFER_SIZE=64 \
-			 -DCONFIG_IOE_USART_OUTBUFFER_MODE=0 \
-			 -DCONFIG_IOE_USART_BAUD=115200 \
-			 -DCONFIG_IOE_USART_PARITY=USART_PARITY_NONE \
-			 -DCONFIG_IOE_USART_STOPBIT=USART_STOPBIT_SINGLE \
-			 -DCONFIG_IOE_USART_DATABITS=8
-
-all: usart.hex
-	@echo Now you can flash usart.hex to your chip.
-
-clean: ioeclean
-	$(RM) echo.o
-	$(RM) usart.elf usart.hex
-
-include ../../avr-ioe.mk
-
-usart.elf: %.elf: $(IOE_OBJ) echo.o
-	@echo " LD       $@"
-	@avr-gcc -Os -mmcu=$(MMCU) $^ -o $@
-
-usart.hex: %.hex: %.elf
-	@echo " OBJCOPY  $@"
-	@avr-objcopy -O ihex -R .eeprom $< $@
-
-echo.o: %.o: %.c
-	@echo " CC       $@"
-	@avr-gcc $(IOE_CFLAGS) -c -o $@ $<