[zaptel-commits] tzafrir: branch 1.2 r3747 - in /branches/1.2: ./ wct4xxp/
SVN commits to the Zaptel project
zaptel-commits at lists.digium.com
Sun Jan 27 09:34:17 CST 2008
Author: tzafrir
Date: Sun Jan 27 09:34:16 2008
New Revision: 3747
URL: http://svn.digium.com/view/zaptel?view=rev&rev=3747
Log:
LINUX26 is defined in zaptel.h, and should not be checked before
including it.
Modified:
branches/1.2/pciradio.c
branches/1.2/tor2.c
branches/1.2/torisa.c
branches/1.2/wcfxo.c
branches/1.2/wct1xxp.c
branches/1.2/wct4xxp/base.c
branches/1.2/wcte11xp.c
branches/1.2/ztdummy.c
branches/1.2/ztdynamic.c
branches/1.2/zttranscode.c
Modified: branches/1.2/pciradio.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/pciradio.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/pciradio.c (original)
+++ branches/1.2/pciradio.c Sun Jan 27 09:34:16 2008
@@ -52,11 +52,12 @@
#include <linux/interrupt.h>
#include <asm/io.h>
#include <asm/delay.h>
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
-#include "zaptel.h"
#define RAD_MAX_IFACES 128
Modified: branches/1.2/tor2.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/tor2.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/tor2.c (original)
+++ branches/1.2/tor2.c Sun Jan 27 09:34:16 2008
@@ -32,11 +32,12 @@
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
#define NEED_PCI_IDS
-#include "zaptel.h"
#include "tor2-hw.h"
#include "tor2fw.h"
Modified: branches/1.2/torisa.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/torisa.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/torisa.c (original)
+++ branches/1.2/torisa.c Sun Jan 27 09:34:16 2008
@@ -31,11 +31,12 @@
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <asm/io.h>
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
-#include "zaptel.h"
#include "torisa.h"
/* Board address offsets (specified in word (not byte) offsets) */
Modified: branches/1.2/wcfxo.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcfxo.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/wcfxo.c (original)
+++ branches/1.2/wcfxo.c Sun Jan 27 09:34:16 2008
@@ -32,11 +32,11 @@
#include <linux/errno.h>
#include <linux/pci.h>
#include <asm/io.h>
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
-
-#include "zaptel.h"
/* Uncomment to enable tasklet handling in the FXO driver. Not recommended
in general, but may improve interactive performance */
Modified: branches/1.2/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct1xxp.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/wct1xxp.c (original)
+++ branches/1.2/wct1xxp.c Sun Jan 27 09:34:16 2008
@@ -32,11 +32,11 @@
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
-
-#include "zaptel.h"
#define WC_MAX_CARDS 32
Modified: branches/1.2/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/base.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/wct4xxp/base.c (original)
+++ branches/1.2/wct4xxp/base.c Sun Jan 27 09:34:16 2008
@@ -33,11 +33,11 @@
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
-
-#include "zaptel.h"
#include "wct4xxp.h"
#include "vpm450m.h"
Modified: branches/1.2/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcte11xp.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/wcte11xp.c (original)
+++ branches/1.2/wcte11xp.c Sun Jan 27 09:34:16 2008
@@ -34,11 +34,11 @@
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
-
-#include "zaptel.h"
/* XXX: fix this */
#include "wct4xxp/wct4xxp.h" /* For certain definitions */
Modified: branches/1.2/ztdummy.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztdummy.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/ztdummy.c (original)
+++ branches/1.2/ztdummy.c Sun Jan 27 09:34:16 2008
@@ -74,6 +74,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>
+#include "zaptel.h"
#ifndef LINUX26
#include <linux/usb.h>
@@ -90,7 +91,6 @@
#include <linux/moduleparam.h>
#endif
-#include "zaptel.h"
#include "ztdummy.h"
Modified: branches/1.2/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztdynamic.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/ztdynamic.c (original)
+++ branches/1.2/ztdynamic.c Sun Jan 27 09:34:16 2008
@@ -36,11 +36,11 @@
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
-
-#include "zaptel.h"
/*
* Tasklets provide better system interactive response at the cost of the
Modified: branches/1.2/zttranscode.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zttranscode.c?view=diff&rev=3747&r1=3746&r2=3747
==============================================================================
--- branches/1.2/zttranscode.c (original)
+++ branches/1.2/zttranscode.c Sun Jan 27 09:34:16 2008
@@ -39,11 +39,11 @@
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif
+
+#include "zaptel.h"
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
-
-#include "zaptel.h"
static int debug = 0;
static struct zt_transcoder *trans;
More information about the zaptel-commits
mailing list