diff options
author | markster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2004-01-02 23:28:52 +0000 |
---|---|---|
committer | markster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2004-01-02 23:28:52 +0000 |
commit | abf800fc845ce8736704cbe769f831b73700fa04 (patch) | |
tree | 49e2e374460c388f00861d170d97caa6b4d980ba /zaptel.c | |
parent | 54335c58ad6e5d482d73038bc1894e4e9156afcd (diff) |
*Begin* Linux 2.6 build process... not all drivers build, and lots of DEC/INC usecount warnings need to be replaced
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@291 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel.c')
-rwxr-xr-x | zaptel.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -36,6 +36,9 @@ * $Id$ */ + +#include "zconfig.h" + #include <linux/kernel.h> #include <linux/errno.h> #include <linux/module.h> @@ -668,7 +671,7 @@ static inline void calc_fcs(struct zt_chan *ss) static int zt_reallocbufs(struct zt_chan *ss, int j, int numbufs) { unsigned char *newbuf, *oldbuf; - long flags; + unsigned long flags; int x; /* Check numbufs */ if (numbufs < 2) @@ -1989,7 +1992,7 @@ static int initialize_channel(struct zt_chan *chan) static int zt_timing_open(struct inode *inode, struct file *file) { struct zt_timer *t; - long flags; + unsigned long flags; t = kmalloc(sizeof(struct zt_timer), GFP_KERNEL); if (!t) return -ENOMEM; @@ -2008,7 +2011,7 @@ static int zt_timing_open(struct inode *inode, struct file *file) static int zt_timer_release(struct inode *inode, struct file *file) { struct zt_timer *t, *cur, *prev; - long flags; + unsigned long flags; t = file->private_data; if (t) { spin_lock_irqsave(&zaptimerlock, flags); @@ -4870,7 +4873,7 @@ void zt_ec_chunk(struct zt_chan *ss, unsigned char *rxchunk, const unsigned char { short rxlin, txlin; int x; - long flags; + unsigned long flags; spin_lock_irqsave(&ss->lock, flags); /* Perform echo cancellation on a chunk if necessary */ if (ss->ec) { @@ -5418,7 +5421,7 @@ out in the later versions, and is put back now. */ static void process_timers(void) { - long flags; + unsigned long flags; struct zt_timer *cur; spin_lock_irqsave(&zaptimerlock, flags); cur = zaptimers; @@ -5439,7 +5442,7 @@ static void process_timers(void) static unsigned int zt_timer_poll(struct file *file, struct poll_table_struct *wait_table) { struct zt_timer *timer = file->private_data; - long flags; + unsigned long flags; int ret = 0; if (timer) { poll_wait(file, &timer->sel, wait_table); @@ -5459,7 +5462,7 @@ zt_chan_poll(struct file *file, struct poll_table_struct *wait_table, int unit) struct zt_chan *chan = chans[unit]; int ret; - long flags; + unsigned long flags; /* do the poll wait */ if (chan) { |