From 27c90e14b9a2600bc38486f046187a7e690b24fb Mon Sep 17 00:00:00 2001 From: aleph Date: Mon, 7 Jun 2004 18:10:06 +0000 Subject: [PATCH] Remove free pool of timers; use user-provided Timer structure instead git-svn-id: https://src.develer.com/svnoss/bertos/trunk@37 38d2e660-2303-0410-9eaa-f027e97ec537 --- drv/buzzer.c | 25 +++++++++++---------- drv/timer.c | 62 +++++----------------------------------------------- drv/timer.h | 5 +++-- 3 files changed, 21 insertions(+), 71 deletions(-) diff --git a/drv/buzzer.c b/drv/buzzer.c index 372647fd..a3e71d99 100755 --- a/drv/buzzer.c +++ b/drv/buzzer.c @@ -15,6 +15,9 @@ /* * $Log$ + * Revision 1.6 2004/06/07 18:10:06 aleph + * Remove free pool of timers; use user-provided Timer structure instead + * * Revision 1.5 2004/06/07 15:54:23 aleph * Update to new event.h naming * @@ -95,7 +98,7 @@ /* Local vars */ -static Timer *buz_timer; +static Timer buz_timer; static bool buz_timer_running; static time_t buz_repeat_interval; static time_t buz_repeat_duration; @@ -112,8 +115,8 @@ static void buz_softint(void) if (buz_repeat_interval) { /* Wait for interval time */ - buz_timer->delay = buz_repeat_interval; - timer_add(buz_timer); + buz_timer.delay = buz_repeat_interval; + timer_add(&buz_timer); } else buz_timer_running = false; @@ -122,8 +125,8 @@ static void buz_softint(void) { /* Wait for beep time */ BUZZER_ON; - buz_timer->delay = buz_repeat_duration; - timer_add(buz_timer); + buz_timer.delay = buz_repeat_duration; + timer_add(&buz_timer); } else buz_timer_running = false; @@ -140,15 +143,15 @@ void buz_beep(time_t time) /* Remove the software interrupt if it was already queued */ DISABLE_IRQSAVE(flags); if (buz_timer_running) - timer_abort(buz_timer); + timer_abort(&buz_timer); /* Turn on buzzer */ BUZZER_ON; /* Add software interrupt to turn the buzzer off later */ buz_timer_running = true; - buz_timer->delay = time; - timer_add(buz_timer); + buz_timer.delay = time; + timer_add(&buz_timer); ENABLE_IRQRESTORE(flags); } @@ -176,7 +179,7 @@ void buz_repeat_stop(void) /* Remove the software interrupt if it was already queued */ if (buz_timer_running) { - timer_abort(buz_timer); + timer_abort(&buz_timer); buz_timer_running = false; } @@ -195,7 +198,5 @@ void buz_init(void) BUZZER_INIT; /* Inizializza software interrupt */ - buz_timer = timer_new(); - ASSERT(buz_timer != NULL); - event_initSoftInt(&buz_timer->expire, (Hook)buz_softint, 0); + event_initSoftInt(&buz_timer.expire, (Hook)buz_softint, 0); } diff --git a/drv/timer.c b/drv/timer.c index 385ef9c3..a941f355 100755 --- a/drv/timer.c +++ b/drv/timer.c @@ -15,6 +15,9 @@ /* * $Log$ + * Revision 1.6 2004/06/07 18:10:06 aleph + * Remove free pool of timers; use user-provided Timer structure instead + * * Revision 1.5 2004/06/07 15:56:55 aleph * Some tabs cleanup and add timer strobe macros * @@ -36,8 +39,8 @@ #include "kdebug.h" #include "timer.h" -#ifdef CONFIG_KERN_SIGNALS -#include +#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS + #include #endif #if (ARCH & ARCH_EMUL) @@ -53,59 +56,12 @@ #endif -/*! Number of available timers */ -#define MAX_TIMERS 4 - - //! Master system clock (1ms accuracy) volatile time_t _clock; -static Timer soft_timers[MAX_TIMERS]; /*!< Pool of Timer structures */ -static List timers_pool; /*!< Pool of free timers */ REGISTER static List timers_queue; /*!< Active timers */ -/*! - * Return a new timer picking and removing it from the available - * timers pool. Return NULL if no more timers are available. - */ -Timer *timer_new(void) -{ - Timer *timer; - cpuflags_t flags; - - DISABLE_IRQSAVE(flags); - - /* Should never happen */ - if (ISLISTEMPTY(&timers_pool)) - { - ENABLE_IRQRESTORE(flags); - DB(kprintf("Tmrspool empty\n");) - return NULL; - } - - /* Get a timer from the free pool */ - timer = (Timer *)timers_pool.head; - REMOVE((Node *)timer); - - ENABLE_IRQRESTORE(flags); - - return timer; -} - - -/*! - * Delete a timer, putting it in the available timers queue. - */ -void timer_delete(Timer *timer) -{ - cpuflags_t flags; - DISABLE_IRQSAVE(flags); - ADDHEAD(&timers_pool, &timer->link); - ENABLE_IRQRESTORE(flags); -} - - /*! * Add the specified timer to the software timer service queue. * When the delay indicated by the timer expires, the timer @@ -260,19 +216,11 @@ DEFINE_TIMER_ISR */ void timer_init(void) { - int i; - TIMER_STROBE_INIT; INITLIST(&timers_queue); - INITLIST(&timers_pool); - - /* Init all software timers in the free pool */ - for (i = 0; i < MAX_TIMERS; i++) - ADDTAIL(&timers_pool, (Node *)&soft_timers[i]); _clock = 0; timer_hw_init(); } - diff --git a/drv/timer.h b/drv/timer.h index f7fb4bff..15665a43 100755 --- a/drv/timer.h +++ b/drv/timer.h @@ -15,6 +15,9 @@ /* * $Log$ + * Revision 1.6 2004/06/07 18:10:06 aleph + * Remove free pool of timers; use user-provided Timer structure instead + * * Revision 1.5 2004/06/07 15:57:12 aleph * Add function prototypes * @@ -52,8 +55,6 @@ typedef struct Timer /* Function protos */ extern void timer_init(void); -extern Timer *timer_new(void); -extern void timer_delete(Timer *timer); extern void timer_add(Timer *timer); extern Timer *timer_abort(Timer *timer); extern void timer_delay(time_t time); -- 2.25.1