X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=simavr%2Fsim%2Fsim_cycle_timers.h;h=9de7f40502beeb541327b564c9b75a10d9c61578;hb=890c3dcba764925a99b60c05b73365d3c3678435;hp=49a98510caaea2a293bf29aae5f2082a31ad39d9;hpb=8d8d509d59334ba6d031f0b8544bf7aa89ac546e;p=simavr

diff --git a/simavr/sim/sim_cycle_timers.h b/simavr/sim/sim_cycle_timers.h
index 49a9851..9de7f40 100644
--- a/simavr/sim/sim_cycle_timers.h
+++ b/simavr/sim/sim_cycle_timers.h
@@ -1,7 +1,7 @@
 /*
 	sim_cycle_timers.h
 
-	Copyright 2008, 2009 Michel Pollet <buserror@gmail.com>
+	Copyright 2008-2012 Michel Pollet <buserror@gmail.com>
 
  	This file is part of simavr.
 
@@ -19,46 +19,82 @@
 	along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+/*
+ * cycle timers are callbacks that will be called when "when" cycle is reached
+ * these timers are one shots, then get cleared if the timer function returns zero,
+ * they get reset if the callback function returns a new cycle number
+ *
+ * the implementation maintains a list of 'pending' timers, sorted by when they
+ * should run, it allows very quick comparison with the next timer to run, and
+ * quick removal of then from the pile once dispatched.
+ */
 #ifndef __SIM_CYCLE_TIMERS_H___
 #define __SIM_CYCLE_TIMERS_H___
 
-#include "sim_avr.h"
+#include "sim_avr_types.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// converts a number of usec to a number of machine cycles, at current speed
-static inline avr_cycle_count_t avr_usec_to_cycles(avr_t * avr, uint32_t usec)
-{
-	return avr->frequency * (avr_cycle_count_t)usec / 1000000;
-}
+#define MAX_CYCLE_TIMERS	32
+
+typedef avr_cycle_count_t (*avr_cycle_timer_t)(
+		struct avr_t * avr,
+		avr_cycle_count_t when,
+		void * param);
 
-// converts back a number of cycles to usecs (for usleep)
-static inline uint32_t avr_cycles_to_usec(avr_t * avr, avr_cycle_count_t cycles)
-{
-	return 1000000 * cycles / avr->frequency;
-}
+typedef struct avr_cycle_timer_slot_t {
+	avr_cycle_count_t	when;
+	avr_cycle_timer_t	timer;
+	void * param;
+} avr_cycle_timer_slot_t;
+
+typedef struct avr_cycle_timer_pool_t {
+	avr_cycle_timer_slot_t timer[MAX_CYCLE_TIMERS];
+	uint8_t	count;
+} avr_cycle_timer_pool_t, *avr_cycle_timer_pool_p;
 
-// converts a number of hz (to megahertz etc) to a number of cycle
-static inline avr_cycle_count_t avr_hz_to_cycles(avr_t * avr, uint32_t hz)
-{
-	return avr->frequency / hz;
-}
 
 // register for calling 'timer' in 'when' cycles
-void avr_cycle_timer_register(avr_t * avr, avr_cycle_count_t when, avr_cycle_timer_t timer, void * param);
+void
+avr_cycle_timer_register(
+		struct avr_t * avr,
+		avr_cycle_count_t when,
+		avr_cycle_timer_t timer,
+		void * param);
 // register a timer to call in 'when' usec
-void avr_cycle_timer_register_usec(avr_t * avr, uint32_t when, avr_cycle_timer_t timer, void * param);
+void
+avr_cycle_timer_register_usec(
+		struct avr_t * avr,
+		uint32_t when,
+		avr_cycle_timer_t timer,
+		void * param);
 // cancel a previously set timer
-void avr_cycle_timer_cancel(avr_t * avr, avr_cycle_timer_t timer, void * param);
-
+void
+avr_cycle_timer_cancel(
+		struct avr_t * avr,
+		avr_cycle_timer_t timer,
+		void * param);
+/*
+ * Check to see if a timer is present, if so, return the number (+1) of
+ * cycles left for it to fire, and if not present, return zero
+ */
+avr_cycle_count_t
+avr_cycle_timer_status(
+		struct avr_t * avr,
+		avr_cycle_timer_t timer,
+		void * param);
 
 //
 // Private, called from the core
 //
-avr_cycle_count_t avr_cycle_timer_process(avr_t * avr);
+avr_cycle_count_t
+avr_cycle_timer_process(
+		struct avr_t * avr);
+void
+avr_cycle_timer_reset(
+		struct avr_t * avr);
 
 #ifdef __cplusplus
 };