FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Rename 'zaptimer' -> 'dahdi_timer'

Browse Source 
DAHDI is not Zaptel anymore.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Review: https://reviewboard.asterisk.org/r/940/

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9412 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2010-09-24 22:44:59 +00:00
parent 283235686d
commit 87336d22fc
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/dahdi/dahdi-base.c
View File

@ -373,9 +373,9 @@ struct dahdi_timer {
wait_queue_head_t sel; wait_queue_head_t sel;
}; };
static LIST_HEAD(zaptimers); static LIST_HEAD(dahdi_timers);
static DEFINE_SPINLOCK(zaptimerlock); static DEFINE_SPINLOCK(dahdi_timer_lock);
static DEFINE_SPINLOCK(bigzaplock); static DEFINE_SPINLOCK(bigzaplock);
struct dahdi_zone { struct dahdi_zone {
@ -2764,9 +2764,9 @@ static int dahdi_timing_open(struct file *file)
INIT_LIST_HEAD(&t->list); INIT_LIST_HEAD(&t->list);
file->private_data = t; file->private_data = t;
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
list_add(&t->list, &zaptimers); list_add(&t->list, &dahdi_timers);
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
return 0; return 0;
} }
@ -2779,16 +2779,16 @@ static int dahdi_timer_release(struct file *file)
if (!(t = file->private_data)) if (!(t = file->private_data))
return 0; return 0;
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
list_for_each_entry_safe(cur, next, &zaptimers, list) { list_for_each_entry_safe(cur, next, &dahdi_timers, list) {
if (t == cur) { if (t == cur) {
list_del(&cur->list); list_del(&cur->list);
break; break;
} }
} }
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
if (!cur) { if (!cur) {
module_printk(KERN_NOTICE, "Timer: Not on list??\n"); module_printk(KERN_NOTICE, "Timer: Not on list??\n");
@ -3567,39 +3567,39 @@ static int dahdi_timer_ioctl(struct file *file, unsigned int cmd, unsigned long
get_user(j, (int __user *)data); get_user(j, (int __user *)data);
if (j < 0) if (j < 0)
j = 0; j = 0;
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
timer->ms = timer->pos = j; timer->ms = timer->pos = j;
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
break; break;
case DAHDI_TIMERACK: case DAHDI_TIMERACK:
get_user(j, (int __user *)data); get_user(j, (int __user *)data);
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
if ((j < 1) || (j > timer->tripped)) if ((j < 1) || (j > timer->tripped))
j = timer->tripped; j = timer->tripped;
timer->tripped -= j; timer->tripped -= j;
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
break; break;
case DAHDI_GETEVENT: /* Get event on queue */ case DAHDI_GETEVENT: /* Get event on queue */
j = DAHDI_EVENT_NONE; j = DAHDI_EVENT_NONE;
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
/* set up for no event */ /* set up for no event */
if (timer->tripped) if (timer->tripped)
j = DAHDI_EVENT_TIMER_EXPIRED; j = DAHDI_EVENT_TIMER_EXPIRED;
if (timer->ping) if (timer->ping)
j = DAHDI_EVENT_TIMER_PING; j = DAHDI_EVENT_TIMER_PING;
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
put_user(j, (int __user *)data); put_user(j, (int __user *)data);
break; break;
case DAHDI_TIMERPING: case DAHDI_TIMERPING:
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
timer->ping = 1; timer->ping = 1;
wake_up_interruptible(&timer->sel); wake_up_interruptible(&timer->sel);
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
break; break;
case DAHDI_TIMERPONG: case DAHDI_TIMERPONG:
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
timer->ping = 0; timer->ping = 0;
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
break; break;
default: default:
return -ENOTTY; return -ENOTTY;
@ -8165,9 +8165,9 @@ static void process_timers(void)
unsigned long flags; unsigned long flags;
struct dahdi_timer *cur; struct dahdi_timer *cur;
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
list_for_each_entry(cur, &zaptimers, list) { list_for_each_entry(cur, &dahdi_timers, list) {
if (cur->ms) { if (cur->ms) {
cur->pos -= DAHDI_CHUNKSIZE; cur->pos -= DAHDI_CHUNKSIZE;
if (cur->pos <= 0) { if (cur->pos <= 0) {
@ -8178,7 +8178,7 @@ static void process_timers(void)
} }
} }
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
} }
static unsigned int dahdi_timer_poll(struct file *file, struct poll_table_struct *wait_table) static unsigned int dahdi_timer_poll(struct file *file, struct poll_table_struct *wait_table)
@ -8188,10 +8188,10 @@ static unsigned int dahdi_timer_poll(struct file *file, struct poll_table_struct
int ret = 0; int ret = 0;
if (timer) { if (timer) {
poll_wait(file, &timer->sel, wait_table); poll_wait(file, &timer->sel, wait_table);
spin_lock_irqsave(&zaptimerlock, flags); spin_lock_irqsave(&dahdi_timer_lock, flags);
if (timer->tripped || timer->ping) if (timer->tripped || timer->ping)
ret |= POLLPRI; ret |= POLLPRI;
spin_unlock_irqrestore(&zaptimerlock, flags); spin_unlock_irqrestore(&dahdi_timer_lock, flags);
} else } else
ret = -EINVAL; ret = -EINVAL;
return ret; return ret;