CRISv10 improve and bugfix fasttimer
Improve and bugfix CRIS v10 fast timers. - irq_handler_t now only takes two arguments. - Keep interrupts disabled as long as we have a reference to the fasttimer list and only enable them while doing the callback. del_fast_timer may be called from other interrupt context. - Fix bug where debug code could return without calling local_irq_restore. - Use jiffies instead of usec (change from struct timeval to fasttime_t). - Don't initialize static variables to zero. - Remove obsolete #ifndef DECLARE_WAITQUEUE code. - fast_timer_init should be __initcall. - Change status/debug variables to unsigned. - Remove CVS log and CVS id. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Mikael Starvik <mikael.starvik@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
3244c77bd3
commit
d8e5219f9f
@@ -1,9 +1,8 @@
|
||||
/* $Id: fasttimer.h,v 1.3 2004/05/14 10:19:19 starvik Exp $
|
||||
/*
|
||||
* linux/include/asm-cris/fasttimer.h
|
||||
*
|
||||
* Fast timers for ETRAX100LX
|
||||
* This may be useful in other OS than Linux so use 2 space indentation...
|
||||
* Copyright (C) 2000, 2002 Axis Communications AB
|
||||
* Copyright (C) 2000-2007 Axis Communications AB
|
||||
*/
|
||||
#include <linux/time.h> /* struct timeval */
|
||||
#include <linux/timex.h>
|
||||
@@ -12,11 +11,16 @@
|
||||
|
||||
typedef void fast_timer_function_type(unsigned long);
|
||||
|
||||
struct fasttime_t {
|
||||
unsigned long tv_jiff; /* jiffies */
|
||||
unsigned long tv_usec; /* microseconds */
|
||||
};
|
||||
|
||||
struct fast_timer{ /* Close to timer_list */
|
||||
struct fast_timer *next;
|
||||
struct fast_timer *prev;
|
||||
struct timeval tv_set;
|
||||
struct timeval tv_expires;
|
||||
struct fasttime_t tv_set;
|
||||
struct fasttime_t tv_expires;
|
||||
unsigned long delay_us;
|
||||
fast_timer_function_type *function;
|
||||
unsigned long data;
|
||||
@@ -38,6 +42,6 @@ int del_fast_timer(struct fast_timer * t);
|
||||
void schedule_usleep(unsigned long us);
|
||||
|
||||
|
||||
void fast_timer_init(void);
|
||||
int fast_timer_init(void);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user