dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for Atmega1284p.

Browse Source
This commit is contained in:
skarg
2012-10-31 04:06:18 +00:00
parent fa12f4bcdf
commit cde2d61d92
8 changed files with 50 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/bdk-atxx4-mstp/Makefile
+24 -3
View File
@@ -3,11 +3,18 @@
############################################################################### ###############################################################################
## General Flags ## General Flags
ifeq (${MCU},atmega1284p)
MCU = atmega1284p
AVRDUDE_MCU = m1284p
LINT_MCU = __AVR_ATmega1284p__
else
MCU = atmega644p MCU = atmega644p
AVRDUDE_MCU = m644p AVRDUDE_MCU = m644p
# ATmega644 bootload is at word address 7000h, 7800h, 7C00h, or 7E00h # ATmega644 bootload is at word address 7000h, 7800h, 7C00h, or 7E00h
# Double that value to get the byte address # Double that value to get the byte address
BOOTLOAD = 0xF800 BOOTLOAD = 0xF800
LINT_MCU = __AVR_ATmega644p__
endif
TARGET = bacnet TARGET = bacnet
## Tools ## Tools
CC = avr-gcc CC = avr-gcc
@@ -17,7 +24,6 @@ OBJDUMP = avr-objdump
SIZE = avr-size SIZE = avr-size
AVRDUDE = avrdude AVRDUDE = avrdude
LINT = splint LINT = splint
LINT_MCU = __AVR_ATmega644p__
SIZE_OPTIONS = -t SIZE_OPTIONS = -t
#SIZE_OPTIONS = -C --mcu=${MCU} #SIZE_OPTIONS = -C --mcu=${MCU}
@@ -30,11 +36,24 @@ SIZE_OPTIONS = -t
# jtag2slow = Atmel JTAG ICE mkII, running at 19200 Bd # jtag2slow = Atmel JTAG ICE mkII, running at 19200 Bd
# avrispmkII = AVR ISP MKII # avrispmkII = AVR ISP MKII
# avr109 = bootloader # avr109 = bootloader
#AVRDUDE_PROGRAMMERID = avr109 ifeq (${JTAG},avr109)
#AVRDUDE_PROGRAMMERID = jtag2fast AVRDUDE_PROGRAMMERID = avr109
endif
ifeq (${JTAG},avrispmkII)
#AVRDUDE_PROGRAMMERID = avrispmkII #AVRDUDE_PROGRAMMERID = avrispmkII
endif
ifeq (${JTAG},dragon_isp)
#AVRDUDE_PROGRAMMERID = dragon_isp #AVRDUDE_PROGRAMMERID = dragon_isp
endif
ifeq (${JTAG},dragon_jtag)
AVRDUDE_PROGRAMMERID = dragon_jtag AVRDUDE_PROGRAMMERID = dragon_jtag
endif
ifeq (${JTAG},jtag2fast)
AVRDUDE_PROGRAMMERID = jtag2fast
endif
ifndef JTAG
AVRDUDE_PROGRAMMERID = jtag2fast
endif
# #
# port--serial or parallel port to which your # port--serial or parallel port to which your
# hardware programmer is attached # hardware programmer is attached
@@ -218,7 +237,9 @@ LDFLAGS = $(COMMON)
#dead code removal #dead code removal
#LDFLAGS += -Wl,-nostartfiles,-nostdlib #LDFLAGS += -Wl,-nostartfiles,-nostdlib
LDFLAGS += -Wl,--gc-sections,-static LDFLAGS += -Wl,--gc-sections,-static
ifneq (${MCU},atmega1284p)
LDFLAGS += -Wl,--section-start=.bootloader=$(BOOTLOAD) LDFLAGS += -Wl,--section-start=.bootloader=$(BOOTLOAD)
endif
LDFLAGS += -Wl,-Map=$(TARGET).map LDFLAGS += -Wl,-Map=$(TARGET).map
LDFLAGS += -Wl,-L.,-l$(TARGET) LDFLAGS += -Wl,-L.,-l$(TARGET)
bacnet-stack/ports/bdk-atxx4-mstp/adc.c
+1 -2
View File
@@ -167,6 +167,5 @@ void adc_init(
1 1 1 Timer/Counter1 Capture Event 1 1 1 Timer/Counter1 Capture Event
*/ */
ADCSRB = (0 << ADTS2) | (0 << ADTS1) | (0 << ADTS0); ADCSRB = (0 << ADTS2) | (0 << ADTS1) | (0 << ADTS0);
/* Clear the Power Reduction bit */ power_adc_enable();
BIT_CLEAR(PRR, PRADC);
} }
bacnet-stack/ports/bdk-atxx4-mstp/bacnet.aps
+1 -1
View File
File diff suppressed because one or more lines are too long
bacnet-stack/ports/bdk-atxx4-mstp/hardware.h
+7 -2
View File
@@ -39,8 +39,13 @@
#if defined(__GNUC__) #if defined(__GNUC__)
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#if !defined(__AVR_ATmega644P__) #include <avr/power.h>
#error Firmware is configured for ATmega644P only (-mmcu=atmega644p) #if defined(__AVR_ATmega644P__)
/* defined for ATmega644p */
#elif defined(__AVR_ATmega1284P__)
/* defined for ATmega1284p */
#else
#error For ATmega644P or ATmega1284p only (-mmcu=atmega644p -mmcu=atmega1284p)
#endif #endif
#endif #endif
bacnet-stack/ports/bdk-atxx4-mstp/input.c
+14 -14
View File
@@ -51,13 +51,13 @@ static void input_switch_workaround(
BIT_SET(DDRA, DDA5); BIT_SET(DDRA, DDA5);
BIT_SET(DDRA, DDA6); BIT_SET(DDRA, DDA6);
/* turn off the outputs */ /* turn off the outputs */
BIT_CLEAR(PORTA, PA0); BIT_CLEAR(PORTA, PORTA0);
BIT_CLEAR(PORTA, PA1); BIT_CLEAR(PORTA, PORTA1);
BIT_CLEAR(PORTA, PA2); BIT_CLEAR(PORTA, PORTA2);
BIT_CLEAR(PORTA, PA3); BIT_CLEAR(PORTA, PORTA3);
BIT_CLEAR(PORTA, PA4); BIT_CLEAR(PORTA, PORTA4);
BIT_CLEAR(PORTA, PA5); BIT_CLEAR(PORTA, PORTA5);
BIT_CLEAR(PORTA, PA6); BIT_CLEAR(PORTA, PORTA6);
/* configure the port pins for the switch - as inputs */ /* configure the port pins for the switch - as inputs */
BIT_CLEAR(DDRA, DDA0); BIT_CLEAR(DDRA, DDA0);
BIT_CLEAR(DDRA, DDA1); BIT_CLEAR(DDRA, DDA1);
@@ -156,13 +156,13 @@ void input_init(
BIT_CLEAR(DDRA, DDA5); BIT_CLEAR(DDRA, DDA5);
BIT_CLEAR(DDRA, DDA6); BIT_CLEAR(DDRA, DDA6);
/* activate the internal pull up resistors */ /* activate the internal pull up resistors */
BIT_SET(PORTA, PA0); BIT_SET(PORTA, PORTA0);
BIT_SET(PORTA, PA1); BIT_SET(PORTA, PORTA1);
BIT_SET(PORTA, PA2); BIT_SET(PORTA, PORTA2);
BIT_SET(PORTA, PA3); BIT_SET(PORTA, PORTA3);
BIT_SET(PORTA, PA4); BIT_SET(PORTA, PORTA4);
BIT_SET(PORTA, PA5); BIT_SET(PORTA, PORTA5);
BIT_SET(PORTA, PA6); BIT_SET(PORTA, PORTA6);
/* configure the port pins for binary inputs */ /* configure the port pins for binary inputs */
BIT_CLEAR(DDRB, DDB1); BIT_CLEAR(DDRB, DDB1);
BIT_CLEAR(DDRB, DDB2); BIT_CLEAR(DDRB, DDB2);
bacnet-stack/ports/bdk-atxx4-mstp/rs485.c
+1 -2
View File
@@ -310,8 +310,7 @@ static void rs485_usart_init(
/* Set Character Size: UCSZn2 UCSZn1 UCSZn0 = 011 for 8-bit */ /* Set Character Size: UCSZn2 UCSZn1 UCSZn0 = 011 for 8-bit */
/* Clock Polarity: UCPOLn = 0 when asynchronous mode is used. */ /* Clock Polarity: UCPOLn = 0 when asynchronous mode is used. */
UCSR0C = _BV(UCSZ01) | _BV(UCSZ00); UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
/* Clear Power Reduction */ power_usart0_enable();
BIT_CLEAR(PRR, PRUSART0);
} }
/**************************************************************************** /****************************************************************************
bacnet-stack/ports/bdk-atxx4-mstp/serial.c
+1 -2
View File
@@ -178,8 +178,7 @@ static void serial_usart_init(
/* Set Character Size: UCSZn2 UCSZn1 UCSZn0 = 011 for 8-bit */ /* Set Character Size: UCSZn2 UCSZn1 UCSZn0 = 011 for 8-bit */
/* Clock Polarity: UCPOLn = 0 when asynchronous mode is used. */ /* Clock Polarity: UCPOLn = 0 when asynchronous mode is used. */
UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
/* Clear Power Reduction */ power_usart1_enable();
BIT_CLEAR(PRR, PRUSART1);
} }
void serial_init( void serial_init(
bacnet-stack/ports/bdk-atxx4-mstp/timer2.c
+1 -2
View File
@@ -161,6 +161,5 @@ void timer_init(
TCNT2 = TIMER2_COUNT; TCNT2 = TIMER2_COUNT;
/* Enable the overflow interrupt */ /* Enable the overflow interrupt */
BIT_SET(TIMSK2, TOIE2); BIT_SET(TIMSK2, TOIE2);
/* Clear the Power Reduction Timer/Counter0 */ power_timer2_enable();
BIT_CLEAR(PRR, PRTIM2);
} }