20080320 release

[avr_serial_lcd.git] / serial_lcd.c

diff --git a/serial_lcd.c b/serial_lcd.c
index 1235c7ba0c527653ba7284c3a149a9c977940bd5..75983d2d2b033b1952daba674a4b5576cf026a72 100644 (file)
--- a/serial_lcd.c
+++ b/serial_lcd.c
@@ -94,11 +94,6 @@ static FLASH_DECLARE(const unsigned char ledPwmPatterns[]) =
 #pragma global_register ledPwmCount:20 sUartRxHead:21 sUartRxTail:22 ledPwmCycling:23\r
 unsigned char ledPwmCount, sUartRxHead, sUartRxTail, ledPwmCycling;\r
 \r
-#elif defined(__CODEVISIONAVR__)\r
-#pragma regalloc-\r
-register unsigned char ledPwmCount, sUartRxHead, sUartRxTail, ledPwmCycling;\r
-#pragma regalloc+\r
-\r
 // Use avr_compat register variables\r
 #else\r
 REGISTER_VAR(unsigned char ledPwmCount, "r4", 15);\r
@@ -263,17 +258,13 @@ static inline void UsartInit(void) {
 #endif\r
 }\r
 \r
-#if defined(__IMAGECRAFT__) || defined(__CODEVISIONAVR__)\r
+#if defined(__IMAGECRAFT__)\r
 // Clock cycle = 67nS @ 14.7456MHz\r
 // Delay resolution ~ 1uS @ 14.7456MHz\r
 // So this function is only accurate at near above frequency\r
 void _delay_us (unsigned int d) {\r
   while (d-- != 0);\r
-#if defined(__IMAGECRAFT__)\r
   asm("nop");\r
-#elif defined(__CODEVISIONAVR__)\r
-  #asm("nop")\r
-#endif\r
 }\r
 #endif\r
 \r
@@ -312,11 +303,7 @@ static inline void LcdInit (void) {
 MAIN_FUNC() {\r
   MCUSR = 0; // clear all reset flags\r
 \r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("wdr");\r
-#else\r
-      wdt_reset();\r
-#endif\r
+  wdt_reset();\r
   WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)\r
   WDTCSR = (1<<WDE)|(1<<WDP3)|(1<<WDP0); // 1024K cycles, 8.0sec\r
   MCUCR &= ~((1<<SM1)|(1<<SM0)); // use idle sleep mode\r
@@ -327,11 +314,7 @@ MAIN_FUNC() {
   // Initialize the AVR USART\r
   UsartInit ();\r
 \r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("sei");\r
-#else\r
   sei();\r
-#endif\r
   while (1) {\r
     unsigned char tail = sUartRxTail; // explicitly set order of volatile access\r
     if (tail != sUartRxHead) { // Check if UART RX buffer has a character\r
@@ -354,50 +337,22 @@ MAIN_FUNC() {
     } else {\r
       // No characters waiting in RX buffer\r
 \r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("cli");\r
-#else\r
       cli();\r
-#endif\r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("wdr");\r
-#else\r
       wdt_reset();\r
-#endif\r
       MCUSR &= ~(1<<WDRF); // clear any watchdog interrupt flags\r
       WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)\r
       WDTCSR &= ~(1<<WDE); // watchdog timer off\r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("sei");\r
-#else\r
       sei();\r
-#endif\r
 \r
       sleep_enable();\r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("sleep");\r
-#else\r
       sleep_cpu();\r
-#endif\r
       sleep_disable();\r
 \r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("cli");\r
-#else\r
       cli();\r
-#endif\r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("wdr");\r
-#else\r
       wdt_reset();\r
-#endif\r
       WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)\r
       WDTCSR &= ~(1<<WDCE);\r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("sei");\r
-#else\r
       sei();\r
-#endif\r
     }\r
   }\r
   MAIN_FUNC_LAST();\r
@@ -406,36 +361,11 @@ MAIN_FUNC() {
 void LcdWriteCmd (unsigned char Cmd) {\r
   LcdBusyWait();\r
   LCD_DATA_PORT = Cmd;  // BusyWait leaves RS low in "Register mode"\r
-#if defined(__CODEVISIONAVR__)\r
-  #asm("nop");\r
-#else\r
    NOP();\r
-#endif\r
   LCD_CONTROL_PORT |= (1<<LCD_E);\r
-#if defined(__CODEVISIONAVR__)\r
-  #if CONSERVATIVE_ENABLE_DURATION\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-  #else\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-  #endif\r
-#else\r
   ENABLE_WAIT();\r
-#endif\r
   LCD_CONTROL_PORT &= ~(1<<LCD_E);\r
-#if defined(__CODEVISIONAVR__)\r
-  #asm("nop");\r
-#else\r
    NOP();\r
-#endif\r
   LCD_CONTROL_PORT |= (1<<LCD_RS); // Set display to "Character mode"\r
 }\r
 \r
@@ -443,30 +373,9 @@ void LcdWriteData (unsigned char c) {
   LcdBusyWait();\r
   LCD_CONTROL_PORT |= (1<<LCD_RS); // Set display to "Character Mode"\r
   LCD_DATA_PORT = c;\r
-#if defined(__CODEVISIONAVR__)\r
-  #asm("nop");\r
-#else\r
    NOP();\r
-#endif\r
   LCD_CONTROL_PORT |= (1<<LCD_E);\r
-#if defined(__CODEVISIONAVR__)\r
-  #if CONSERVATIVE_ENABLE_DURATION\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-  #else\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-  #endif\r
-#else\r
   ENABLE_WAIT();\r
-#endif\r
   LCD_CONTROL_PORT &= ~(1<<LCD_E);\r
 }\r
 \r
@@ -475,36 +384,11 @@ unsigned char LcdBusyWait (void) {
   LCD_DATA_DIR = 0x00; // Set LCD data port to inputs\r
   LCD_CONTROL_PORT &= ~(1<<LCD_RS); // Set display to "Register mode"\r
   LCD_CONTROL_PORT |= (1<<LCD_RW); // Put the display in the read mode\r
-#if defined(__CODEVISIONAVR__)\r
-  #asm("nop");\r
-#else\r
    NOP();\r
-#endif\r
   do {\r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("wdr");\r
-#else\r
       wdt_reset();\r
-#endif\r
     LCD_CONTROL_PORT |= (1<<LCD_E);\r
-#if defined(__CODEVISIONAVR__)\r
-  #if CONSERVATIVE_ENABLE_DURATION\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-  #else\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-    #asm("nop")\r
-  #endif\r
-#else\r
-  ENABLE_WAIT();\r
-#endif\r
+    ENABLE_WAIT();\r
     LCDStatus = LCD_DATA_PIN_REG;\r
     LCD_CONTROL_PORT &= ~(1<<LCD_E);\r
   } while (LCDStatus & (1<<LCD_BUSY));\r
@@ -553,22 +437,14 @@ static unsigned char WaitRxChar (void) {
   unsigned char tail;\r
   do {\r
     tail = sUartRxTail; // explicitly set order of volatile variable access\r
-#if defined(__CODEVISIONAVR__)\r
-      #asm("wdr");\r
-#else\r
-      wdt_reset();\r
-#endif\r
+    wdt_reset();\r
   } while (sUartRxHead == tail); // while buffer is empty\r
 \r
 #if USE_CTS\r
   // turn off interrupts so that if UART char ready to be stored, then storage\r
   // will occur after CTS pin is set active. This allows UART ISR to set\r
   //  CTS inactive if byte fills buffer after we remove current byte\r
-#if defined(__CODEVISIONAVR__)\r
-  #asm("cli");\r
-#else\r
   cli();\r
-#endif\r
 #endif\r
 \r
   // increment tail position\r
@@ -579,11 +455,7 @@ static unsigned char WaitRxChar (void) {
 \r
 #if USE_CTS\r
   CTS_PORT |= (1<<CTS_PIN); // Ensure CTS is active since just removed a byte\r
-#if defined(__CODEVISIONAVR__)\r
-  #asm("sei");\r
-#else\r
   sei();   // Allow UART ISR to read character and change potentially change CTS\r
-#endif\r
 #endif\r
 \r
   return sUartRxBuf[sUartRxTail];\r
@@ -592,17 +464,11 @@ static unsigned char WaitRxChar (void) {
 #if defined(__IMAGECRAFT__)\r
 #pragma interrupt_handler timer0_compa_handler:iv_TIMER0_COMPA\r
 void timer0_compa_handler(void)\r
-#elif defined(__CODEVISIONAVR__)\r
-interrupt [TIM0_COMPA] void timer0_compa_handler(void)\r
 #else\r
   ISR(TIMER0_COMPA_vect)\r
 #endif\r
 {\r
-#if defined(__CODEVISIONAVR__)\r
-  #asm("sei");\r
-#else\r
   sei(); // Okay to allow USART interrupts while controlling LED PWM\r
-#endif\r
 \r
   // Set current LED state based on cycling variable\r
   if (ledPwmCycling & 0x01) {\r