mirror/bacnet-stack
1
0
Fork 0
mirror of https://github.com/stargieg/bacnet-stack synced 2025-10-19 23:25:23 +08:00
Code Issues Releases Wiki Activity

[r3109] Updated Atmega8 project to compile under IAR EWARM 6.40.3

Browse Source
This commit is contained in:
Steve Karg 2017-01-28 19:43:57 +01:00 committed by Patrick Grimm
parent d046829710
commit 447a18383d
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ports/atmega8/bacnet.ewp
View File

@ -153,7 +153,7 @@
</option>
<option>
<name>Input description</name>
<state>Full formatting.</state>
<state>Full formatting</state>
</option>
<option>
<name>Output variant</name>
@ -162,7 +162,7 @@
</option>
<option>
<name>Output description</name>
<state> specifier a or A, no specifier n, no float or long long.</state>
<state>No specifier a, A, no specifier n, no float nor long long.</state>
</option>
<option>
<name>GRuntimeLibSelectSlave</name>
@ -1153,7 +1153,7 @@
</option>
<option>
<name>RTConfigPath</name>
<state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-sf-n.h</state>
<state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-1s-ec_mul-n.h</state>
</option>
<option>
<name>RTLibraryPath</name>
@ -1166,7 +1166,7 @@
</option>
<option>
<name>Input description</name>
<state>Full formatting.</state>
<state>Full formatting</state>
</option>
<option>
<name>Output variant</name>
@ -1175,7 +1175,7 @@
</option>
<option>
<name>Output description</name>
<state> specifier a or A, no specifier n, no float or long long.</state>
<state>No specifier a, A, no specifier n, no float nor long long.</state>
</option>
<option>
<name>GRuntimeLibSelectSlave</name>
@ -1230,7 +1230,7 @@
</option>
<option>
<name>GenDeviceSelectMenu</name>
<state>m168 ATmega168</state>
<state>m8 ATmega8</state>
</option>
</data>
</settings>
@ -1259,7 +1259,6 @@
</option>
<option>
<name>CCDefines</name>
<state>NDEBUG</state>
<state>BACDL_MSTP</state>
<state>MAX_APDU=50</state>
<state>BIG_ENDIAN=0</state>
@ -1356,7 +1355,7 @@
<option>
<name>CCCrossCallPassesList</name>
<version>8</version>
<state>1</state>
<state>5</state>
</option>
<option>
<name>CCObjUseModuleName</name>
@ -1368,7 +1367,7 @@
</option>
<option>
<name>CCDebugInfo</name>
<state>0</state>
<state>1</state>
</option>
<option>
<name>CCNoErrorMsg</name>
@ -1396,7 +1395,7 @@
</option>
<option>
<name>CCCharIs</name>
<state>1</state>
<state>0</state>
</option>
<option>
<name>CCExt</name>
@ -1426,6 +1425,7 @@
<name>newCCIncludePaths</name>
<state>$PROJ_DIR$</state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\..\..\demo\object</state>
</option>
<option>
<name>CCStdIncCheck</name>
@ -1565,7 +1565,7 @@
</option>
<option>
<name>CDebug</name>
<state>0</state>
<state>1</state>
</option>
<option>
<name>ADefines</name>
@ -1686,7 +1686,7 @@
</option>
<option>
<name>ANewIncludes</name>
<state>###Uninitialized###</state>
<state>$TOOLKIT_DIR$\INC\</state>
</option>
<option>
<name>AsmMultiByteSupport</name>
@ -1702,7 +1702,7 @@
</option>
<option>
<name>AsmOutputFile</name>
<state></state>
<state>$FILE_BNAME$.r90</state>
</option>
<option>
<name>AStdIncCheck</name>
@ -1744,12 +1744,12 @@
</option>
<option>
<name>OutputFile</name>
<state>$PROJ_FNAME$.hex</state>
<state>$PROJ_FNAME$.d90</state>
</option>
<option>
<name>OutputFormat</name>
<version>11</version>
<state>23</state>
<state>70</state>
</option>
<option>
<name>FormatVariant</name>
@ -1856,7 +1856,7 @@
</option>
<option>
<name>SuppressDiags</name>
<state></state>
<state>w31</state>
</option>
<option>
<name>TreatAsWarn</name>
@ -1882,13 +1882,11 @@
</option>
<option>
<name>XExtraOptionsCheck</name>
<state>1</state>
<state>0</state>
</option>
<option>
<name>XExtraOptions</name>
<state>-y(CODE)</state>
<state>-Ointel-extended,(DATA)=$EXE_DIR$\$PROJ_FNAME$_data.hex</state>
<state>-Ointel-extended,(XDATA)=$EXE_DIR$\$PROJ_FNAME$_eeprom.hex</state>
<state></state>
</option>
<option>
<name>IncludeSuppressed</name>
@ -1904,7 +1902,7 @@
</option>
<option>
<name>DebugInformation</name>
<state>1</state>
<state>0</state>
</option>
<option>
<name>RuntimeControl</name>
@ -1916,7 +1914,7 @@
</option>
<option>
<name>AllowExtraOutput</name>
<state>0</state>
<state>1</state>
</option>
<option>
<name>GenerateExtraOutput</name>

10
ports/atmega8/hardware.h
View File

@ -31,8 +31,12 @@
#endif
#if defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ASM__)
#include <iom168.h>
#define WATCHDOG_INIT() {BIT_CLEAR(MCUSR, WDRF); WDTCSR = 0;}
#include <ioavr.h>
#if defined(__ATmega168__)
#define WATCHDOG_INIT() {BIT_CLEAR(MCUSR, WDRF); WDTCSR = 0;}
#else
#define WATCHDOG_INIT()
#endif
#else
#if !defined(__AVR_ATmega168__)
#error Firmware is configured for ATmega168 only (-mmcu=atmega168)
@ -45,7 +49,7 @@
#endif
#include "iar2gcc.h"
#include "avr035.h"
#include "bits.h"
#define LED_NPDU_INIT() BIT_SET(DDRD, DDD5)
#define LED_NPDU_ON() BIT_CLEAR(PORTD, PD5)

8
ports/atmega8/rs485.c
View File

@ -182,20 +182,20 @@ void RS485_Turnaround_Delay(
RS485_Transmitter_Enable(false);
while (nbytes) {
while (!BIT_CHECK(UCSR0A, UDRE0)) {
while (!BIT_CHECK(UCSRA, UDRE)) {
/* do nothing - wait until Tx buffer is empty */
}
/* Send the data byte */
UDR0 = 0xff;
UDR = 0xff;
nbytes--;
}
/* was the frame sent? */
while (!BIT_CHECK(UCSR0A, TXC0)) {
while (!BIT_CHECK(UCSRA, TXC)) {
/* do nothing - wait until the entire frame in the
Transmit Shift Register has been shifted out */
}
/* Clear the Transmit Complete flag by writing a one to it. */
BIT_SET(UCSR0A, TXC0);
BIT_SET(UCSRA, TXC);
}
/****************************************************************************