projects
/
avr_serial_lcd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add lss file for cpp_obj program
[avr_serial_lcd.git]
/
serial_lcd.h
diff --git
a/serial_lcd.h
b/serial_lcd.h
index ad4bbc9bdda73f1172e8ea57dbc537e5051ed287..9d4439836ca0b847ea223c1ccd707820216ef1a5 100644
(file)
--- a/
serial_lcd.h
+++ b/
serial_lcd.h
@@
-126,11
+126,9
@@
typedef __flash unsigned int prog_uint32_t;
// CodeVision Compiler
\r
#elif defined(__CODEVISIONAVR__)
\r
\r
// CodeVision Compiler
\r
#elif defined(__CODEVISIONAVR__)
\r
\r
-#if __CODEVISIONAVR__ >= 2
\r
#include <io.h>
\r
#include <io.h>
\r
-#else
\r
-#include <tiny2313.h>
\r
-#endif
\r
+#include <delay.h>
\r
+#include <sleep.h>
\r
\r
#if defined(_CHIP_ATTINY2313_) || defined(_CHIP_ATTINY2313V_)
\r
#if !defined(WDTCSR)
\r
\r
#if defined(_CHIP_ATTINY2313_) || defined(_CHIP_ATTINY2313V_)
\r
#if !defined(WDTCSR)
\r
@@
-141,6
+139,8
@@
typedef __flash unsigned int prog_uint32_t;
#define UCSZ1 2
\r
#define TXEN 3
\r
#define RXEN 4
\r
#define UCSZ1 2
\r
#define TXEN 3
\r
#define RXEN 4
\r
+ #define DOR 3
\r
+ #define FE 4
\r
#define RXC 7
\r
#define RXCIE 7
\r
#define PD1 1
\r
#define RXC 7
\r
#define RXCIE 7
\r
#define PD1 1
\r
@@
-163,14
+163,18
@@
typedef __flash unsigned int prog_uint32_t;
#define SM0 4
\r
#define SM1 6
\r
#define SE 5
\r
#define SM0 4
\r
#define SM1 6
\r
#define SE 5
\r
- #define sleep_enable() MCUCR |= (1<<SE)
\r
- #define sleep_disable() MCUCR &= ~(1<<SE)
\r
#define USART_RX_vect USART_RXC
\r
#define USART_RX_vect USART_RXC
\r
+ #define TIMER0_COMPA_vect TIM0_COMPA
\r
#endif
\r
\r
#define FLASH_DECLARE(x) flash x
\r
#endif
\r
\r
#define FLASH_DECLARE(x) flash x
\r
-#define ASM(a) asm(a)
\r
-#define NOP() asm("nop");
\r
+#define ASM(a) #asm(a)
\r
+#define NOP() #asm("nop")
\r
+#define cli() #asm("cli")
\r
+#define sei() #asm("sei")
\r
+#define wdt_reset() #asm("wdr")
\r
+#define sleep_cpu() #asm("sleep")
\r
+#define REGISTER_VAR(V,GNU,IAR) register V
\r
#define inline
\r
#define INLINE_FUNC_DECLARE(x) x
\r
#define NEAR_VAR(x) x
\r
#define inline
\r
#define INLINE_FUNC_DECLARE(x) x
\r
#define NEAR_VAR(x) x
\r
@@
-180,10
+184,11
@@
typedef __flash unsigned int prog_uint32_t;
#define PGM_READ_BYTE(x) (*(x))
\r
\r
#define NO_INIT_DECLARE(x) x
\r
#define PGM_READ_BYTE(x) (*(x))
\r
\r
#define NO_INIT_DECLARE(x) x
\r
-#define REGISTER_VAR(V,GNUR,IAR) register V
\r
-
\r
#define ISR(vec) interrupt [ ## vec ## ] void vec ## _handler(void)
\r
\r
#define ISR(vec) interrupt [ ## vec ## ] void vec ## _handler(void)
\r
\r
+#define _delay_us(us) delay_us(us)
\r
+#define _delay_ms(ms) delay_ms(ms)
\r
+
\r
#else
\r
#error Unsupported compiler
\r
#endif
\r
#else
\r
#error Unsupported compiler
\r
#endif
\r