From 0a62ac52be5389e32425b4a7a7f625c378da678c Mon Sep 17 00:00:00 2001
From: david <david@optixx.org>
Date: Thu, 2 Jul 2009 11:24:12 +0200
Subject: [PATCH] add timer

---
 avr/usbload/timer.c    | 63 ++++++++++++++++++++++++++++++++++++++++++
 avr/usbload/timer.h    |  5 ++++
 avr/usbload/usb_bulk.c |  4 ++-
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 avr/usbload/timer.c
 create mode 100644 avr/usbload/timer.h

diff --git a/avr/usbload/timer.c b/avr/usbload/timer.c
new file mode 100644
index 0000000..f8c041f
--- /dev/null
+++ b/avr/usbload/timer.c
@@ -0,0 +1,63 @@
+#include <io.h>
+#include <interrupt.h>
+#include <signal.h>
+ 
+ 
+#ifndef OCR1A
+    #define OCR1A OCR1  // 2313 support
+#endif
+ 
+#ifndef WGM12
+    #define WGM12 CTC1  // 2313 support
+#endif
+
+//#define XTAL      11059201L   // nominal value
+#define XTAL        20000000L 
+
+ 
+#define DEBOUNCE    256L        // debounce clock (256Hz = 4msec)
+ 
+#define uint8_t unsigned char
+#define uint unsigned int
+ 
+uint8_t prescaler;
+uint8_t volatile second;          // count seconds
+ 
+ 
+SIGNAL (SIG_OUTPUT_COMPARE1A)
+{
+ 
+#if XTAL % DEBOUNCE                     // bei rest
+  OCR1A = XTAL / DEBOUNCE - 1;      // compare DEBOUNCE - 1 times
+#endif
+  if( --prescaler == 0 ){
+    prescaler = (uint8_t)DEBOUNCE;
+    second++;               // exact one second over
+#if XTAL % DEBOUNCE         // handle remainder
+    OCR1A = XTAL / DEBOUNCE + XTAL % DEBOUNCE - 1; // compare once per second
+#endif
+  }
+}
+ 
+ 
+uint16_t timer_start( void )
+{
+  TCCR1B = (1<<WGM12) | (1<<CS10);      // divide by 1
+                                        // clear on compare
+  OCR1A = XTAL / DEBOUNCE - 1;          // Output Compare Register
+  TCNT1 = 0;                            // Timmer startet mit 0
+  second = 0;
+  prescaler = (uint8_t)DEBOUNCE;          //software teiler
+  TIMSK = 1<<OCIE1A;                    // beim Vergleichswertes Compare Match                    
+                                        // Interrupt (SIG_OUTPUT_COMPARE1A)
+  sei();
+}
+
+uint16_t timer_stop(void)
+{
+    cli():
+    return second
+}
+
+
+
diff --git a/avr/usbload/timer.h b/avr/usbload/timer.h
new file mode 100644
index 0000000..8f0df0b
--- /dev/null
+++ b/avr/usbload/timer.h
@@ -0,0 +1,5 @@
+
+
+uint16_t timer_start( void );
+uint16_t timer_stop( void );
+
diff --git a/avr/usbload/usb_bulk.c b/avr/usbload/usb_bulk.c
index 70da50a..61e12d0 100644
--- a/avr/usbload/usb_bulk.c
+++ b/avr/usbload/usb_bulk.c
@@ -59,6 +59,8 @@ uint8_t usbFunctionWrite(uint8_t * data, uint8_t len)
             sram_bulk_write_next();
         }
     }
+    /* test this */
+    //return rx_remaining == 0
     return len;
 }
 
@@ -75,4 +77,4 @@ uint8_t usbFunctionRead(uint8_t * data, uint8_t len)
         data++;
     }
     return len;
-}
\ No newline at end of file
+}