X-Git-Url: http://git.kpe.io/?p=avr_serial_lcd.git;a=blobdiff_plain;f=serial_lcd.c;h=1235c7ba0c527653ba7284c3a149a9c977940bd5;hp=0c8bb10aa85dd36c288d89cb41e623a00e9a65bb;hb=8147823cf64e37f6f43838ffa9e056ea48e30c32;hpb=debfa9107d3c94c1534808fe9ca260b8f4521e30

diff --git a/serial_lcd.c b/serial_lcd.c
index 0c8bb10..1235c7b 100644
--- a/serial_lcd.c
+++ b/serial_lcd.c
@@ -11,8 +11,9 @@
 **
 ** Compilers supported:
 **   - WinAVR-20071221 (includes avr-libc 1.6 required for proper _delay_us)
-**   - IAR AVR 4.30
-**   - Imagecraft AVR 7
+**   - IAR AVR 4.30 and 5.10
+**   - Imagecraft AVR 7.16
+**   - Codevision AVR 2.02.06
 **
 ** LICENSE
 **   See accompaning LICENSE file
@@ -30,7 +31,7 @@ FUSES = {
   .extended = EFUSE_DEFAULT,
 };
 #endif
-
+  
 // Number of PWM brightness levels supported
 #define LED_BRIGHTNESS_LEVELS 8
 
@@ -93,6 +94,12 @@ static FLASH_DECLARE(const unsigned char ledPwmPatterns[]) =
 #pragma global_register ledPwmCount:20 sUartRxHead:21 sUartRxTail:22 ledPwmCycling:23
 unsigned char ledPwmCount, sUartRxHead, sUartRxTail, ledPwmCycling;
 
+#elif defined(__CODEVISIONAVR__)
+#pragma regalloc-
+register unsigned char ledPwmCount, sUartRxHead, sUartRxTail, ledPwmCycling;
+#pragma regalloc+
+
+// Use avr_compat register variables
 #else
 REGISTER_VAR(unsigned char ledPwmCount, "r4", 15);
 REGISTER_VAR(unsigned char sUartRxHead, "r5", 14);
@@ -101,8 +108,16 @@ REGISTER_VAR(unsigned char ledPwmCycling, "r7", 12);
 #endif
 
 #define ledPwmPattern GPIOR0
-#define ledStatus GPIOR1
+#if defined(REGISTER_BIT)
 #define BIT_led_on REGISTER_BIT(GPIOR1,0)
+#define BACKLIGHT_STATUS() BIT_led_on
+#define BACKLIGHT_OFF() BIT_led_on = 0
+#define BACKLIGHT_ON() BIT_led_on = 1
+#else
+#define BACKLIGHT_STATUS() (GPIOR1 & 0x01)
+#define BACKLIGHT_OFF() GPIOR1 &=~ ~0x01
+#define BACKLIGHT_ON() GPIOR1 |= 0x01
+#endif
 
 // Function declarations
 void LcdWriteCmd (unsigned char);
@@ -110,8 +125,8 @@ void LcdWriteData (unsigned char);
 unsigned char LcdBusyWait (void);
 static unsigned char WaitRxChar (void);
 
-// ImageCraft doesn't support inline functions, so use preprocessor
-#if defined(__IMAGECRAFT__)
+// ImageCraft/Codevision don't support inline functions, so use preprocessor
+#if defined(__IMAGECRAFT__) || defined(__CODEVISIONAVR__)
 #define LedTimerStop() TCCR0B = 0
 // Start with 256 prescaler
 #define LedTimerStart() TCCR0B = (1<<CS02)
@@ -139,7 +154,7 @@ static inline void LedPwmInit (void) {
   TIMSK = (1<<OCIE0A);  // Turn on timer0 COMPA intr (all other timer intr off)
   LED_PORT &= ~(1<<LED_PIN); // Ensure LED is off during initialization
   LED_DIR |= (1<<LED_PIN);   // Ensure LED is output direction
-  BIT_led_on = 0;       // note that LED is off
+  BACKLIGHT_OFF();       // note that LED is off
   ledPwmPattern = 0xFF; // maximum brightness
 }
 
@@ -149,7 +164,7 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
   unsigned char ledPwmPos;
 
   if (brightness == 0) { // turn backlight off for 0 brightness
-    if (BIT_led_on) {
+    if (BACKLIGHT_STATUS()) {
       LedTimerStop();
       ledPwmPattern = 0;
       ledPwmCycling = 0;
@@ -158,7 +173,7 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
     return;
   }
 
-  ledPwmPos = (brightness * (LED_BRIGHTNESS_LEVELS-1) + 127) >> 8;
+  ledPwmPos = (brightness * (LED_BRIGHTNESS_LEVELS-1) + (unsigned int) 127) >> 8;
   // Below is probably not required, but ensures we don't exceed array
   if (ledPwmPos > LED_BRIGHTNESS_LEVELS - 1)
     ledPwmPos = LED_BRIGHTNESS_LEVELS - 1;
@@ -168,12 +183,12 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
   ledPwmCycling = ledPwmPattern;
   if (ledPwmPos >= LED_BRIGHTNESS_LEVELS-1) { // maximum brightness
     // don't need PWM for continuously on
-    if (BIT_led_on) {
+    if (BACKLIGHT_STATUS()) {
       LedTimerStop();
       LED_PORT |= (1<<LED_PIN);
     }
   } else {
-    if (BIT_led_on) {
+    if (BACKLIGHT_STATUS()) {
       LedTimerStart();
     }
   }
@@ -182,13 +197,13 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
 INLINE_FUNC_DECLARE(static void LedPwmSwitchOff (void));
 static inline void LedPwmSwitchOff (void) {
   LED_PORT &= ~(1<<LED_PIN);
-  BIT_led_on = 0;
+  BACKLIGHT_OFF();
   LedTimerStop();
 }
 
 INLINE_FUNC_DECLARE(static void LedPwmSwitchOn (void));
 static inline void LedPwmSwitchOn (void) {
-  BIT_led_on = 1;
+  BACKLIGHT_ON();
   if (ledPwmPattern == 0xFF) { // maximum brightness, no need for PWM
     LedTimerStop();
     LED_PORT |= (1<<LED_PIN); // keep LED on at all times
@@ -248,13 +263,17 @@ static inline void UsartInit(void) {
 #endif
 }
 
-#if defined(__IMAGECRAFT__)
+#if defined(__IMAGECRAFT__) || defined(__CODEVISIONAVR__)
 // Clock cycle = 67nS @ 14.7456MHz
 // Delay resolution ~ 1uS @ 14.7456MHz
 // So this function is only accurate at near above frequency
 void _delay_us (unsigned int d) {
   while (d-- != 0);
+#if defined(__IMAGECRAFT__)
   asm("nop");
+#elif defined(__CODEVISIONAVR__)
+  #asm("nop")
+#endif
 }
 #endif
 
@@ -293,7 +312,11 @@ static inline void LcdInit (void) {
 MAIN_FUNC() {
   MCUSR = 0; // clear all reset flags
 
-  wdt_reset();
+#if defined(__CODEVISIONAVR__)
+      #asm("wdr");
+#else
+      wdt_reset();
+#endif
   WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)
   WDTCSR = (1<<WDE)|(1<<WDP3)|(1<<WDP0); // 1024K cycles, 8.0sec
   MCUCR &= ~((1<<SM1)|(1<<SM0)); // use idle sleep mode
@@ -304,7 +327,11 @@ MAIN_FUNC() {
   // Initialize the AVR USART
   UsartInit ();
 
+#if defined(__CODEVISIONAVR__)
+      #asm("sei");
+#else
   sei();
+#endif
   while (1) {
     unsigned char tail = sUartRxTail; // explicitly set order of volatile access
     if (tail != sUartRxHead) { // Check if UART RX buffer has a character
@@ -327,22 +354,50 @@ MAIN_FUNC() {
     } else {
       // No characters waiting in RX buffer
 
+#if defined(__CODEVISIONAVR__)
+      #asm("cli");
+#else
       cli();
+#endif
+#if defined(__CODEVISIONAVR__)
+      #asm("wdr");
+#else
       wdt_reset();
+#endif
       MCUSR &= ~(1<<WDRF); // clear any watchdog interrupt flags
       WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)
       WDTCSR &= ~(1<<WDE); // watchdog timer off
+#if defined(__CODEVISIONAVR__)
+      #asm("sei");
+#else
       sei();
+#endif
 
       sleep_enable();
+#if defined(__CODEVISIONAVR__)
+      #asm("sleep");
+#else
       sleep_cpu();
+#endif
       sleep_disable();
 
+#if defined(__CODEVISIONAVR__)
+      #asm("cli");
+#else
       cli();
+#endif
+#if defined(__CODEVISIONAVR__)
+      #asm("wdr");
+#else
       wdt_reset();
+#endif
       WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)
       WDTCSR &= ~(1<<WDCE);
+#if defined(__CODEVISIONAVR__)
+      #asm("sei");
+#else
       sei();
+#endif
     }
   }
   MAIN_FUNC_LAST();
@@ -351,11 +406,36 @@ MAIN_FUNC() {
 void LcdWriteCmd (unsigned char Cmd) {
   LcdBusyWait();
   LCD_DATA_PORT = Cmd;  // BusyWait leaves RS low in "Register mode"
-  NOP();
+#if defined(__CODEVISIONAVR__)
+  #asm("nop");
+#else
+   NOP();
+#endif
   LCD_CONTROL_PORT |= (1<<LCD_E);
+#if defined(__CODEVISIONAVR__)
+  #if CONSERVATIVE_ENABLE_DURATION
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+  #else
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+  #endif
+#else
   ENABLE_WAIT();
+#endif
   LCD_CONTROL_PORT &= ~(1<<LCD_E);
-  NOP();
+#if defined(__CODEVISIONAVR__)
+  #asm("nop");
+#else
+   NOP();
+#endif
   LCD_CONTROL_PORT |= (1<<LCD_RS); // Set display to "Character mode"
 }
 
@@ -363,9 +443,30 @@ void LcdWriteData (unsigned char c) {
   LcdBusyWait();
   LCD_CONTROL_PORT |= (1<<LCD_RS); // Set display to "Character Mode"
   LCD_DATA_PORT = c;
-  NOP();
+#if defined(__CODEVISIONAVR__)
+  #asm("nop");
+#else
+   NOP();
+#endif
   LCD_CONTROL_PORT |= (1<<LCD_E);
+#if defined(__CODEVISIONAVR__)
+  #if CONSERVATIVE_ENABLE_DURATION
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+  #else
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+  #endif
+#else
   ENABLE_WAIT();
+#endif
   LCD_CONTROL_PORT &= ~(1<<LCD_E);
 }
 
@@ -374,11 +475,36 @@ unsigned char LcdBusyWait (void) {
   LCD_DATA_DIR = 0x00; // Set LCD data port to inputs
   LCD_CONTROL_PORT &= ~(1<<LCD_RS); // Set display to "Register mode"
   LCD_CONTROL_PORT |= (1<<LCD_RW); // Put the display in the read mode
-  NOP();
+#if defined(__CODEVISIONAVR__)
+  #asm("nop");
+#else
+   NOP();
+#endif
   do {
-    wdt_reset();
+#if defined(__CODEVISIONAVR__)
+      #asm("wdr");
+#else
+      wdt_reset();
+#endif
     LCD_CONTROL_PORT |= (1<<LCD_E);
-    ENABLE_WAIT();
+#if defined(__CODEVISIONAVR__)
+  #if CONSERVATIVE_ENABLE_DURATION
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+  #else
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+    #asm("nop")
+  #endif
+#else
+  ENABLE_WAIT();
+#endif
     LCDStatus = LCD_DATA_PIN_REG;
     LCD_CONTROL_PORT &= ~(1<<LCD_E);
   } while (LCDStatus & (1<<LCD_BUSY));
@@ -427,14 +553,22 @@ static unsigned char WaitRxChar (void) {
   unsigned char tail;
   do {
     tail = sUartRxTail; // explicitly set order of volatile variable access
-    wdt_reset();
+#if defined(__CODEVISIONAVR__)
+      #asm("wdr");
+#else
+      wdt_reset();
+#endif
   } while (sUartRxHead == tail); // while buffer is empty
 
 #if USE_CTS
   // turn off interrupts so that if UART char ready to be stored, then storage
   // will occur after CTS pin is set active. This allows UART ISR to set
   //  CTS inactive if byte fills buffer after we remove current byte
+#if defined(__CODEVISIONAVR__)
+  #asm("cli");
+#else
   cli();
+#endif
 #endif
 
   // increment tail position
@@ -445,7 +579,11 @@ static unsigned char WaitRxChar (void) {
 
 #if USE_CTS
   CTS_PORT |= (1<<CTS_PIN); // Ensure CTS is active since just removed a byte
+#if defined(__CODEVISIONAVR__)
+  #asm("sei");
+#else
   sei();   // Allow UART ISR to read character and change potentially change CTS
+#endif
 #endif
 
   return sUartRxBuf[sUartRxTail];
@@ -454,11 +592,17 @@ static unsigned char WaitRxChar (void) {
 #if defined(__IMAGECRAFT__)
 #pragma interrupt_handler timer0_compa_handler:iv_TIMER0_COMPA
 void timer0_compa_handler(void)
+#elif defined(__CODEVISIONAVR__)
+interrupt [TIM0_COMPA] void timer0_compa_handler(void)
 #else
   ISR(TIMER0_COMPA_vect)
 #endif
 {
+#if defined(__CODEVISIONAVR__)
+  #asm("sei");
+#else
   sei(); // Okay to allow USART interrupts while controlling LED PWM
+#endif
 
   // Set current LED state based on cycling variable
   if (ledPwmCycling & 0x01) {