X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=serial_lcd.h;h=ae4a58e7bcff48e1eb2b42d05c554bd1acf04200;hb=ed1c6857c750294747f3705d1d9e37c89658bd5b;hp=ad4bbc9bdda73f1172e8ea57dbc537e5051ed287;hpb=8147823cf64e37f6f43838ffa9e056ea48e30c32;p=avr_serial_lcd.git

diff --git a/serial_lcd.h b/serial_lcd.h
index ad4bbc9..ae4a58e 100644
--- a/serial_lcd.h
+++ b/serial_lcd.h
@@ -126,11 +126,9 @@ typedef __flash unsigned int prog_uint32_t;
 // CodeVision Compiler
 #elif defined(__CODEVISIONAVR__)
 
-#if __CODEVISIONAVR__ >= 2
 #include <io.h>
-#else
-#include <tiny2313.h>
-#endif
+#include <delay.h>
+#include <sleep.h>
 
 #if defined(_CHIP_ATTINY2313_) || defined(_CHIP_ATTINY2313V_)
   #if !defined(WDTCSR)
@@ -141,6 +139,8 @@ typedef __flash unsigned int prog_uint32_t;
   #define UCSZ1   2
   #define TXEN    3
   #define RXEN    4
+  #define DOR     3
+  #define FE      4
   #define RXC	  7
   #define RXCIE   7
   #define PD1     1
@@ -163,14 +163,18 @@ typedef __flash unsigned int prog_uint32_t;
   #define SM0     4
   #define SM1     6
   #define SE      5
-  #define sleep_enable() MCUCR |= (1<<SE)
-  #define sleep_disable() MCUCR &= ~(1<<SE)
   #define USART_RX_vect USART_RXC
+  #define TIMER0_COMPA_vect TIM0_COMPA
 #endif
 
 #define FLASH_DECLARE(x) flash x
-#define ASM(a) asm(a)
-#define NOP() asm("nop");
+#define ASM(a) #asm(a)
+#define NOP() #asm("nop");
+#define cli() #asm("cli")
+#define sei() #asm("sei")
+#define wdt_reset() #asm("wdr")
+#define sleep_cpu() #asm("sleep")
+#define REGISTER_VAR(V,GNU,IAR) register V
 #define inline
 #define INLINE_FUNC_DECLARE(x) x
 #define NEAR_VAR(x) x
@@ -180,10 +184,11 @@ typedef __flash unsigned int prog_uint32_t;
 #define PGM_READ_BYTE(x) (*(x))
 
 #define NO_INIT_DECLARE(x) x
-#define REGISTER_VAR(V,GNUR,IAR) register V
-
 #define ISR(vec) interrupt [ ## vec ## ] void vec ## _handler(void)
 
+#define _delay_us(us) delay_us(us)
+#define _delay_ms(ms) delay_ms(ms)
+
 #else
 #error Unsupported compiler
 #endif