Clean build on Linux 2.6, will need lots of testing

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@292 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 12 insertions, 8 deletions

diff --git a/ztdynamic.c b/ztdynamic.c
index 149fdbe..90aa4fa 100755
--- a/ztdynamic.c
+++ b/ztdynamic.c
@@ -105,7 +105,7 @@ static spinlock_t dlock = SPIN_LOCK_UNLOCKED;
 
 static void checkmaster(void)
 {
-	long flags;
+	unsigned long flags;
 	int newhasmaster=0;
 	int best = 9999999;
 	struct zt_dynamic *z, *master=NULL;
@@ -199,7 +199,7 @@ static void ztd_sendmessage(struct zt_dynamic *z)
 
 static void ztdynamic_run(void)
 {
-	long flags;
+	unsigned long flags;
 	struct zt_dynamic *z;
 	int y;
 	spin_lock_irqsave(&dlock, flags);
@@ -225,7 +225,7 @@ void zt_dynamic_receive(struct zt_span *span, unsigned char *msg, int msglen)
 {
 	struct zt_dynamic *ztd = span->pvt;
 	int newerr=0;
-	long flags;
+	unsigned long flags;
 	int sflags;
 	int xlen;
 	int x, bits, sig;
@@ -401,7 +401,7 @@ static struct zt_dynamic_driver *find_driver(char *name)
 
 static int destroy_dynamic(ZT_DYNAMIC_SPAN *zds)
 {
-	long flags;
+	unsigned long flags;
 	struct zt_dynamic *z, *cur, *prev=NULL;
 	spin_lock_irqsave(&dlock, flags);
 	z = find_dynamic(zds);
@@ -445,7 +445,9 @@ static int ztd_open(struct zt_chan *chan)
 			return -ENODEV;
 		z->usecount++;
 	}
+#ifndef LINUX26
 	MOD_INC_USE_COUNT;
+#endif	
 	return 0;
 }
 
@@ -462,7 +464,9 @@ static int ztd_close(struct zt_chan *chan)
 		z->usecount--;
 	if (z->dead && !z->usecount)
 		dynamic_destroy(z);
+#ifndef LINUX26
 	MOD_DEC_USE_COUNT;
+#endif	
 	return 0;
 }
 
@@ -470,7 +474,7 @@ static int create_dynamic(ZT_DYNAMIC_SPAN *zds)
 {
 	struct zt_dynamic *z;
 	struct zt_dynamic_driver *ztd;
-	long flags;
+	unsigned long flags;
 	int x;
 	int bufsize;
 
@@ -642,7 +646,7 @@ static int ztdynamic_ioctl(unsigned int cmd, unsigned long data)
 
 int zt_dynamic_register(struct zt_dynamic_driver *dri)
 {
-	long flags;
+	unsigned long flags;
 	int res = 0;
 	spin_lock_irqsave(&dlock, flags);
 	if (find_driver(dri->name))
@@ -659,7 +663,7 @@ void zt_dynamic_unregister(struct zt_dynamic_driver *dri)
 {
 	struct zt_dynamic_driver *cur, *prev=NULL;
 	struct zt_dynamic *z, *zp, *zn;
-	long flags;
+	unsigned long flags;
 	spin_lock_irqsave(&dlock, flags);
 	cur = drivers;
 	while(cur) {
@@ -699,7 +703,7 @@ struct timer_list alarmcheck;
 
 static void check_for_red_alarm(unsigned long ignored)
 {
-	long flags;
+	unsigned long flags;
 	int newalarm;
 	int alarmchanged = 0;
 	struct zt_dynamic *z;