From 7fc57d561bb8a264dc2c3b30d41cfead6a147b9b Mon Sep 17 00:00:00 2001
From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Sun, 6 Jun 2010 11:56:22 -0600
Subject: [PATCH] Move C ISR code to a static function

---
 serial_lcd.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/serial_lcd.c b/serial_lcd.c
index b611fa1..bef0e8c 100644
--- a/serial_lcd.c
+++ b/serial_lcd.c
@@ -419,14 +419,9 @@ unsigned char LcdBusyWait (void) {
   return (LCDStatus);
 }
 
-#if defined(__IMAGECRAFT__)
-#pragma interrupt_handler usart_rx_handler:iv_USART0_RXC
-void usart_rx_handler(void)
-#else
-ISR(USART_RX_vect)
-#endif
-{
-  unsigned char rx, tmphead;
+INLINE_FUNC_DECLARE(static void UartStoreRx (uint8_t rx));
+static inline void UartStoreRx (uint8_t rx) {
+  unsigned char tmphead;
 
   if (UCSRA & (1<<FE)) {
     // framing error. Currrently, this is silently ignored
@@ -440,7 +435,6 @@ ISR(USART_RX_vect)
   }
 #endif
 
-  rx = UDR;
   // Calculate next buffer position.
   tmphead = sUartRxHead;
   if (tmphead == UART_RX_BUFFER_SIZE-1)
@@ -468,6 +462,16 @@ ISR(USART_RX_vect)
 #endif
 }
 
+#if defined(__IMAGECRAFT__)
+#pragma interrupt_handler usart_rx_handler:iv_USART0_RXC
+void usart_rx_handler(void)
+#else
+ISR(USART_RX_vect)
+#endif
+{
+  UartStoreRx(UDR);
+}
+
 static unsigned char WaitRxChar (void) {
   // waits for next RX character, then return it
   unsigned char tail;
-- 
2.34.1