xpp: pre/post_unregister: not for the EC

Don't run the pre- and post-unregister hooks on a non-phone XPD (practically: the echo canceller). This fixes a panic with manual 'dahdi_registertion off' as it is now called for the whole device (regression of 2.6.x). Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10735 a0bf4364-ded3-4de4-8d8a-66a801d63aff
How to get OSLEC from dahdi-linux-extra
2012-11-15 13:40:56 +00:00 · 2012-10-11 13:25:28 +00:00 · 2012-10-04 20:24:55 +00:00 · 2012-10-04 20:24:46 +00:00 · 2012-10-04 20:24:42 +00:00 · 2012-10-04 20:24:37 +00:00
88 changed files with 32453 additions and 9477 deletions
--- a/47
+++ b/47
@@ -163,6 +163,24 @@ to the script:
  ./build_tools/make_static_devs -d tmp/newroot/dev/dahdi


+DKMS
+~~~~
+DKMS, Dynamic Kernel Module Support, is a framework for building Linux
+kernel modules. It is used, among others, by several distributions that
+package the DAHDI kernel modules.
+
+DKMS is designed to provide updates over drivers installed from original
+kernel modules tree. Thus it installed modules into /lib/modules/updates
+or /lib/modules/VERSION/updates . This is generally not an issue on
+normal operation. However if you try to install DAHDI from source on
+a system with DAHDI installed from DKMS this way (potentially of an
+older version), be sure to remove the DKMS-installed modules from the
+updates directory. If you're not sure, the following command will give
+you a clue of the versions installed:
+
+  find /lib/modules -name dahdi.ko
+
+
 Installing the B410P drivers with mISDN
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 DAHDI includes the wcb4xxp driver for the B410P, however, support for the
@@ -212,13 +230,10 @@ under driver/staging/echo . In fact, dahdi_echocan_oslec assumes that
 this is where the oslec code lies. If it is elsewhere you'll need to fix
 the #include line.

-Thus for the moment, the simplest way to build OSLEC with dahdi is:
-
-1. Copy the directory `drivers/staging/echo` from a recent kernel tree 
-   (at least 2.6.28-rc1) to the a subdirectory with the same name in the
-   dahdi-linux tree.
-
-2. Edit drivers/dahdi/Kbuild and uncomment the two lines related to OSLEC.
+Thus for the moment, the simplest way to build OSLEC with dahdi is to
+copy the directory `drivers/staging/echo` from a recent kernel tree (at
+least 2.6.28-rc1) to the a subdirectory with the same name in the
+dahdi-linux tree.

 After doing that, you'll see the following when building (running
 'make')
@@ -233,6 +248,15 @@ be reported on the
 https://lists.sourceforge.net/lists/listinfo/freetel-oslec[OSLEC mailing
 list].

+Alternatively you can also get the OSLEC code from the dahdi-linux-extra
+GIT repository:
+
+  git clone git://gitorious.org/dahdi-extra/dahdi-linux-extra.git
+  cd dahdi-linux-extra
+  git archive extra-2.6 drivers/staging | (cd ..; tar xf -)
+  cd ..; rm -rf dahdi-linux-extra
+
+
 Live Install
 ~~~~~~~~~~~~
 In many cases you already have DAHDI installed on your system but would
@@ -470,6 +494,9 @@ max_pseudo_channels (dahdi)::
  create.  Pseudo channels are used when conferencing channels together.
  The default is 512.

+auto_assign_spans (dahdi)::
+  See <<_span_assignments,Span Assignments>> below.
+
 To get a list of parameters supported by a module, use 

  modinfo module_name
@@ -805,6 +832,12 @@ A free-form description of the span.
 ===== /sys/bus/dahdi_spans/devices/span-N/lbo
 LBO setting for the channel.

+===== /sys/bus/dahdi_spans/devices/span-N/lineconfig
+The framing and coding of the span, for a digital span. Textual
+represenation:
+
+<B8ZS|AMI|HDB3>/<D4|ESF|CCS>[/CRC4]
+
 ===== /sys/bus/dahdi_spans/devices/span-N/local_spanno
 The number of the span within the DAHDI device.

--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -33,14 +33,13 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2)	+= dahdi_echocan_mg2.o

 obj-m += $(DAHDI_MODULES_EXTRA)

-# Only enable this if you think you know what you're doing. This is not
-# supported yet:
-#obj-m += dahdi_echocan_oslec.o
-#
-# A quick and dirty way to build OSLEC, if you happened to place it
-# yourself in the dahdi source tree. This is experimental. See README
-# regarding OSLEC.
-#obj-m += ../staging/echo/
+# If you want to build OSLEC, include the code in the standard location:
+# drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as
+# well:
+ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
+obj-m += dahdi_echocan_oslec.o
+obj-m += ../staging/echo/
+endif

 CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)

@@ -78,7 +77,7 @@ CFLAGS_dahdi_dynamic_ethmf.o := -DNEW_SKB_LINEARIZE
 endif
 endif

-dahdi-objs := dahdi-base.o dahdi-sysfs.o dahdi-version.o
+dahdi-objs := dahdi-base.o dahdi-sysfs.o dahdi-sysfs-chan.o dahdi-version.o

 ###############################################################################
 # Find appropriate ARCH value for VPMADT032 and HPEC binary modules
--- a/drivers/dahdi/Makefile
+++ b/drivers/dahdi/Makefile
@@ -1,6 +0,0 @@
-ifdef KBUILD_EXTMOD
-# We only get here on kernels 2.6.0-2.6.9 .
-# For newer kernels, Kbuild will be included directly by the kernel
-# build system.
-include $(src)/Kbuild
-endif
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -15,7 +15,7 @@
 * from Cisco 3620 to IBM x305 here in F1 Group
 *
 * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
- * Copyright (C) 2001 - 2011 Digium, Inc.
+ * Copyright (C) 2001 - 2012 Digium, Inc.
 *
 * All rights reserved.
 *
@@ -60,7 +60,6 @@
 #include <asm/atomic.h>

 #define DAHDI_PRINK_MACROS_USE_debug
-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)

 /* Grab fasthdlc with tables */
 #define FAST_HDLC_NEED_TABLES
@@ -86,12 +85,6 @@
 #error "You cannot define both EMPULSE and EMFLASH"
 #endif

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-#ifndef CONFIG_BKL
-#warning "No CONFIG_BKL is an experimental configuration."
-#endif
-#endif
-
 /* Get helper arithmetic */
 #include "arith.h"
 #if defined(CONFIG_DAHDI_MMX) || defined(ECHO_CAN_FP)
@@ -122,7 +115,6 @@ EXPORT_SYMBOL(dahdi_qevent_nolock);
 EXPORT_SYMBOL(dahdi_qevent_lock);
 EXPORT_SYMBOL(dahdi_hooksig);
 EXPORT_SYMBOL(dahdi_alarm_notify);
-EXPORT_SYMBOL(dahdi_set_dynamic_ioctl);
 EXPORT_SYMBOL(dahdi_hdlc_abort);
 EXPORT_SYMBOL(dahdi_hdlc_finish);
 EXPORT_SYMBOL(dahdi_hdlc_getbuf);
@@ -190,6 +182,7 @@ static struct core_timer {
 	struct timer_list timer;
 	struct timespec start_interval;
 	unsigned long interval;
+	int dahdi_receive_used;
 	atomic_t count;
 	atomic_t shutdown;
 	atomic_t last_count;
@@ -340,12 +333,7 @@ static void tone_zone_release(struct kref *kref)
 */
 static inline int tone_zone_put(struct dahdi_zone *z)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
-	kref_put(&z->refcount, tone_zone_release);
-	return 1;
-#else
 	return kref_put(&z->refcount, tone_zone_release);
-#endif
 }

 static inline void tone_zone_get(struct dahdi_zone *z)
@@ -358,6 +346,11 @@ static DEFINE_SPINLOCK(zone_lock);
 /* The first zone on the list is the default zone. */
 static LIST_HEAD(tone_zones);

+static inline struct device *span_device(struct dahdi_span *span)
+{
+	return &span->parent->dev;
+}
+
 /* Protects the span_list and pseudo_chans lists from concurrent access in
 * process context.  The spin_lock is needed to synchronize with the interrupt
 * handler. */
@@ -543,10 +536,6 @@ u_char __dahdi_lin2a[16384];

 static u_char defgain[256];

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
-#define __RW_LOCK_UNLOCKED() RW_LOCK_UNLOCKED
-#endif
-
 #define NUM_SIGS	10

 static DEFINE_SPINLOCK(ecfactory_list_lock);
@@ -711,6 +700,116 @@ static int dahdi_q_sig(struct dahdi_chan *chan)
 	return -1; /* not found -- error */
 }

+enum spantypes dahdi_str2spantype(const char *name)
+{
+	if (strcasecmp("FXS", name) == 0)
+		return SPANTYPE_ANALOG_FXS;
+	else if (strcasecmp("FXO", name) == 0)
+		return SPANTYPE_ANALOG_FXO;
+	else if (strcasecmp("ANALOG_MIXED", name) == 0)
+		return SPANTYPE_ANALOG_MIXED;
+	else if (strcasecmp("E1", name) == 0)
+		return SPANTYPE_DIGITAL_E1;
+	else if (strcasecmp("T1", name) == 0)
+		return SPANTYPE_DIGITAL_T1;
+	else if (strcasecmp("J1", name) == 0)
+		return SPANTYPE_DIGITAL_J1;
+	else if (strcasecmp("BRI_NT", name) == 0)
+		return SPANTYPE_DIGITAL_BRI_NT;
+	else if (strcasecmp("BRI_TE", name) == 0)
+		return SPANTYPE_DIGITAL_BRI_TE;
+	else if (strcasecmp("BRI_SOFT", name) == 0)
+		return SPANTYPE_DIGITAL_BRI_SOFT;
+	else
+		return SPANTYPE_INVALID;
+}
+EXPORT_SYMBOL(dahdi_str2spantype);
+
+const char *dahdi_spantype2str(enum spantypes st)
+{
+	switch (st) {
+	case SPANTYPE_ANALOG_FXS:	return "FXS";
+	case SPANTYPE_ANALOG_FXO:	return "FXO";
+	case SPANTYPE_ANALOG_MIXED:	return "ANALOG_MIXED";
+	case SPANTYPE_DIGITAL_E1:	return "E1";
+	case SPANTYPE_DIGITAL_T1:	return "T1";
+	case SPANTYPE_DIGITAL_J1:	return "J1";
+	case SPANTYPE_DIGITAL_BRI_NT:	return "BRI_NT";
+	case SPANTYPE_DIGITAL_BRI_TE:	return "BRI_TE";
+	case SPANTYPE_DIGITAL_BRI_SOFT:	return "BRI_SOFT";
+	default:
+	case SPANTYPE_INVALID:		return "INVALID";
+	};
+}
+EXPORT_SYMBOL(dahdi_spantype2str);
+
+
+const char *dahdi_lineconfig_bit_name(int lineconfig_bit)
+{
+	static const char * const table[] = {
+			/* These apply to T1 */
+			[4]	= "D4",
+			[5]	= "ESF",
+			[6]	= "AMI",
+			[7]	= "B8ZS",
+			/* These apply to E1 */
+			[8]	= "CCS",
+			[9]	= "HDB3",
+			[10]	= "CRC4",
+			/* These apply to BRI */
+			[11]	= "NTTE",
+			[12]	= "TERM",
+			/* Finish */
+			[16]	= "NOTOPEN",
+		};
+	if (lineconfig_bit < 0 || lineconfig_bit >= ARRAY_SIZE(table))
+		return NULL;
+	return table[lineconfig_bit];
+}
+EXPORT_SYMBOL(dahdi_lineconfig_bit_name);
+
+ssize_t lineconfig_str(int lineconfig, char buf[], size_t size)
+{
+	int framing_bit = 0;
+	int coding_bit = 0;
+	int crc4_bit = 0;
+	int len = 0;
+	int bit;
+
+	for (bit = 4; bit <= 12; bit++) {
+		int mask = (1 << bit);
+		if (!(lineconfig & mask))
+			continue;
+		if (!framing_bit) {
+			switch (mask) {
+			case DAHDI_CONFIG_B8ZS:
+			case DAHDI_CONFIG_AMI:
+			case DAHDI_CONFIG_HDB3:
+				framing_bit = bit;
+				len += snprintf(buf + len, size, "%s/",
+					dahdi_lineconfig_bit_name(bit));
+			}
+		}
+		if (!coding_bit) {
+			switch (mask) {
+			case DAHDI_CONFIG_ESF:
+			case DAHDI_CONFIG_D4:
+			case DAHDI_CONFIG_CCS:
+				coding_bit = bit;
+				len += snprintf(buf + len, size, "%s",
+					dahdi_lineconfig_bit_name(bit));
+			}
+		}
+		if (!crc4_bit && mask == DAHDI_CONFIG_CRC4) {
+				crc4_bit = bit;
+				len += snprintf(buf + len, size, "/%s",
+					dahdi_lineconfig_bit_name(bit));
+		}
+	}
+	return len;
+}
+EXPORT_SYMBOL(lineconfig_str);
+
 #ifdef CONFIG_PROC_FS
 static const char *sigstr(int sig)
 {
@@ -810,23 +909,9 @@ static int dahdi_seq_show(struct seq_file *sfile, void *v)
 		seq_printf(sfile, " (MASTER)");

 	if (s->lineconfig) {
-		/* framing first */
-		if (s->lineconfig & DAHDI_CONFIG_B8ZS)
-			seq_printf(sfile, " B8ZS/");
-		else if (s->lineconfig & DAHDI_CONFIG_AMI)
-			seq_printf(sfile, " AMI/");
-		else if (s->lineconfig & DAHDI_CONFIG_HDB3)
-			seq_printf(sfile, " HDB3/");
-		/* then coding */
-		if (s->lineconfig & DAHDI_CONFIG_ESF)
-			seq_printf(sfile, "ESF");
-		else if (s->lineconfig & DAHDI_CONFIG_D4)
-			seq_printf(sfile, "D4");
-		else if (s->lineconfig & DAHDI_CONFIG_CCS)
-			seq_printf(sfile, "CCS");
-		/* E1's can enable CRC checking */
-		if (s->lineconfig & DAHDI_CONFIG_CRC4)
-			seq_printf(sfile, "/CRC4");
+		char tmpbuf[20];
+		lineconfig_str(s->lineconfig, tmpbuf, sizeof(tmpbuf));
+		seq_printf(sfile, " %s", tmpbuf);
 	}

 	seq_printf(sfile, " ");
@@ -1138,11 +1223,6 @@ static int dahdi_reallocbufs(struct dahdi_chan *ss, int blocksize, int numbufs)
 	else
 		ss->txdisable = 0;

-	if (ss->rxbufpolicy == DAHDI_POLICY_WHEN_FULL)
-		ss->rxdisable = 1;
-	else
-		ss->rxdisable = 0;
-
 	spin_unlock_irqrestore(&ss->lock, flags);

 	kfree(oldtxbuf);
@@ -1871,10 +1951,6 @@ static int dahdi_register_hdlc_device(struct net_device *dev, const char *dev_na
 	result = register_netdev(dev);
 	if (result != 0)
 		return -EIO;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,14)
-	if (netif_carrier_ok(dev))
-		netif_carrier_off(dev); /* no carrier until DCD goes up */
-#endif
 	return 0;
 }

@@ -2266,8 +2342,6 @@ static ssize_t dahdi_chan_read(struct file *file, char __user *usrbuf,
 			return -ELAST /* - chan->eventbuf[chan->eventoutidx]*/;
 		}
 		res = chan->outreadbuf;
-		if (chan->rxdisable)
-			res = -1;
 		spin_unlock_irqrestore(&chan->lock, flags);
 		if (res >= 0)
 			break;
@@ -2322,8 +2396,6 @@ static ssize_t dahdi_chan_read(struct file *file, char __user *usrbuf,
 	if (chan->outreadbuf == chan->inreadbuf) {
 		/* Out of stuff */
 		chan->outreadbuf = -1;
-		if (chan->rxbufpolicy == DAHDI_POLICY_WHEN_FULL)
-			chan->rxdisable = 1;
 	}
 	if (chan->inreadbuf < 0) {
 		/* Notify interrupt handler that we have some space now */
@@ -2459,12 +2531,11 @@ static ssize_t dahdi_chan_write(struct file *file, const char __user *usrbuf,
 		if ((chan->ec_state) &&
 		    (ECHO_MODE_ACTIVE == chan->ec_state->status.mode) &&
 		    (chan->ec_state->ops->echocan_process_tx)) {
-			struct ec_state *const ec_state = chan->ec_state;
+			struct dahdi_echocan_state *const ec = chan->ec_state;
 			for (x = 0; x < chan->writen[res]; ++x) {
 				short tx;
 				tx = DAHDI_XLAW(chan->writebuf[res][x], chan);
-				ec_state->ops->echocan_process_tx(ec_state,
-								  &tx, 1);
+				ec->ops->echocan_process_tx(ec, &tx, 1);
 				chan->writebuf[res][x] = DAHDI_LIN2X((int) tx,
 								     chan);
 			}
@@ -2778,7 +2849,6 @@ static int initialize_channel(struct dahdi_chan *chan)

 	spin_lock_irqsave(&chan->lock, flags);

-	chan->rxbufpolicy = DAHDI_POLICY_IMMEDIATE;
 	chan->txbufpolicy = DAHDI_POLICY_IMMEDIATE;

 	ec_state = chan->ec_state;
@@ -2787,7 +2857,6 @@ static int initialize_channel(struct dahdi_chan *chan)
 	chan->ec_current = NULL;

 	chan->txdisable = 0;
-	chan->rxdisable = 0;

 	chan->digitmode = DIGIT_MODE_DTMF;
 	chan->dialing = 0;
@@ -3155,13 +3224,9 @@ static int dahdi_open(struct inode *inode, struct file *file)
 				return -ENXIO;
 			}
 		}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-		__MOD_INC_USE_COUNT (dahdi_transcode_fops->owner);
-#else
 		if (!try_module_get(dahdi_transcode_fops->owner)) {
 			return -ENXIO;
 		}
-#endif
 		if (dahdi_transcode_fops && dahdi_transcode_fops->open) {
 			return dahdi_transcode_fops->open(inode, file);
 		} else {
@@ -4032,9 +4097,10 @@ static int dahdi_ioctl_chandiag(struct file *file, unsigned long data)
 	module_printk(KERN_INFO, "inreadbuf: %d, outreadbuf: %d, inwritebuf: %d, outwritebuf: %d\n",
 		      temp->inreadbuf, temp->outreadbuf, temp->inwritebuf, temp->outwritebuf);
 	module_printk(KERN_INFO, "blocksize: %d, numbufs: %d, txbufpolicy: %d, txbufpolicy: %d\n",
-		      temp->blocksize, temp->numbufs, temp->txbufpolicy, temp->rxbufpolicy);
+		      temp->blocksize, temp->numbufs, temp->txbufpolicy,
+		      DAHDI_POLICY_IMMEDIATE);
 	module_printk(KERN_INFO, "txdisable: %d, rxdisable: %d, iomask: %d\n",
-		      temp->txdisable, temp->rxdisable, temp->iomask);
+		      temp->txdisable, 0, temp->iomask);
 	module_printk(KERN_INFO, "curzone: %p, tonezone: %d, curtone: %p, tonep: %d\n",
 		      temp->curzone,
 		      ((temp->curzone) ? temp->curzone->num : -1),
@@ -4279,8 +4345,39 @@ static int dahdi_ioctl_spanstat(struct file *file, unsigned long data)
 			sizeof(spaninfo.location));
 	}
 	if (s->spantype) {
-		strlcpy(spaninfo.spantype, s->spantype,
-				  sizeof(spaninfo.spantype));
+		/*
+		 * The API is brain-damaged, returning fixed length
+		 * null terminated strings via ioctl() is...
+		 *
+		 * This field contain only 6 characters
+		 * (including null termination, 5 effective characters).
+		 *
+		 * For backward compatibility, massage this info for dahdi-scan
+		 * and friends, until:
+		 *    - They either learn to read the info from sysfs
+		 *    - Or this API is broken to return the enum value
+		 */
+		const char *st = dahdi_spantype2str(s->spantype);
+		switch (s->spantype) {
+		case SPANTYPE_DIGITAL_BRI_NT:
+			strlcpy(spaninfo.spantype, "NT",
+					sizeof(spaninfo.spantype));
+			break;
+		case SPANTYPE_DIGITAL_BRI_TE:
+			strlcpy(spaninfo.spantype, "TE",
+					sizeof(spaninfo.spantype));
+			break;
+		default:
+			/*
+			 * The rest are either short (FXS, FXO, E1, T1, J1)
+			 * Or new (BRI_SOFT, ANALOG_MIXED, INVALID),
+			 * so no backward compatibility for this
+			 * broken interface.
+			 */
+			strlcpy(spaninfo.spantype, st,
+					sizeof(spaninfo.spantype));
+			break;
+		}
 	}

 	if (copy_to_user((void __user *)data, &spaninfo, size_to_copy))
@@ -4370,7 +4467,7 @@ static int dahdi_ioctl_spanstat_v1(struct file *file, unsigned long data)

 	if (s->spantype) {
 		strlcpy(spaninfo_v1.spantype,
-				  s->spantype,
+				  dahdi_spantype2str(s->spantype),
 				  sizeof(spaninfo_v1.spantype));
 	}

@@ -4417,12 +4514,14 @@ static int dahdi_common_ioctl(struct file *file, unsigned int cmd,
 	return 0;
 }

-static int (*dahdi_dynamic_ioctl)(unsigned int cmd, unsigned long data);
-
-void dahdi_set_dynamic_ioctl(int (*func)(unsigned int cmd, unsigned long data))
+static const struct dahdi_dynamic_ops *dahdi_dynamic_ops;
+void dahdi_set_dynamic_ops(const struct dahdi_dynamic_ops *ops)
 {
-	dahdi_dynamic_ioctl = func;
+	mutex_lock(&registration_mutex);
+	dahdi_dynamic_ops = ops;
+	mutex_unlock(&registration_mutex);
 }
+EXPORT_SYMBOL(dahdi_set_dynamic_ops);

 static int (*dahdi_hpec_ioctl)(unsigned int cmd, unsigned long data);

@@ -4643,7 +4742,6 @@ static int dahdi_ioctl_chanconfig(struct file *file, unsigned long data)
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
 				SET_MODULE_OWNER(chan->hdlcnetdev->netdev);
 #endif
-				chan->hdlcnetdev->netdev->irq = chan->span->irq;
 				chan->hdlcnetdev->netdev->tx_queue_len = 50;
 #ifdef HAVE_NET_DEVICE_OPS
 				chan->hdlcnetdev->netdev->netdev_ops = &dahdi_netdev_ops;
@@ -5023,19 +5121,57 @@ static int dahdi_ioctl_sfconfig(unsigned long data)
 	return res;
 }

+/* Returns true if there are any hardware echocan on any span. */
+static bool dahdi_any_hwec_available(void)
+{
+	int i;
+	bool hwec_available = false;
+	struct dahdi_span *s;
+
+	mutex_lock(&registration_mutex);
+	list_for_each_entry(s, &span_list, spans_node) {
+		for (i = 0; i < s->channels; ++i) {
+			struct dahdi_chan *const chan = s->chans[i];
+			if (dahdi_is_hwec_available(chan)) {
+				hwec_available = true;
+				break;
+			}
+		}
+	}
+	mutex_unlock(&registration_mutex);
+
+	return hwec_available;
+}
+
 static int dahdi_ioctl_get_version(unsigned long data)
 {
 	struct dahdi_versioninfo vi;
 	struct ecfactory *cur;
 	size_t space = sizeof(vi.echo_canceller) - 1;
+	bool have_hwec = dahdi_any_hwec_available();

 	memset(&vi, 0, sizeof(vi));
 	strlcpy(vi.version, dahdi_version, sizeof(vi.version));
 	spin_lock(&ecfactory_list_lock);
 	list_for_each_entry(cur, &ecfactory_list, list) {
+		const char * const ec_name = cur->ec->get_name(NULL);
+		if ((ec_name == hwec_def_name) && !have_hwec) {
+			/*
+			 * The hardware echocan factory is always registered so
+			 * that hwec can be configured on the channels as if it
+			 * was a software echocan. However, it can be confusing
+			 * to list it as one of the available options in the
+			 * output of dahdi_cfg if there isn't a REAL hardware
+			 * echocanceler attached to any of the spans. In that
+			 * case, do not report the presence of the hardware
+			 * echocan factory to userspace.
+			 *
+			 */
+			 continue;
+		}
 		strncat(vi.echo_canceller + strlen(vi.echo_canceller),
-			cur->ec->get_name(NULL), space);
-		space -= strlen(cur->ec->get_name(NULL));
+			ec_name, space);
+		space -= strlen(ec_name);
 		if (space < 1)
 			break;
 		if (cur->list.next && (cur->list.next != &ecfactory_list)) {
@@ -5074,8 +5210,7 @@ static int dahdi_ioctl_maint(unsigned long data)
 	spin_lock_irqsave(&s->lock, flags);
 	  /* save current maint state */
 	i = s->maintstat;
-	  /* set maint mode */
-	s->maintstat = maint.command;
+
 	switch (maint.command) {
 	case DAHDI_MAINT_NONE:
 	case DAHDI_MAINT_LOCALLOOP:
@@ -5134,6 +5269,10 @@ static int dahdi_ioctl_maint(unsigned long data)
 		put_span(s);
 		return -ENOSYS;
 	}
+
+	/* set maint mode */
+	s->maintstat = maint.command;
+
 	dahdi_alarm_notify(s);  /* process alarm-related events */
 	spin_unlock_irqrestore(&s->lock, flags);
 	put_span(s);
@@ -5141,6 +5280,33 @@ static int dahdi_ioctl_maint(unsigned long data)
 	return 0;
 }

+static int dahdi_ioctl_dynamic(unsigned int cmd, unsigned long data)
+{
+	bool tried_load = false;
+	int res;
+
+retry_check:
+	mutex_lock(&registration_mutex);
+	if (!dahdi_dynamic_ops) {
+		mutex_unlock(&registration_mutex);
+		if (tried_load)
+			return -ENOSYS;
+
+		request_module("dahdi_dynamic");
+		tried_load = true;
+		goto retry_check;
+	}
+	if (!try_module_get(dahdi_dynamic_ops->owner)) {
+		mutex_unlock(&registration_mutex);
+		return -ENOSYS;
+	}
+	mutex_unlock(&registration_mutex);
+
+	res = dahdi_dynamic_ops->ioctl(cmd, data);
+	module_put(dahdi_dynamic_ops->owner);
+	return res;
+}
+
 static int
 dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 {
@@ -5175,14 +5341,7 @@ dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 		return dahdi_ioctl_maint(data);
 	case DAHDI_DYNAMIC_CREATE:
 	case DAHDI_DYNAMIC_DESTROY:
-		if (dahdi_dynamic_ioctl) {
-			return dahdi_dynamic_ioctl(cmd, data);
-		} else {
-			request_module("dahdi_dynamic");
-			if (dahdi_dynamic_ioctl)
-				return dahdi_dynamic_ioctl(cmd, data);
-		}
-		return -ENOSYS;
+		return dahdi_ioctl_dynamic(cmd, data);
 	case DAHDI_EC_LICENSE_CHALLENGE:
 	case DAHDI_EC_LICENSE_RESPONSE:
 		if (dahdi_hpec_ioctl) {
@@ -5516,7 +5675,7 @@ static int dahdi_ioctl_iomux(struct file *file, unsigned long data)
 		spin_lock_irqsave(&chan->lock, flags);
 		chan->iomask = iomask;
 		if (iomask & DAHDI_IOMUX_READ) {
-			if ((chan->outreadbuf > -1)  && !chan->rxdisable)
+			if (chan->outreadbuf > -1)
 				wait_result |= DAHDI_IOMUX_READ;
 		}
 		if (iomask & DAHDI_IOMUX_WRITE) {
@@ -5680,7 +5839,7 @@ dahdi_chanandpseudo_ioctl(struct file *file, unsigned int cmd,
 		return ioctl_dahdi_dial(chan, data);
 	case DAHDI_GET_BUFINFO:
 		memset(&stack.bi, 0, sizeof(stack.bi));
-		stack.bi.rxbufpolicy = chan->rxbufpolicy;
+		stack.bi.rxbufpolicy = DAHDI_POLICY_IMMEDIATE;
 		stack.bi.txbufpolicy = chan->txbufpolicy;
 		stack.bi.numbufs = chan->numbufs;
 		stack.bi.bufsize = chan->blocksize;
@@ -6649,7 +6808,7 @@ static void
 set_spanno_and_basechan(struct dahdi_span *span, u32 spanno, u32 basechan)
 {
 	int i;
-	dahdi_dev_dbg(ASSIGN, span->parent->dev.parent,
+	dahdi_dev_dbg(ASSIGN, span_device(span),
 		"set: spanno=%d, basechan=%d (span->channels=%d)\n",
 		spanno, basechan, span->channels);
 	span->spanno = spanno;
@@ -6673,7 +6832,7 @@ static int _assign_spanno_and_basechan(struct dahdi_span *span)
 	unsigned int spanno = 1;
 	unsigned int basechan = 1;

-	dahdi_dev_dbg(ASSIGN, span->parent->dev.parent,
+	dahdi_dev_dbg(ASSIGN, span_device(span),
 		"assign: channels=%d\n", span->channels);
 	list_for_each_entry(pos, &span_list, spans_node) {

@@ -6693,7 +6852,7 @@ static int _assign_spanno_and_basechan(struct dahdi_span *span)
 			basechan = pos->chans[0]->channo + pos->channels;
 	}

-	dahdi_dev_dbg(ASSIGN, span->parent->dev.parent,
+	dahdi_dev_dbg(ASSIGN, span_device(span),
 		"good: spanno=%d, basechan=%d (span->channels=%d)\n",
 		spanno, basechan, span->channels);
 	set_spanno_and_basechan(span, spanno, basechan);
@@ -6743,20 +6902,20 @@ _check_spanno_and_basechan(struct dahdi_span *span, u32 spanno, u32 basechan)
 	struct dahdi_span *pos;
 	unsigned int next_channo;

-	dahdi_dev_dbg(ASSIGN, span->parent->dev.parent,
+	dahdi_dev_dbg(ASSIGN, span_device(span),
 		"check: spanno=%d, basechan=%d (span->channels=%d)\n",
 		spanno, basechan, span->channels);
 	list_for_each_entry(pos, &span_list, spans_node) {

 		next_channo = _get_next_channo(pos);
-		dahdi_dev_dbg(ASSIGN, span->parent->dev.parent,
+		dahdi_dev_dbg(ASSIGN, span_device(span),
 			"pos: spanno=%d channels=%d (next_channo=%d)\n",
 			pos->spanno, pos->channels, next_channo);

 		if (pos->spanno <= spanno) {
 			if (basechan < next_channo + pos->channels) {
 				/* Requested basechan breaks channel sorting */
-				dev_notice(span->parent->dev.parent,
+				dev_notice(span_device(span),
 					"[%d] basechan (%d) is too low for wanted span %d\n",
 					local_spanno(span), basechan, spanno);
 				return -EINVAL;
@@ -6771,13 +6930,13 @@ _check_spanno_and_basechan(struct dahdi_span *span, u32 spanno, u32 basechan)
 			break;

 		/* Cannot fit the span into the requested location. Abort. */
-		dev_notice(span->parent->dev.parent,
+		dev_notice(span_device(span),
 			"cannot fit span %d (basechan=%d) into requested location\n",
 			spanno, basechan);
 		return -EINVAL;
 	}

-	dahdi_dev_dbg(ASSIGN, span->parent->dev.parent,
+	dahdi_dev_dbg(ASSIGN, span_device(span),
 		"good: spanno=%d, basechan=%d (span->channels=%d)\n",
 		spanno, basechan, span->channels);
 	set_spanno_and_basechan(span, spanno, basechan);
@@ -6822,6 +6981,11 @@ static void __dahdi_init_span(struct dahdi_span *span)
 			      span->name);
 		span->deflaw = DAHDI_LAW_MULAW;
 	}
+	if (span->spantype == SPANTYPE_INVALID) {
+		module_printk(KERN_NOTICE,
+			"Warning: Span %s didn't specify a spantype. "
+			"Please fix driver!\n", span->name);
+	}

 	for (x = 0; x < span->channels; ++x) {
 		span->chans[x]->span = span;
@@ -6876,10 +7040,9 @@ static int _dahdi_assign_span(struct dahdi_span *span, unsigned int spanno,
 		return -EFAULT;

 	if (test_bit(DAHDI_FLAGBIT_REGISTERED, &span->flags)) {
-		dev_notice(span->parent->dev.parent,
-			 "local span %d is already assigned span %d "
-			 "with base channel %d\n", local_spanno(span), span->spanno,
-			 span->chans[0]->channo);
+		dev_notice(span_device(span),
+			 "local span %d is already assigned span %d\n",
+			 local_spanno(span), span->spanno);
 		return -EINVAL;
 	}

@@ -6887,7 +7050,7 @@ static int _dahdi_assign_span(struct dahdi_span *span, unsigned int spanno,
 	    span->ops->disable_hw_preechocan) {
 		if ((NULL == span->ops->enable_hw_preechocan) ||
 		    (NULL == span->ops->disable_hw_preechocan)) {
-			dev_notice(span->parent->dev.parent,
+			dev_notice(span_device(span),
 				"span with inconsistent enable/disable hw_preechocan");
 			return -EFAULT;
 		}
@@ -7091,7 +7254,7 @@ static int _dahdi_unassign_span(struct dahdi_span *span)
 	unsigned long flags;

 	if (!test_bit(DAHDI_FLAGBIT_REGISTERED, &span->flags)) {
-		dev_info(span->parent->dev.parent,
+		dev_info(span_device(span),
 			"local span %d is already unassigned\n",
 			local_spanno(span));
 		return -EINVAL;
@@ -7593,8 +7756,6 @@ static inline void __dahdi_process_getaudio_chunk(struct dahdi_chan *ss, unsigne
 			ms->ec_state->status.mode = ECHO_MODE_AWAITINGECHO;
 		}
 	}
-	/* save value from last chunk */
-	memcpy(ms->getlin_lastchunk, ms->getlin, DAHDI_CHUNKSIZE * sizeof(short));
 	/* save value from current */
 	memcpy(ms->getlin, getlin, DAHDI_CHUNKSIZE * sizeof(short));
 	/* save value from current */
@@ -8866,16 +9027,12 @@ static void __putbuf_chunk(struct dahdi_chan *ss, unsigned char *rxb, int bytes)
 							module_printk(KERN_NOTICE, "Out of storage space\n");
 #endif
 							ms->inreadbuf = -1;
-							/* Enable the receiver in case they've got POLICY_WHEN_FULL */
-							ms->rxdisable = 0;
 						}
 						if (ms->outreadbuf < 0) { /* start out buffer if not already */
 							ms->outreadbuf = oldbuf;
 							/* if there are processes waiting in poll() on this channel,
 							   wake them up */
-							if (!ms->rxdisable) {
-								wake_up_interruptible(&ms->waitq);
-							}
+							wake_up_interruptible(&ms->waitq);
 						}
 /* In the very orignal driver, it was quite well known to me (Jim) that there
 was a possibility that a channel sleeping on a receive block needed to
@@ -8890,14 +9047,12 @@ out in the later versions, and is put back now. Note that this is *NOT*
 needed for poll() waiters, because the poll_wait() function that is used there
 is atomic enough for this purpose; it will not go to sleep before ensuring
 that the waitqueue is empty. */
-						if (!ms->rxdisable) { /* if receiver enabled */
-							/* Notify a blocked reader that there is data available
-							to be read, unless we're waiting for it to be full */
+						/* Notify a blocked reader that there is data available
+						to be read, unless we're waiting for it to be full */
 #ifdef CONFIG_DAHDI_DEBUG
-							module_printk(KERN_NOTICE, "Notifying reader data in block %d\n", oldbuf);
+						module_printk(KERN_NOTICE, "Notifying reader data in block %d\n", oldbuf);
 #endif
-							wake_up_interruptible(&ms->waitq);
-						}
+						wake_up_interruptible(&ms->waitq);
 					}
 				}
 			}
@@ -9071,14 +9226,12 @@ void dahdi_hdlc_finish(struct dahdi_chan *ss)
 #ifdef CONFIG_DAHDI_DEBUG
 		module_printk(KERN_NOTICE, "Notifying reader data in block %d\n", oldreadbuf);
 #endif
-		ss->rxdisable = 0;
 	}
 	if (ss->outreadbuf < 0) {
 		ss->outreadbuf = oldreadbuf;
 	}

-	if (!ss->rxdisable)
-		wake_up_interruptible(&ss->waitq);
+	wake_up_interruptible(&ss->waitq);
 	spin_unlock_irqrestore(&ss->lock, flags);
 }

@@ -9206,7 +9359,7 @@ dahdi_chan_poll(struct file *file, struct poll_table_struct *wait_table)

 	spin_lock_irqsave(&c->lock, flags);
 	ret |= (c->inwritebuf > -1) ? POLLOUT|POLLWRNORM : 0;
-	ret |= ((c->outreadbuf > -1) && !c->rxdisable) ?  POLLIN|POLLRDNORM : 0;
+	ret |= (c->outreadbuf > -1) ?  POLLIN|POLLRDNORM : 0;
 	ret |= (c->eventoutidx != c->eventinidx) ? POLLPRI : 0;
 	spin_unlock_irqrestore(&c->lock, flags);

@@ -9608,7 +9761,7 @@ static void coretimer_func(unsigned long param)
 	const long MS_LIMIT = 3000;
 	long difference;

-	now = current_kernel_time();
+	ktime_get_ts(&now);

 	if (atomic_read(&core_timer.count) ==
 	    atomic_read(&core_timer.last_count)) {
@@ -9616,6 +9769,10 @@ static void coretimer_func(unsigned long param)
 		/* This is the code path if a board driver is not calling
 		 * dahdi_receive, and therefore the core of dahdi needs to
 		 * perform the master span processing itself. */
+		if (core_timer.dahdi_receive_used) {
+			core_timer.dahdi_receive_used = 0;
+			dahdi_dbg(GENERAL, "Master changed to core_timer\n");
+		}

 		if (!atomic_read(&core_timer.shutdown)) {
 			mod_timer(&core_timer.timer, jiffies +
@@ -9661,6 +9818,10 @@ static void coretimer_func(unsigned long param)

 		/* It looks like a board driver is calling dahdi_receive. We
 		 * will just check again in a second. */
+		if (!core_timer.dahdi_receive_used) {
+			core_timer.dahdi_receive_used = 1;
+			dahdi_dbg(GENERAL, "Master is no longer core_timer\n");
+		}
 		atomic_set(&core_timer.count, 0);
 		atomic_set(&core_timer.last_count, 0);
 		core_timer.start_interval = now;
@@ -9673,7 +9834,7 @@ static void coretimer_init(void)
 {
 	init_timer(&core_timer.timer);
 	core_timer.timer.function = coretimer_func;
-	core_timer.start_interval = current_kernel_time();
+	ktime_get_ts(&core_timer.start_interval);
 	atomic_set(&core_timer.count, 0);
 	atomic_set(&core_timer.shutdown, 0);
 	core_timer.interval = max(msecs_to_jiffies(DAHDI_MSECS_PER_CHUNK), 1UL);
@@ -9952,7 +10113,7 @@ static void watchdog_check(unsigned long ignored)
 	static int wdcheck=0;
 	struct dahdi_span *s;

-	spin_lock_irqsave(&span_list_lock, flags);
+	spin_lock_irqsave(&chan_lock, flags);
 	list_for_each_entry(s, &span_list, spans_node) {
 		if (s->flags & DAHDI_FLAG_RUNNING) {
 			if (s->watchcounter == DAHDI_WATCHDOG_INIT) {
@@ -9960,9 +10121,9 @@ static void watchdog_check(unsigned long ignored)
 				if ((s->watchstate == DAHDI_WATCHSTATE_OK) ||
 					(s->watchstate == DAHDI_WATCHSTATE_UNKNOWN)) {
 					s->watchstate = DAHDI_WATCHSTATE_RECOVERING;
-					if (s->watchdog) {
+					if (s->ops->watchdog) {
 						module_printk(KERN_NOTICE, "Kicking span %s\n", s->name);
-						s->watchdog(spans[x], DAHDI_WATCHDOG_NOINTS);
+						s->ops->watchdog(s, DAHDI_WATCHDOG_NOINTS);
 					} else {
 						module_printk(KERN_NOTICE, "Span %s is dead with no revival\n", s->name);
 						s->watchstate = DAHDI_WATCHSTATE_FAILED;
@@ -9977,7 +10138,7 @@ static void watchdog_check(unsigned long ignored)
 			s->watchcounter = DAHDI_WATCHDOG_INIT;
 		}
 	}
-	spin_unlock_irqrestore(&span_list_lock, flags);
+	spin_unlock_irqrestore(&chan_lock, flags);
 	if (!wdcheck) {
 		module_printk(KERN_NOTICE, "watchdog on duty!\n");
 		wdcheck=1;
@@ -10007,6 +10168,7 @@ static int __init dahdi_init(void)
 {
 	int res = 0;

+	module_printk(KERN_INFO, "Version: %s\n", dahdi_version);
 #ifdef CONFIG_PROC_FS
 	root_proc_entry = proc_mkdir("dahdi", NULL);
 	if (!root_proc_entry) {
@@ -10045,6 +10207,24 @@ failed_driver_init:
 	return res;
 }

+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
+#ifdef CONFIG_PCI
+void dahdi_pci_disable_link_state(struct pci_dev *pdev, int state)
+{
+	u16 reg16;
+	int pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+	state &= (PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+		  PCIE_LINK_STATE_CLKPM);
+	if (!pos)
+		return;
+	pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &reg16);
+	reg16 &= ~(state);
+	pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);
+}
+EXPORT_SYMBOL(dahdi_pci_disable_link_state);
+#endif /* CONFIG_PCI */
+#endif /* 2.6.25 */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
 static inline void flush_find_master_work(void)
 {
@@ -10092,34 +10272,5 @@ static void __exit dahdi_cleanup(void)
 	flush_find_master_work();
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
-char *dahdi_kasprintf(gfp_t gfp, const char *fmt, ...)
-{
-	va_list ap;
-	char *p;
-	char *temp;
-	unsigned int len;
-
-	temp = kmalloc(PAGE_SIZE, GFP_KERNEL);
-	if (!temp)
-		return NULL;
-
-	va_start(ap, fmt);
-	len = vsnprintf(temp, PAGE_SIZE, fmt, ap);
-	va_end(ap);
-
-	p = kzalloc(len + 1, gfp);
-	if (!p) {
-		kfree(temp);
-		return NULL;
-	}
-
-	memcpy(p, temp, len + 1);
-	kfree(temp);
-	return p;
-}
-EXPORT_SYMBOL(dahdi_kasprintf);
-#endif
-
 module_init(dahdi_init);
 module_exit(dahdi_cleanup);
--- a/drivers/dahdi/dahdi-sysfs-chan.c
+++ b/drivers/dahdi/dahdi-sysfs-chan.c
@@ -0,0 +1,215 @@
+/* dahdi-sysfs-chan.c
+ *
+ * Copyright (C) 2011-2012, Xorcom
+ * Copyright (C) 2011-2012, Digium, Inc.
+ *
+ * All rights reserved.
+ *
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ */
+
+#include <linux/version.h>
+
+#define DAHDI_PRINK_MACROS_USE_debug
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <dahdi/kernel.h>
+#include "dahdi.h"
+#include "dahdi-sysfs.h"
+
+/* shortcuts, for code readability */
+#define MAKE_DAHDI_DEV(num, name) \
+	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, num), NULL, name)
+#define DEL_DAHDI_DEV(num) \
+	CLASS_DEV_DESTROY(dahdi_class, MKDEV(DAHDI_MAJOR, num))
+
+static struct class *dahdi_class;
+
+int chan_sysfs_create(struct dahdi_chan *chan)
+{
+	char chan_name[32];
+	void *dummy;
+	int res = 0;
+
+	if (chan->channo >= 250)
+		return 0;
+	if (test_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags))
+		return 0;
+	snprintf(chan_name, sizeof(chan_name), "dahdi!%d", chan->channo);
+	dummy = (void *)MAKE_DAHDI_DEV(chan->channo, chan_name);
+	if (IS_ERR(dummy)) {
+		res = PTR_ERR(dummy);
+		chan_err(chan, "Failed creating sysfs device: %d\n",
+				res);
+		return res;
+	}
+	set_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags);
+	return 0;
+}
+
+void chan_sysfs_remove(struct dahdi_chan *chan)
+{
+	if (!test_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags))
+		return;
+	DEL_DAHDI_DEV(chan->channo);
+	clear_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags);
+}
+
+/*
+ * Used by dahdi_transcode.c
+ */
+int dahdi_register_chardev(struct dahdi_chardev *dev)
+{
+	static const char *DAHDI_STRING = "dahdi!";
+	char *udevname;
+
+	udevname = kzalloc(strlen(dev->name) + sizeof(DAHDI_STRING) + 1,
+			   GFP_KERNEL);
+	if (!udevname)
+		return -ENOMEM;
+
+	strcpy(udevname, DAHDI_STRING);
+	strcat(udevname, dev->name);
+	MAKE_DAHDI_DEV(dev->minor, udevname);
+	kfree(udevname);
+	return 0;
+}
+EXPORT_SYMBOL(dahdi_register_chardev);
+
+/*
+ * Used by dahdi_transcode.c
+ */
+int dahdi_unregister_chardev(struct dahdi_chardev *dev)
+{
+	DEL_DAHDI_DEV(dev->minor);
+	return 0;
+}
+EXPORT_SYMBOL(dahdi_unregister_chardev);
+
+/*--------- Sysfs Device handling ----*/
+
+/*
+ * Describe fixed device files and maintain their
+ * pointer so fixed_devfiles_remove() can always be called
+ * and work cleanly
+ */
+static struct {
+	int	minor;
+	char	*name;
+	void	*dev;	/* FIXME: wrong type because of old kernels */
+} fixed_minors[] = {
+	{ DAHDI_CTL,		"dahdi!ctl",	},
+	{ DAHDI_TIMER,		"dahdi!timer",	},
+	{ DAHDI_CHANNEL,	"dahdi!channel",},
+	{ DAHDI_PSEUDO,		"dahdi!pseudo",	},
+};
+
+/*
+ * Removes /dev/dahdi/{ctl,timer,channel,pseudo}
+ *
+ * It is safe to call it during initialization error handling,
+ * as it skips non existing objects.
+ */
+static void fixed_devfiles_remove(void)
+{
+	int i;
+
+	if (!dahdi_class)
+		return;
+	for (i = 0; i < ARRAY_SIZE(fixed_minors); i++) {
+		void *d = fixed_minors[i].dev;
+		if (d && !IS_ERR(d))
+			dahdi_dbg(DEVICES, "Removing fixed device file %s\n",
+				fixed_minors[i].name);
+			DEL_DAHDI_DEV(fixed_minors[i].minor);
+	}
+}
+
+/*
+ * Creates /dev/dahdi/{ctl,timer,channel,pseudo}
+ */
+static int fixed_devfiles_create(void)
+{
+	int i;
+	int res = 0;
+
+	if (!dahdi_class) {
+		dahdi_err("%s: dahdi_class is not initialized yet!\n",
+				__func__);
+		res = -ENODEV;
+		goto cleanup;
+	}
+	for (i = 0; i < ARRAY_SIZE(fixed_minors); i++) {
+		char *name = fixed_minors[i].name;
+		int minor = fixed_minors[i].minor;
+		void *dummy;
+
+		dahdi_dbg(DEVICES, "Making fixed device file %s\n", name);
+		dummy = (void *)MAKE_DAHDI_DEV(minor, name);
+		if (IS_ERR(dummy)) {
+			int res = PTR_ERR(dummy);
+
+			dahdi_err("%s: failed (%d: %s). Error: %d\n",
+					__func__, minor, name, res);
+			goto cleanup;
+		}
+		fixed_minors[i].dev = dummy;
+	}
+	return 0;
+cleanup:
+	fixed_devfiles_remove();
+	return res;
+}
+
+/*
+ * Called during driver unload and while handling any error during
+ * driver load.
+ * Always clean any (and only) objects that were initialized (invariant)
+ */
+static void sysfs_channels_cleanup(void)
+{
+	fixed_devfiles_remove();
+	if (dahdi_class) {
+		dahdi_dbg(DEVICES, "Destroying DAHDI class:\n");
+		class_destroy(dahdi_class);
+		dahdi_class = NULL;
+	}
+}
+
+int __init dahdi_sysfs_chan_init(const struct file_operations *fops)
+{
+	int res = 0;
+
+	dahdi_class = class_create(THIS_MODULE, "dahdi");
+	if (IS_ERR(dahdi_class)) {
+		res = PTR_ERR(dahdi_class);
+		dahdi_err("%s: class_create(dahi_chan) failed. Error: %d\n",
+			__func__, res);
+		goto cleanup;
+	}
+	res = fixed_devfiles_create();
+	if (res)
+		goto cleanup;
+	return 0;
+cleanup:
+	sysfs_channels_cleanup();
+	return res;
+}
+
+void dahdi_sysfs_chan_exit(void)
+{
+	sysfs_channels_cleanup();
+}
--- a/drivers/dahdi/dahdi-sysfs.c
+++ b/drivers/dahdi/dahdi-sysfs.c
@@ -1,108 +1,35 @@
+/* dahdi-sysfs.c
+ *
+ * Copyright (C) 2011-2012, Xorcom
+ * Copyright (C) 2011-2012, Digium, Inc.
+ *
+ * All rights reserved.
+ *
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ */
+
 #include <linux/kernel.h>
 #include <linux/version.h>
 #define DAHDI_PRINK_MACROS_USE_debug
 #include <dahdi/kernel.h>
 #include <linux/device.h>
 #include <linux/slab.h>
+#include <linux/ctype.h>

 #include "dahdi.h"
-
-/* FIXME: Move to kernel.h */
-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-#define CLASS_DEV_CREATE(class, devt, device, name) \
-	device_create(class, device, devt, NULL, "%s", name)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-#define CLASS_DEV_CREATE(class, devt, device, name) \
-	device_create(class, device, devt, name)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
-#define CLASS_DEV_CREATE(class, devt, device, name) \
-        class_device_create(class, NULL, devt, device, name)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
-#define CLASS_DEV_CREATE(class, devt, device, name) \
-        class_device_create(class, devt, device, name)
-#else
-#define CLASS_DEV_CREATE(class, devt, device, name) \
-        class_simple_device_add(class, devt, device, name)
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-#define CLASS_DEV_DESTROY(class, devt) \
-	device_destroy(class, devt)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
-#define CLASS_DEV_DESTROY(class, devt) \
-	class_device_destroy(class, devt)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
-#define CLASS_DEV_DESTROY(class, devt) \
-	class_simple_device_remove(devt)
-#else
-#define CLASS_DEV_DESTROY(class, devt) \
-	class_simple_device_remove(class, devt)
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
-static struct class *dahdi_class = NULL;
-#else
-static struct class_simple *dahdi_class = NULL;
-#define class_create class_simple_create
-#define class_destroy class_simple_destroy
-#endif
-
-/*
- * Very old hotplug support
- */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 9)
-#define	OLD_HOTPLUG_SUPPORT	/* for older kernels */
-#define	OLD_HOTPLUG_SUPPORT_269
-#endif
-
-#ifdef	OLD_HOTPLUG_SUPPORT_269
-/* Copy from new kernels lib/kobject_uevent.c */
-enum kobject_action {
-	KOBJ_ADD,
-	KOBJ_REMOVE,
-	KOBJ_CHANGE,
-	KOBJ_MOUNT,
-	KOBJ_UMOUNT,
-	KOBJ_OFFLINE,
-	KOBJ_ONLINE,
-};
-#endif
-
-/*
- * Hotplug replaced with uevent in 2.6.16
- */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
-#define	OLD_HOTPLUG_SUPPORT	/* for older kernels */
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-#define	DEVICE_ATTR_READER(name, dev, buf)	\
-		ssize_t name(struct device *dev, struct device_attribute *attr,\
-				char *buf)
-#define	DEVICE_ATTR_WRITER(name, dev, buf, count)	\
-		ssize_t name(struct device *dev, struct device_attribute *attr,\
-				const char *buf, size_t count)
-#define BUS_ATTR_READER(name, dev, buf) \
-	ssize_t name(struct device *dev, struct device_attribute *attr, \
-		char *buf)
-#define BUS_ATTR_WRITER(name, dev, buf, count) \
-		ssize_t name(struct device *dev, struct device_attribute *attr,\
-			const char *buf, size_t count)
-#else
-#define	DEVICE_ATTR_READER(name, dev, buf)	\
-		ssize_t name(struct device *dev, char *buf)
-#define	DEVICE_ATTR_WRITER(name, dev, buf, count)	\
-		ssize_t name(struct device *dev, const char *buf, size_t count)
-#define BUS_ATTR_READER(name, dev, buf) \
-		ssize_t name(struct device *dev, char *buf)
-#define BUS_ATTR_WRITER(name, dev, buf, count) \
-		ssize_t name(struct device *dev, const char *buf, size_t count)
-#endif
-
-#define	DRIVER_ATTR_READER(name, drv, buf)	\
-		ssize_t name(struct device_driver *drv, char * buf)
+#include "dahdi-sysfs.h"


 static char *initdir = "/usr/share/dahdi";
@@ -118,23 +45,6 @@ static inline struct dahdi_span *dev_to_span(struct device *dev)
 	return dev_get_drvdata(dev);
 }

-#ifdef OLD_HOTPLUG_SUPPORT
-static int span_hotplug(struct device *dev, char **envp, int envnum,
-		char *buff, int bufsize)
-{
-	struct dahdi_span *span;
-
-	if (!dev)
-		return -ENODEV;
-	span = dev_to_span(dev);
-	envp[0] = buff;
-	if (snprintf(buff, bufsize, "SPAN_NAME=%s", span->name) >= bufsize)
-		return -ENOMEM;
-	envp[1] = NULL;
-	return 0;
-}
-#else
-
 #define	SPAN_VAR_BLOCK	\
 	do {		\
 		DAHDI_ADD_UEVENT_VAR("DAHDI_INIT_DIR=%s", initdir);	\
@@ -152,12 +62,6 @@ static int span_hotplug(struct device *dev, char **envp, int envnum,
 			return err;				\
 	} while (0)

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
-#define dev_name(dev)		((dev)->bus_id)
-#define dev_set_name(dev, format, ...) \
-	snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__);
-#endif
-
 static int span_uevent(struct device *dev, char **envp, int num_envp,
 		char *buffer, int buffer_size)
 {
@@ -204,8 +108,6 @@ static int span_uevent(struct device *dev, struct kobj_uevent_env *kenv)

 #endif

-#endif	/* OLD_HOTPLUG_SUPPORT */
-
 #define span_attr(field, format_string)				\
 static BUS_ATTR_READER(field##_show, dev, buf)			\
 {								\
@@ -217,11 +119,18 @@ static BUS_ATTR_READER(field##_show, dev, buf)			\

 span_attr(name, "%s\n");
 span_attr(desc, "%s\n");
-span_attr(spantype, "%s\n");
 span_attr(alarms, "0x%x\n");
 span_attr(lbo, "%d\n");
 span_attr(syncsrc, "%d\n");

+static BUS_ATTR_READER(spantype_show, dev, buf)
+{
+	struct dahdi_span *span;
+
+	span = dev_to_span(dev);
+	return sprintf(buf, "%s\n", dahdi_spantype2str(span->spantype));
+}
+
 static BUS_ATTR_READER(local_spanno_show, dev, buf)
 {
 	struct dahdi_span *span;
@@ -251,6 +160,8 @@ static BUS_ATTR_READER(basechan_show, dev, buf)
 	struct dahdi_span *span;

 	span = dev_to_span(dev);
+	if (!span->channels)
+		return -ENODEV;
 	return sprintf(buf, "%d\n", span->chans[0]->channo);
 }

@@ -262,6 +173,38 @@ static BUS_ATTR_READER(channels_show, dev, buf)
 	return sprintf(buf, "%d\n", span->channels);
 }

+static BUS_ATTR_READER(lineconfig_show, dev, buf)
+{
+	struct dahdi_span *span;
+	int len = 0;
+
+	span = dev_to_span(dev);
+	len += lineconfig_str(span->lineconfig, buf, 20);
+	len += sprintf(buf + len, "\n");
+	return len;
+}
+
+static BUS_ATTR_READER(linecompat_show, dev, buf)
+{
+	struct dahdi_span *span;
+	int bit;
+	int len = 0;
+
+	span = dev_to_span(dev);
+	for (bit = 4; bit <= 12; bit++) {
+		if (span->linecompat & (1 << bit)) {
+			const char *name = dahdi_lineconfig_bit_name(bit);
+			if (name)
+				len += sprintf(buf + len, "%s ", name);
+		}
+	}
+	/* chomp */
+	while (len > 0 && isspace(buf[len - 1]))
+		buf[--len] = '\0';
+	len += sprintf(buf + len, "\n");
+	return len;
+}
+
 static struct device_attribute span_dev_attrs[] = {
 	__ATTR_RO(name),
 	__ATTR_RO(desc),
@@ -274,6 +217,8 @@ static struct device_attribute span_dev_attrs[] = {
 	__ATTR_RO(is_sync_master),
 	__ATTR_RO(basechan),
 	__ATTR_RO(channels),
+	__ATTR_RO(lineconfig),
+	__ATTR_RO(linecompat),
 	__ATTR_NULL,
 };

@@ -284,11 +229,7 @@ static struct driver_attribute dahdi_attrs[] = {
 static struct bus_type spans_bus_type = {
 	.name           = "dahdi_spans",
 	.match          = span_match,
-#ifdef OLD_HOTPLUG_SUPPORT
-	.hotplug	= span_hotplug,
-#else
 	.uevent         = span_uevent,
-#endif
 	.dev_attrs	= span_dev_attrs,
 	.drv_attrs	= dahdi_attrs,
 };
@@ -316,9 +257,7 @@ static struct device_driver dahdi_driver = {
 	.bus		= &spans_bus_type,
 	.probe		= span_probe,
 	.remove		= span_remove,
-#ifndef OLD_HOTPLUG_SUPPORT
 	.owner		= THIS_MODULE
-#endif
 };

 static void span_uevent_send(struct dahdi_span *span, enum kobject_action act)
@@ -328,26 +267,7 @@ static void span_uevent_send(struct dahdi_span *span, enum kobject_action act)
 	kobj = &span->span_device->kobj;
 	span_dbg(DEVICES, span, "SYFS dev_name=%s action=%d\n",
 		dev_name(span->span_device), act);
-
-#if defined(OLD_HOTPLUG_SUPPORT_269)
-	{
-		/* Copy from new kernels lib/kobject_uevent.c */
-		static const char *const str[] = {
-			[KOBJ_ADD]	"add",
-			[KOBJ_REMOVE]	"remove",
-			[KOBJ_CHANGE]	"change",
-			[KOBJ_MOUNT]	"mount",
-			[KOBJ_UMOUNT]	"umount",
-			[KOBJ_OFFLINE]	"offline",
-			[KOBJ_ONLINE]	"online"
-		};
-		kobject_hotplug(str[act], kobj);
-	}
-#elif defined(OLD_HOTPLUG_SUPPORT)
-	kobject_hotplug(kobj, act);
-#else
 	kobject_uevent(kobj, act);
-#endif
 }

 static void span_release(struct device *dev)
@@ -355,32 +275,6 @@ static void span_release(struct device *dev)
 	dahdi_dbg(DEVICES, "%s: %s\n", __func__, dev_name(dev));
 }

-int dahdi_register_chardev(struct dahdi_chardev *dev)
-{
-	static const char *DAHDI_STRING = "dahdi!";
-	char *udevname;
-
-	udevname = kzalloc(strlen(dev->name) + sizeof(DAHDI_STRING) + 1,
-			   GFP_KERNEL);
-	if (!udevname)
-		return -ENOMEM;
-
-	strcpy(udevname, DAHDI_STRING);
-	strcat(udevname, dev->name);
-	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, dev->minor), NULL, udevname);
-	kfree(udevname);
-	return 0;
-}
-EXPORT_SYMBOL(dahdi_register_chardev);
-
-int dahdi_unregister_chardev(struct dahdi_chardev *dev)
-{
-	CLASS_DEV_DESTROY(dahdi_class, MKDEV(DAHDI_MAJOR, dev->minor));
-
-	return 0;
-}
-EXPORT_SYMBOL(dahdi_unregister_chardev);
-
 void span_sysfs_remove(struct dahdi_span *span)
 {
 	struct device *span_device;
@@ -392,15 +286,8 @@ void span_sysfs_remove(struct dahdi_span *span)
 	if (!span_device)
 		return;

-	for (x = 0; x < span->channels; x++) {
-		struct dahdi_chan *chan = span->chans[x];
-		if (!test_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags))
-			continue;
-
-		CLASS_DEV_DESTROY(dahdi_class,
-				MKDEV(DAHDI_MAJOR, chan->channo));
-		clear_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags);
-	}
+	for (x = 0; x < span->channels; x++)
+		chan_sysfs_remove(span->chans[x]);
 	if (!dev_get_drvdata(span_device))
 		return;

@@ -451,28 +338,9 @@ int span_sysfs_create(struct dahdi_span *span)
 	}

 	for (x = 0; x < span->channels; x++) {
-		struct dahdi_chan *chan = span->chans[x];
-		char chan_name[32];
-		void *dummy;
-
-		if (chan->channo >= 250)
-			continue;
-		if (test_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags))
-			continue;
-
-		snprintf(chan_name, sizeof(chan_name), "dahdi!%d",
-				chan->channo);
-		dummy = (void *)CLASS_DEV_CREATE(dahdi_class,
-				MKDEV(DAHDI_MAJOR, chan->channo),
-				NULL, chan_name);
-		if (IS_ERR(dummy)) {
-			res = PTR_ERR(dummy);
-			chan_err(chan, "Failed creating sysfs device: %d\n",
-					res);
+		res = chan_sysfs_create(span->chans[x]);
+		if (res)
 			goto cleanup;
-		}
-
-		set_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags);
 	}
 	return 0;

@@ -481,58 +349,38 @@ cleanup:
 	return res;
 }

-#define MAKE_DAHDI_DEV(num, name) \
-	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, num), NULL, name)
-#define DEL_DAHDI_DEV(num) \
-	CLASS_DEV_DESTROY(dahdi_class, MKDEV(DAHDI_MAJOR, num))
-
 /* Only used to flag that the device exists: */
 static struct {
-	unsigned int ctl:1;
-	unsigned int timer:1;
-	unsigned int channel:1;
-	unsigned int pseudo:1;
-	unsigned int sysfs_driver_registered:1;
-	unsigned int sysfs_spans_bus_type:1;
-	unsigned int dahdi_device_bus_registered:1;
-} dummy_dev;
+	unsigned int clean_dahdi_driver:1;
+	unsigned int clean_span_bus_type:1;
+	unsigned int clean_device_bus:1;
+	unsigned int clean_chardev:1;
+} should_cleanup;

 static inline struct dahdi_device *to_ddev(struct device *dev)
 {
 	return container_of(dev, struct dahdi_device, dev);
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t dahdi_device_manufacturer_show(struct device *dev, char *buf)
-#else
 static ssize_t
 dahdi_device_manufacturer_show(struct device *dev,
 			       struct device_attribute *attr, char *buf)
-#endif
 {
 	struct dahdi_device *ddev = to_ddev(dev);
 	return sprintf(buf, "%s\n", ddev->manufacturer);
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t dahdi_device_type_show(struct device *dev, char *buf)
-#else
 static ssize_t
 dahdi_device_type_show(struct device *dev,
 		       struct device_attribute *attr, char *buf)
-#endif
 {
 	struct dahdi_device *ddev = to_ddev(dev);
 	return sprintf(buf, "%s\n", ddev->devicetype);
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t dahdi_device_span_count_show(struct device *dev, char *buf)
-#else
 static ssize_t
 dahdi_device_span_count_show(struct device *dev,
 			     struct device_attribute *attr, char *buf)
-#endif
 {
 	struct dahdi_device *ddev = to_ddev(dev);
 	unsigned int count = 0;
@@ -544,13 +392,9 @@ dahdi_device_span_count_show(struct device *dev,
 	return sprintf(buf, "%d\n", count);
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t dahdi_device_hardware_id_show(struct device *dev, char *buf)
-#else
 static ssize_t
 dahdi_device_hardware_id_show(struct device *dev,
 			     struct device_attribute *attr, char *buf)
-#endif
 {
 	struct dahdi_device *ddev = to_ddev(dev);

@@ -558,28 +402,18 @@ dahdi_device_hardware_id_show(struct device *dev,
 		(ddev->hardware_id) ? ddev->hardware_id : "");
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t
-dahdi_device_auto_assign(struct device *dev, const char *buf, size_t count)
-#else
 static ssize_t
 dahdi_device_auto_assign(struct device *dev, struct device_attribute *attr,
 			 const char *buf, size_t count)
-#endif
 {
 	struct dahdi_device *ddev = to_ddev(dev);
 	dahdi_assign_device_spans(ddev);
 	return count;
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t
-dahdi_device_assign_span(struct device *dev, const char *buf, size_t count)
-#else
 static ssize_t
 dahdi_device_assign_span(struct device *dev, struct device_attribute *attr,
 			 const char *buf, size_t count)
-#endif
 {
 	int ret;
 	struct dahdi_span *span;
@@ -591,7 +425,7 @@ dahdi_device_assign_span(struct device *dev, struct device_attribute *attr,
 	ret = sscanf(buf, "%u:%u:%u", &local_span_number, &desired_spanno,
 		     &desired_basechanno);
 	if (ret != 3) {
-		dev_notice(dev, "badly formatted input (should be <num>:<num>:<num>)\n");
+		dev_notice(dev, "bad input (should be <num>:<num>:<num>)\n");
 		return -EINVAL;
 	}

@@ -607,18 +441,14 @@ dahdi_device_assign_span(struct device *dev, struct device_attribute *attr,
 			return (ret) ? ret : count;
 		}
 	}
-	dev_notice(dev, "no match for local span number %d\n", local_span_number);
+	dev_notice(dev, "no match for local span number %d\n",
+		local_span_number);
 	return -EINVAL;
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t
-dahdi_device_unassign_span(struct device *dev, const char *buf, size_t count)
-#else
 static ssize_t
 dahdi_device_unassign_span(struct device *dev, struct device_attribute *attr,
 			   const char *buf, size_t count)
-#endif
 {
 	int ret;
 	unsigned int local_span_number;
@@ -644,13 +474,9 @@ dahdi_device_unassign_span(struct device *dev, struct device_attribute *attr,
 	return (ret < 0) ? ret : count;
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t dahdi_spantype_show(struct device *dev, char *buf)
-#else
 static ssize_t
 dahdi_spantype_show(struct device *dev,
 		    struct device_attribute *attr, char *buf)
-#endif
 {
 	struct dahdi_device *ddev = to_ddev(dev);
 	int count = 0;
@@ -659,7 +485,8 @@ dahdi_spantype_show(struct device *dev,

 	/* TODO: Make sure this doesn't overflow the page. */
 	list_for_each_entry(span, &ddev->spans, device_node) {
-		count = sprintf(buf, "%d:%s\n", local_spanno(span), span->spantype);
+		count = sprintf(buf, "%d:%s\n",
+			local_spanno(span), dahdi_spantype2str(span->spantype));
 		buf += count;
 		total += count;
 	}
@@ -667,24 +494,27 @@ dahdi_spantype_show(struct device *dev,
 	return total;
 }

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
-static ssize_t
-dahdi_spantype_store(struct device *dev, const char *buf, size_t count)
-#else
 static ssize_t
 dahdi_spantype_store(struct device *dev, struct device_attribute *attr,
 		     const char *buf, size_t count)
-#endif
 {
 	struct dahdi_device *const ddev = to_ddev(dev);
 	int ret;
 	struct dahdi_span *span;
 	unsigned int local_span_number;
-	char desired_spantype[80];
+	char spantype_name[80];
+	enum spantypes spantype;

-	ret = sscanf(buf, "%u:%70s", &local_span_number, desired_spantype);
-	if (ret != 2)
+	ret = sscanf(buf, "%u:%70s", &local_span_number, spantype_name);
+	if (ret != 2) {
+		dev_err(&ddev->dev, "Wrong input format: '%s'\n", buf);
 		return -EINVAL;
+	}
+	spantype = dahdi_str2spantype(spantype_name);
+	if (spantype == SPANTYPE_INVALID) {
+		dev_err(&ddev->dev, "Invalid spantype: '%s'\n", buf);
+		return -EINVAL;
+	}

 	list_for_each_entry(span, &ddev->spans, device_node) {
 		if (local_spanno(span) == local_span_number)
@@ -698,8 +528,9 @@ dahdi_spantype_store(struct device *dev, struct device_attribute *attr,
 	}

 	if (local_spanno(span) != local_span_number) {
-		module_printk(KERN_WARNING, "%d is not a valid local span number "
-			      "for this device.\n", local_span_number);
+		module_printk(KERN_WARNING,
+				"%d is not a valid local span number "
+				"for this device.\n", local_span_number);
 		return -EINVAL;
 	}

@@ -709,7 +540,7 @@ dahdi_spantype_store(struct device *dev, struct device_attribute *attr,
 		return -EINVAL;
 	}

-	ret = span->ops->set_spantype(span, &desired_spantype[0]);
+	ret = span->ops->set_spantype(span, spantype);
 	return (ret < 0) ? ret : count;
 }

@@ -731,49 +562,30 @@ static struct bus_type dahdi_device_bus = {
 	.dev_attrs = dahdi_device_attrs,
 };

-void dahdi_sysfs_exit(void)
+static void dahdi_sysfs_cleanup(void)
 {
 	dahdi_dbg(DEVICES, "SYSFS\n");
-	if (dummy_dev.pseudo) {
-		dahdi_dbg(DEVICES, "Removing /dev/dahdi/pseudo:\n");
-		DEL_DAHDI_DEV(DAHDI_PSEUDO);
-		dummy_dev.pseudo = 0;
-	}
-	if (dummy_dev.channel) {
-		dahdi_dbg(DEVICES, "Removing /dev/dahdi/channel:\n");
-		DEL_DAHDI_DEV(DAHDI_CHANNEL);
-		dummy_dev.channel = 0;
-	}
-	if (dummy_dev.timer) {
-		dahdi_dbg(DEVICES, "Removing /dev/dahdi/timer:\n");
-		DEL_DAHDI_DEV(DAHDI_TIMER);
-		dummy_dev.timer = 0;
-	}
-	if (dummy_dev.ctl) {
-		dahdi_dbg(DEVICES, "Removing /dev/dahdi/ctl:\n");
-		DEL_DAHDI_DEV(DAHDI_CTL);
-		dummy_dev.ctl = 0;
-	}
-	if (dahdi_class) {
-		dahdi_dbg(DEVICES, "Destroying DAHDI class:\n");
-		class_destroy(dahdi_class);
-		dahdi_class = NULL;
-	}
-	if (dummy_dev.sysfs_driver_registered) {
+	if (should_cleanup.clean_dahdi_driver) {
 		dahdi_dbg(DEVICES, "Unregister driver\n");
 		driver_unregister(&dahdi_driver);
-		dummy_dev.sysfs_driver_registered = 0;
+		should_cleanup.clean_dahdi_driver = 0;
 	}
-	if (dummy_dev.sysfs_spans_bus_type) {
+	if (should_cleanup.clean_span_bus_type) {
 		dahdi_dbg(DEVICES, "Unregister span bus type\n");
 		bus_unregister(&spans_bus_type);
-		dummy_dev.sysfs_spans_bus_type = 0;
+		should_cleanup.clean_span_bus_type = 0;
+	}
+	dahdi_sysfs_chan_exit();
+	if (should_cleanup.clean_chardev) {
+		dahdi_dbg(DEVICES, "Unregister character device\n");
+		unregister_chrdev(DAHDI_MAJOR, "dahdi");
+		should_cleanup.clean_chardev = 0;
 	}
-	unregister_chrdev(DAHDI_MAJOR, "dahdi");

-	if (dummy_dev.dahdi_device_bus_registered) {
+	if (should_cleanup.clean_device_bus) {
+		dahdi_dbg(DEVICES, "Unregister DAHDI device bus\n");
 		bus_unregister(&dahdi_device_bus);
-		dummy_dev.dahdi_device_bus_registered = 0;
+		should_cleanup.clean_device_bus = 0;
 	}
 }

@@ -796,10 +608,17 @@ int dahdi_sysfs_add_device(struct dahdi_device *ddev, struct device *parent)
 {
 	int ret;
 	struct device *const dev = &ddev->dev;
+	const char *dn;

 	dev->parent = parent;
 	dev->bus = &dahdi_device_bus;
-	dev_set_name(dev, "%s:%s", parent->bus->name, dev_name(parent));
+	dn = dev_name(dev);
+	if (!dn || !*dn) {
+		/* Invent default name based on parent */
+		if (!parent)
+			return -EINVAL;
+		dev_set_name(dev, "%s:%s", parent->bus->name, dev_name(parent));
+	}
 	ret = device_add(dev);
 	return ret;
 }
@@ -818,79 +637,54 @@ void dahdi_sysfs_unregister_device(struct dahdi_device *ddev)
 int __init dahdi_sysfs_init(const struct file_operations *dahdi_fops)
 {
 	int res = 0;
-	void *dev;

+	dahdi_dbg(DEVICES, "Registering DAHDI device bus\n");
 	res = bus_register(&dahdi_device_bus);
 	if (res)
 		return res;
+	should_cleanup.clean_device_bus = 1;

-	dummy_dev.dahdi_device_bus_registered = 1;
-
+	dahdi_dbg(DEVICES,
+		"Registering character device (major=%d)\n", DAHDI_MAJOR);
 	res = register_chrdev(DAHDI_MAJOR, "dahdi", dahdi_fops);
 	if (res) {
-		module_printk(KERN_ERR, "Unable to register DAHDI character device handler on %d\n", DAHDI_MAJOR);
+		module_printk(KERN_ERR,
+			"Unable to register DAHDI character device "
+			"handler on %d\n", DAHDI_MAJOR);
 		return res;
 	}
-	module_printk(KERN_INFO, "Telephony Interface Registered on major %d\n",
-			DAHDI_MAJOR);
-	module_printk(KERN_INFO, "Version: %s\n", dahdi_version);
+	should_cleanup.clean_chardev = 1;

-	dahdi_class = class_create(THIS_MODULE, "dahdi");
-	if (!dahdi_class) {
-		res = -EEXIST;
+	res = dahdi_sysfs_chan_init(dahdi_fops);
+	if (res)
 		goto cleanup;
-	}

-	dahdi_dbg(DEVICES, "Creating /dev/dahdi/timer:\n");
-	dev = MAKE_DAHDI_DEV(DAHDI_TIMER, "dahdi!timer");
-	if (IS_ERR(dev)) {
-		res = PTR_ERR(dev);
-		goto cleanup;
-	}
-	dummy_dev.timer = 1;
-
-	dahdi_dbg(DEVICES, "Creating /dev/dahdi/channel:\n");
-	dev = MAKE_DAHDI_DEV(DAHDI_CHANNEL, "dahdi!channel");
-	if (IS_ERR(dev)) {
-		res = PTR_ERR(dev);
-		goto cleanup;
-	}
-	dummy_dev.channel = 1;
-
-	dahdi_dbg(DEVICES, "Creating /dev/dahdi/pseudo:\n");
-	dev = MAKE_DAHDI_DEV(DAHDI_PSEUDO, "dahdi!pseudo");
-	if (IS_ERR(dev)) {
-		res = PTR_ERR(dev);
-		goto cleanup;
-	}
-	dummy_dev.pseudo = 1;
-
-	dahdi_dbg(DEVICES, "Creating /dev/dahdi/ctl:\n");
-	dev = MAKE_DAHDI_DEV(DAHDI_CTL, "dahdi!ctl");
-	if (IS_ERR(dev)) {
-		res = PTR_ERR(dev);
-		goto cleanup;
-	}
-	dummy_dev.ctl = 1;
 	res = bus_register(&spans_bus_type);
-	if (res != 0) {
+	if (res) {
 		dahdi_err("%s: bus_register(%s) failed. Error number %d",
 			__func__, spans_bus_type.name, res);
 		goto cleanup;
 	}
-	dummy_dev.sysfs_spans_bus_type = 1;
+	should_cleanup.clean_span_bus_type = 1;
+
 	res = driver_register(&dahdi_driver);
-	if (res < 0) {
+	if (res) {
 		dahdi_err("%s: driver_register(%s) failed. Error number %d",
 			__func__, dahdi_driver.name, res);
 		goto cleanup;
 	}
-	dummy_dev.sysfs_driver_registered = 1;
+	should_cleanup.clean_dahdi_driver = 1;

+	module_printk(KERN_INFO, "Telephony Interface Registered on major %d\n",
+			DAHDI_MAJOR);
 	return 0;

 cleanup:
-	dahdi_sysfs_exit();
+	dahdi_sysfs_cleanup();
 	return res;
 }

+void dahdi_sysfs_exit(void)
+{
+	dahdi_sysfs_cleanup();
+}
--- a/drivers/dahdi/dahdi-sysfs.h
+++ b/drivers/dahdi/dahdi-sysfs.h
@@ -0,0 +1,55 @@
+#ifndef	DAHDI_SYSFS_H
+#define	DAHDI_SYSFS_H
+
+#define	DEVICE_ATTR_READER(name, dev, buf) \
+		ssize_t name(struct device *dev, \
+			struct device_attribute *attr, \
+			char *buf)
+#define	DEVICE_ATTR_WRITER(name, dev, buf, count) \
+		ssize_t name(struct device *dev, \
+			struct device_attribute *attr, \
+			const char *buf, size_t count)
+#define BUS_ATTR_READER(name, dev, buf) \
+	ssize_t name(struct device *dev, \
+		struct device_attribute *attr, \
+		char *buf)
+#define BUS_ATTR_WRITER(name, dev, buf, count) \
+		ssize_t name(struct device *dev, \
+			struct device_attribute *attr, \
+			const char *buf, size_t count)
+
+#define	DRIVER_ATTR_READER(name, drv, buf)	\
+		ssize_t name(struct device_driver *drv, char * buf)
+
+/* Device file creation macros */
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#define CLASS_DEV_CREATE(class, devt, device, name) \
+	device_create(class, device, devt, NULL, "%s", name)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+#define CLASS_DEV_CREATE(class, devt, device, name) \
+	device_create(class, device, devt, name)
+#else
+#define CLASS_DEV_CREATE(class, devt, device, name) \
+	class_device_create(class, NULL, devt, device, name)
+#endif
+
+/* Device file destruction macros */
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+#define CLASS_DEV_DESTROY(class, devt) \
+	device_destroy(class, devt)
+#else
+#define CLASS_DEV_DESTROY(class, devt) \
+	class_device_destroy(class, devt)
+#endif
+
+/* Global */
+int __init dahdi_sysfs_chan_init(const struct file_operations *fops);
+void dahdi_sysfs_chan_exit(void);
+
+/* Channel Handling */
+int chan_sysfs_create(struct dahdi_chan *chan);
+void chan_sysfs_remove(struct dahdi_chan *chan);
+
+#endif	/* DAHDI_SYSFS_H */
--- a/drivers/dahdi/dahdi.h
+++ b/drivers/dahdi/dahdi.h
@@ -6,6 +6,7 @@
 *
 * Written by Tzafrir Cohen <tzafrir.cohen@xorcom.com>
 * Copyright (C) 2011, Xorcom
+ * Copyright (C) 2011, Digium, Inc
 *
 * All rights reserved.
 *
--- a/drivers/dahdi/dahdi_dummy.c
+++ b/drivers/dahdi/dahdi_dummy.c
@@ -10,7 +10,7 @@
 * Converted to use HighResTimers on i386 by Jeffery Palmer <jeff@triggerinc.com>
 *
 * Copyright (C) 2002, Hermes Softlab
- * Copyright (C) 2004-2009, Digium, Inc.
+ * Copyright (C) 2004-2012, Digium, Inc.
 *
 * All rights reserved.
 *
@@ -53,7 +53,7 @@
 #if defined(USE_HIGHRESTIMER)
 #include <linux/hrtimer.h>
 #else
-#include <linux/time.h>
+#include <linux/timer.h>
 #endif

 #include <dahdi/kernel.h>
@@ -75,6 +75,7 @@ static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
 #endif

 struct dahdi_dummy {
+	struct dahdi_device *ddev;
 	struct dahdi_span span;
 	struct dahdi_chan _chan;
 	struct dahdi_chan *chan;
@@ -205,37 +206,44 @@ static const struct dahdi_span_ops dummy_ops = {

 static int dahdi_dummy_initialize(struct dahdi_dummy *ztd)
 {
+	int res = 0;
 	/* DAHDI stuff */
+	ztd->ddev = dahdi_create_device();
+	if (!ztd->ddev)
+		return -ENOMEM;
+	dev_set_name(&ztd->ddev->dev, "dahdi_dummy");
 	ztd->chan = &ztd->_chan;
 	sprintf(ztd->span.name, "DAHDI_DUMMY/1");
 	snprintf(ztd->span.desc, sizeof(ztd->span.desc) - 1, "%s (source: " CLOCK_SRC ") %d", ztd->span.name, 1);
 	sprintf(ztd->chan->name, "DAHDI_DUMMY/%d/%d", 1, 0);
-	strlcpy(ztd->span.devicetype, "DAHDI Dummy Timing",
-		sizeof(ztd->span.devicetype));
+	ztd->ddev->devicetype = "DAHDI Dummy Timing";
 	ztd->chan->chanpos = 1;
 	ztd->span.chans = &ztd->chan;
 	ztd->span.channels = 0;		/* no channels on our span */
 	ztd->span.deflaw = DAHDI_LAW_MULAW;
 	ztd->chan->pvt = ztd;
 	ztd->span.ops = &dummy_ops;
-	if (dahdi_register(&ztd->span, 0)) {
-		return -1;
-	}
-	return 0;
+	list_add_tail(&ztd->span.device_node, &ztd->ddev->spans);
+	res = dahdi_register_device(ztd->ddev, NULL);
+	return res;
 }

 int init_module(void)
 {
+	int res;
 	ztd = kzalloc(sizeof(*ztd), GFP_KERNEL);
 	if (ztd == NULL) {
 		printk(KERN_ERR "dahdi_dummy: Unable to allocate memory\n");
 		return -ENOMEM;
 	}

-	if (dahdi_dummy_initialize(ztd)) {
-		printk(KERN_ERR "dahdi_dummy: Unable to intialize DAHDI driver\n");
+	res = dahdi_dummy_initialize(ztd);
+	if (res) {
+		printk(KERN_ERR
+		       "dahdi_dummy: Unable to intialize DAHDI driver (%d)\n",
+		       res);
 		kfree(ztd);
-		return -ENODEV;
+		return res;
 	}

 #if defined(USE_HIGHRESTIMER)
@@ -273,7 +281,8 @@ void cleanup_module(void)
 	atomic_set(&shutdown, 1);
 	del_timer_sync(&timer);
 #endif
-	dahdi_unregister(&ztd->span);
+	dahdi_unregister_device(ztd->ddev);
+	dahdi_free_device(ztd->ddev);
 	kfree(ztd);
 	if (debug)
 		printk(KERN_DEBUG "dahdi_dummy: cleanup() finished\n");
--- a/drivers/dahdi/dahdi_dynamic.c
+++ b/drivers/dahdi/dahdi_dynamic.c
@@ -3,7 +3,7 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2010, Digium, Inc.
+ * Copyright (C) 2001-2012, Digium, Inc.
 *
 * All rights reserved.
 *
@@ -385,16 +385,6 @@ static void dahdi_dynamic_release(struct kref *kref)

 	WARN_ON(test_bit(DAHDI_FLAGBIT_REGISTERED, &d->span.flags));

-	if (d->pvt) {
-		if (d->driver && d->driver->destroy) {
-			__module_get(d->driver->owner);
-			d->driver->destroy(d);
-			module_put(d->driver->owner);
-		} else {
-			WARN_ON(1);
-		}
-	}
-
 	kfree(d->msgbuf);

 	for (x = 0; x < d->span.channels; x++)
@@ -406,12 +396,7 @@ static void dahdi_dynamic_release(struct kref *kref)

 static inline int dynamic_put(struct dahdi_dynamic *d)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
-	kref_put(&d->kref, dahdi_dynamic_release);
-	return 1;
-#else
 	return kref_put(&d->kref, dahdi_dynamic_release);
-#endif
 }

 static inline void dynamic_get(struct dahdi_dynamic *d)
@@ -470,6 +455,24 @@ static int _destroy_dynamic(struct dahdi_dynamic_span *dds)
 		return -EBUSY;
 	}

+	if (d->pvt) {
+		if (d->driver && d->driver->destroy) {
+			if (!try_module_get(d->driver->owner)) {
+				/* The driver for this device is in the
+				 * process of unloading. Leave this dynamic on
+				 * the list so it's cleaned up when the driver
+				 * unregisters. */
+				 dynamic_put(d);
+				 return -ENXIO;
+			}
+			d->driver->destroy(d);
+			module_put(d->driver->owner);
+		} else {
+			WARN_ON(1);
+		}
+		d->pvt = NULL;
+	}
+
 	dahdi_unregister_device(d->ddev);

 	spin_lock_irqsave(&dspan_lock, flags);
@@ -605,9 +608,10 @@ static int _create_dynamic(struct dahdi_dynamic_span *dds)
 	strlcpy(d->dname, dds->driver, sizeof(d->dname));
 	strlcpy(d->addr, dds->addr, sizeof(d->addr));
 	d->timing = dds->timing;
-	sprintf(d->span.name, "DYN/%s/%s", dds->driver, dds->addr);
-	sprintf(d->span.desc, "Dynamic '%s' span at '%s'",
-		dds->driver, dds->addr);
+	snprintf(d->span.name, sizeof(d->span.name), "DYN/%s/%s",
+		 dds->driver, dds->addr);
+	snprintf(d->span.desc, sizeof(d->span.desc),
+		 "Dynamic '%s' span at '%s'", dds->driver, dds->addr);
 	d->span.deflaw = DAHDI_LAW_MULAW;
 	d->span.flags |= DAHDI_FLAG_RBS;
 	d->span.chans = d->chans;
@@ -658,6 +662,9 @@ static int _create_dynamic(struct dahdi_dynamic_span *dds)
 		return res;
 	}

+	d->ddev->devicetype = d->span.name;
+	d->ddev->hardware_id = d->span.name;
+	dev_set_name(&d->ddev->dev, "dynamic:%s:%d", dds->driver, dtd->id++);
 	list_add_tail(&d->span.device_node, &d->ddev->spans);
 	/* Whee!  We're created.  Now register the span */
 	if (dahdi_register_device(d->ddev, d->dev)) {
@@ -763,19 +770,17 @@ void dahdi_dynamic_unregister_driver(struct dahdi_dynamic_driver *dri)
 	list_for_each_entry_safe(d, n, &dspan_list, list) {
 		if (d->driver == dri) {
 			if (d->pvt) {
-				if (d->driver && d->driver->destroy) {
-					__module_get(d->driver->owner);
+				if (d->driver && d->driver->destroy)
 					d->driver->destroy(d);
-					module_put(d->driver->owner);
-				} else {
+				else
 					WARN_ON(1);
-				}
 			}
 			dahdi_unregister_device(d->ddev);
 			spin_lock_irqsave(&dspan_lock, flags);
 			list_del_rcu(&d->list);
 			spin_unlock_irqrestore(&dspan_lock, flags);
 			synchronize_rcu();
+			d->driver = NULL;
 			dynamic_put(d);
 		}
 	}
@@ -819,10 +824,13 @@ static void check_for_red_alarm(unsigned long ignored)
 	mod_timer(&alarmcheck, jiffies + 1 * HZ);
 }

+static const struct dahdi_dynamic_ops dahdi_dynamic_ops = {
+	.owner = THIS_MODULE,
+	.ioctl = dahdi_dynamic_ioctl,
+};
+
 static int dahdi_dynamic_init(void)
 {
-	dahdi_set_dynamic_ioctl(dahdi_dynamic_ioctl);
-
 	/* Start process to check for RED ALARM */
 	init_timer(&alarmcheck);
 	alarmcheck.expires = 0;
@@ -833,19 +841,25 @@ static int dahdi_dynamic_init(void)
 #ifdef ENABLE_TASKLETS
 	tasklet_init(&dahdi_dynamic_tlet, dahdi_dynamic_tasklet, 0);
 #endif
+	dahdi_set_dynamic_ops(&dahdi_dynamic_ops);
+
 	printk(KERN_INFO "DAHDI Dynamic Span support LOADED\n");
 	return 0;
 }

 static void dahdi_dynamic_cleanup(void)
 {
+	dahdi_set_dynamic_ops(NULL);
+
 #ifdef ENABLE_TASKLETS
 	if (taskletpending) {
 		tasklet_disable(&dahdi_dynamic_tlet);
 		tasklet_kill(&dahdi_dynamic_tlet);
 	}
 #endif
-	dahdi_set_dynamic_ioctl(NULL);
+	del_timer_sync(&alarmcheck);
+	/* Must call again in case it was running before and rescheduled
+	 * itself. */
 	del_timer(&alarmcheck);
 	printk(KERN_INFO "DAHDI Dynamic Span support unloaded\n");
 }
--- a/drivers/dahdi/dahdi_dynamic_eth.c
+++ b/drivers/dahdi/dahdi_dynamic_eth.c
@@ -3,7 +3,7 @@
 *
 * Written by Mark Spencer <markster@digium.com>
 *
- * Copyright (C) 2001-2008, Digium, Inc.
+ * Copyright (C) 2001-2012, Digium, Inc.
 *
 * All rights reserved.
 *
@@ -71,14 +71,12 @@ static struct dahdi_span *ztdeth_getspan(unsigned char *addr, unsigned short sub
 	if (z)
 		span = z->span;
 	spin_unlock_irqrestore(&zlock, flags);
+	if (!span || !test_bit(DAHDI_FLAGBIT_REGISTERED, &span->flags))
+		return NULL;
 	return span;
 }

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
 static int ztdeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
-#else
-static int ztdeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
-#endif
 {
 	struct dahdi_span *span;
 	struct ztdeth_header *zh;
@@ -87,11 +85,7 @@ static int ztdeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
 #else
 	zh = (struct ztdeth_header *)skb->nh.raw;
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
 	span = ztdeth_getspan(eth_hdr(skb)->h_source, zh->subaddr);
-#else
-	span = ztdeth_getspan(skb->mac.ethernet->h_source, zh->subaddr);
-#endif	
 	if (span) {
 		skb_pull(skb, sizeof(struct ztdeth_header));
 #ifdef NEW_SKB_LINEARIZE
@@ -152,7 +146,7 @@ static void ztdeth_transmit(struct dahdi_dynamic *dyn, u8 *msg, size_t msglen)

 	spin_lock_irqsave(&zlock, flags);
 	z = dyn->pvt;
-	if (z->dev) {
+	if (z && z->dev) {
 		/* Copy fields to local variables to remove spinlock ASAP */
 		dev = z->dev;
 		memcpy(addr, z->addr, sizeof(z->addr));
@@ -191,15 +185,44 @@ static void ztdeth_transmit(struct dahdi_dynamic *dyn, u8 *msg, size_t msglen)
 		spin_unlock_irqrestore(&zlock, flags);
 }

-
-static int ztdeth_flush(void)
+/**
+ * dahdi_dynamic_flush_work_fn - Flush all pending transactions.
+ *
+ * This function is run in a work queue since we can't guarantee interrupts
+ * will be enabled when we're called, and dev_queue_xmit() requires that
+ * interrupts be enabled.
+ *
+ */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+static void dahdi_dynamic_flush_work_fn(void *data)
+#else
+static void dahdi_dynamic_flush_work_fn(struct work_struct *work)
+#endif
 {
 	struct sk_buff *skb;
-
 	/* Handle all transmissions now */
 	while ((skb = skb_dequeue(&skbs))) {
 		dev_queue_xmit(skb);
 	}
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+static DECLARE_WORK(dahdi_dynamic_eth_flush_work,
+		    dahdi_dynamic_flush_work_fn, NULL);
+#else
+static DECLARE_WORK(dahdi_dynamic_eth_flush_work,
+		    dahdi_dynamic_flush_work_fn);
+#endif
+
+/**
+ * ztdeth_flush - Flush all pending transactions.
+ *
+ * This function is called in interrupt context while processing the master
+ * span.
+ */
+static int ztdeth_flush(void)
+{
+	schedule_work(&dahdi_dynamic_eth_flush_work);
 	return 0;
 }

@@ -284,11 +307,12 @@ static void ztdeth_destroy(struct dahdi_dynamic *dyn)
 		prev = cur;
 		cur = cur->next;
 	}
-	spin_unlock_irqrestore(&zlock, flags);
 	if (cur == z) {	/* Successfully removed */
+		dyn->pvt = NULL;
 		printk(KERN_INFO "TDMoE: Removed interface for %s\n", z->span->name);
 		kfree(z);
 	}
+	spin_unlock_irqrestore(&zlock, flags);
 }

 static int ztdeth_create(struct dahdi_dynamic *dyn, const char *addr)
@@ -411,20 +435,27 @@ static struct notifier_block ztdeth_nblock = {

 static int __init ztdeth_init(void)
 {
+	skb_queue_head_init(&skbs);
+
 	dev_add_pack(&ztdeth_ptype);
 	register_netdevice_notifier(&ztdeth_nblock);
 	dahdi_dynamic_register_driver(&ztd_eth);

-	skb_queue_head_init(&skbs);
-
 	return 0;
 }

 static void __exit ztdeth_exit(void)
 {
-	dev_remove_pack(&ztdeth_ptype);
-	unregister_netdevice_notifier(&ztdeth_nblock);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+	flush_scheduled_work();
+#else
+	cancel_work_sync(&dahdi_dynamic_eth_flush_work);
+#endif
 	dahdi_dynamic_unregister_driver(&ztd_eth);
+	unregister_netdevice_notifier(&ztdeth_nblock);
+	dev_remove_pack(&ztdeth_ptype);
+
+	skb_queue_purge(&skbs);
 }

 MODULE_DESCRIPTION("DAHDI Dynamic TDMoE Support");
--- a/drivers/dahdi/dahdi_dynamic_ethmf.c
+++ b/drivers/dahdi/dahdi_dynamic_ethmf.c
@@ -224,13 +224,8 @@ static inline int ethmf_trx_spans_ready(unsigned int addr_hash, struct ztdeth *(
 /**
 * Ethernet receiving side processing function.
 */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
 static int ztdethmf_rcv(struct sk_buff *skb, struct net_device *dev,
 		struct packet_type *pt, struct net_device *orig_dev)
-#else
-static int ztdethmf_rcv(struct sk_buff *skb, struct net_device *dev,
-		struct packet_type *pt)
-#endif
 {
 	int num_spans = 0, span_index = 0;
 	unsigned char *data;
@@ -267,13 +262,8 @@ static int ztdethmf_rcv(struct sk_buff *skb, struct net_device *dev,

 		rcu_read_lock();
 		do {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9)
 			find_ethmf(eth_hdr(skb)->h_source,
 				htons(span_index), &z, &span);
-#else
-			find_ethmf(skb->mac.ethernet->h_source,
-				htons(span_index), &z, &span);
-#endif
 			if (unlikely(!z || !span)) {
 				/* The recv'd span does not belong to us */
 				/* ethmf_errors_inc(); */
@@ -396,10 +386,6 @@ static void ztdethmf_transmit(struct dahdi_dynamic *dyn, u8 *msg, size_t msglen)
 	struct net_device *dev;
 	unsigned char addr[ETH_ALEN];
 	int spans_ready = 0, index = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
-	static DEFINE_SPINLOCK(lock);
-	unsigned long flags;
-#endif

 	if (atomic_read(&shutdown))
 		return;
@@ -411,24 +397,12 @@ static void ztdethmf_transmit(struct dahdi_dynamic *dyn, u8 *msg, size_t msglen)
 		return;
 	}

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
-	if (!atomic_read(&z->ready)) {
-		spin_lock_irqsave(&lock, flags);
-		atomic_inc(&z->ready);
-		if (1 == atomic_read(&z->ready)) {
-			memcpy(z->msgbuf, msg, msglen);
-			z->msgbuf_len = msglen;
-		}
-		spin_unlock_irqrestore(&lock, flags);
-	}
-#else
 	if (!atomic_read(&z->ready)) {
 		if (atomic_inc_return(&z->ready) == 1) {
 			memcpy(z->msgbuf, msg, msglen);
 			z->msgbuf_len = msglen;
 		}
 	}
-#endif

 	spans_ready = ethmf_trx_spans_ready(z->addr_hash, &ready_spans);
 	if (spans_ready) {
--- a/drivers/dahdi/dahdi_dynamic_loc.c
+++ b/drivers/dahdi/dahdi_dynamic_loc.c
@@ -78,10 +78,11 @@ static LIST_HEAD(dynamic_local_list);
 static void
 dahdi_dynamic_local_transmit(struct dahdi_dynamic *dyn, u8 *msg, size_t msglen)
 {
-	struct dahdi_dynamic_local *const d = dyn->pvt;
+	struct dahdi_dynamic_local *d;
 	unsigned long flags;

 	spin_lock_irqsave(&local_lock, flags);
+	d = dyn->pvt;
 	if (d && d->peer && d->peer->span) {
 		if (test_bit(DAHDI_FLAGBIT_REGISTERED, &d->peer->span->flags))
 			dahdi_dynamic_receive(d->peer->span, msg, msglen);
@@ -130,11 +131,12 @@ static int digit2int(char d)

 static void dahdi_dynamic_local_destroy(struct dahdi_dynamic *dyn)
 {
-	struct dahdi_dynamic_local *d = dyn->pvt;
+	struct dahdi_dynamic_local *d;
 	unsigned long flags;
 	struct dahdi_dynamic_local *cur;

 	spin_lock_irqsave(&local_lock, flags);
+	d = dyn->pvt;
 	list_for_each_entry(cur, &dynamic_local_list, node) {
 		if (cur->peer == d)
 			cur->peer = NULL;
--- a/drivers/dahdi/dahdi_echocan_jpah.c
+++ b/drivers/dahdi/dahdi_echocan_jpah.c
@@ -7,7 +7,7 @@
 * This "echo can" will completely hose your audio.
 * Don't use it unless you're absolutely sure you know what you're doing.
 *
- * Copyright (C) 2007-2008, Digium, Inc.
+ * Copyright (C) 2007-2012, Digium, Inc.
 *
 * All rights reserved.
 *
@@ -38,9 +38,6 @@

 static int debug;

-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-
 static int echo_can_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
 			   struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec);
 static void echo_can_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec);
--- a/drivers/dahdi/dahdi_echocan_kb1.c
+++ b/drivers/dahdi/dahdi_echocan_kb1.c
@@ -5,7 +5,7 @@
 *
 * Based upon mec2.h
 * 
- * Copyright (C) 2002, Digium, Inc.
+ * Copyright (C) 2002-2012, Digium, Inc.
 *
 * Additional background on the techniques used in this code can be found in:
 *
@@ -44,9 +44,6 @@
 static int debug;
 static int aggressive;

-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-
 /* Uncomment to provide summary statistics for overall echo can performance every 4000 samples */ 
 /* #define MEC2_STATS 4000 */

--- a/drivers/dahdi/dahdi_echocan_mg2.c
+++ b/drivers/dahdi/dahdi_echocan_mg2.c
@@ -5,7 +5,7 @@
 *
 * Based upon kb1ec.h and mec2.h
 * 
- * Copyright (C) 2002, Digium, Inc.
+ * Copyright (C) 2002-2012, Digium, Inc.
 *
 * Additional background on the techniques used in this code can be found in:
 *
@@ -44,9 +44,6 @@
 static int debug;
 static int aggressive;

-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-
 #define ABS(a) abs(a!=-32768?a:-32767)

 #define RESTORE_COEFFS {\
--- a/drivers/dahdi/dahdi_echocan_oslec.c
+++ b/drivers/dahdi/dahdi_echocan_oslec.c
@@ -36,8 +36,6 @@

 #include <dahdi/kernel.h>

-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-
 static int echo_can_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
 			   struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec);
 static void echo_can_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec);
--- a/drivers/dahdi/dahdi_echocan_sec.c
+++ b/drivers/dahdi/dahdi_echocan_sec.c
@@ -48,9 +48,6 @@

 static int debug;

-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-
 #include "arith.h"

 #ifndef NULL
--- a/drivers/dahdi/dahdi_echocan_sec2.c
+++ b/drivers/dahdi/dahdi_echocan_sec2.c
@@ -47,9 +47,6 @@

 static int debug;

-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-
 #include "fir.h"

 #ifndef NULL
--- a/drivers/dahdi/firmware/Makefile
+++ b/drivers/dahdi/firmware/Makefile
@@ -58,6 +58,7 @@ OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-256=dahdi-fw-oct6114-256.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=dahdi-fw-tc400m.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-HX8=dahdi-fw-hx8.o)
+OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMOCT032=dahdi-fw-vpmoct032.o)

 # Force usage of wget, for now
 DOWNLOAD=wget
@@ -220,3 +221,8 @@ dahdi-fw-oct6114-256.o: dahdi-fw-oct6114-256-$(OCT6114_256_VERSION).tar.gz dahdi
 dahdi-fw-tc400m.o: dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz dahdi-fw-tc400m.bin make_firmware_object
 	@echo Making firmware object file for dahdi-fw-tc400m.bin
 	./make_firmware_object dahdi-fw-tc400m.bin $@
+
+# Build object file of a VPMOCT032 firmware image for linking
+dahdi-fw-vpmoct032.o: dahdi-fw-vpmoct032-$(VPMOCT032_VERSION).tar.gz dahdi-fw-vpmoct032.bin make_firmware_object
+	@echo Making firmware object file for dahdi-fw-vpmoct032.bin
+	./make_firmware_object dahdi-fw-vpmoct032.bin $@
--- a/drivers/dahdi/hpec/dahdi_echocan_hpec.c
+++ b/drivers/dahdi/hpec/dahdi_echocan_hpec.c
@@ -1,7 +1,7 @@
 /*
 * DAHDI Telephony Interface to Digium High-Performance Echo Canceller
 *
- * Copyright (C) 2006-2008 Digium, Inc.
+ * Copyright (C) 2006-2012 Digium, Inc.
 *
 * All rights reserved.
 *
@@ -31,9 +31,6 @@

 static int debug;

-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-
 #include "hpec_user.h"
 #include "hpec.h"

@@ -75,18 +72,9 @@ static int __attribute__((regparm(0), format(printf, 1, 2))) logger(const char *
 	int res;
 	va_list args;

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
 	va_start(args, format);
 	res = vprintk(format, args);
 	va_end(args);
-#else
-	char buf[256];
-
-	va_start(args, format);
-	res = vsnprintf(buf, sizeof(buf), format, args);
-	va_end(args);
-	printk(KERN_INFO "%s" buf);
-#endif

 	return res;
 }
--- a/drivers/dahdi/tor2.c
+++ b/drivers/dahdi/tor2.c
@@ -290,12 +290,12 @@ static void init_spans(struct tor2 *tor)
 			s->channels = 24;
 			s->deflaw = DAHDI_LAW_MULAW;
 			s->linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS | DAHDI_CONFIG_D4 | DAHDI_CONFIG_ESF;
-			s->spantype = "T1";
+			s->spantype = SPANTYPE_DIGITAL_T1;
 		} else {
 			s->channels = 31;
 			s->deflaw = DAHDI_LAW_ALAW;
 			s->linecompat = DAHDI_CONFIG_HDB3 | DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4;
-			s->spantype = "E1";
+			s->spantype = SPANTYPE_DIGITAL_E1;
 		}
 		s->chans = tor->chans[x];
 		s->flags = DAHDI_FLAG_RBS;
--- a/drivers/dahdi/voicebus/Kbuild
+++ b/drivers/dahdi/voicebus/Kbuild
@@ -2,4 +2,17 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VOICEBUS) += dahdi_voicebus.o

 dahdi_voicebus-objs := voicebus.o GpakCust.o GpakApi.o voicebus_net.o vpmoct.o

-EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+FIRM_DIR	:= ../firmware
+
+ifneq ($(HOTPLUG_FIRMWARE),yes)
+dahdi_voicebus-objs += $(FIRM_DIR)/dahdi-fw-vpmoct032.o
+$(warning WARNING: You are compiling firmware into voicebus.ko which is not available under the terms of the GPL. It may be a violation of the GPL to distribute the resulting image since it combines both GPL and non-GPL work. You should consult a lawyer of your own before distributing such an image.)
+else
+  EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
+endif
+
+EXTRA_CFLAGS += -I$(src)/.. -Wno-undef
+
+$(obj)/$(FIRM_DIR)/dahdi-fw-vpmoct032.o: $(obj)/voicebus.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-vpmoct032.o
+
--- a/drivers/dahdi/voicebus/Makefile
+++ b/drivers/dahdi/voicebus/Makefile
@@ -1,6 +0,0 @@
-ifdef KBUILD_EXTMOD
-# We only get here on kernels 2.6.0-2.6.9 .
-# For newer kernels, Kbuild will be included directly by the kernel
-# build system.
-include $(src)/Kbuild
-endif
--- a/drivers/dahdi/voicebus/voicebus.h
+++ b/drivers/dahdi/voicebus/voicebus.h
@@ -57,6 +57,15 @@
 * (and not tasklet). */
 #define CONFIG_VOICEBUS_INTERRUPT

+/*
+ * Enable the following definition in order to disable Active-State Power
+ * Management on the PCIe bridge for PCIe cards. This has been known to work
+ * around issues where the BIOS enables it on the cards even though the
+ * platform does not support it.
+ *
+ */
+#undef CONFIG_VOICEBUS_DISABLE_ASPM
+
 /* Define this to use a FIFO for the software echocan reference.
 * (experimental) */
 #undef CONFIG_VOICEBUS_ECREFERENCE
--- a/drivers/dahdi/voicebus/vpmoct.c
+++ b/drivers/dahdi/voicebus/vpmoct.c
@@ -443,6 +443,47 @@ static void vpmoct_set_defaults(struct vpmoct *vpm)
 	vpmoct_write_dword(vpm, 0x30, 0);
 }

+static const char *const FIRMWARE_NAME = "dahdi-fw-vpmoct032.bin";
+#if defined(HOTPLUG_FIRMWARE)
+static int
+vpmoct_request_firmware(const struct firmware **fw, struct device *dev)
+{
+	return request_firmware(fw, FIRMWARE_NAME, dev);
+}
+
+static void vpmoct_release_firmware(const struct firmware *fw)
+{
+	release_firmware(fw);
+}
+#else
+static int
+vpmoct_request_firmware(const struct firmware **fw_p, struct device *dev)
+{
+	struct firmware *fw;
+	extern void _binary_dahdi_fw_vpmoct032_bin_size;
+	extern u8 _binary_dahdi_fw_vpmoct032_bin_start[];
+
+	*fw_p = fw = kzalloc(sizeof(*fw), GFP_KERNEL);
+	if (!fw)
+		return -ENOMEM;
+
+	fw->data = _binary_dahdi_fw_vpmoct032_bin_start;
+	/* Yes... this is weird. objcopy gives us a symbol containing
+	   the size of the firmware, not a pointer a variable containing the
+	   size. The only way we can get the value of the symbol is to take
+	   its address, so we define it as a pointer and then cast that value
+	   to the proper type.  */
+	fw->size = (size_t) &_binary_dahdi_fw_vpmoct032_bin_size;
+
+	return 0;
+}
+
+static void vpmoct_release_firmware(const struct firmware *fw)
+{
+	kfree(fw);
+}
+#endif
+
 /**
 * vpmoct_load_flash - Check the current flash version and possibly load.
 * @vpm:  The VPMOCT032 module to check / load.
@@ -463,10 +504,9 @@ static void vpmoct_load_flash(struct work_struct *data)
 	const struct firmware *fw;
 	const struct vpmoct_header *header;
 	char serial[VPMOCT_SERIAL_SIZE+1];
-	const char *const FIRMWARE_NAME = "dahdi-fw-vpmoct032.bin";
 	int i;

-	res = request_firmware(&fw, FIRMWARE_NAME, vpm->dev);
+	res = vpmoct_request_firmware(&fw, vpm->dev);
 	if (res) {
 		dev_warn(vpm->dev,
 			 "vpmoct: Failed to load firmware from userspace! %d\n",
@@ -505,7 +545,7 @@ static void vpmoct_load_flash(struct work_struct *data)
 				 FIRMWARE_NAME);

 			/* Just use the old version of the fimware. */
-			release_firmware(fw);
+			vpmoct_release_firmware(fw);
 			vpmoct_set_defaults(vpm);
 			vpmoct_load_complete(work, true);
 			return;
@@ -514,7 +554,7 @@ static void vpmoct_load_flash(struct work_struct *data)
 		if (vpm->minor == header->minor &&
 		    vpm->major == header->major) {
 			/* Proper version is running */
-			release_firmware(fw);
+			vpmoct_release_firmware(fw);
 			vpmoct_set_defaults(vpm);
 			vpmoct_load_complete(work, true);
 			return;
@@ -548,14 +588,14 @@ static void vpmoct_load_flash(struct work_struct *data)
 	if (vpmoct_check_firmware_crc(vpm, fw->size-VPMOCT_FIRM_HEADER_LEN*2,
 					header->major, header->minor))
 		goto error;
-	release_firmware(fw);
+	vpmoct_release_firmware(fw);
 	vpmoct_set_defaults(vpm);
 	vpmoct_load_complete(work, true);
 	return;

 error:
 	dev_info(vpm->dev, "Unable to load firmware\n");
-	release_firmware(fw);
+	vpmoct_release_firmware(fw);
 	/* TODO: Should we disable module if the firmware doesn't load? */
 	vpmoct_load_complete(work, false);
 	return;
--- a/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c
+++ b/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c
@@ -1,7 +1,7 @@
 /*
 * DAHDI Telephony Interface to VPMADT032 Firmware Loader
 *
- * Copyright (C) 2008-2011 Digium, Inc. All rights reserved.
+ * Copyright (C) 2008-2012 Digium, Inc. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
@@ -38,18 +38,9 @@ logger(const char *format, ...)
 	int res;
 	va_list args;

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9)
 	va_start(args, format);
 	res = vprintk(format, args);
 	va_end(args);
-#else
-	char buf[256];
-
-	va_start(args, format);
-	res = vsnprintf(buf, sizeof(buf), format, args);
-	va_end(args);
-	printk(KERN_INFO "%s" buf);
-#endif

 	return res;
 }
--- a/drivers/dahdi/wcb4xxp/Makefile
+++ b/drivers/dahdi/wcb4xxp/Makefile
@@ -1,7 +0,0 @@
-ifdef KBUILD_EXTMOD
-# We only get here on kernels 2.6.0-2.6.9 .
-# For newer kernels, Kbuild will be included directly by the kernel
-# build system.
-include $(src)/Kbuild
-else
-endif
--- a/drivers/dahdi/wcb4xxp/base.c
+++ b/drivers/dahdi/wcb4xxp/base.c
@@ -2,7 +2,7 @@
 * WCB410P  Quad-BRI PCI Driver
 * Written by Andrew Kohlsmith <akohlsmith@mixdown.ca>
 *
- * Copyright (C) 2009-2011 Digium, Inc.
+ * Copyright (C) 2009-2012 Digium, Inc.
 * All rights reserved.
 *
 */
@@ -35,7 +35,6 @@
 #include <linux/spinlock.h>
 #include <linux/device.h>	/* dev_err() */
 #include <linux/interrupt.h>
-#include <asm/system.h>		/* cli(), *_flags */
 #include <asm/uaccess.h>	/* copy_*_user */
 #include <linux/workqueue.h>	/* work_struct */
 #include <linux/timer.h>	/* timer_struct */
@@ -91,6 +90,7 @@ static int milliwatt = 0;
 static int pedanticpci = 0;
 static int teignorered = 0;
 static int alarmdebounce = 500;
+static int persistentlayer1 = 1;
 static int vpmsupport = 1;
 static int timer_1_ms = 2000;
 static int timer_3_ms = 30000;
@@ -140,7 +140,7 @@ static struct devtype hfc8s_BN = {"BeroNet BN8S0", .ports = 8, .card_type = BN8S
 static struct devtype hfc4s_SW = {"Swyx 4xS0 SX2 QuadBri", .ports = 4, .card_type = BSWYX_SX2 };
 static struct devtype hfc4s_EV = {"CCD HFC-4S Eval. Board", .ports = 4,
 					.card_type = QUADBRI_EVAL };
- 
+
 #define CARD_HAS_EC(card) ((card)->card_type == B410P)

 static void echocan_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec);
@@ -1198,7 +1198,6 @@ static int b4xxp_find_sync(struct b4xxp *b4)
 		return src;
 }

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18))
 static ssize_t b4_timing_master_show(struct device *dev,
 				     struct device_attribute *attr,
 				     char *buf)
@@ -1226,13 +1225,6 @@ static void remove_sysfs_files(struct b4xxp *b4)
 			   &dev_attr_timing_master);
 }

-#else
-
-static inline void create_sysfs_files(struct b4xxp *b4) { return; }
-static inline void remove_sysfs_files(struct b4xxp *b4) { return; }
-
-#endif /* LINUX_KERNEL > 2.6.18 */
-
 /*
 * allocates memory and pretty-prints a given S/T state engine state to it.
 * calling routine is responsible for freeing the pointer returned!
@@ -1303,6 +1295,9 @@ static void hfc_force_st_state(struct b4xxp *b4, int port, int state, int resume
 	hfc_handle_state(&b4->spans[port]);
 }

+static void hfc_stop_st(struct b4xxp_span *s);
+static void hfc_start_st(struct b4xxp_span *s);
+
 /* figures out what to do when an S/T port's timer expires. */
 static void hfc_timer_expire(struct b4xxp_span *s, int t_no)
 {
@@ -1316,10 +1311,15 @@ static void hfc_timer_expire(struct b4xxp_span *s, int t_no)
 			 s->hfc_timer_on[t_no]);
 	}
 /*
- * there are three timers associated with every HFC S/T port.
- * T1 is used by the NT state machine, and is the maximum time the NT side should wait for G3 (active) state.
- * T2 is not actually used in the driver, it is handled by the HFC-4S internally.
- * T3 is used by the TE state machine; it is the maximum time the TE side should wait for the INFO4 (activated) signal.
+ * There are four timers associated with every HFC S/T port:
+ * T1 is used by the NT state machine, and is the maximum time the NT side
+ *	should wait for G3 (active) state.
+ * T2 is not actually used in the driver, it is handled by the HFC-4S
+ *	internally.
+ * T3 is used by the TE state machine; it is the maximum time the TE side should
+ *	wait for the INFO4 (activated) signal.
+ * T4 is a special timer used for debug purposes for monitoring of L1 state
+ *	during activation attempt.
 */

 /* First, disable the expired timer; hfc_force_st_state() may activate it again. */
@@ -1333,7 +1333,14 @@ static void hfc_timer_expire(struct b4xxp_span *s, int t_no)
 		hfc_force_st_state(b4, s->port, 1, 1);
 		break;
 	case HFC_T3:					/* switch to F3 (deactivated), resume auto mode */
-		hfc_force_st_state(b4, s->port, 3, 1);
+		hfc_stop_st(s);
+		if (persistentlayer1)
+			hfc_start_st(s);
+		break;
+	case HFC_T4:
+		hfc_handle_state(s);
+		s->hfc_timers[HFC_T4] = b4->ticks + 1000;
+		s->hfc_timer_on[HFC_T4] = 1;
 		break;
 	default:
 		if (printk_ratelimit()) {
@@ -1356,9 +1363,9 @@ static void hfc_update_st_timers(struct b4xxp *b4)
 	for (i=0; i < b4->numspans; i++) {
 		s = &b4->spans[i];

-		for (j=HFC_T1; j <= HFC_T3; j++) {
-
-/* we don't really do timer2, it is expired by the state change handler */
+		for (j = HFC_T1; j < ARRAY_SIZE(s->hfc_timers); j++) {
+			/* we don't really do timer2, it is expired by the
+			 * state change handler */
 			if (j == HFC_T2)
 				continue;

@@ -1442,6 +1449,7 @@ static void hfc_handle_state(struct b4xxp_span *s)
 			break;
 		case 0x7:			/* TE state F7: Activated */
 			s->hfc_timer_on[HFC_T3] = 0;
+			s->hfc_timer_on[HFC_T4] = 0;
 			s->newalarm = 0;
 			break;
 		}
@@ -1463,14 +1471,17 @@ static void hfc_handle_state(struct b4xxp_span *s)

 /* If we're in F3 and receiving INFO0, start T3 and jump to F4 */
 	if (!nt && (sta == 3) && (state & V_INFO0)) {
-		s->hfc_timers[HFC_T3] = b4->ticks + timer_3_ms;
-		s->hfc_timer_on[HFC_T3] = 1;
-		if (DBG_ST) {
-			dev_info(&b4->pdev->dev,
-				 "port %d: receiving INFO0 in state 3, "
-				 "setting T3 and jumping to F4\n", s->port + 1);
+		if (persistentlayer1) {
+			s->hfc_timers[HFC_T3] = b4->ticks + timer_3_ms;
+			s->hfc_timer_on[HFC_T3] = 1;
+			if (DBG_ST) {
+				dev_info(&b4->pdev->dev,
+					 "port %d: receiving INFO0 in state 3, "
+					 "setting T3 and jumping to F4\n",
+					 s->port + 1);
+			}
+			hfc_start_st(s);
 		}
-		hfc_force_st_state(b4, s->port, 4, 1);
 	}

 /* read in R_BERT_STA to determine where our current sync source is */
@@ -1485,6 +1496,24 @@ static void hfc_handle_state(struct b4xxp_span *s)
 	}
 }

+static void hfc_stop_all_timers(struct b4xxp_span *s)
+{
+	s->hfc_timer_on[HFC_T4] = 0;
+	s->hfc_timer_on[HFC_T3] = 0;
+	s->hfc_timer_on[HFC_T2] = 0;
+	s->hfc_timer_on[HFC_T1] = 0;
+}
+
+static void hfc_stop_st(struct b4xxp_span *s)
+{
+	struct b4xxp *b4 = s->parent;
+
+	hfc_stop_all_timers(s);
+
+	b4xxp_setreg_ra(b4, R_ST_SEL, s->port, A_ST_WR_STA,
+			V_ST_ACT_DEACTIVATE);
+}
+
 /*
 * resets an S/T interface to a given NT/TE mode
 */
@@ -1495,10 +1524,16 @@ static void hfc_reset_st(struct b4xxp_span *s)

 	b4 = s->parent;

+	hfc_stop_st(s);
+
 /* force state G0/F0 (reset), then force state 1/2 (deactivated/sensing) */
 	b4xxp_setreg_ra(b4, R_ST_SEL, s->port, A_ST_WR_STA, V_ST_LD_STA);
 	flush_pci();			/* make sure write hit hardware */

+	s->span.alarms = DAHDI_ALARM_RED;
+	s->newalarm = DAHDI_ALARM_RED;
+	dahdi_alarm_notify(&s->span);
+
 	udelay(10);

 /* set up the clock control register.  Must be done before we activate the interface. */
@@ -1529,9 +1564,13 @@ static void hfc_start_st(struct b4xxp_span *s)

 /* start T1 if in NT mode, T3 if in TE mode */
 	if (s->te_mode) {
-		s->hfc_timers[HFC_T3] = b4->ticks + 500;	/* 500ms wait first time, timer_t3_ms afterward. */
+		s->hfc_timers[HFC_T3] = b4->ticks + timer_3_ms;
 		s->hfc_timer_on[HFC_T3] = 1;
 		s->hfc_timer_on[HFC_T1] = 0;
+
+		s->hfc_timers[HFC_T4] = b4->ticks + 1000;
+		s->hfc_timer_on[HFC_T4] = 1;
+
 		if (DBG_ST) {
 			dev_info(&b4->pdev->dev,
 				 "setting port %d t3 timer to %lu\n",
@@ -1549,17 +1588,6 @@ static void hfc_start_st(struct b4xxp_span *s)
 	}
 }

-#if 0 /* TODO: This function is not called anywhere */
-static void hfc_stop_st(struct b4xxp_span *s)
-{
-	b4xxp_setreg_ra(s->parent, R_ST_SEL, s->port, A_ST_WR_STA, V_ST_ACT_DEACTIVATE);
-
-	s->hfc_timer_on[HFC_T1] = 0;
-	s->hfc_timer_on[HFC_T2] = 0;
-	s->hfc_timer_on[HFC_T3] = 0;
-}
-#endif
-
 /*
 * read in the HFC GPIO to determine each port's mode (TE or NT).
 * Then, reset and start the port.
@@ -1592,8 +1620,6 @@ static void hfc_init_all_st(struct b4xxp *b4)
 		dev_info(&b4->pdev->dev,
 			 "Port %d: %s mode\n", i + 1, (nt ? "NT" : "TE"));

-		hfc_reset_st(s);
-		hfc_start_st(s);
 	}
 }

@@ -1850,10 +1876,10 @@ static int hdlc_tx_frame(struct b4xxp_span *bspan)
 	char debugbuf[256];
 	unsigned long irq_flags;

-/* if we're ignoring TE red alarms and we are in alarm, restart the S/T state machine */
-	if (bspan->te_mode && teignorered && bspan->newalarm == DAHDI_ALARM_RED) {
-		hfc_force_st_state(b4, bspan->port, 3, 1);
-	}
+	/* if we're ignoring TE red alarms and we are in alarm, restart the
+	 * S/T state machine */
+	if (bspan->te_mode && bspan->newalarm != 0)
+		hfc_start_st(bspan);

 	fifo = bspan->fifos[2];
 	res = dahdi_hdlc_getbuf(bspan->sigchan, buf, &size);
@@ -2341,6 +2367,10 @@ static int b4xxp_spanconfig(struct file *file, struct dahdi_span *span,
 	if (lc->sync)
 		b4->spans[lc->sync - 1].sync = (span->offset + 1);

+	hfc_reset_st(bspan);
+	if (persistentlayer1)
+		hfc_start_st(bspan);
+
 	b4xxp_reset_span(bspan);

 /* call startup() manually here, because DAHDI won't call the startup function unless it receives an IOCTL to do so, and dahdi_cfg doesn't. */
@@ -2475,7 +2505,9 @@ static void init_spans(struct b4xxp *b4)
 		bspan = &b4->spans[i];
 		bspan->parent = b4;

-		bspan->span.spantype = (bspan->te_mode) ? "TE" : "NT";
+		bspan->span.spantype = (bspan->te_mode)
+			? SPANTYPE_DIGITAL_BRI_TE
+			: SPANTYPE_DIGITAL_BRI_NT;
 		bspan->span.offset = i;
 		bspan->span.channels = WCB4XXP_CHANNELS_PER_SPAN;
 		bspan->span.flags = 0;
@@ -3119,6 +3151,7 @@ module_param(vpmsupport, int, S_IRUGO);
 module_param(timer_1_ms, int, S_IRUGO | S_IWUSR);
 module_param(timer_3_ms, int, S_IRUGO | S_IWUSR);
 module_param(companding, charp, S_IRUGO);
+module_param(persistentlayer1, int, S_IRUGO | S_IWUSR);

 MODULE_PARM_DESC(debug, "bitmap: 1=general 2=dtmf 4=regops 8=fops 16=ec 32=st state 64=hdlc 128=alarm");
 MODULE_PARM_DESC(spanfilter, "debug filter for spans. bitmap: 1=port 1, 2=port 2, 4=port 3, 8=port 4");
--- a/drivers/dahdi/wcb4xxp/wcb4xxp.h
+++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h
@@ -376,6 +376,7 @@
 #define HFC_T1					0
 #define HFC_T2					1
 #define HFC_T3					2
+#define HFC_T4					3

 #define MAX_SPANS_PER_CARD			8

@@ -396,8 +397,8 @@ struct b4xxp_span {
 	unsigned long alarmtimer;

 	int te_mode;				/* 1=TE, 0=NT */
-	unsigned long hfc_timers[WCB4XXP_CHANNELS_PER_SPAN];		/* T1, T2, T3 */
-	int hfc_timer_on[WCB4XXP_CHANNELS_PER_SPAN];			/* 1=timer active */
+	unsigned long hfc_timers[4];		/* T1, T2, T3, Fake T4 */
+	int hfc_timer_on[4];			/* 1=timer active */
 	int fifos[WCB4XXP_CHANNELS_PER_SPAN];				/* B1, B2, D <--> host fifo numbers */

 	/* HDLC controller fields */
--- a/drivers/dahdi/wct1xxp.c
+++ b/drivers/dahdi/wct1xxp.c
@@ -792,12 +792,12 @@ static int t1xxp_software_init(struct t1xxp *wc)
 		wc->span.channels = 31;
 		wc->span.deflaw = DAHDI_LAW_ALAW;
 		wc->span.linecompat = DAHDI_CONFIG_HDB3 | DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4;
-		wc->span.spantype = "E1";
+		wc->span.spantype = SPANTYPE_DIGITAL_E1;
 	} else {
 		wc->span.channels = 24;
 		wc->span.deflaw = DAHDI_LAW_MULAW;
 		wc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS | DAHDI_CONFIG_D4 | DAHDI_CONFIG_ESF;
-		wc->span.spantype = "T1";
+		wc->span.spantype = SPANTYPE_DIGITAL_T1;
 	}
 	for (x=0;x<wc->span.channels;x++) {
 		sprintf(wc->chans[x]->name, "WCT1/%d/%d", wc->num, x + 1);
--- a/drivers/dahdi/wct4xxp/Kbuild
+++ b/drivers/dahdi/wct4xxp/Kbuild
@@ -18,6 +18,7 @@ wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper object

 ifneq ($(HOTPLUG_FIRMWARE),yes)
 wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o $(FIRM_DIR)/dahdi-fw-oct6114-256.o
+$(warning WARNING: You are compiling firmware into wct4xxp.ko which is not available under the terms of the GPL. It may be a violation of the GPL to distribute the resulting image since it combines both GPL and non-GPL work. You should consult a lawyer of your own before distributing such an image.)
 endif

 $(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-064.o: $(obj)/base.o
--- a/drivers/dahdi/wct4xxp/Makefile
+++ b/drivers/dahdi/wct4xxp/Makefile
@@ -1,8 +0,0 @@
-ifdef KBUILD_EXTMOD
-# We only get here on kernels 2.6.0-2.6.9 .
-# For newer kernels, Kbuild will be included directly by the kernel
-# build system.
-include $(src)/Kbuild
-
-else
-endif
--- a/drivers/dahdi/wct4xxp/base.c
+++ b/drivers/dahdi/wct4xxp/base.c
@@ -9,7 +9,7 @@
 *   Russ Meyerriecks <rmeyerriecks@digium.com>
 *
 * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
- * Copyright (C) 2001-2011, Digium, Inc.
+ * Copyright (C) 2001-2012, Digium, Inc.
 *
 * All rights reserved.
 *
@@ -119,11 +119,7 @@ struct cpu_workqueue_struct {
 */
 struct workqueue_struct {
 	/* TODO: Find out exactly where the API changed */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct cpu_workqueue_struct *cpu_wq;
-#else
-	struct cpu_workqueue_struct cpu_wq[NR_CPUS];
-#endif
 	const char *name;
 	struct list_head list; 	/* Empty if single thread */
 };
@@ -173,6 +169,15 @@ static inline int t4_queue_work(struct workqueue_struct *wq, struct work_struct
 /* #define CONFIG_FORCE_EXTENDED_RESET */
 /* #define CONFIG_NOEXTENDED_RESET */

+/*
+ * Uncomment the following definition in order to disable Active-State Power
+ * Management on the PCIe bridge for PCIe cards. This has been known to work
+ * around issues where the BIOS enables it on the cards even though the
+ * platform does not support it.
+ *
+ */
+/* #define CONFIG_WCT4XXP_DISABLE_ASPM */
+
 #if defined(CONFIG_FORCE_EXTENDED_RESET) && defined(CONFIG_NOEXTENDED_RESET)
 #error "You cannot define both CONFIG_FORCE_EXTENDED_RESET and " \
 		"CONFIG_NOEXTENDED_RESET."
@@ -378,6 +383,11 @@ struct t4 {
 	struct spi_state st;
 };

+static inline bool is_pcie(const struct t4 *wc)
+{
+	return (wc->devtype->flags & FLAG_EXPRESS) > 0;
+}
+
 static inline bool has_e1_span(const struct t4 *wc)
 {
 	return (wc->t1e1) != 0;
@@ -426,6 +436,7 @@ static const struct dahdi_echocan_ops vpm_ec_ops = {
 #endif

 static void __set_clear(struct t4 *wc, int span);
+static int _t4_startup(struct file *file, struct dahdi_span *span);
 static int t4_startup(struct file *file, struct dahdi_span *span);
 static int t4_shutdown(struct dahdi_span *span);
 static int t4_rbsbits(struct dahdi_chan *chan, int bits);
@@ -670,11 +681,12 @@ static unsigned int __t4_framer_in(const struct t4 *wc, int unit,

 	val = ((unit & 0x3) << 8) | (addr & 0xff) | haddr;
 	writel(val, wc_laddr);
-	/* readl(wc_version); */
+	readl(wc_version);
 	writel(val | WC_LFRMR_CS | WC_LREAD, wc_laddr);
 	readl(wc_version);
 	ret = readb(wc_ldata);
 	writel(val, wc_laddr);
+	readl(wc_version);
 	return ret;
 }

@@ -700,11 +712,13 @@ static void __t4_framer_out(const struct t4 *wc, int unit, const u8 addr,

 	val = ((unit & 0x3) << 8) | (addr & 0xff) | haddr;
 	writel(val, wc_laddr);
+	readl(wc_version);
 	writel(value, wc_ldata);
 	readl(wc_version);
 	writel(val | WC_LFRMR_CS | WC_LWRITE, wc_laddr);
-	/* readl(wc_version); */
+	readl(wc_version);
 	writel(val, wc_laddr);
+	readl(wc_version);
 }

 static void t4_framer_out(struct t4 *wc, int unit,
@@ -1222,9 +1236,11 @@ static int t4_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long dat
 		else
 			clear_bit(chan->chanpos - 1, &ts->dtmfmutemask);

-		channel = (chan->chanpos) << 3;
-		if (!has_e1_span(wc))
-			channel += (4 << 3);
+		channel = has_e1_span(wc) ? chan->chanpos : chan->chanpos + 4;
+		if (is_octal(wc))
+			channel = channel << 3;
+		else
+			channel = channel << 2;
 		channel |= chan->span->offset;
 		vpm450m_setdtmf(wc->vpm, channel, j & DAHDI_TONEDETECT_ON,
 				j & DAHDI_TONEDETECT_MUTE);
@@ -1680,7 +1696,7 @@ static void t4_chan_set_sigcap(struct dahdi_span *span, int x)
 }

 static int
-t4_spanconfig(struct file *file, struct dahdi_span *span,
+_t4_spanconfig(struct file *file, struct dahdi_span *span,
 	      struct dahdi_lineconfig *lc)
 {
 	int i;
@@ -1720,13 +1736,36 @@ t4_spanconfig(struct file *file, struct dahdi_span *span,

 	/* If we're already running, then go ahead and apply the changes */
 	if (span->flags & DAHDI_FLAG_RUNNING)
-		return t4_startup(file, span);
+		return _t4_startup(file, span);

 	if (debug)
 		dev_info(&wc->dev->dev, "Done with spanconfig!\n");
 	return 0;
 }

+static int
+t4_spanconfig(struct file *file, struct dahdi_span *span,
+	      struct dahdi_lineconfig *lc)
+{
+	int ret;
+	struct dahdi_device *const ddev = span->parent;
+	struct dahdi_span *s;
+
+	ret = _t4_spanconfig(file, span, lc);
+
+	/* Make sure all the spans have a basic configuration in case they are
+	 * not all specified in the configuration files. */
+	lc->sync = 0;
+	list_for_each_entry(s, &ddev->spans, device_node) {
+		WARN_ON(!s->channels);
+		if (!s->channels)
+			continue;
+		if (!s->chans[0]->sigcap)
+			_t4_spanconfig(file, s, lc);
+	}
+	return ret;
+}
+
 static int
 t4_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype)
 {
@@ -2076,6 +2115,8 @@ static int t4_alloc_channels(struct t4 *wc, struct t4_span *ts,
 	for (i = 0; i < ARRAY_SIZE(ts->chans); ++i) {
 		kfree(ts->chans[i]);
 		kfree(ts->ec[i]);
+		ts->chans[i] = NULL;
+		ts->ec[i] = NULL;
 	}

 	ts->linemode = linemode;
@@ -2115,13 +2156,13 @@ static void t4_init_one_span(struct t4 *wc, struct t4_span *ts)

 	switch (ts->linemode) {
 	case T1:
-		ts->span.spantype = "T1";
+		ts->span.spantype = SPANTYPE_DIGITAL_T1;
 		break;
 	case E1:
-		ts->span.spantype = "E1";
+		ts->span.spantype = SPANTYPE_DIGITAL_E1;
 		break;
 	case J1:
-		ts->span.spantype = "J1";
+		ts->span.spantype = SPANTYPE_DIGITAL_J1;
 		break;
 	}

@@ -2170,40 +2211,47 @@ static void t4_init_one_span(struct t4 *wc, struct t4_span *ts)
 /**
 * t4_set_linemode - Allows user space to change the linemode before spans are assigned.
 * @span:	span on which to change the linemode.
- * @linemode:	Textual description of the new linemode.
+ * @linemode:	A value from enumerated spantypes
 *
 * This callback is used to override the E1/T1 mode jumper settings and set
 * the linemode on for each span. Called when the "spantype" attribute
 * is written in sysfs under the dahdi_device.
 *
 */
-static int t4_set_linemode(struct dahdi_span *span, const char *linemode)
+static int t4_set_linemode(struct dahdi_span *span, enum spantypes linemode)
 {
 	struct t4_span *ts = container_of(span, struct t4_span, span);
 	struct t4 *wc = ts->owner;
 	int res = 0;
 	enum linemode mode;
+	const char *old_name;

-	dev_dbg(&wc->dev->dev, "Setting '%s' to '%s'\n", span->name, linemode);
+	dev_dbg(&wc->dev->dev, "Setting '%s' to '%s'\n", span->name,
+		dahdi_spantype2str(linemode));

-	if (!strcasecmp(span->spantype, linemode))
+	if (span->spantype == linemode)
 		return 0;

-	if (!strcasecmp(linemode, "t1")) {
+	old_name = dahdi_spantype2str(span->spantype);
+	switch (linemode) {
+	case SPANTYPE_DIGITAL_T1:
 		dev_info(&wc->dev->dev,
-			 "Changing from %s to T1 line mode.\n", span->spantype);
+			 "Changing from %s to T1 line mode.\n", old_name);
 		mode = T1;
-	} else if (!strcasecmp(linemode, "e1")) {
+		break;
+	case SPANTYPE_DIGITAL_E1:
 		dev_info(&wc->dev->dev,
-			 "Changing from %s to E1 line mode.\n", span->spantype);
+			 "Changing from %s to E1 line mode.\n", old_name);
 		mode = E1;
-	} else if (!strcasecmp(linemode, "j1")) {
+		break;
+	case SPANTYPE_DIGITAL_J1:
 		dev_info(&wc->dev->dev,
-			 "Changing from %s to J1 line mode.\n", span->spantype);
+			 "Changing from %s to J1 line mode.\n", old_name);
 		mode = J1;
-	} else {
+		break;
+	default:
 		dev_err(&wc->dev->dev,
-			"'%s' is an unknown linemode.\n", linemode);
+			"Got invalid linemode %d from dahdi\n", linemode);
 		res = -EINVAL;
 	}

@@ -2280,13 +2328,13 @@ static void init_spans(struct t4 *wc)
 			 "T%dXXP (PCI) Card %d Span %d", wc->numspans, wc->num, x+1);
 		switch (ts->linemode) {
 		case T1:
-			ts->span.spantype = "T1";
+			ts->span.spantype = SPANTYPE_DIGITAL_T1;
 			break;
 		case E1:
-			ts->span.spantype = "E1";
+			ts->span.spantype = SPANTYPE_DIGITAL_E1;
 			break;
 		case J1:
-			ts->span.spantype = "J1";
+			ts->span.spantype = SPANTYPE_DIGITAL_J1;
 			break;
 		}

@@ -2400,7 +2448,6 @@ static void __t4_set_sclk_src(struct t4 *wc, int mode, int master, int slave)
 	__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
 }

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18))
 static ssize_t t4_timing_master_show(struct device *dev,
 				     struct device_attribute *attr,
 				     char *buf)
@@ -2431,13 +2478,6 @@ static void remove_sysfs_files(struct t4 *wc)
 			   &dev_attr_timing_master);
 }

-#else
-
-static inline void create_sysfs_files(struct t4 *wc) { return; }
-static inline void remove_sysfs_files(struct t4 *wc) { return; }
-
-#endif /* LINUX_KERNEL > 2.6.18 */
-
 static inline void __t4_update_timing(struct t4 *wc)
 {
 	int i;
@@ -2819,7 +2859,7 @@ static int t4_check_for_interrupts(struct t4 *wc)
 	return 0;
 }

-static int t4_startup(struct file *file, struct dahdi_span *span)
+static int _t4_startup(struct file *file, struct dahdi_span *span)
 {
 #ifdef SUPPORT_GEN1
 	int i;
@@ -2952,6 +2992,21 @@ static int t4_startup(struct file *file, struct dahdi_span *span)
 	return 0;
 }

+static int t4_startup(struct file *file, struct dahdi_span *span)
+{
+	int ret;
+	struct dahdi_device *const ddev = span->parent;
+	struct dahdi_span *s;
+
+	ret = _t4_startup(file, span);
+	list_for_each_entry(s, &ddev->spans, device_node) {
+		if (!test_bit(DAHDI_FLAGBIT_RUNNING, &s->flags)) {
+			_t4_startup(file, s);
+		}
+	}
+	return ret;
+}
+
 #ifdef SUPPORT_GEN1
 static inline void e1_check(struct t4 *wc, int span, int val)
 {
@@ -3767,7 +3822,7 @@ static inline void t4_framer_interrupt(struct t4 *wc, int span)
 }

 #ifdef SUPPORT_GEN1
-DAHDI_IRQ_HANDLER(t4_interrupt)
+static irqreturn_t _t4_interrupt(int irq, void *dev_id)
 {
 	struct t4 *wc = dev_id;
 	unsigned long flags;
@@ -3835,6 +3890,16 @@ DAHDI_IRQ_HANDLER(t4_interrupt)

 	return IRQ_RETVAL(1);
 }
+
+DAHDI_IRQ_HANDLER(t4_interrupt)
+{
+	irqreturn_t ret;
+	unsigned long flags;
+	local_irq_save(flags);
+	ret = _t4_interrupt(irq, dev_id);
+	local_irq_restore(flags);
+	return ret;
+}
 #endif

 static int t4_allocate_buffers(struct t4 *wc, int numbufs,
@@ -3952,7 +4017,7 @@ static void t4_isr_bh(unsigned long data)
 #endif
 }

-DAHDI_IRQ_HANDLER(t4_interrupt_gen2)
+static irqreturn_t _t4_interrupt_gen2(int irq, void *dev_id)
 {
 	struct t4 *wc = dev_id;
 	unsigned int status;
@@ -4148,6 +4213,16 @@ out:
 	return IRQ_RETVAL(1);
 }

+DAHDI_IRQ_HANDLER(t4_interrupt_gen2)
+{
+	irqreturn_t ret;
+	unsigned long flags;
+	local_irq_save(flags);
+	ret = _t4_interrupt_gen2(irq, dev_id);
+	local_irq_restore(flags);
+	return ret;
+}
+
 #ifdef SUPPORT_GEN1
 static int t4_reset_dma(struct t4 *wc)
 {
@@ -4617,12 +4692,6 @@ static int t8_update_firmware(struct t4 *wc, const struct firmware *fw,
 	const u32 BASE_ADDRESS = 0x00080000;
 	const u8 *data, *end;
 	size_t size = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
-	u32 *pci_state;
-	pci_state = kzalloc(64 * sizeof(u32), GFP_KERNEL);
-	if (!pci_state)
-		return -ENOMEM;
-#endif

 	/* Erase flash */
 	erase_half(wc);
@@ -4647,11 +4716,7 @@ static int t8_update_firmware(struct t4 *wc, const struct firmware *fw,

 	/* Reset te820 fpga after loading firmware */
 	dev_info(&wc->dev->dev, "Firmware load complete. Reseting device.\n");
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
-	res = pci_save_state(wc->dev, pci_state);
-#else
 	res = pci_save_state(wc->dev);
-#endif
 	if (res)
 		goto error_exit;
 	/* Set the fpga reset bits and clobber the remainder of the
@@ -4659,11 +4724,7 @@ static int t8_update_firmware(struct t4 *wc, const struct firmware *fw,
 	t4_pci_out(wc, WC_LEDS, 0xe0000000);
 	msleep(1000);

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
-	pci_restore_state(wc->dev, pci_state);
-#else
 	pci_restore_state(wc->dev);
-#endif

 	/* Signal the driver to restart initialization.
 	 * This will back out all initialization so far and
@@ -4671,9 +4732,6 @@ static int t8_update_firmware(struct t4 *wc, const struct firmware *fw,
 	return -EAGAIN;

 error_exit:
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)
-	kfree(pci_state);
-#endif
 	return res;
 }

@@ -5072,6 +5130,13 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	spin_lock_init(&wc->reglock);
 	wc->devtype = (const struct devtype *)(ent->driver_data);

+#ifdef CONFIG_WCT4XXP_DISABLE_ASPM
+	if (is_pcie(wc)) {
+		pci_disable_link_state(pdev->bus->self, PCIE_LINK_STATE_L0S |
+			PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
+	};
+#endif
+
 	if (is_octal(wc))
 		wc->numspans = 8;
 	else if (wc->devtype->flags & FLAG_2PORT)
@@ -5188,22 +5253,23 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #ifdef SUPPORT_GEN1
 	if (request_irq(pdev->irq, (wc->devtype->flags & FLAG_2NDGEN) ?
 					t4_interrupt_gen2 : t4_interrupt,
-			DAHDI_IRQ_SHARED_DISABLED,
+			DAHDI_IRQ_SHARED,
 			(wc->numspans == 8) ? "wct8xxp" :
 					      (wc->numspans == 2) ? "wct2xxp" :
 								    "wct4xxp",
-			wc))
+			wc)) {
 #else
-		if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) {
-			dev_notice(&wc->dev->dev, "This driver does not "
-					"support 1st gen modules\n");
-			free_wc(wc);
-			return -ENODEV;
-		}	
-	if (request_irq(pdev->irq, t4_interrupt_gen2, DAHDI_IRQ_SHARED_DISABLED, "t4xxp", wc)) 
+	if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) {
+		dev_notice(&wc->dev->dev, "This driver does not "
+				"support 1st gen modules\n");
+		free_wc(wc);
+		return -ENODEV;
+	}
+
+	if (request_irq(pdev->irq, t4_interrupt_gen2,
+			DAHDI_IRQ_SHARED, "t4xxp", wc)) {
 #endif
-	{
-		dev_notice(&wc->dev->dev, "t4xxp: Unable to request IRQ %d\n",
+		dev_notice(&wc->dev->dev, "Unable to request IRQ %d\n",
 				pdev->irq);
 		free_wc(wc);
 		return -EIO;
@@ -5383,13 +5449,11 @@ static DEFINE_PCI_DEVICE_TABLE(t4_pci_tbl) =
 	{ 0, }
 };

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
 static void _t4_shutdown(struct pci_dev *pdev)
 {
 	struct t4 *wc = pci_get_drvdata(pdev);
 	t4_hardware_stop(wc);
 }
-#endif

 static int t4_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -5400,9 +5464,7 @@ static struct pci_driver t4_driver = {
 	.name = "wct4xxp",
 	.probe = t4_init_one_retry,
 	.remove = __devexit_p(t4_remove_one),
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
 	.shutdown = _t4_shutdown,
-#endif
 	.suspend = t4_suspend,
 	.id_table = t4_pci_tbl,
 };
--- a/drivers/dahdi/wct4xxp/vpm450m.c
+++ b/drivers/dahdi/wct4xxp/vpm450m.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Digium, Inc.
+ * Copyright (C) 2005-2012 Digium, Inc.
 *
 * Mark Spencer <markster@digium.com>
 *
@@ -28,10 +28,6 @@
 #include "vpm450m.h"
 #include "oct6100api/oct6100_api.h"

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-#include <linux/config.h>
-#endif
-
 /* API for Octasic access */
 UINT32 Oct6100UserGetTime(tPOCT6100_GET_TIME f_pTime)
 {
@@ -422,6 +418,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
 	tOCT6100_GET_INSTANCE_SIZE InstanceSize;
 	tOCT6100_CHANNEL_OPEN *ChannelOpen;
 	UINT32 ulResult;
+	const unsigned int mask = (8 == numspans) ? 0x7 : 0x3;
 	unsigned int sout_stream, rout_stream;
 	struct vpm450m *vpm450m;
 	int x,y,law;
@@ -527,7 +524,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
 		 	*  therefore, the lower 2 bits tell us which span this 
 			*  timeslot/channel
 		 	*/
-			if (isalaw[x & 0x07])
+			if (isalaw[x & mask])
 				law = cOCT6100_PCM_A_LAW;
 			else
 				law = cOCT6100_PCM_U_LAW;
--- a/drivers/dahdi/wctc4xxp/Makefile
+++ b/drivers/dahdi/wctc4xxp/Makefile
@@ -1,7 +0,0 @@
-ifdef KBUILD_EXTMOD
-# We only get here on kernels 2.6.0-2.6.9 .
-# For newer kernels, Kbuild will be included directly by the kernel
-# build system.
-include $(src)/Kbuild
-else
-endif
--- a/drivers/dahdi/wctc4xxp/base.c
+++ b/drivers/dahdi/wctc4xxp/base.c
@@ -1,6 +1,6 @@
 /* Wildcard TC400B Driver
 *
- * Copyright (C) 2006-2010, Digium, Inc.
+ * Copyright (C) 2006-2012, Digium, Inc.
 *
 * All rights reserved.
 *
@@ -42,11 +42,7 @@

 #include "dahdi/kernel.h"

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
-#include <asm/io.h>
-#else
 #include <linux/io.h>
-#endif

 /* COMPILE TIME OPTIONS =================================================== */

@@ -73,13 +69,6 @@
 		dev_info(&(wc)->pdev->dev, _fmt, ## _args);		\
 	}								\

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14)
-/* also added in RHEL kernels with the OpenInfiniband backport: */
-#if LINUX_VERSION_CODE != KERNEL_VERSION(2, 6, 9) || !defined(DEFINE_SPINLOCK)
-typedef	unsigned gfp_t;		/* Added in 2.6.14 */
-#endif
-#endif
-

 /* define CONFIG_WCTC4XXP_POLLING to operate in a pure polling mode.  This is
 * was placed in as a debugging tool for a particluar system that wasn't
--- a/drivers/dahdi/wctdm24xxp/Makefile
+++ b/drivers/dahdi/wctdm24xxp/Makefile
@@ -1,6 +0,0 @@
-ifdef KBUILD_EXTMOD
-# We only get here on kernels 2.6.0-2.6.9 .
-# For newer kernels, Kbuild will be included directly by the kernel
-# build system.
-include $(src)/Kbuild
-endif
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -7,7 +7,7 @@
 * Support for Hx8 by Andrew Kohlsmith <akohlsmith@mixdown.ca> and Matthew
 * Fredrickson <creslin@digium.com>
 *
- * Copyright (C) 2005 - 2011 Digium, Inc.
+ * Copyright (C) 2005 - 2012 Digium, Inc.
 * All rights reserved.
 *
 * Sections for QRV cards written by Jim Dixon <jim@lambdatel.com>
@@ -191,6 +191,11 @@ static const struct wctdm_desc wcaex410 = { "Wildcard AEX410", FLAG_EXPRESS, 4 }
 static const struct wctdm_desc wcha80000 = { "HA8-0000", 0, 8 };
 static const struct wctdm_desc wchb80000 = { "HB8-0000", FLAG_EXPRESS, 8 };

+static inline bool is_pcie(const struct wctdm *wc)
+{
+	return (wc->desc->flags & FLAG_EXPRESS) > 0;
+}
+
 /**
 * Returns true if the card is one of the Hybrid Digital Analog Cards.
 */
@@ -1068,9 +1073,22 @@ wctdm_isr_getreg(struct wctdm *wc, struct wctdm_module *const mod, u8 address)
 	list_add(&cmd->node, &mod->pending_cmds);
 }

+/* Must be called with wc.reglock held and local interrupts disabled */
 static inline void
-wctdm_setreg_intr(struct wctdm *wc, struct wctdm_module *mod,
-		  int addr, int val);
+wctdm_setreg_intr(struct wctdm *wc, struct wctdm_module *mod, int addr, int val)
+{
+	struct wctdm_cmd *cmd;
+
+	cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);
+	if (unlikely(!cmd))
+		return;
+
+	cmd->complete = NULL;
+	cmd->cmd = CMD_WR(addr, val);
+
+	list_add_tail(&cmd->node, &mod->pending_cmds);
+}
+

 static void cmd_checkisr(struct wctdm *wc, struct wctdm_module *const mod)
 {
@@ -1215,22 +1233,6 @@ static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *sframe)
 	spin_unlock(&wc->reglock);
 }

-/* Must be called with wc.reglock held and local interrupts disabled */
-static inline void
-wctdm_setreg_intr(struct wctdm *wc, struct wctdm_module *mod, int addr, int val)
-{
-	struct wctdm_cmd *cmd;
-
-	cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);
-	if (unlikely(!cmd))
-		return;
-
-	cmd->complete = NULL;
-	cmd->cmd = CMD_WR(addr, val);
-
-	list_add_tail(&cmd->node, &mod->pending_cmds);
-}
-
 int wctdm_setreg(struct wctdm *wc, struct wctdm_module *mod, int addr, int val)
 {
 	struct wctdm_cmd *cmd;
@@ -1831,19 +1833,22 @@ static void wctdm_qrvdri_check_hook(struct wctdm *wc, int card)
 static inline bool is_fxo_ringing(const struct fxo *const fxo)
 {
 	return ((fxo->hook_ring_shadow & 0x60) &&
-		(fxo->battery_state == BATTERY_PRESENT));
+		((fxo->battery_state == BATTERY_PRESENT) ||
+		 (fxo->battery_state == BATTERY_DEBOUNCING_LOST)));
 }

 static inline bool is_fxo_ringing_positive(const struct fxo *const fxo)
 {
 	return (((fxo->hook_ring_shadow & 0x60) == 0x20) &&
-		(fxo->battery_state == BATTERY_PRESENT));
+		((fxo->battery_state == BATTERY_PRESENT) ||
+		 (fxo->battery_state == BATTERY_DEBOUNCING_LOST)));
 }

 static inline bool is_fxo_ringing_negative(const struct fxo *const fxo)
 {
 	return (((fxo->hook_ring_shadow & 0x60) == 0x40) &&
-		(fxo->battery_state == BATTERY_PRESENT));
+		((fxo->battery_state == BATTERY_PRESENT) ||
+		 (fxo->battery_state == BATTERY_DEBOUNCING_LOST)));
 }

 static inline void set_ring(struct fxo *fxo, enum ring_detector_state new)
@@ -1854,19 +1859,21 @@ static inline void set_ring(struct fxo *fxo, enum ring_detector_state new)
 static void wctdm_fxo_ring_detect(struct wctdm *wc, struct wctdm_module *mod)
 {
 	struct fxo *const fxo = &mod->mod.fxo;
+	static const unsigned int POLARITY_CHANGES_NEEDED = 2;

 	/* Look for ring status bits (Ring Detect Signal Negative and Ring
-	 * Detect Signal Positive) to transition back and forth some number of
-	 * times to indicate that a ring is occurring.  Provide some number of
-	 * samples to allow for the transitions to occur before giving up.
-	 * NOTE: neon mwi voltages will trigger one of these bits to go active
-	 * but not to have transitions between the two bits (i.e. no negative
-	 * to positive or positive to negative traversals) */
+	 * Detect Signal Positive) to transition back and forth
+	 * POLARITY_CHANGES_NEEDED times to indicate that a ring is occurring.
+	 * Provide some number of samples to allow for the transitions to occur
+	 * before giving up.  NOTE: neon mwi voltages will trigger one of these
+	 * bits to go active but not to have transitions between the two bits
+	 * (i.e. no negative to positive or positive to negative traversals) */

 	switch (fxo->ring_state) {
 	case DEBOUNCING_RINGING_POSITIVE:
 		if (is_fxo_ringing_negative(fxo)) {
-			if (++fxo->ring_polarity_change_count > 4) {
+			if (++fxo->ring_polarity_change_count >
+						POLARITY_CHANGES_NEEDED) {
 				mod_hooksig(wc, mod, DAHDI_RXSIG_RING);
 				set_ring(fxo, RINGING);
 				if (debug) {
@@ -1884,7 +1891,8 @@ static void wctdm_fxo_ring_detect(struct wctdm *wc, struct wctdm_module *mod)
 		break;
 	case DEBOUNCING_RINGING_NEGATIVE:
 		if (is_fxo_ringing_positive(fxo)) {
-			if (++fxo->ring_polarity_change_count > 4) {
+			if (++fxo->ring_polarity_change_count >
+						POLARITY_CHANGES_NEEDED) {
 				mod_hooksig(wc, mod, DAHDI_RXSIG_RING);
 				set_ring(fxo, RINGING);
 				if (debug) {
@@ -1904,7 +1912,7 @@ static void wctdm_fxo_ring_detect(struct wctdm *wc, struct wctdm_module *mod)
 		if (!is_fxo_ringing(fxo)) {
 			set_ring(fxo, DEBOUNCING_RINGOFF);
 			fxo->ringdebounce_timer =
-					wc->framecount + ringdebounce / 2;
+					wc->framecount + ringdebounce / 8;
 		}
 		break;
 	case DEBOUNCING_RINGOFF:
@@ -3727,14 +3735,15 @@ static int wctdm_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long

 		if (((fxs->lasttxhook & SLIC_LF_SETMASK) == SLIC_LF_ACTIVE_FWD) ||
 		    ((fxs->lasttxhook & SLIC_LF_SETMASK) == SLIC_LF_ACTIVE_REV)) {
+			int res;

-			x = set_lasttxhook_interruptible(wc, fxs,
+			res = set_lasttxhook_interruptible(wc, fxs,
 				(POLARITY_XOR(fxs) ?
 				SLIC_LF_OHTRAN_REV : SLIC_LF_OHTRAN_FWD),
 				&mod->sethook);

 			if (debug & DEBUG_CARD) {
-				if (x) {
+				if (res) {
 					dev_info(&wc->vb.pdev->dev,
 						 "Channel %d TIMEOUT: "
 						 "OnHookTransfer start\n",
@@ -4517,10 +4526,11 @@ wctdm_init_span(struct wctdm *wc, int spanno, int chanoffset, int chancount,
 		s->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS | DAHDI_CONFIG_D4;
 		s->span.linecompat |= DAHDI_CONFIG_ESF | DAHDI_CONFIG_HDB3 | DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4;
 		s->span.linecompat |= DAHDI_CONFIG_NTTE | DAHDI_CONFIG_TERM;
-		s->span.spantype = "TE";
+		s->span.spantype = SPANTYPE_DIGITAL_BRI_TE;
 	} else {
 		s->span.ops = &wctdm24xxp_analog_span_ops;
 		s->span.flags = DAHDI_FLAG_RBS;
+		s->span.spantype = SPANTYPE_ANALOG_MIXED;
 		/* analog sigcap handled in fixup_analog_span() */
 	}

@@ -5678,6 +5688,13 @@ __wctdm_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	wc->vb.pdev = pdev;
 	wc->vb.debug = &debug;

+#ifdef CONFIG_VOICEBUS_DISABLE_ASPM
+	if (is_pcie(wc)) {
+		pci_disable_link_state(pdev->bus->self, PCIE_LINK_STATE_L0S |
+			PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
+	};
+#endif
+
 	if (is_hx8(wc)) {
 		wc->vb.ops = &hx8_voicebus_operations;
 		ret = voicebus_boot_init(&wc->vb, wc->board_name);
@@ -6050,13 +6067,11 @@ static DEFINE_PCI_DEVICE_TABLE(wctdm_pci_tbl) = {
 	{ 0 }
 };

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
 static void wctdm_shutdown(struct pci_dev *pdev)
 {
 	struct wctdm *wc = pci_get_drvdata(pdev);
 	voicebus_quiesce(&wc->vb);
 }
-#endif

 MODULE_DEVICE_TABLE(pci, wctdm_pci_tbl);

@@ -6069,9 +6084,7 @@ static struct pci_driver wctdm_driver = {
 	.name = "wctdm24xxp",
 	.probe = wctdm_init_one,
 	.remove = __devexit_p(wctdm_remove_one),
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
 	.shutdown = wctdm_shutdown,
-#endif
 	.suspend = wctdm_suspend,
 	.id_table = wctdm_pci_tbl,
 };
--- a/drivers/dahdi/wctdm24xxp/xhfc.c
+++ b/drivers/dahdi/wctdm24xxp/xhfc.c
@@ -2150,7 +2150,9 @@ static int b400m_set_ntte(struct b400m_span *bspan, int te_mode, int term_on)
 	int all_modes = 0, all_terms = 0;
 	int i;

-	bspan->wspan->span.spantype = (te_mode > 0) ? "TE" : "NT";
+	bspan->wspan->span.spantype = (te_mode > 0)
+		? SPANTYPE_DIGITAL_BRI_TE
+		: SPANTYPE_DIGITAL_BRI_NT;

 	bspan->te_mode = te_mode;
 	bspan->term_on = term_on;
--- a/drivers/dahdi/wcte11xp.c
+++ b/drivers/dahdi/wcte11xp.c
@@ -1000,12 +1000,12 @@ static int t1xxp_software_init(struct t1 *wc)
 		else
 			wc->span.channels = 31;
 		wc->span.deflaw = DAHDI_LAW_ALAW;
-		wc->span.spantype = "E1";
+		wc->span.spantype = SPANTYPE_DIGITAL_E1;
 		wc->span.linecompat = DAHDI_CONFIG_HDB3 | DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4;
 	} else {
 		wc->span.channels = 24;
 		wc->span.deflaw = DAHDI_LAW_MULAW;
-		wc->span.spantype = "T1";
+		wc->span.spantype = SPANTYPE_DIGITAL_T1;
 		wc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS | DAHDI_CONFIG_D4 | DAHDI_CONFIG_ESF;
 	}
 	wc->span.chans = wc->chans;
--- a/drivers/dahdi/wcte12xp/Makefile
+++ b/drivers/dahdi/wcte12xp/Makefile
@@ -1,6 +0,0 @@
-ifdef KBUILD_EXTMOD
-# We only get here on kernels 2.6.0-2.6.9 .
-# For newer kernels, Kbuild will be included directly by the kernel
-# build system.
-include $(src)/Kbuild
-endif
--- a/drivers/dahdi/wcte12xp/base.c
+++ b/drivers/dahdi/wcte12xp/base.c
@@ -8,7 +8,7 @@
 *            Matthew Fredrickson <creslin@digium.com>
 *            William Meadows <wmeadows@digium.com>
 *
- * Copyright (C) 2007-2011, Digium, Inc.
+ * Copyright (C) 2007-2012, Digium, Inc.
 *
 * All rights reserved.
 *
@@ -27,6 +27,8 @@
 * this program for more details.
 */

+#define pr_fmt(fmt)             KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/module.h>
@@ -55,18 +57,14 @@
 #error VOICEBUS_SFRAME_SIZE != SFRAME_SIZE
 #endif

-#ifndef pr_fmt
-#define pr_fmt(fmt)             KBUILD_MODNAME ": " fmt
-#endif
-
 static int debug;
-static int j1mode = 0;
+static int j1mode = -1;
 static int alarmdebounce = 2500; /* LOF/LFA def to 2.5s AT&T TR54016*/
 static int losalarmdebounce = 2500; /* LOS def to 2.5s AT&T TR54016*/
 static int aisalarmdebounce = 2500; /* AIS(blue) def to 2.5s AT&T TR54016*/
 static int yelalarmdebounce = 500; /* RAI(yellow) def to 0.5s AT&T devguide */
 static int t1e1override = -1; /* deprecated */
-static char *default_linemode = "auto"; /* 'auto', 'e1', or 't1' */
+static char *default_linemode = "auto"; /* 'auto', 'e1', 't1', or 'j1' */
 static int latency = VOICEBUS_DEFAULT_LATENCY;
 static unsigned int max_latency = VOICEBUS_DEFAULT_MAXLATENCY;
 static int vpmsupport = 1;
@@ -99,6 +97,11 @@ static const struct t1_desc te120p = {"Wildcard TE120P"};
 static const struct t1_desc te122 = {"Wildcard TE122"};
 static const struct t1_desc te121 = {"Wildcard TE121"};

+static inline bool is_pcie(const struct t1 *t1)
+{
+	return (0 == strcmp(t1->variety, te121.name));
+}
+
 /* names of HWEC modules */
 static const char *vpmadt032_name = "VPMADT032";
 static const char *vpmoct_name = "VPMOCT032";
@@ -640,21 +643,21 @@ static inline int t1_setreg(struct t1 *wc, int addr, int val)
 	return 0;
 }

-static int t1_getreg(struct t1 *wc, int addr)
+static void __t1_getreg(struct t1 *wc, int addr, struct command *cmd)
 {
-	struct command *cmd =  NULL;
-	unsigned long ret;
-	unsigned long flags;
-
-	might_sleep();
-
-	cmd = get_free_cmd(wc);
-	if (!cmd)
-		return -ENOMEM;
 	cmd->address = addr;
 	cmd->data = 0x00;
 	cmd->flags = __CMD_RD;
 	submit_cmd(wc, cmd);
+}
+
+static int __t1_getresult(struct t1 *wc, struct command *cmd)
+{
+	int ret;
+	unsigned long flags;
+
+	might_sleep();
+
 	ret = wait_for_completion_interruptible_timeout(&cmd->complete, HZ*10);
 	if (unlikely(!ret)) {
 		spin_lock_irqsave(&wc->reglock, flags);
@@ -685,10 +688,22 @@ static int t1_getreg(struct t1 *wc, int addr)
 		}
 	}
 	ret = cmd->data;
-	free_cmd(wc, cmd);
 	return ret;
 }

+static int t1_getreg(struct t1 *wc, int addr)
+{
+	int res;
+	struct command *cmd =  NULL;
+	cmd = get_free_cmd(wc);
+	if (!cmd)
+		return -ENOMEM;
+	__t1_getreg(wc, addr, cmd);
+	res = __t1_getresult(wc, cmd);
+	free_cmd(wc, cmd);
+	return res;
+}
+
 static void t1_setleds(struct t1 *wc, int leds)
 {
 	struct command *cmd;
@@ -878,7 +893,8 @@ static void t1_configure_t1(struct t1 *wc, int lineconfig, int txlevel)
 	fmr1 = 0x9e; /* FMR1: Mode 0, T1 mode, CRC on for ESF, 2.048 Mhz system data rate, no XAIS */
 	fmr2 = 0x20; /* FMR2: no payload loopback, don't auto yellow alarm */

-	if (j1mode)
+
+	if (SPANTYPE_DIGITAL_J1 == wc->span.spantype)
 		fmr4 = 0x1c;
 	else
 		fmr4 = 0x0c; /* FMR4: Lose sync on 2 out of 5 framing bits, auto resync */
@@ -918,7 +934,7 @@ static void t1_configure_t1(struct t1 *wc, int lineconfig, int txlevel)
 	t1_setreg(wc, 0x38, 0x0a);	/* PCD: LOS after 176 consecutive "zeros" */
 	t1_setreg(wc, 0x39, 0x15);	/* PCR: 22 "ones" clear LOS */

-	if (j1mode)
+	if (SPANTYPE_DIGITAL_J1 == wc->span.spantype)
 		t1_setreg(wc, 0x24, 0x80); /* J1 overide */
 		
 	/* Generate pulse mask for T1 */
@@ -1179,15 +1195,47 @@ static int t1xxp_rbsbits(struct dahdi_chan *chan, int bits)
 	return 0;
 }

-static inline void t1_check_sigbits(struct t1 *wc)
+static void t1_check_sigbits(struct t1 *wc)
 {
+	struct command_container {
+		struct command *cmd;
+		struct list_head node;
+		unsigned int index;
+	};
+	struct command_container *cont;
+	LIST_HEAD(commands);
 	int a,i,rxs;

 	if (!(test_bit(DAHDI_FLAGBIT_RUNNING, &wc->span.flags)))
 		return;
+
 	if (dahdi_is_e1_span(&wc->span)) {
+		/* Send out all the commands first. */
 		for (i = 0; i < 15; i++) {
-			a = t1_getreg(wc, 0x71 + i);
+			if (!(wc->span.chans[i+16]->sig & DAHDI_SIG_CLEAR) ||
+			    !(wc->span.chans[i]->sig & DAHDI_SIG_CLEAR))  {
+				cont = kzalloc(sizeof(*cont), GFP_KERNEL);
+				if (!cont) {
+					WARN_ON_ONCE(1);
+					goto done;
+				}
+				cont->cmd = get_free_cmd(wc);
+				if (!cont->cmd) {
+					WARN_ON_ONCE(1);
+					goto done;
+				}
+				cont->index = i;
+				list_add_tail(&cont->node, &commands);
+				__t1_getreg(wc, 0x71 + i, cont->cmd);
+			}
+		}
+
+		/* Now check the results */
+		list_for_each_entry_reverse(cont, &commands, node) {
+			i = cont->index;
+			a = __t1_getresult(wc, cont->cmd);
+			free_cmd(wc, cont->cmd);
+			cont->cmd = NULL;
 			if (a > -1) {
 				/* Get high channel in low bits */
 				rxs = (a & 0xf);
@@ -1205,8 +1253,29 @@ static inline void t1_check_sigbits(struct t1 *wc)
 			}
 		}
 	} else if (wc->span.lineconfig & DAHDI_CONFIG_D4) {
-		for (i = 0; i < 24; i+=4) {
-			a = t1_getreg(wc, 0x70 + (i>>2));
+		/* First we'll send out the commands */
+		for (i = 0; i < 24; i += 4) {
+			cont = kzalloc(sizeof(*cont), GFP_KERNEL);
+			if (!cont) {
+				WARN_ON_ONCE(1);
+				goto done;
+			}
+			cont->cmd = get_free_cmd(wc);
+			if (!cont->cmd) {
+				WARN_ON_ONCE(1);
+				goto done;
+			}
+			cont->index = i;
+			list_add_tail(&cont->node, &commands);
+			__t1_getreg(wc, 0x70 + (i>>2), cont->cmd);
+		}
+
+		/* Now we'll check the results */
+		list_for_each_entry_reverse(cont, &commands, node) {
+			i = cont->index;
+			a = __t1_getresult(wc, cont->cmd);
+			free_cmd(wc, cont->cmd);
+			cont->cmd = NULL;
 			if (a > -1) {
 				/* Get high channel in low bits */
 				rxs = (a & 0x3) << 2;
@@ -1236,8 +1305,28 @@ static inline void t1_check_sigbits(struct t1 *wc)
 			}
 		}
 	} else {
-		for (i = 0; i < 24; i+=2) {
-			a = t1_getreg(wc, 0x70 + (i>>1));
+		/* First send out the commands. */
+		for (i = 0; i < 24; i += 2) {
+			cont = kzalloc(sizeof(*cont), GFP_KERNEL);
+			if (!cont) {
+				WARN_ON_ONCE(1);
+				goto done;
+			}
+			cont->cmd = get_free_cmd(wc);
+			if (!cont->cmd) {
+				WARN_ON_ONCE(1);
+				goto done;
+			}
+			cont->index = i;
+			list_add_tail(&cont->node, &commands);
+			__t1_getreg(wc, 0x70 + (i>>1), cont->cmd);
+		}
+
+		list_for_each_entry_reverse(cont, &commands, node) {
+			i = cont->index;
+			a = __t1_getresult(wc, cont->cmd);
+			free_cmd(wc, cont->cmd);
+			cont->cmd = NULL;
 			if (a > -1) {
 				/* Get high channel in low bits */
 				rxs = (a & 0xf);
@@ -1255,6 +1344,21 @@ static inline void t1_check_sigbits(struct t1 *wc)
 			}
 		}
 	}
+done:
+	while (!list_empty(&commands)) {
+		cont = container_of(commands.next,
+				    struct command_container, node);
+		if (unlikely(cont->cmd)) {
+			/* We do not care about the result, let's just wait for
+			 * the rest of the system to finish with it. */
+			__t1_getresult(wc, cont->cmd);
+			free_cmd(wc, cont->cmd);
+			cont->cmd = NULL;
+		}
+		list_del(&cont->node);
+		kfree(cont);
+	}
+	return;
 }

 struct maint_work_struct {
@@ -1841,18 +1945,32 @@ static int t1_software_init(struct t1 *wc, enum linemode type)
 	memset(chans, 0, sizeof(chans));
 	memset(ec, 0, sizeof(ec));

-	if (type == E1) {
+	switch (type) {
+	case E1:
 		wc->span.channels = 31;
-		wc->span.spantype = "E1";
+		wc->span.spantype = SPANTYPE_DIGITAL_E1;
 		wc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_HDB3 |
 			DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4;
 		wc->span.deflaw = DAHDI_LAW_ALAW;
-	} else {
+		break;
+	case T1:
 		wc->span.channels = 24;
-		wc->span.spantype = "T1";
+		wc->span.spantype = SPANTYPE_DIGITAL_T1;
 		wc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS |
 			DAHDI_CONFIG_D4 | DAHDI_CONFIG_ESF;
 		wc->span.deflaw = DAHDI_LAW_MULAW;
+		break;
+	case J1:
+		wc->span.channels = 24;
+		wc->span.spantype = SPANTYPE_DIGITAL_J1;
+		wc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS |
+			DAHDI_CONFIG_D4 | DAHDI_CONFIG_ESF;
+		wc->span.deflaw = DAHDI_LAW_MULAW;
+		break;
+	default:
+		spin_unlock_irqrestore(&wc->reglock, flags);
+		res = -EINVAL;
+		goto error_exit;
 	}

 	spin_unlock_irqrestore(&wc->reglock, flags);
@@ -1861,7 +1979,7 @@ static int t1_software_init(struct t1 *wc, enum linemode type)
 		return -ENOMEM;

 	t1_info(wc, "Setting up global serial parameters for %s\n",
-		(dahdi_is_e1_span(&wc->span) ? "E1" : "T1"));
+		dahdi_spantype2str(wc->span.spantype));

 	t4_serial_setup(wc);
 	set_bit(DAHDI_FLAGBIT_RBS, &wc->span.flags);
@@ -1895,13 +2013,13 @@ error_exit:
 * DAHDI).
 *
 */
-static int t1xxp_set_linemode(struct dahdi_span *span, const char *linemode)
+static int t1xxp_set_linemode(struct dahdi_span *span, enum spantypes linemode)
 {
 	int res;
 	struct t1 *wc = container_of(span, struct t1, span);

 	/* We may already be set to the requested type. */
-	if (!strcasecmp(span->spantype, linemode))
+	if (span->spantype == linemode)
 		return 0;

 	res = t1_wait_for_ready(wc);
@@ -1915,17 +2033,28 @@ static int t1xxp_set_linemode(struct dahdi_span *span, const char *linemode)
 	del_timer_sync(&wc->timer);
 	flush_workqueue(wc->wq);

-	if (!strcasecmp(linemode, "t1")) {
+	switch (linemode) {
+	case SPANTYPE_DIGITAL_T1:
 		dev_info(&wc->vb.pdev->dev,
-			 "Changing from E1 to T1 line mode.\n");
+			 "Changing from %s to T1 line mode.\n",
+			 dahdi_spantype2str(wc->span.spantype));
 		res = t1_software_init(wc, T1);
-	} else if (!strcasecmp(linemode, "e1")) {
+		break;
+	case SPANTYPE_DIGITAL_E1:
 		dev_info(&wc->vb.pdev->dev,
-			 "Changing from T1 to E1 line mode.\n");
+			 "Changing from %s to E1 line mode.\n",
+			 dahdi_spantype2str(wc->span.spantype));
 		res = t1_software_init(wc, E1);
-	} else {
+		break;
+	case SPANTYPE_DIGITAL_J1:
+		dev_info(&wc->vb.pdev->dev,
+			 "Changing from %s to E1 line mode.\n",
+			 dahdi_spantype2str(wc->span.spantype));
+		res = t1_software_init(wc, J1);
+	default:
 		dev_err(&wc->vb.pdev->dev,
-			"'%s' is an unknown linemode.\n", linemode);
+			"Got invalid linemode '%s' from dahdi\n",
+			dahdi_spantype2str(linemode));
 		res = -EINVAL;
 	}

@@ -1962,14 +2091,15 @@ static int t1_hardware_post_init(struct t1 *wc, enum linemode *type)
 	int x;

 	/* T1 or E1 */
-	if (-1 != t1e1override) {
-		pr_info("t1e1override is deprecated. Please use 'default_linemode'.\n");
-		*type = (t1e1override) ? E1 : T1;
+	if ((-1 != t1e1override) || (-1 != j1mode)) {
+		*type = (t1e1override) ? E1 : (j1mode) ? J1 : T1;
 	} else {
 		if (!strcasecmp(default_linemode, "e1")) {
 			*type = E1;
 		} else if (!strcasecmp(default_linemode, "t1")) {
 			*type = T1;
+		} else if (!strcasecmp(default_linemode, "j1")) {
+			*type = J1;
 		} else {
 			u8 pins;
 			res = t1_getpins(wc, &pins);
@@ -1978,7 +2108,8 @@ static int t1_hardware_post_init(struct t1 *wc, enum linemode *type)
 			*type = (pins & 0x01) ? T1 : E1;
 		}
 	}
-	debug_printk(wc, 1, "linemode: %s\n", (*type == T1) ? "T1" : "E1");
+	debug_printk(wc, 1, "linemode: %s\n", (*type == T1) ? "T1" :
+					(J1 == *type) ? "J1" : "E1");
 	
 	/* what version of the FALC are we using? */
 	reg = t1_setreg(wc, 0x4a, 0xaa);
@@ -2009,19 +2140,41 @@ static int t1_hardware_post_init(struct t1 *wc, enum linemode *type)
 	return 0;
 }

-static inline void t1_check_alarms(struct t1 *wc)
+static void t1_check_alarms(struct t1 *wc)
 {
 	unsigned char c,d;
 	int alarms;
 	int x,j;
 	unsigned char fmr4; /* must read this always */
+	struct command *cmds[3];

 	if (!(test_bit(DAHDI_FLAGBIT_RUNNING, &wc->span.flags)))
 		return;

-	c = t1_getreg(wc, 0x4c);
-	fmr4 = t1_getreg(wc, 0x20); /* must read this even if we don't use it */
-	d = t1_getreg(wc, 0x4d);
+	for (x = 0; x < ARRAY_SIZE(cmds); ++x) {
+		cmds[x] = get_free_cmd(wc);
+		if (!cmds[x]) {
+			WARN_ON(1);
+			for (x = 0; x < ARRAY_SIZE(cmds); ++x)
+				free_cmd(wc, cmds[x]);
+			return;
+		}
+	}
+
+	/* Since this is voicebus, if we issue all the reads initially and then
+	 * check the results we can save ourselves some time. Otherwise, each
+	 * read will take a minimum of 3ms to go through the complete pipeline.
+	 */
+	__t1_getreg(wc, 0x4c, cmds[0]);
+	__t1_getreg(wc, 0x20, cmds[1]); /* must read this even if not used */
+	__t1_getreg(wc, 0x4d, cmds[2]);
+
+	d = __t1_getresult(wc, cmds[2]);
+	fmr4 = __t1_getresult(wc, cmds[1]);
+	c = __t1_getresult(wc, cmds[0]);
+
+	for (x=0; x < ARRAY_SIZE(cmds); ++x)
+		free_cmd(wc, cmds[x]);

 	/* Assume no alarms */
 	alarms = 0;
@@ -2437,11 +2590,11 @@ static void timer_work_func(struct work_struct *work)
 {
 	struct t1 *wc = container_of(work, struct t1, timer_work);
 #endif
+	if (test_bit(INITIALIZED, &wc->bit_flags))
+		mod_timer(&wc->timer, jiffies + HZ/30);
 	t1_do_counters(wc);
 	t1_check_alarms(wc);
 	t1_check_sigbits(wc);
-	if (test_bit(INITIALIZED, &wc->bit_flags))
-		mod_timer(&wc->timer, jiffies + HZ/10);
 }

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
@@ -2697,13 +2850,7 @@ static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_devi
 	spin_lock_init(&wc->reglock);
 	INIT_LIST_HEAD(&wc->active_cmds);
 	INIT_LIST_HEAD(&wc->pending_cmds);
-#	if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
-	wc->timer.function = te12xp_timer;
-	wc->timer.data = (unsigned long)wc;
-	init_timer(&wc->timer);
-#	else
 	setup_timer(&wc->timer, te12xp_timer, (unsigned long)wc);
-#	endif

 #	if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
 	INIT_WORK(&wc->timer_work, timer_work_func, wc);
@@ -2749,6 +2896,13 @@ static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_devi
 	}
 #endif /* CONFIG_VOICEBUS_ECREFERENCE */

+#ifdef CONFIG_VOICEBUS_DISABLE_ASPM
+	if (is_pcie(wc)) {
+		pci_disable_link_state(pdev->bus->self, PCIE_LINK_STATE_L0S |
+			PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
+	};
+#endif
+
 	snprintf(wc->name, sizeof(wc->name)-1, "wcte12xp%d", index);
 	pci_set_drvdata(pdev, wc);
 	wc->vb.ops = &voicebus_operations;
@@ -2876,13 +3030,11 @@ static DEFINE_PCI_DEVICE_TABLE(te12xp_pci_tbl) = {
 	{ 0 }
 };

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
 static void te12xp_shutdown(struct pci_dev *pdev)
 {
 	struct t1 *wc = pci_get_drvdata(pdev);
 	voicebus_quiesce(&wc->vb);
 }
-#endif

 static int te12xp_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -2895,9 +3047,7 @@ static struct pci_driver te12xp_driver = {
 	.name = "wcte12xp",
 	.probe = te12xp_init_one,
 	.remove = __devexit_p(te12xp_remove_one),
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
 	.shutdown = te12xp_shutdown,
-#endif
 	.suspend = te12xp_suspend,
 	.id_table = te12xp_pci_tbl,
 };
@@ -2920,14 +3070,20 @@ static int __init te12xp_init(void)
 	if (!cmd_cache)
 		return -ENOMEM;

-	if (-1 != t1e1override) {
-		pr_info("'t1e1override' is deprecated. "
-			"Please use 'default_linemode' instead\n");
+	if ((-1 != t1e1override) || (-1 != j1mode)) {
+		pr_info("'t1e1override' and 'j1mode' are deprecated. "
+			"Please use 'default_linemode' instead.\n");
+		/* If someone is setting j1mode, then, t1e1override most likely
+		 * needs to be forced to t1 mode */
+		if (j1mode > 0)
+			t1e1override = 0;
 	} else if (strcasecmp(default_linemode, "auto") &&
 		   strcasecmp(default_linemode, "t1") &&
+		   strcasecmp(default_linemode, "j1") &&
 		   strcasecmp(default_linemode, "e1")) {
-		pr_err("'%s' is an unknown span type.", default_linemode);
+		pr_err("'%s' is an unknown span type.\n", default_linemode);
 		default_linemode = "auto";
+		kmem_cache_destroy(cmd_cache);
 		return -EINVAL;
 	}
 	res = dahdi_pci_module(&te12xp_driver);
--- a/drivers/dahdi/wcte12xp/wcte12xp.h
+++ b/drivers/dahdi/wcte12xp/wcte12xp.h
@@ -77,6 +77,7 @@
 enum linemode {
 	T1 = 1,
 	E1,
+	J1,
 };

 struct command {
--- a/drivers/dahdi/xpp/card_bri.c
+++ b/drivers/dahdi/xpp/card_bri.c
--- a/drivers/dahdi/xpp/card_bri.h
+++ b/drivers/dahdi/xpp/card_bri.h
@@ -25,7 +25,7 @@
 #include "xpd.h"

 enum bri_opcodes {
-	XPROTO_NAME(BRI, SET_LED)			= 0x33,
+	XPROTO_NAME(BRI, SET_LED) = 0x33,
 };

-#endif	/* CARD_BRI_H */
+#endif /* CARD_BRI_H */
--- a/drivers/dahdi/xpp/card_echo.c
+++ b/drivers/dahdi/xpp/card_echo.c
@@ -42,25 +42,20 @@ static DEF_PARM(int, debug, 0, 0644, "Print DBG statements");
 static bool echo_packet_is_valid(xpacket_t *pack);
 static void echo_packet_dump(const char *msg, xpacket_t *pack);

-DEF_RPACKET_DATA(ECHO, SET,
-	byte timeslots[ECHO_TIMESLOTS];
-	);
+DEF_RPACKET_DATA(ECHO, SET, __u8 timeslots[ECHO_TIMESLOTS];);

-DEF_RPACKET_DATA(ECHO, SET_REPLY,
-	byte status;
-	byte reserved;
-	);
+DEF_RPACKET_DATA(ECHO, SET_REPLY, __u8 status; __u8 reserved;);

 struct ECHO_priv_data {
 };

-static xproto_table_t	PROTO_TABLE(ECHO);
+static xproto_table_t PROTO_TABLE(ECHO);

 /*---------------- ECHO: Methods -------------------------------------------*/

 static xpd_t *ECHO_card_new(xbus_t *xbus, int unit, int subunit,
-		const xproto_table_t *proto_table, byte subtype,
-		int subunits, int subunit_ports, bool to_phone)
+			    const xproto_table_t *proto_table, __u8 subtype,
+			    int subunits, int subunit_ports, bool to_phone)
 {
 	xpd_t *xpd = NULL;
 	int channels = 0;
@@ -70,8 +65,9 @@ static xpd_t *ECHO_card_new(xbus_t *xbus, int unit, int subunit,
 		return NULL;
 	}
 	XBUS_DBG(GENERAL, xbus, "\n");
-	xpd = xpd_alloc(xbus, unit, subunit, subtype, subunits,
-		sizeof(struct ECHO_priv_data), proto_table, channels);
+	xpd =
+	    xpd_alloc(xbus, unit, subunit, subtype, subunits,
+		      sizeof(struct ECHO_priv_data), proto_table, channels);
 	if (!xpd)
 		return NULL;
 	xpd->type_name = "ECHO";
@@ -122,19 +118,17 @@ static int ECHO_card_register_reply(xbus_t *xbus, xpd_t *xpd, reg_cmd_t *info)
 		static int rate_limit;

 		if ((rate_limit++ % 1003) < 5)
-			notify_bad_xpd(__func__, xbus, addr,
-					orig_xpd->xpdname);
+			notify_bad_xpd(__func__, xbus, addr, orig_xpd->xpdname);
 		return -EPROTO;
 	}
 	spin_lock_irqsave(&xpd->lock, flags);
 	/* Update /proc info only if reply related to last reg read request */
-	if (
-			REG_FIELD(&xpd->requested_reply, regnum) ==
-				REG_FIELD(info, regnum) &&
-			REG_FIELD(&xpd->requested_reply, do_subreg) ==
-				REG_FIELD(info, do_subreg) &&
-			REG_FIELD(&xpd->requested_reply, subreg) ==
-				REG_FIELD(info, subreg)) {
+	if (REG_FIELD(&xpd->requested_reply, regnum) ==
+			REG_FIELD(info, regnum)
+		&& REG_FIELD(&xpd->requested_reply, do_subreg) ==
+			REG_FIELD(info, do_subreg)
+		&& REG_FIELD(&xpd->requested_reply, subreg) ==
+			REG_FIELD(info, subreg)) {
 		xpd->last_reply = *info;
 	}
 	spin_unlock_irqrestore(&xpd->lock, flags);
@@ -146,7 +140,7 @@ static int ECHO_card_register_reply(xbus_t *xbus, xpd_t *xpd, reg_cmd_t *info)
 static /* 0x39 */ HOSTCMD(ECHO, SET)
 {
 	struct xbus_echo_state *es;
-	byte *ts;
+	__u8 *ts;
 	xframe_t *xframe;
 	xpacket_t *pack;
 	int ret;
@@ -172,7 +166,7 @@ static int ECHO_ec_set(xpd_t *xpd, int pos, bool on)
 {
 	int ts_number;
 	int ts_mask;
-	byte *ts;
+	__u8 *ts;

 	ts = xpd->xbus->echo_state.timeslots;
 	/*
@@ -198,7 +192,7 @@ static int ECHO_ec_set(xpd_t *xpd, int pos, bool on)
 			ts[ts_number] &= ~ts_mask;
 	}
 	LINE_DBG(GENERAL, xpd, pos, "%s = %d -- ts_number=%d ts_mask=0x%X\n",
-		__func__, on, ts_number, ts_mask);
+		 __func__, on, ts_number, ts_mask);
 	return 0;
 }

@@ -207,7 +201,7 @@ static int ECHO_ec_get(xpd_t *xpd, int pos)
 	int ts_number;
 	int ts_mask;
 	int is_on;
-	byte *ts;
+	__u8 *ts;

 	ts = xpd->xbus->echo_state.timeslots;
 	ts_mask = (xpd->addr.unit == 0) ? 0x1 : 0x2;	/* Which bit? */
@@ -220,14 +214,14 @@ static int ECHO_ec_get(xpd_t *xpd, int pos)
 	}
 #if 0
 	LINE_DBG(GENERAL, xpd, pos, "ec_get=%d -- ts_number=%d ts_mask=0x%X\n",
-		is_on, ts_number, ts_mask);
+		 is_on, ts_number, ts_mask);
 #endif
 	return is_on;
 }

 static void ECHO_ec_dump(xbus_t *xbus)
 {
-	byte *ts;
+	__u8 *ts;
 	int i;

 	ts = xbus->echo_state.timeslots;
@@ -236,12 +230,11 @@ static void ECHO_ec_dump(xbus_t *xbus)
 			"EC-DUMP[%03d]: "
 			"0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X "
 			"0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
-			i,
-			ts[i+0], ts[i+1], ts[i+2], ts[i+3], ts[i+4], ts[i+5],
-				ts[i+6], ts[i+7],
-			ts[i+8], ts[i+9], ts[i+10], ts[i+11], ts[i+12],
-				ts[i+13], ts[i+14], ts[i+15]
-			);
+			i, ts[i + 0], ts[i + 1], ts[i + 2], ts[i + 3],
+			ts[i + 4], ts[i + 5], ts[i + 6], ts[i + 7], ts[i + 8],
+			ts[i + 9], ts[i + 10], ts[i + 11], ts[i + 12],
+			ts[i + 13], ts[i + 14], ts[i + 15]
+		    );
 	}
 }

@@ -255,7 +248,7 @@ static int ECHO_ec_update(xbus_t *xbus)
 /*---------------- ECHO: Astribank Reply Handlers --------------------------*/
 HANDLER_DEF(ECHO, SET_REPLY)
 {
-	byte	status;
+	__u8 status;

 	BUG_ON(!xpd);
 	status = RPACKET_FIELD(pack, ECHO, SET_REPLY, status);
@@ -263,26 +256,26 @@ HANDLER_DEF(ECHO, SET_REPLY)
 	return 0;
 }

-static const struct xops	echo_xops = {
-	.card_new		= ECHO_card_new,
-	.card_init		= ECHO_card_init,
-	.card_remove		= ECHO_card_remove,
-	.card_tick		= ECHO_card_tick,
-	.card_register_reply	= ECHO_card_register_reply,
+static const struct xops echo_xops = {
+	.card_new = ECHO_card_new,
+	.card_init = ECHO_card_init,
+	.card_remove = ECHO_card_remove,
+	.card_tick = ECHO_card_tick,
+	.card_register_reply = ECHO_card_register_reply,
 };

-static const struct echoops	echoops = {
-	.ec_set		= ECHO_ec_set,
-	.ec_get		= ECHO_ec_get,
-	.ec_update	= ECHO_ec_update,
-	.ec_dump	= ECHO_ec_dump,
+static const struct echoops echoops = {
+	.ec_set = ECHO_ec_set,
+	.ec_get = ECHO_ec_get,
+	.ec_update = ECHO_ec_update,
+	.ec_dump = ECHO_ec_dump,
 };

 static xproto_table_t PROTO_TABLE(ECHO) = {
 	.owner = THIS_MODULE,
 	.entries = {
-		/*	Table	Card	Opcode		*/
-		XENTRY(ECHO,	ECHO,	SET_REPLY),
+		/*      Table   Card    Opcode          */
+		XENTRY(	ECHO,	ECHO,	SET_REPLY	),
 	},
 	.name = "ECHO",
 	.ports_per_subunit = 1,
@@ -295,7 +288,7 @@ static xproto_table_t PROTO_TABLE(ECHO) = {

 static bool echo_packet_is_valid(xpacket_t *pack)
 {
-	const xproto_entry_t	*xe = NULL;
+	const xproto_entry_t *xe = NULL;
 	// DBG(GENERAL, "\n");
 	xe = xproto_card_entry(&PROTO_TABLE(ECHO), XPACKET_OP(pack));
 	return xe != NULL;
@@ -309,14 +302,14 @@ static void echo_packet_dump(const char *msg, xpacket_t *pack)
 /*------------------------- sysfs stuff --------------------------------*/
 static int echo_xpd_probe(struct device *dev)
 {
-	xpd_t	*ec_xpd;
-	int	ret = 0;
+	xpd_t *ec_xpd;
+	int ret = 0;

 	ec_xpd = dev_to_xpd(dev);
 	/* Is it our device? */
 	if (ec_xpd->type != XPD_TYPE_ECHO) {
-		XPD_ERR(ec_xpd, "drop suggestion for %s (%d)\n",
-			dev_name(dev), ec_xpd->type);
+		XPD_ERR(ec_xpd, "drop suggestion for %s (%d)\n", dev_name(dev),
+			ec_xpd->type);
 		return -EINVAL;
 	}
 	XPD_DBG(DEVICES, ec_xpd, "SYSFS\n");
@@ -325,23 +318,20 @@ static int echo_xpd_probe(struct device *dev)

 static int echo_xpd_remove(struct device *dev)
 {
-	xpd_t	*ec_xpd;
+	xpd_t *ec_xpd;

 	ec_xpd = dev_to_xpd(dev);
 	XPD_DBG(DEVICES, ec_xpd, "SYSFS\n");
 	return 0;
 }

-static struct xpd_driver	echo_driver = {
-	.type		= XPD_TYPE_ECHO,
-	.driver		= {
-		.name = "echo",
-#ifndef OLD_HOTPLUG_SUPPORT
-		.owner = THIS_MODULE,
-#endif
-		.probe = echo_xpd_probe,
-		.remove = echo_xpd_remove
-	}
+static struct xpd_driver echo_driver = {
+	.type = XPD_TYPE_ECHO,
+	.driver = {
+		   .name = "echo",
+		   .owner = THIS_MODULE,
+		   .probe = echo_xpd_probe,
+		   .remove = echo_xpd_remove}
 };

 static int __init card_echo_startup(void)
--- a/drivers/dahdi/xpp/card_echo.h
+++ b/drivers/dahdi/xpp/card_echo.h
@@ -24,8 +24,8 @@
 #include "xpd.h"

 enum echo_opcodes {
-	XPROTO_NAME(ECHO, SET)		= 0x39,
-	XPROTO_NAME(ECHO, SET_REPLY)	= 0x3A,
+	XPROTO_NAME(ECHO, SET) = 0x39,
+	XPROTO_NAME(ECHO, SET_REPLY) = 0x3A,
 };

-#endif	/* CARD_ECHO_H */
+#endif /* CARD_ECHO_H */
--- a/drivers/dahdi/xpp/card_fxo.c
+++ b/drivers/dahdi/xpp/card_fxo.c
--- a/drivers/dahdi/xpp/card_fxo.h
+++ b/drivers/dahdi/xpp/card_fxo.h
@@ -25,17 +25,16 @@
 #include "xpd.h"

 enum fxo_opcodes {
-	XPROTO_NAME(FXO, SIG_CHANGED)		= 0x06,
-/**/
-	XPROTO_NAME(FXO, DAA_WRITE)		= 0x0F,	/* Write to DAA */
-	XPROTO_NAME(FXO, CHAN_CID)		= 0x0F,	/* Write to DAA */
-	XPROTO_NAME(FXO, LED)			= 0x0F,	/* Write to DAA */
+	XPROTO_NAME(FXO, SIG_CHANGED) = 0x06,		/**/
+	XPROTO_NAME(FXO, DAA_WRITE) = 0x0F,		/* Write to DAA */
+	XPROTO_NAME(FXO, CHAN_CID) = 0x0F,		/* Write to DAA */
+	XPROTO_NAME(FXO, LED) = 0x0F,			/* Write to DAA */
 };


 DEF_RPACKET_DATA(FXO, SIG_CHANGED,
-	xpp_line_t	sig_status;	/* channels: lsb=1, msb=8 */
-	xpp_line_t	sig_toggles;	/* channels: lsb=1, msb=8 */
-	);
+		xpp_line_t sig_status;	/* channels: lsb=1, msb=8 */
+		xpp_line_t sig_toggles;	/* channels: lsb=1, msb=8 */
+		);

-#endif	/* CARD_FXO_H */
+#endif /* CARD_FXO_H */
--- a/drivers/dahdi/xpp/card_fxs.c
+++ b/drivers/dahdi/xpp/card_fxs.c
--- a/drivers/dahdi/xpp/card_fxs.h
+++ b/drivers/dahdi/xpp/card_fxs.h
@@ -25,17 +25,15 @@
 #include "xpd.h"

 enum fxs_opcodes {
-	XPROTO_NAME(FXS, SIG_CHANGED)		= 0x06,
-/**/
-	XPROTO_NAME(FXS, CHAN_POWER)		= 0x0F,	/* Write to SLIC */
-	XPROTO_NAME(FXS, CHAN_CID)		= 0x0F,	/* Write to SLIC */
-	XPROTO_NAME(FXS, LED)			= 0x0F,	/* Write to SLIC */
+	XPROTO_NAME(FXS, SIG_CHANGED) = 0x06,
+	 /**/ XPROTO_NAME(FXS, CHAN_POWER) = 0x0F,	/* Write to SLIC */
+	XPROTO_NAME(FXS, CHAN_CID) = 0x0F,	/* Write to SLIC */
+	XPROTO_NAME(FXS, LED) = 0x0F,	/* Write to SLIC */
 };

-
 DEF_RPACKET_DATA(FXS, SIG_CHANGED,
-	xpp_line_t	sig_status;	/* channels: lsb=1, msb=8 */
-	xpp_line_t	sig_toggles;	/* channels: lsb=1, msb=8 */
-	);
+		xpp_line_t sig_status;	/* channels: lsb=1, msb=8 */
+		xpp_line_t sig_toggles;	/* channels: lsb=1, msb=8 */
+		);

-#endif	/* CARD_FXS_H */
+#endif /* CARD_FXS_H */
--- a/drivers/dahdi/xpp/card_global.c
+++ b/drivers/dahdi/xpp/card_global.c
@@ -22,6 +22,7 @@

 #include <linux/module.h>
 #include <linux/delay.h>
+#include <linux/kmod.h>
 #include "xdefs.h"
 #include "xpd.h"
 #include "xpp_dahdi.h"
@@ -32,21 +33,22 @@

 static const char rcsid[] = "$Id$";

-DEF_PARM(charp,initdir, "/usr/share/dahdi", 0644, "The directory of card initialization scripts");
+DEF_PARM(charp, initdir, "/usr/share/dahdi", 0644,
+	 "The directory of card initialization scripts");

 #define	CHIP_REGISTERS	"chipregs"

-extern	int debug;
+extern int debug;

 /*---------------- GLOBAL PROC handling -----------------------------------*/

-static int send_magic_request(xbus_t *xbus,
-	unsigned unit, xportno_t portno, bool eoftx)
+static int send_magic_request(xbus_t *xbus, unsigned unit, xportno_t portno,
+			      bool eoftx)
 {
-	xframe_t	*xframe;
-	xpacket_t	*pack;
-	reg_cmd_t	*reg_cmd;
-	int		ret;
+	xframe_t *xframe;
+	xpacket_t *pack;
+	reg_cmd_t *reg_cmd;
+	int ret;

 	/*
 	 * Zero length multibyte is legal and has special meaning for the
@@ -65,203 +67,210 @@ static int send_magic_request(xbus_t *xbus,
 		dump_xframe(__func__, xbus, xframe, debug);
 	ret = send_cmd_frame(xbus, xframe);
 	if (ret < 0)
-		PORT_ERR(xbus, unit, portno,
-			"%s: failed sending xframe\n", __func__);
+		PORT_ERR(xbus, unit, portno, "%s: failed sending xframe\n",
+			 __func__);
 	return ret;
 }

 static int parse_hexbyte(const char *buf)
 {
-	char		*endp;
-	unsigned	val;
+	char *endp;
+	unsigned val;

 	val = simple_strtoul(buf, &endp, 16);
-	if(*endp != '\0' || val > 0xFF)
+	if (*endp != '\0' || val > 0xFF)
 		return -EBADR;
-	return (byte)val;
+	return (__u8)val;
 }

 static int execute_chip_command(xpd_t *xpd, const int argc, char *argv[])
 {
-	int			argno;
-	char			num_args;
-	int			portno;
-	bool			writing;
-	int			op;		/* [W]rite, [R]ead */
-	int			addr_mode;	/* [D]irect, [I]ndirect, [Mm]ulti */
-	bool			do_subreg = 0;
-	int			regnum;
-	int			subreg;
-	int			data_low;
-	bool			do_datah;
-	int			data_high;
-	int			ret = -EBADR;
+	int argno;
+	char num_args;
+	int portno;
+	bool writing;
+	int op;			/* [W]rite, [R]ead */
+	int addr_mode;		/* [D]irect, [I]ndirect, [Mm]ulti */
+	bool do_subreg = 0;
+	int regnum;
+	int subreg;
+	int data_low;
+	bool do_datah;
+	int data_high;
+	int ret = -EBADR;

-	num_args = 2;	/* port + operation */
-	if(argc < num_args) {
+	num_args = 2;		/* port + operation */
+	if (argc < num_args) {
 		XPD_ERR(xpd, "Not enough arguments (%d)\n", argc);
 		XPD_ERR(xpd,
-				"Any Command is composed of at least %d words (got only %d)\n",
-				num_args, argc);
+			"Any Command is composed of at least %d words "
+			"(got only %d)\n",
+			num_args, argc);
 		goto out;
 	}
 	/* Process the arguments */
 	argno = 0;
-	if(strcmp(argv[argno], "*") == 0) {
+	if (strcmp(argv[argno], "*") == 0) {
 		portno = PORT_BROADCAST;
 		//XPD_DBG(REGS, xpd, "Port broadcast\n");
 	} else {
 		portno = parse_hexbyte(argv[argno]);
-		if(portno < 0 || portno >= 8) {
+		if (portno < 0 || portno >= 8) {
 			XPD_ERR(xpd, "Illegal port number '%s'\n", argv[argno]);
 			goto out;
 		}
 		//XPD_DBG(REGS, xpd, "Port is %d\n", portno);
 	}
 	argno++;
-	if(strlen(argv[argno]) != 2) {
+	if (strlen(argv[argno]) != 2) {
 		XPD_ERR(xpd, "Wrong operation codes '%s'\n", argv[argno]);
 		goto out;
 	}
 	op = argv[argno][0];
-	switch(op) {
-		case 'W':
-			writing = 1;
-			num_args++;	/* data low */
-			//XPD_DBG(REGS, xpd, "WRITING\n");
-			break;
-		case 'R':
-			writing = 0;
-			//XPD_DBG(REGS, xpd, "READING\n");
-			break;
-		default:
-			XPD_ERR(xpd, "Unknown operation type '%c'\n", op);
-			goto out;
+	switch (op) {
+	case 'W':
+		writing = 1;
+		num_args++;	/* data low */
+		//XPD_DBG(REGS, xpd, "WRITING\n");
+		break;
+	case 'R':
+		writing = 0;
+		//XPD_DBG(REGS, xpd, "READING\n");
+		break;
+	default:
+		XPD_ERR(xpd, "Unknown operation type '%c'\n", op);
+		goto out;
 	}
 	addr_mode = argv[argno][1];
-	switch(addr_mode) {
-		case 'I':
-			XPD_NOTICE(xpd, "'I' is deprecated in register commands. Use 'S' instead.\n");
-			/* fall through */
-		case 'S':
-			do_subreg = 1;
-			num_args += 2;	/* register + subreg */
-			//XPD_DBG(REGS, xpd, "SUBREG\n");
-			break;
-		case 'D':
-			do_subreg = 0;
-			num_args++;	/* register */
-			//XPD_DBG(REGS, xpd, "DIRECT\n");
-			break;
-		case 'M':
-		case 'm':
-			if(op != 'W') {
-				XPD_ERR(xpd,
-						"Can use Multibyte (%c) only with op 'W'\n", addr_mode);
-				goto out;
-			}
-			num_args--;	/* No data low */
-			//XPD_DBG(REGS, xpd, "Multibyte (%c)\n", addr_mode);
-			break;
-		default:
-			XPD_ERR(xpd, "Unknown addressing type '%c'\n", addr_mode);
+	switch (addr_mode) {
+	case 'I':
+		XPD_NOTICE(xpd,
+			"'I' is deprecated in register commands. "
+			"Use 'S' instead.\n");
+		/* fall through */
+	case 'S':
+		do_subreg = 1;
+		num_args += 2;	/* register + subreg */
+		//XPD_DBG(REGS, xpd, "SUBREG\n");
+		break;
+	case 'D':
+		do_subreg = 0;
+		num_args++;	/* register */
+		//XPD_DBG(REGS, xpd, "DIRECT\n");
+		break;
+	case 'M':
+	case 'm':
+		if (op != 'W') {
+			XPD_ERR(xpd,
+				"Can use Multibyte (%c) only with op 'W'\n",
+				addr_mode);
 			goto out;
+		}
+		num_args--;	/* No data low */
+		//XPD_DBG(REGS, xpd, "Multibyte (%c)\n", addr_mode);
+		break;
+	default:
+		XPD_ERR(xpd, "Unknown addressing type '%c'\n", addr_mode);
+		goto out;
 	}
-	if(argv[argno][2] != '\0') {
+	if (argv[argno][2] != '\0') {
 		XPD_ERR(xpd, "Bad operation field '%s'\n", argv[argno]);
 		goto out;
 	}
-	if(argc < num_args) {
+	if (argc < num_args) {
 		XPD_ERR(xpd,
-				"Command \"%s\" is composed of at least %d words (got only %d)\n",
-				argv[argno], num_args, argc);
+			"Command \"%s\" is composed of at least %d words "
+			"(got only %d)\n",
+			argv[argno], num_args, argc);
 		goto out;
 	}
 	argno++;
-	if(addr_mode == 'M' || addr_mode == 'm') {
-		if(argno < argc) {
+	if (addr_mode == 'M' || addr_mode == 'm') {
+		if (argno < argc) {
 			XPD_ERR(xpd,
-					"Magic-Multibyte(%c) with %d extra arguments\n",
-					addr_mode, argc - argno);
+				"Magic-Multibyte(%c) with %d extra arguments\n",
+				addr_mode, argc - argno);
 			goto out;
 		}
-		ret = send_magic_request(xpd->xbus, xpd->addr.unit, portno,
-			addr_mode == 'm');
+		ret =
+		    send_magic_request(xpd->xbus, xpd->addr.unit, portno,
+				       addr_mode == 'm');
 		goto out;
 	}
 	/* Normal (non-Magic) register commands */
 	do_datah = 0;
-	if(argno >= argc) {
+	if (argno >= argc) {
 		XPD_ERR(xpd, "Missing register number\n");
 		goto out;
 	}
 	regnum = parse_hexbyte(argv[argno]);
-	if(regnum < 0) {
+	if (regnum < 0) {
 		XPD_ERR(xpd, "Illegal register number '%s'\n", argv[argno]);
 		goto out;
 	}
 	//XPD_DBG(REGS, xpd, "Register is %X\n", regnum);
 	argno++;
-	if(do_subreg) {
-		if(argno >= argc) {
+	if (do_subreg) {
+		if (argno >= argc) {
 			XPD_ERR(xpd, "Missing subregister number\n");
 			goto out;
 		}
 		subreg = parse_hexbyte(argv[argno]);
-		if(subreg < 0) {
-			XPD_ERR(xpd, "Illegal subregister number '%s'\n", argv[argno]);
+		if (subreg < 0) {
+			XPD_ERR(xpd, "Illegal subregister number '%s'\n",
+				argv[argno]);
 			goto out;
 		}
 		//XPD_DBG(REGS, xpd, "Subreg is %X\n", subreg);
 		argno++;
 	} else
 		subreg = 0;
-	if(writing) {
-		if(argno >= argc) {
+	if (writing) {
+		if (argno >= argc) {
 			XPD_ERR(xpd, "Missing data low number\n");
 			goto out;
 		}
 		data_low = parse_hexbyte(argv[argno]);
-		if(data_low < 0) {
-			XPD_ERR(xpd, "Illegal data_low number '%s'\n", argv[argno]);
+		if (data_low < 0) {
+			XPD_ERR(xpd, "Illegal data_low number '%s'\n",
+				argv[argno]);
 			goto out;
 		}
 		//XPD_DBG(REGS, xpd, "Data Low is %X\n", data_low);
 		argno++;
 	} else
 		data_low = 0;
-	if(argno < argc) {
+	if (argno < argc) {
 		do_datah = 1;
-		if(!argv[argno]) {
+		if (!argv[argno]) {
 			XPD_ERR(xpd, "Missing data high number\n");
 			goto out;
 		}
 		data_high = parse_hexbyte(argv[argno]);
-		if(data_high < 0) {
-			XPD_ERR(xpd, "Illegal data_high number '%s'\n", argv[argno]);
+		if (data_high < 0) {
+			XPD_ERR(xpd, "Illegal data_high number '%s'\n",
+				argv[argno]);
 			goto out;
 		}
 		//XPD_DBG(REGS, xpd, "Data High is %X\n", data_high);
 		argno++;
 	} else
 		data_high = 0;
-	if(argno < argc) {
-		XPD_ERR(xpd,
-				"Command contains an extra %d argument\n",
-				argc - argno);
+	if (argno < argc) {
+		XPD_ERR(xpd, "Command contains an extra %d argument\n",
+			argc - argno);
 		goto out;
 	}
 #if 0
 	XPD_DBG(REGS, xpd,
-			"portno=%d writing=%d regnum=%d do_subreg=%d subreg=%d dataL=%d do_datah=%d dataH=%d\n",
-			portno,		/* portno	*/
-			writing,	/* writing	*/
-			regnum,
-			do_subreg,	/* use subreg	*/
-			subreg, 	/* subreg	*/
-			data_low,
-			do_datah,	/* use data_high*/
-			data_high);
+		"portno=%d writing=%d regnum=%d do_subreg=%d subreg=%d "
+		"dataL=%d do_datah=%d dataH=%d\n",
+		portno,			/* portno       */
+		writing,		/* writing      */
+		regnum, do_subreg,	/* use subreg   */
+		subreg,			/* subreg       */
+		data_low, do_datah,	/* use data_high */
+		data_high);
 #endif
 	ret = xpp_register_request(xpd->xbus, xpd, portno,
 		writing, regnum, do_subreg, subreg,
@@ -270,36 +279,38 @@ out:
 	return ret;
 }

+#define	MAX_ARGS	10
+
 int parse_chip_command(xpd_t *xpd, char *cmdline)
 {
-	xbus_t			*xbus;
-	int			ret = -EBADR;
-	byte			buf[MAX_PROC_WRITE];
-	char			*str;
-	char			*p;
-	static const int	MAX_ARGS = 10;
-	char			*argv[MAX_ARGS + 1];
-	int			argc;
-	int			i;
+	xbus_t *xbus;
+	int ret = -EBADR;
+	__u8 buf[MAX_PROC_WRITE];
+	char *str;
+	char *p;
+	char *argv[MAX_ARGS + 1];
+	int argc;
+	int i;

 	BUG_ON(!xpd);
 	xbus = xpd->xbus;
-	if(!XBUS_FLAGS(xbus, CONNECTED)) {
+	if (!XBUS_FLAGS(xbus, CONNECTED)) {
 		XBUS_DBG(GENERAL, xbus, "Dropped packet. Disconnected.\n");
 		return -EBUSY;
 	}
 	strlcpy(buf, cmdline, MAX_PROC_WRITE);	/* Save a copy */
-	if(buf[0] == '#' || buf[0] == ';')
+	if (buf[0] == '#' || buf[0] == ';')
 		XPD_DBG(REGS, xpd, "Note: '%s'\n", buf);
-	if((p = strchr(buf, '#')) != NULL)	/* Truncate comments */
+	if ((p = strchr(buf, '#')) != NULL)	/* Truncate comments */
 		*p = '\0';
-	if((p = strchr(buf, ';')) != NULL)	/* Truncate comments */
+	if ((p = strchr(buf, ';')) != NULL)	/* Truncate comments */
 		*p = '\0';
-	for(p = buf; *p && (*p == ' ' || *p == '\t'); p++) /* Trim leading whitespace */
+	/* Trim leading whitespace */
+	for (p = buf; *p && (*p == ' ' || *p == '\t'); p++)
 		;
 	str = p;
-	for(i = 0; (p = strsep(&str, " \t")) != NULL && i < MAX_ARGS; ) {
-		if(*p != '\0') {
+	for (i = 0; (p = strsep(&str, " \t")) != NULL && i < MAX_ARGS;) {
+		if (*p != '\0') {
 			argv[i] = p;
 			// XPD_DBG(REGS, xpd, "ARG %d = '%s'\n", i, p);
 			i++;
@@ -307,11 +318,12 @@ int parse_chip_command(xpd_t *xpd, char *cmdline)
 	}
 	argv[i] = NULL;
 	argc = i;
-	if(p) {
-		XPD_ERR(xpd, "Too many words (%d) to process. Last was '%s'\n", i, p);
+	if (p) {
+		XPD_ERR(xpd, "Too many words (%d) to process. Last was '%s'\n",
+			i, p);
 		goto out;
 	}
-	if(argc)
+	if (argc)
 		ret = execute_chip_command(xpd, argc, argv);
 	else
 		ret = 0;	/* empty command - no op */
@@ -328,11 +340,11 @@ static void global_packet_dump(const char *msg, xpacket_t *pack);

 /* 0x07 */ HOSTCMD(GLOBAL, AB_REQUEST)
 {
-	int		ret = -ENODEV;
-	xframe_t	*xframe;
-	xpacket_t	*pack;
+	int ret = -ENODEV;
+	xframe_t *xframe;
+	xpacket_t *pack;

-	if(!xbus) {
+	if (!xbus) {
 		DBG(DEVICES, "NO XBUS\n");
 		return -EINVAL;
 	}
@@ -342,33 +354,35 @@ static void global_packet_dump(const char *msg, xpacket_t *pack);
 	RPACKET_FIELD(pack, GLOBAL, AB_REQUEST, rev) = XPP_PROTOCOL_VERSION;
 	RPACKET_FIELD(pack, GLOBAL, AB_REQUEST, reserved) = 0;
 	XBUS_DBG(DEVICES, xbus, "Protocol Version %d\n", XPP_PROTOCOL_VERSION);
-	if(xbus_setstate(xbus, XBUS_STATE_SENT_REQUEST))
+	if (xbus_setstate(xbus, XBUS_STATE_SENT_REQUEST))
 		ret = send_cmd_frame(xbus, xframe);
 	return ret;
 }

 int xpp_register_request(xbus_t *xbus, xpd_t *xpd, xportno_t portno,
-	bool writing, byte regnum, bool do_subreg, byte subreg,
-	byte data_low, bool do_datah, byte data_high, bool should_reply)
+			 bool writing, __u8 regnum, bool do_subreg, __u8 subreg,
+			 __u8 data_low, bool do_datah, __u8 data_high,
+			 bool should_reply)
 {
-	int		ret = 0;
-	xframe_t	*xframe;
-	xpacket_t	*pack;
-	reg_cmd_t	*reg_cmd;
+	int ret = 0;
+	xframe_t *xframe;
+	xpacket_t *pack;
+	reg_cmd_t *reg_cmd;

-	if(!xbus) {
+	if (!xbus) {
 		DBG(REGS, "NO XBUS\n");
 		return -EINVAL;
 	}
-	XFRAME_NEW_CMD(xframe, pack, xbus, GLOBAL, REGISTER_REQUEST, xpd->xbus_idx);
+	XFRAME_NEW_CMD(xframe, pack, xbus, GLOBAL, REGISTER_REQUEST,
+		       xpd->xbus_idx);
 	LINE_DBG(REGS, xpd, portno, "%c%c %02X %02X %02X %02X\n",
-			(writing)?'W':'R',
-			(do_subreg)?'S':'D',
-			regnum, subreg, data_low, data_high);
+		 (writing) ? 'W' : 'R', (do_subreg) ? 'S' : 'D', regnum, subreg,
+		 data_low, data_high);
 	reg_cmd = &RPACKET_FIELD(pack, GLOBAL, REGISTER_REQUEST, reg_cmd);
-	reg_cmd->bytes = sizeof(*reg_cmd) - 1;	// do not count the 'bytes' field
+	/* do not count the 'bytes' field */
+	reg_cmd->bytes = sizeof(*reg_cmd) - 1;
 	reg_cmd->is_multibyte = 0;
-	if(portno == PORT_BROADCAST) {
+	if (portno == PORT_BROADCAST) {
 		reg_cmd->portnum = 0;
 		REG_FIELD(reg_cmd, all_ports_broadcast) = 1;
 	} else {
@@ -384,14 +398,15 @@ int xpp_register_request(xbus_t *xbus, xpd_t *xpd, xportno_t portno,
 	REG_FIELD(reg_cmd, do_datah) = do_datah;
 	REG_FIELD(reg_cmd, data_low) = data_low;
 	REG_FIELD(reg_cmd, data_high) = data_high;
-	if(should_reply)
+	if (should_reply)
 		xpd->requested_reply = *reg_cmd;
-	if(debug & DBG_REGS) {
-		dump_reg_cmd("REG_REQ", 1, xbus, xpd->addr.unit, reg_cmd->portnum, reg_cmd);
+	if (debug & DBG_REGS) {
+		dump_reg_cmd("REG_REQ", 1, xbus, xpd->addr.unit,
+			     reg_cmd->portnum, reg_cmd);
 		dump_packet("REG_REQ", pack, 1);
 	}
-	if(!xframe->usec_towait) {	/* default processing time of SPI */
-		if(subreg)
+	if (!xframe->usec_towait) {	/* default processing time of SPI */
+		if (subreg)
 			xframe->usec_towait = 2000;
 		else
 			xframe->usec_towait = 1000;
@@ -399,18 +414,19 @@ int xpp_register_request(xbus_t *xbus, xpd_t *xpd, xportno_t portno,
 	ret = send_cmd_frame(xbus, xframe);
 	return ret;
 }
+EXPORT_SYMBOL(xpp_register_request);

 /*
 * The XPD parameter is totaly ignored by the driver and firmware as well.
 */
 /* 0x19 */ HOSTCMD(GLOBAL, SYNC_SOURCE, enum sync_mode mode, int drift)
 {
-	xframe_t	*xframe;
-	xpacket_t	*pack;
-	const char	*mode_name;
+	xframe_t *xframe;
+	xpacket_t *pack;
+	const char *mode_name;

 	BUG_ON(!xbus);
-	if((mode_name = sync_mode_name(mode)) == NULL) {
+	if ((mode_name = sync_mode_name(mode)) == NULL) {
 		XBUS_ERR(xbus, "SYNC_SOURCE: bad sync_mode=0x%X\n", mode);
 		return -EINVAL;
 	}
@@ -422,19 +438,37 @@ int xpp_register_request(xbus_t *xbus, xpd_t *xpd, xportno_t portno,
 	return 0;
 }

-/* 0x23 */ HOSTCMD(GLOBAL, RESET_SYNC_COUNTERS)
+/*
+ * Wrapper for different types of xbus reset
+ */
+static int send_xbus_reset(xbus_t *xbus, uint8_t reset_mask)
 {
-	xframe_t	*xframe;
-	xpacket_t	*pack;
+	xframe_t *xframe;
+	xpacket_t *pack;

 	BUG_ON(!xbus);
-	//XBUS_DBG(SYNC, xbus, "\n");
-	XFRAME_NEW_CMD(xframe, pack, xbus, GLOBAL, RESET_SYNC_COUNTERS, 0);
-	RPACKET_FIELD(pack, GLOBAL, RESET_SYNC_COUNTERS, mask) = 0x10;
+	XFRAME_NEW_CMD(xframe, pack, xbus, GLOBAL, XBUS_RESET, 0);
+	RPACKET_FIELD(pack, GLOBAL, XBUS_RESET, mask) = reset_mask;
 	send_cmd_frame(xbus, xframe);
 	return 0;
 }

+/* 0x23 */ HOSTCMD(GLOBAL, RESET_SPI)
+{
+	XBUS_DBG(DEVICES, xbus, "Sending SPI reset\n");
+	/* toggle reset line */
+	send_xbus_reset(xbus, 0x04);
+	send_xbus_reset(xbus, 0x00);
+	return 0;
+}
+
+
+/* 0x23 */ HOSTCMD(GLOBAL, RESET_SYNC_COUNTERS)
+{
+	//XBUS_DBG(SYNC, xbus, "\n");
+	return send_xbus_reset(xbus, 0x10);
+}
+
 /*---------------- GLOBAL: Astribank Reply Handlers -----------------------*/

 HANDLER_DEF(GLOBAL, NULL_REPLY)
@@ -443,14 +477,14 @@ HANDLER_DEF(GLOBAL, NULL_REPLY)
 	return 0;
 }

-HANDLER_DEF(GLOBAL, AB_DESCRIPTION)	/* 0x08 */
-{
-	struct xbus_workqueue	*worker;
-	byte			rev;
-	struct unit_descriptor	*units;
-	int			count_units;
-	int			i;
-	int			ret = 0;
+HANDLER_DEF(GLOBAL, AB_DESCRIPTION)
+{				/* 0x08 */
+	struct xbus_workqueue *worker;
+	__u8 rev;
+	struct unit_descriptor *units;
+	int count_units;
+	int i;
+	int ret = 0;

 	if (!xbus) {
 		NOTICE("%s: xbus is gone!!!\n", __func__);
@@ -458,31 +492,31 @@ HANDLER_DEF(GLOBAL, AB_DESCRIPTION)	/* 0x08 */
 	}
 	rev = RPACKET_FIELD(pack, GLOBAL, AB_DESCRIPTION, rev);
 	units = RPACKET_FIELD(pack, GLOBAL, AB_DESCRIPTION, unit_descriptor);
-	count_units = XPACKET_LEN(pack) - ((byte *)units - (byte *)pack);
+	count_units = XPACKET_LEN(pack) - ((__u8 *)units - (__u8 *)pack);
 	count_units /= sizeof(*units);
-	if(rev != XPP_PROTOCOL_VERSION) {
+	if (rev != XPP_PROTOCOL_VERSION) {
 		XBUS_NOTICE(xbus, "Bad protocol version %d (should be %d)\n",
-			rev, XPP_PROTOCOL_VERSION);
+			    rev, XPP_PROTOCOL_VERSION);
 		ret = -EPROTO;
 		goto proto_err;
 	}
-	if(count_units > NUM_UNITS) {
+	if (count_units > NUM_UNITS) {
 		XBUS_NOTICE(xbus, "Too many units %d (should be %d)\n",
-			count_units, NUM_UNITS);
+			    count_units, NUM_UNITS);
 		ret = -EPROTO;
 		goto proto_err;
 	}
-	if(count_units <= 0) {
-		XBUS_NOTICE(xbus, "Empty astribank? (%d units)\n",
-			count_units);
+	if (count_units <= 0) {
+		XBUS_NOTICE(xbus, "Empty astribank? (%d units)\n", count_units);
 		ret = -EPROTO;
 		goto proto_err;
 	}
-	if(!xbus_setstate(xbus, XBUS_STATE_RECVD_DESC)) {
+	if (!xbus_setstate(xbus, XBUS_STATE_RECVD_DESC)) {
 		ret = -EPROTO;
 		goto proto_err;
 	}
-	XBUS_INFO(xbus, "DESCRIPTOR: %d cards, protocol revision %d\n", count_units, rev);
+	XBUS_INFO(xbus, "DESCRIPTOR: %d cards, protocol revision %d\n",
+		  count_units, rev);
 	if (xbus_check_unique(xbus))
 		return -EBUSY;
 	xbus->revision = rev;
@@ -492,12 +526,14 @@ HANDLER_DEF(GLOBAL, AB_DESCRIPTION)	/* 0x08 */
 		ret = -ENODEV;
 		goto out;
 	}
-	for(i = 0; i < count_units; i++) {
-		struct unit_descriptor	*this_unit = &units[i];
-		struct card_desc_struct	*card_desc;
-		unsigned long		flags;
+	for (i = 0; i < count_units; i++) {
+		struct unit_descriptor *this_unit = &units[i];
+		struct card_desc_struct *card_desc;
+		unsigned long flags;

-		if((card_desc = KZALLOC(sizeof(struct card_desc_struct), GFP_ATOMIC)) == NULL) {
+		if ((card_desc =
+		     KZALLOC(sizeof(struct card_desc_struct),
+			     GFP_ATOMIC)) == NULL) {
 			XBUS_ERR(xbus, "Card description allocation failed.\n");
 			ret = -ENOMEM;
 			goto out;
@@ -510,22 +546,22 @@ HANDLER_DEF(GLOBAL, AB_DESCRIPTION)	/* 0x08 */
 		card_desc->numchips = this_unit->numchips;
 		card_desc->ports_per_chip = this_unit->ports_per_chip;
 		card_desc->port_dir = this_unit->port_dir;
-		card_desc->ports = card_desc->numchips * card_desc->ports_per_chip;
-		XBUS_INFO(xbus, "    CARD %d type=%d.%d ports=%d (%dx%d), port-dir=0x%02X\n",
-				card_desc->xpd_addr.unit,
-				card_desc->type,
-				card_desc->subtype,
-				card_desc->ports,
-				card_desc->numchips,
-				card_desc->ports_per_chip,
-				card_desc->port_dir
-				);
+		card_desc->ports =
+		    card_desc->numchips * card_desc->ports_per_chip;
+		XBUS_INFO(xbus,
+			"    CARD %d type=%d.%d ports=%d (%dx%d), "
+			"port-dir=0x%02X\n",
+			card_desc->xpd_addr.unit, card_desc->type,
+			card_desc->subtype, card_desc->ports,
+			card_desc->numchips, card_desc->ports_per_chip,
+			card_desc->port_dir);
 		spin_lock_irqsave(&worker->worker_lock, flags);
 		worker->num_units++;
 		XBUS_COUNTER(xbus, UNITS)++;
 		list_add_tail(&card_desc->card_list, &worker->card_list);
 		spin_unlock_irqrestore(&worker->worker_lock, flags);
 	}
+	CALL_PROTO(GLOBAL, RESET_SPI, xbus, NULL);
 	if (!xbus_process_worker(xbus)) {
 		ret = -ENODEV;
 		goto out;
@@ -539,21 +575,23 @@ out:

 HANDLER_DEF(GLOBAL, REGISTER_REPLY)
 {
-	reg_cmd_t		*reg = &RPACKET_FIELD(pack, GLOBAL, REGISTER_REPLY, regcmd);
+	reg_cmd_t *reg = &RPACKET_FIELD(pack, GLOBAL, REGISTER_REPLY, regcmd);

-	if(!xpd) {
-		static int	rate_limit;
+	if (!xpd) {
+		static int rate_limit;

-		if((rate_limit++ % 1003) < 5)
-			notify_bad_xpd(__FUNCTION__, xbus, XPACKET_ADDR(pack), "");
+		if ((rate_limit++ % 1003) < 5)
+			notify_bad_xpd(__func__, xbus, XPACKET_ADDR(pack), "");
 		return -EPROTO;
 	}
-	if(debug & DBG_REGS) {
-		dump_reg_cmd("REG_REPLY", 0, xbus, xpd->addr.unit, reg->portnum, reg);
+	if (debug & DBG_REGS) {
+		dump_reg_cmd("REG_REPLY", 0, xbus, xpd->addr.unit, reg->portnum,
+			     reg);
 		dump_packet("REG_REPLY", pack, 1);
 	}
-	if (! XMETHOD(card_register_reply, xpd)) {
-		XPD_ERR(xpd, "REGISTER_REPLY: without card_register_reply() method\n");
+	if (!XMETHOD(card_register_reply, xpd)) {
+		XPD_ERR(xpd,
+			"REGISTER_REPLY: missing card_register_reply()\n");
 		return -EINVAL;
 	}
 	return CALL_XMETHOD(card_register_reply, xpd, reg);
@@ -561,12 +599,12 @@ HANDLER_DEF(GLOBAL, REGISTER_REPLY)

 HANDLER_DEF(GLOBAL, SYNC_REPLY)
 {
-	byte		mode = RPACKET_FIELD(pack, GLOBAL, SYNC_REPLY, sync_mode);
-	byte		drift = RPACKET_FIELD(pack, GLOBAL, SYNC_REPLY, drift);
-	const char	*mode_name;
+	__u8 mode = RPACKET_FIELD(pack, GLOBAL, SYNC_REPLY, sync_mode);
+	__u8 drift = RPACKET_FIELD(pack, GLOBAL, SYNC_REPLY, drift);
+	const char *mode_name;

 	BUG_ON(!xbus);
-	if((mode_name = sync_mode_name(mode)) == NULL) {
+	if ((mode_name = sync_mode_name(mode)) == NULL) {
 		XBUS_ERR(xbus, "SYNC_REPLY: bad sync_mode=0x%X\n", mode);
 		return -EINVAL;
 	}
@@ -580,24 +618,26 @@ HANDLER_DEF(GLOBAL, SYNC_REPLY)

 HANDLER_DEF(GLOBAL, ERROR_CODE)
 {
-	char			tmp_name[TMP_NAME_LEN];
-	static long		rate_limit;
-	byte			category_code;
-	byte			errorbits;
+	char tmp_name[TMP_NAME_LEN];
+	static long rate_limit;
+	__u8 category_code;
+	__u8 errorbits;

 	BUG_ON(!xbus);
-	if((rate_limit++ % 5003) > 200)
+	if ((rate_limit++ % 5003) > 200)
 		return 0;
 	category_code = RPACKET_FIELD(pack, GLOBAL, ERROR_CODE, category_code);
 	errorbits = RPACKET_FIELD(pack, GLOBAL, ERROR_CODE, errorbits);
-	if(!xpd) {
+	if (!xpd) {
 		snprintf(tmp_name, TMP_NAME_LEN, "%s(%1d%1d)", xbus->busname,
-			XPACKET_ADDR_UNIT(pack), XPACKET_ADDR_SUBUNIT(pack));
+			 XPACKET_ADDR_UNIT(pack), XPACKET_ADDR_SUBUNIT(pack));
 	} else {
-		snprintf(tmp_name, TMP_NAME_LEN, "%s/%s", xbus->busname, xpd->xpdname);
+		snprintf(tmp_name, TMP_NAME_LEN, "%s/%s", xbus->busname,
+			 xpd->xpdname);
 	}
-	NOTICE("%s: FIRMWARE %s: category=%d errorbits=0x%02X (rate_limit=%ld)\n",
-			tmp_name, cmd->name, category_code, errorbits, rate_limit);
+	NOTICE
+	    ("%s: FIRMWARE %s: category=%d errorbits=0x%02X (rate_limit=%ld)\n",
+	     tmp_name, cmd->name, category_code, errorbits, rate_limit);
 	dump_packet("FIRMWARE: ", pack, 1);
 	/*
 	 * FIXME: Should implement an error recovery plan
@@ -605,15 +645,14 @@ HANDLER_DEF(GLOBAL, ERROR_CODE)
 	return 0;
 }

-
 xproto_table_t PROTO_TABLE(GLOBAL) = {
 	.entries = {
 		/*	Prototable	Card	Opcode		*/
-		XENTRY(	GLOBAL,		GLOBAL, NULL_REPLY	),
-		XENTRY(	GLOBAL,		GLOBAL, AB_DESCRIPTION	),
+		XENTRY(	GLOBAL,		GLOBAL,	NULL_REPLY	),
+		XENTRY(	GLOBAL,		GLOBAL,	AB_DESCRIPTION	),
 		XENTRY(	GLOBAL,		GLOBAL,	SYNC_REPLY	),
-		XENTRY(	GLOBAL,		GLOBAL, ERROR_CODE	),
-		XENTRY(	GLOBAL,		GLOBAL, REGISTER_REPLY	),
+		XENTRY(	GLOBAL,		GLOBAL,	ERROR_CODE	),
+		XENTRY(	GLOBAL,		GLOBAL,	REGISTER_REPLY	),
 	},
 	.name = "GLOBAL",
 	.packet_is_valid = global_packet_is_valid,
@@ -622,7 +661,7 @@ xproto_table_t PROTO_TABLE(GLOBAL) = {

 static bool global_packet_is_valid(xpacket_t *pack)
 {
-	const xproto_entry_t	*xe;
+	const xproto_entry_t *xe;

 	//DBG(GENERAL, "\n");
 	xe = xproto_global_entry(XPACKET_OP(pack));
@@ -636,28 +675,37 @@ static void global_packet_dump(const char *msg, xpacket_t *pack)

 #define	MAX_PATH_STR	128

+#ifndef	UMH_WAIT_PROC
+/*
+ * - UMH_WAIT_PROC was introduced as enum in 2.6.23
+ *   with a value of 1
+ * - It was changed to a macro (and it's value was modified) in 3.3.0
+ */
+#define	UMH_WAIT_PROC	1
+#endif
+
 int run_initialize_registers(xpd_t *xpd)
 {
-	int	ret;
-	xbus_t	*xbus;
-	char	busstr[MAX_ENV_STR];
-	char	busnumstr[MAX_ENV_STR];
-	char	modelstr[MAX_ENV_STR];
-	char	unitstr[MAX_ENV_STR];
-	char	subunitsstr[MAX_ENV_STR];
-	char	typestr[MAX_ENV_STR];
-	char	directionstr[MAX_ENV_STR];
-	char	revstr[MAX_ENV_STR];
-	char	connectorstr[MAX_ENV_STR];
-	char	xbuslabel[MAX_ENV_STR];
-	char	init_card[MAX_PATH_STR];
-	byte	direction_mask;
-	int	i;
-	char	*argv[] = {
+	int ret;
+	xbus_t *xbus;
+	char busstr[MAX_ENV_STR];
+	char busnumstr[MAX_ENV_STR];
+	char modelstr[MAX_ENV_STR];
+	char unitstr[MAX_ENV_STR];
+	char subunitsstr[MAX_ENV_STR];
+	char typestr[MAX_ENV_STR];
+	char directionstr[MAX_ENV_STR];
+	char revstr[MAX_ENV_STR];
+	char connectorstr[MAX_ENV_STR];
+	char xbuslabel[MAX_ENV_STR];
+	char init_card[MAX_PATH_STR];
+	__u8 direction_mask;
+	int i;
+	char *argv[] = {
 		init_card,
 		NULL
 	};
-	char	*envp[] = {
+	char *envp[] = {
 		busstr,
 		busnumstr,
 		modelstr,
@@ -673,74 +721,82 @@ int run_initialize_registers(xpd_t *xpd)

 	BUG_ON(!xpd);
 	xbus = xpd->xbus;
-	if(!initdir || !initdir[0]) {
+	if (!initdir || !initdir[0]) {
 		XPD_NOTICE(xpd, "Missing initdir parameter\n");
 		ret = -EINVAL;
 		goto err;
 	}
-	if(!xpd_setstate(xpd, XPD_STATE_INIT_REGS)) {
+	if (!xpd_setstate(xpd, XPD_STATE_INIT_REGS)) {
 		ret = -EINVAL;
 		goto err;
 	}
 	direction_mask = 0;
-	for(i = 0; i < xpd->subunits; i++) {
-		xpd_t	*su = xpd_byaddr(xbus, xpd->addr.unit, i);
+	for (i = 0; i < xpd->subunits; i++) {
+		xpd_t *su = xpd_byaddr(xbus, xpd->addr.unit, i);

-		if(!su) {
-			XPD_ERR(xpd,
-				"Have %d subunits, but not subunit #%d\n",
+		if (!su) {
+			XPD_ERR(xpd, "Have %d subunits, but not subunit #%d\n",
 				xpd->subunits, i);
 			continue;
 		}
-		direction_mask |= (PHONEDEV(su).direction == TO_PHONE) ? BIT(i) : 0;
+		direction_mask |=
+		    (PHONEDEV(su).direction == TO_PHONE) ? BIT(i) : 0;
 	}
 	snprintf(busstr, MAX_ENV_STR, "XBUS_NAME=%s", xbus->busname);
 	snprintf(busnumstr, MAX_ENV_STR, "XBUS_NUMBER=%d", xbus->num);
-	snprintf(modelstr, MAX_ENV_STR, "XBUS_MODEL_STRING=%s", xbus->transport.model_string);
+	snprintf(modelstr, MAX_ENV_STR, "XBUS_MODEL_STRING=%s",
+		 xbus->transport.model_string);
 	snprintf(unitstr, MAX_ENV_STR, "UNIT_NUMBER=%d", xpd->addr.unit);
 	snprintf(typestr, MAX_ENV_STR, "UNIT_TYPE=%d", xpd->type);
 	snprintf(subunitsstr, MAX_ENV_STR, "UNIT_SUBUNITS=%d", xpd->subunits);
-	snprintf(directionstr, MAX_ENV_STR, "UNIT_SUBUNITS_DIR=%d", direction_mask);
+	snprintf(directionstr, MAX_ENV_STR, "UNIT_SUBUNITS_DIR=%d",
+		 direction_mask);
 	snprintf(revstr, MAX_ENV_STR, "XBUS_REVISION=%d", xbus->revision);
-	snprintf(connectorstr, MAX_ENV_STR, "XBUS_CONNECTOR=%s", xbus->connector);
+	snprintf(connectorstr, MAX_ENV_STR, "XBUS_CONNECTOR=%s",
+		 xbus->connector);
 	snprintf(xbuslabel, MAX_ENV_STR, "XBUS_LABEL=%s", xbus->label);
-	if(snprintf(init_card, MAX_PATH_STR, "%s/init_card_%d_%d",
-				initdir, xpd->type, xbus->revision) > MAX_PATH_STR) {
-		XPD_NOTICE(xpd, "Cannot initialize. pathname is longer than %d characters.\n", MAX_PATH_STR);
+	if (snprintf
+	    (init_card, MAX_PATH_STR, "%s/init_card_%d_%d", initdir, xpd->type,
+	     xbus->revision) > MAX_PATH_STR) {
+		XPD_NOTICE(xpd,
+			"Cannot initialize. pathname is longer "
+			"than %d characters.\n",
+			MAX_PATH_STR);
 		ret = -E2BIG;
 		goto err;
 	}
-	if(!XBUS_IS(xbus, RECVD_DESC)) {
-		XBUS_ERR(xbus, "Skipped register initialization. In state %s.\n",
-			xbus_statename(XBUS_STATE(xbus)));
+	if (!XBUS_IS(xbus, RECVD_DESC)) {
+		XBUS_ERR(xbus,
+			 "Skipped register initialization. In state %s.\n",
+			 xbus_statename(XBUS_STATE(xbus)));
 		ret = -ENODEV;
 		goto err;
 	}
 	XPD_DBG(DEVICES, xpd, "running '%s' for type=%d revision=%d\n",
-			init_card, xpd->type, xbus->revision);
-	ret = call_usermodehelper(init_card, argv, envp, 1);
+		init_card, xpd->type, xbus->revision);
+	ret = call_usermodehelper(init_card, argv, envp, UMH_WAIT_PROC);
 	/*
 	 * Carefully report results
 	 */
-	if(ret == 0)
+	if (ret == 0)
 		XPD_DBG(DEVICES, xpd, "'%s' finished OK\n", init_card);
-	else if(ret < 0) {
-		XPD_ERR(xpd, "Failed running '%s' (errno %d)\n", init_card, ret);
+	else if (ret < 0) {
+		XPD_ERR(xpd, "Failed running '%s' (errno %d)\n", init_card,
+			ret);
 	} else {
-		byte	exitval = ((unsigned)ret >> 8) & 0xFF;
-		byte	sigval = ret & 0xFF;
+		__u8 exitval = ((unsigned)ret >> 8) & 0xFF;
+		__u8 sigval = ret & 0xFF;

-		if(!exitval) {
-			XPD_ERR(xpd, "'%s' killed by signal %d\n", init_card, sigval);
+		if (!exitval) {
+			XPD_ERR(xpd, "'%s' killed by signal %d\n", init_card,
+				sigval);
 		} else {
-			XPD_ERR(xpd, "'%s' aborted with exitval %d\n", init_card, exitval);
+			XPD_ERR(xpd, "'%s' aborted with exitval %d\n",
+				init_card, exitval);
 		}
 		ret = -EINVAL;
 	}
 err:
 	return ret;
 }
-
-EXPORT_SYMBOL(sync_mode_name);
 EXPORT_SYMBOL(run_initialize_registers);
-EXPORT_SYMBOL(xpp_register_request);
--- a/drivers/dahdi/xpp/card_global.h
+++ b/drivers/dahdi/xpp/card_global.h
@@ -26,88 +26,60 @@
 #include "xbus-pcm.h"

 enum global_opcodes {
-	XPROTO_NAME(GLOBAL, AB_REQUEST)		= 0x07,
-	XPROTO_NAME(GLOBAL, AB_DESCRIPTION)	= 0x08,
-	XPROTO_NAME(GLOBAL, REGISTER_REQUEST)	= 0x0F,
-	XPROTO_NAME(GLOBAL, REGISTER_REPLY)	= 0x10,
-/**/
-	XPROTO_NAME(GLOBAL, PCM_WRITE)		= 0x11,
-	XPROTO_NAME(GLOBAL, PCM_READ)		= 0x12,
-/**/
-	XPROTO_NAME(GLOBAL, SYNC_SOURCE)	= 0x19,
-	XPROTO_NAME(GLOBAL, SYNC_REPLY)		= 0x1A,
-/**/
-	XPROTO_NAME(GLOBAL, ERROR_CODE)		= 0x22,
-	XPROTO_NAME(GLOBAL, RESET_SYNC_COUNTERS)	= 0x23,
-	XPROTO_NAME(GLOBAL, NULL_REPLY)		= 0xFE,
+	XPROTO_NAME(GLOBAL, AB_REQUEST) = 0x07,
+	XPROTO_NAME(GLOBAL, AB_DESCRIPTION) = 0x08,
+	XPROTO_NAME(GLOBAL, REGISTER_REQUEST) = 0x0F,
+	XPROTO_NAME(GLOBAL, REGISTER_REPLY) = 0x10,
+	 /**/ XPROTO_NAME(GLOBAL, PCM_WRITE) = 0x11,
+	XPROTO_NAME(GLOBAL, PCM_READ) = 0x12,
+	 /**/ XPROTO_NAME(GLOBAL, SYNC_SOURCE) = 0x19,
+	XPROTO_NAME(GLOBAL, SYNC_REPLY) = 0x1A,
+	 /**/ XPROTO_NAME(GLOBAL, ERROR_CODE) = 0x22,
+	XPROTO_NAME(GLOBAL, XBUS_RESET) = 0x23,
+	XPROTO_NAME(GLOBAL, NULL_REPLY) = 0xFE,
 };

 struct unit_descriptor {
-	struct xpd_addr	addr;
-	byte		subtype:4;
-	byte		type:4;
-	byte		numchips;
-	byte		ports_per_chip;
-	byte		port_dir;	/* bitmask: 0 - PSTN, 1 - PHONE */
-	byte		reserved[2];
-	struct xpd_addr	ec_addr;
+	struct xpd_addr addr;
+	__u8 subtype:4;
+	__u8 type:4;
+	__u8 numchips;
+	__u8 ports_per_chip;
+	__u8 port_dir;		/* bitmask: 0 - PSTN, 1 - PHONE */
+	__u8 reserved[2];
+	struct xpd_addr ec_addr;
 };

 #define	NUM_UNITS	6

 DEF_RPACKET_DATA(GLOBAL, NULL_REPLY);
-DEF_RPACKET_DATA(GLOBAL, AB_REQUEST,
-	byte		rev;
-	byte		reserved;
-	);
-DEF_RPACKET_DATA(GLOBAL, AB_DESCRIPTION,
-	byte			rev;
-	byte			reserved[3];
-	struct unit_descriptor	unit_descriptor[NUM_UNITS];
-	);
-DEF_RPACKET_DATA(GLOBAL, REGISTER_REQUEST,
-	reg_cmd_t	reg_cmd;
-	);
-DEF_RPACKET_DATA(GLOBAL, PCM_WRITE,
-	xpp_line_t	lines;
-	byte		pcm[PCM_CHUNKSIZE];
-	);
-DEF_RPACKET_DATA(GLOBAL, PCM_READ,
-	xpp_line_t	lines;
-	byte		pcm[PCM_CHUNKSIZE];
-	);
-DEF_RPACKET_DATA(GLOBAL, SYNC_SOURCE,
-	byte		sync_mode;
-	byte		drift;
-	);
-DEF_RPACKET_DATA(GLOBAL, SYNC_REPLY,
-	byte		sync_mode;
-	byte		drift;
-	);
-DEF_RPACKET_DATA(GLOBAL, REGISTER_REPLY,
-	reg_cmd_t	regcmd;
-	);
-DEF_RPACKET_DATA(GLOBAL, RESET_SYNC_COUNTERS,
-	byte		mask;
-	);
-DEF_RPACKET_DATA(GLOBAL, ERROR_CODE,
-	byte		category_code;
-	byte		errorbits;
-	byte		bad_packet[0];
-	);
+DEF_RPACKET_DATA(GLOBAL, AB_REQUEST, __u8 rev; __u8 reserved;);
+DEF_RPACKET_DATA(GLOBAL, AB_DESCRIPTION, __u8 rev; __u8 reserved[3];
+		 struct unit_descriptor unit_descriptor[NUM_UNITS];);
+DEF_RPACKET_DATA(GLOBAL, REGISTER_REQUEST, reg_cmd_t reg_cmd;);
+DEF_RPACKET_DATA(GLOBAL, PCM_WRITE, xpp_line_t lines; __u8 pcm[PCM_CHUNKSIZE];);
+DEF_RPACKET_DATA(GLOBAL, PCM_READ, xpp_line_t lines; __u8 pcm[PCM_CHUNKSIZE];);
+DEF_RPACKET_DATA(GLOBAL, SYNC_SOURCE, __u8 sync_mode; __u8 drift;);
+DEF_RPACKET_DATA(GLOBAL, SYNC_REPLY, __u8 sync_mode; __u8 drift;);
+DEF_RPACKET_DATA(GLOBAL, REGISTER_REPLY, reg_cmd_t regcmd;);
+DEF_RPACKET_DATA(GLOBAL, XBUS_RESET, __u8 mask;);
+DEF_RPACKET_DATA(GLOBAL, ERROR_CODE, __u8 category_code; __u8 errorbits;
+		 __u8 bad_packet[0];);

 /* 0x07 */ DECLARE_CMD(GLOBAL, AB_REQUEST);
 /* 0x19 */ DECLARE_CMD(GLOBAL, SYNC_SOURCE, enum sync_mode mode, int drift);
+/* 0x23 */ DECLARE_CMD(GLOBAL, RESET_SPI);
 /* 0x23 */ DECLARE_CMD(GLOBAL, RESET_SYNC_COUNTERS);

 int xpp_register_request(xbus_t *xbus, xpd_t *xpd, xportno_t portno,
-	bool writing, byte regnum, bool do_subreg, byte subreg,
-	byte data_low, bool do_datah, byte data_high, bool should_reply);
+			 bool writing, __u8 regnum, bool do_subreg, __u8 subreg,
+			 __u8 data_low, bool do_datah, __u8 data_high,
+			 bool should_reply);
 int send_multibyte_request(xbus_t *xbus, unsigned unit, xportno_t portno,
-	bool eoftx, byte *buf, unsigned len);
+			   bool eoftx, __u8 *buf, unsigned len);
 extern xproto_table_t PROTO_TABLE(GLOBAL);
 int run_initialize_registers(xpd_t *xpd);
 int parse_chip_command(xpd_t *xpd, char *cmdline);
 extern charp initdir;

-#endif	/* CARD_GLOBAL_H */
+#endif /* CARD_GLOBAL_H */
--- a/drivers/dahdi/xpp/card_pri.c
+++ b/drivers/dahdi/xpp/card_pri.c
--- a/drivers/dahdi/xpp/card_pri.h
+++ b/drivers/dahdi/xpp/card_pri.h
@@ -25,8 +25,7 @@
 #include "xpd.h"

 enum pri_opcodes {
-	XPROTO_NAME(PRI, SET_LED)			= 0x33,
+	XPROTO_NAME(PRI, SET_LED) = 0x33,
 };

-
-#endif	/* CARD_PRI_H */
+#endif /* CARD_PRI_H */
--- a/drivers/dahdi/xpp/dahdi_debug.c
+++ b/drivers/dahdi/xpp/dahdi_debug.c
@@ -20,11 +20,6 @@
 *
 */
 #include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#  warning "This module is tested only with 2.6 kernels"
-#endif
-
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/module.h>
@@ -35,57 +30,48 @@
 static const char rcsid[] = "$Id$";

 #define	P_(x)	[ x ] = { .value = x, .name = #x, }
-static	struct {
+static struct {
 	int value;
 	char *name;
 } poll_names[] = {
-	P_(POLLIN),
-	P_(POLLPRI),
-	P_(POLLOUT),
-	P_(POLLERR),
-	P_(POLLHUP),
-	P_(POLLNVAL),
-	P_(POLLRDNORM),
-	P_(POLLRDBAND),
-	P_(POLLWRNORM),
-	P_(POLLWRBAND),
-	P_(POLLMSG),
-	P_(POLLREMOVE)
+	P_(POLLIN), P_(POLLPRI), P_(POLLOUT), P_(POLLERR), P_(POLLHUP),
+	    P_(POLLNVAL), P_(POLLRDNORM), P_(POLLRDBAND), P_(POLLWRNORM),
+	    P_(POLLWRBAND), P_(POLLMSG), P_(POLLREMOVE)
 };
+
 #undef	P_

 void dump_poll(int debug, const char *msg, int poll)
 {
-	int	i;
+	int i;

-	for(i = 0; i < ARRAY_SIZE(poll_names); i++) {
-		if(poll & poll_names[i].value)
+	for (i = 0; i < ARRAY_SIZE(poll_names); i++) {
+		if (poll & poll_names[i].value)
 			DBG(GENERAL, "%s: %s\n", msg, poll_names[i].name);
 	}
 }
+EXPORT_SYMBOL(dump_poll);

 void alarm2str(int alarm, char *buf, int buflen)
 {
-	char	*p = buf;
-	int	left = buflen;
-	int	i;
-	int	n;
+	char *p = buf;
+	int left = buflen;
+	int i;
+	int n;

-	if(!alarm) {
+	if (!alarm) {
 		snprintf(buf, buflen, "NONE");
 		return;
 	}
 	memset(buf, 0, buflen);
-	for(i = 0; i < 8; i++) {
-		if(left && (alarm & BIT(i))) {
+	for (i = 0; i < 8; i++) {
+		if (left && (alarm & BIT(i))) {
 			n = snprintf(p, left, "%s,", alarmbit2str(i));
 			p += n;
 			left -= n;
 		}
 	}
-	if(p > buf)	/* kill last comma */
+	if (p > buf)		/* kill last comma */
 		*(p - 1) = '\0';
 }
-
-EXPORT_SYMBOL(dump_poll);
 EXPORT_SYMBOL(alarm2str);
--- a/drivers/dahdi/xpp/dahdi_debug.h
+++ b/drivers/dahdi/xpp/dahdi_debug.h
@@ -26,55 +26,76 @@

 /* Debugging Macros */

-#define	PRINTK(level, category, fmt, ...)	\
-	printk(KERN_ ## level "%s%s-%s: " fmt, #level, category, THIS_MODULE->name, ## __VA_ARGS__)
+#define	PRINTK(level, category, fmt, ...) \
+	printk(KERN_ ## level "%s%s-%s: " fmt, \
+	#level, category, THIS_MODULE->name, ## __VA_ARGS__)

-#define	XBUS_PRINTK(level, category, xbus, fmt, ...)	\
-	printk(KERN_ ## level "%s%s-%s: %s: " fmt, #level,	\
+#define	XBUS_PRINTK(level, category, xbus, fmt, ...) \
+	printk(KERN_ ## level "%s%s-%s: %s: " fmt, #level, \
 		category, THIS_MODULE->name, (xbus)->busname, ## __VA_ARGS__)

-#define	XPD_PRINTK(level, category, xpd, fmt, ...)	\
-	printk(KERN_ ## level "%s%s-%s: %s/%s: " fmt, #level,	\
-		category, THIS_MODULE->name, (xpd)->xbus->busname, (xpd)->xpdname, ## __VA_ARGS__)
+#define	XPD_PRINTK(level, category, xpd, fmt, ...) \
+	printk(KERN_ ## level "%s%s-%s: %s/%s: " fmt, #level, \
+		category, THIS_MODULE->name, \
+		(xpd)->xbus->busname, (xpd)->xpdname, ## __VA_ARGS__)

-#define	LINE_PRINTK(level, category, xpd, pos, fmt, ...)	\
-	printk(KERN_ ## level "%s%s-%s: %s/%s/%d: " fmt, #level,	\
-		category, THIS_MODULE->name, (xpd)->xbus->busname, (xpd)->xpdname, (pos), ## __VA_ARGS__)
+#define	LINE_PRINTK(level, category, xpd, pos, fmt, ...) \
+	printk(KERN_ ## level "%s%s-%s: %s/%s/%d: " fmt, #level, \
+		category, THIS_MODULE->name, \
+		(xpd)->xbus->busname, (xpd)->xpdname, (pos), ## __VA_ARGS__)

-#define	PORT_PRINTK(level, category, xbus, unit, port, fmt, ...)	\
-	printk(KERN_ ## level "%s%s-%s: %s UNIT=%d PORT=%d: " fmt, #level,	\
-		category, THIS_MODULE->name, (xbus)->busname, (unit), (port), ## __VA_ARGS__)
+#define	PORT_PRINTK(level, category, xbus, unit, port, fmt, ...) \
+	printk(KERN_ ## level "%s%s-%s: %s UNIT=%d PORT=%d: " fmt, #level, \
+		category, THIS_MODULE->name, \
+		(xbus)->busname, (unit), (port), ## __VA_ARGS__)

-#define	DBG(bits, fmt, ...)	\
-	((void)((debug & (DBG_ ## bits)) && PRINTK(DEBUG, "-" #bits, "%s: " fmt, __FUNCTION__, ## __VA_ARGS__)))
+#define	DBG(bits, fmt, ...) \
+	((void)((debug & (DBG_ ## bits)) && \
+		PRINTK(DEBUG, "-" #bits, "%s: " fmt, \
+		__func__, ## __VA_ARGS__)))
 #define	INFO(fmt, ...)		PRINTK(INFO, "", fmt, ## __VA_ARGS__)
 #define	NOTICE(fmt, ...)	PRINTK(NOTICE, "", fmt, ## __VA_ARGS__)
 #define	WARNING(fmt, ...)	PRINTK(WARNING, "", fmt, ## __VA_ARGS__)
 #define	ERR(fmt, ...)		PRINTK(ERR, "", fmt, ## __VA_ARGS__)

-#define	XBUS_DBG(bits, xbus, fmt, ...)	\
-			((void)((debug & (DBG_ ## bits)) && XBUS_PRINTK(DEBUG, "-" #bits, xbus, "%s: " fmt, __FUNCTION__, ## __VA_ARGS__)))
-#define	XBUS_INFO(xbus, fmt, ...)		XBUS_PRINTK(INFO, "", xbus, fmt, ## __VA_ARGS__)
-#define	XBUS_NOTICE(xbus, fmt, ...)		XBUS_PRINTK(NOTICE, "", xbus, fmt, ## __VA_ARGS__)
-#define	XBUS_ERR(xbus, fmt, ...)		XBUS_PRINTK(ERR, "", xbus, fmt, ## __VA_ARGS__)
+#define	XBUS_DBG(bits, xbus, fmt, ...) \
+	((void)((debug & (DBG_ ## bits)) && XBUS_PRINTK(DEBUG, "-" #bits, \
+	xbus, "%s: " fmt, __func__, ## __VA_ARGS__)))
+#define	XBUS_INFO(xbus, fmt, ...) \
+		XBUS_PRINTK(INFO, "", xbus, fmt, ## __VA_ARGS__)
+#define	XBUS_NOTICE(xbus, fmt, ...) \
+		XBUS_PRINTK(NOTICE, "", xbus, fmt, ## __VA_ARGS__)
+#define	XBUS_ERR(xbus, fmt, ...) \
+		XBUS_PRINTK(ERR, "", xbus, fmt, ## __VA_ARGS__)

-#define	XPD_DBG(bits, xpd, fmt, ...)	\
-		((void)((debug & (DBG_ ## bits)) && XPD_PRINTK(DEBUG, "-" #bits, xpd, "%s: " fmt, __FUNCTION__, ## __VA_ARGS__)))
-#define	XPD_INFO(xpd, fmt, ...)		XPD_PRINTK(INFO, "", xpd, fmt, ## __VA_ARGS__)
-#define	XPD_NOTICE(xpd, fmt, ...)	XPD_PRINTK(NOTICE, "", xpd, fmt, ## __VA_ARGS__)
-#define	XPD_WARNING(xpd, fmt, ...)	XPD_PRINTK(WARNING, "", xpd, fmt, ## __VA_ARGS__)
-#define	XPD_ERR(xpd, fmt, ...)		XPD_PRINTK(ERR, "", xpd, fmt, ## __VA_ARGS__)
+#define	XPD_DBG(bits, xpd, fmt, ...) \
+	((void)((debug & (DBG_ ## bits)) && XPD_PRINTK(DEBUG, "-" #bits, \
+	xpd, "%s: " fmt, __func__, ## __VA_ARGS__)))
+#define	XPD_INFO(xpd, fmt, ...) \
+		XPD_PRINTK(INFO, "", xpd, fmt, ## __VA_ARGS__)
+#define	XPD_NOTICE(xpd, fmt, ...) \
+		XPD_PRINTK(NOTICE, "", xpd, fmt, ## __VA_ARGS__)
+#define	XPD_WARNING(xpd, fmt, ...) \
+		XPD_PRINTK(WARNING, "", xpd, fmt, ## __VA_ARGS__)
+#define	XPD_ERR(xpd, fmt, ...) \
+		XPD_PRINTK(ERR, "", xpd, fmt, ## __VA_ARGS__)

-#define	LINE_DBG(bits, xpd, pos, fmt, ...)	\
-			((void)((debug & (DBG_ ## bits)) && LINE_PRINTK(DEBUG, "-" #bits, xpd, pos, "%s: " fmt, __FUNCTION__, ## __VA_ARGS__)))
-#define	LINE_NOTICE(xpd, pos, fmt, ...)		LINE_PRINTK(NOTICE, "", xpd, pos, fmt, ## __VA_ARGS__)
-#define	LINE_ERR(xpd, pos, fmt, ...)		LINE_PRINTK(ERR, "", xpd, pos, fmt, ## __VA_ARGS__)
+#define	LINE_DBG(bits, xpd, pos, fmt, ...) \
+	((void)((debug & (DBG_ ## bits)) && LINE_PRINTK(DEBUG, "-" #bits, \
+	xpd, pos, "%s: " fmt, __func__, ## __VA_ARGS__)))
+#define	LINE_NOTICE(xpd, pos, fmt, ...) \
+		LINE_PRINTK(NOTICE, "", xpd, pos, fmt, ## __VA_ARGS__)
+#define	LINE_ERR(xpd, pos, fmt, ...) \
+		LINE_PRINTK(ERR, "", xpd, pos, fmt, ## __VA_ARGS__)

-#define	PORT_DBG(bits, xbus, unit, port, fmt, ...)	\
-			((void)((debug & (DBG_ ## bits)) && PORT_PRINTK(DEBUG, "-" #bits,	\
-					xbus, unit, port, "%s: " fmt, __FUNCTION__, ## __VA_ARGS__)))
-#define	PORT_NOTICE(xbus, unit, port, fmt, ...)	PORT_PRINTK(NOTICE, "", xbus, unit, port, fmt, ## __VA_ARGS__)
-#define	PORT_ERR(xbus, unit, port, fmt, ...)		PORT_PRINTK(ERR, "", xbus, unit, port, fmt, ## __VA_ARGS__)
+#define	PORT_DBG(bits, xbus, unit, port, fmt, ...) \
+		((void)((debug & (DBG_ ## bits)) && \
+		PORT_PRINTK(DEBUG, "-" #bits, \
+		xbus, unit, port, "%s: " fmt, __func__, ## __VA_ARGS__)))
+#define	PORT_NOTICE(xbus, unit, port, fmt, ...) \
+		PORT_PRINTK(NOTICE, "", xbus, unit, port, fmt, ## __VA_ARGS__)
+#define	PORT_ERR(xbus, unit, port, fmt, ...) \
+		PORT_PRINTK(ERR, "", xbus, unit, port, fmt, ## __VA_ARGS__)

 /*
 * Bits for debug
@@ -94,63 +115,98 @@ void dump_poll(int debug, const char *msg, int poll);

 static inline char *rxsig2str(enum dahdi_rxsig sig)
 {
-	switch(sig) {
-		case DAHDI_RXSIG_ONHOOK:	return "ONHOOK";
-		case DAHDI_RXSIG_OFFHOOK:	return "OFFHOOK";
-		case DAHDI_RXSIG_START:	return "START";
-		case DAHDI_RXSIG_RING:	return "RING";
-		case DAHDI_RXSIG_INITIAL:	return "INITIAL";
+	switch (sig) {
+	case DAHDI_RXSIG_ONHOOK:
+		return "ONHOOK";
+	case DAHDI_RXSIG_OFFHOOK:
+		return "OFFHOOK";
+	case DAHDI_RXSIG_START:
+		return "START";
+	case DAHDI_RXSIG_RING:
+		return "RING";
+	case DAHDI_RXSIG_INITIAL:
+		return "INITIAL";
 	}
 	return "Unknown rxsig";
 }

 static inline char *txsig2str(enum dahdi_txsig sig)
 {
-	switch(sig) {
-		case DAHDI_TXSIG_ONHOOK:	return "TXSIG_ONHOOK";
-		case DAHDI_TXSIG_OFFHOOK:	return "TXSIG_OFFHOOK";
-		case DAHDI_TXSIG_START:	return "TXSIG_START";
-		case DAHDI_TXSIG_KEWL:	return "TXSIG_KEWL";				/* Drop battery if possible */
-		case DAHDI_TXSIG_TOTAL: break;
+	switch (sig) {
+	case DAHDI_TXSIG_ONHOOK:
+		return "TXSIG_ONHOOK";
+	case DAHDI_TXSIG_OFFHOOK:
+		return "TXSIG_OFFHOOK";
+	case DAHDI_TXSIG_START:
+		return "TXSIG_START";
+	case DAHDI_TXSIG_KEWL:
+		return "TXSIG_KEWL";	/* Drop battery if possible */
+	case DAHDI_TXSIG_TOTAL:
+		break;
 	}
 	return "Unknown txsig";
 }

 static inline char *event2str(int event)
 {
-	switch(event) {
-		case DAHDI_EVENT_NONE:		return "NONE";
-		case DAHDI_EVENT_ONHOOK:		return "ONHOOK";
-		case DAHDI_EVENT_RINGOFFHOOK:	return "RINGOFFHOOK";
-		case DAHDI_EVENT_WINKFLASH:	return "WINKFLASH";
-		case DAHDI_EVENT_ALARM:		return "ALARM";
-		case DAHDI_EVENT_NOALARM:		return "NOALARM";
-		case DAHDI_EVENT_ABORT:		return "ABORT";
-		case DAHDI_EVENT_OVERRUN:		return "OVERRUN";
-		case DAHDI_EVENT_BADFCS:		return "BADFCS";
-		case DAHDI_EVENT_DIALCOMPLETE:	return "DIALCOMPLETE";
-		case DAHDI_EVENT_RINGERON:		return "RINGERON";
-		case DAHDI_EVENT_RINGEROFF:	return "RINGEROFF";
-		case DAHDI_EVENT_HOOKCOMPLETE:	return "HOOKCOMPLETE";
-		case DAHDI_EVENT_BITSCHANGED:	return "BITSCHANGED";
-		case DAHDI_EVENT_PULSE_START:	return "PULSE_START";
-		case DAHDI_EVENT_TIMER_EXPIRED:	return "TIMER_EXPIRED";
-		case DAHDI_EVENT_TIMER_PING:	return "TIMER_PING";
-		case DAHDI_EVENT_POLARITY:		return "POLARITY";
+	switch (event) {
+	case DAHDI_EVENT_NONE:
+		return "NONE";
+	case DAHDI_EVENT_ONHOOK:
+		return "ONHOOK";
+	case DAHDI_EVENT_RINGOFFHOOK:
+		return "RINGOFFHOOK";
+	case DAHDI_EVENT_WINKFLASH:
+		return "WINKFLASH";
+	case DAHDI_EVENT_ALARM:
+		return "ALARM";
+	case DAHDI_EVENT_NOALARM:
+		return "NOALARM";
+	case DAHDI_EVENT_ABORT:
+		return "ABORT";
+	case DAHDI_EVENT_OVERRUN:
+		return "OVERRUN";
+	case DAHDI_EVENT_BADFCS:
+		return "BADFCS";
+	case DAHDI_EVENT_DIALCOMPLETE:
+		return "DIALCOMPLETE";
+	case DAHDI_EVENT_RINGERON:
+		return "RINGERON";
+	case DAHDI_EVENT_RINGEROFF:
+		return "RINGEROFF";
+	case DAHDI_EVENT_HOOKCOMPLETE:
+		return "HOOKCOMPLETE";
+	case DAHDI_EVENT_BITSCHANGED:
+		return "BITSCHANGED";
+	case DAHDI_EVENT_PULSE_START:
+		return "PULSE_START";
+	case DAHDI_EVENT_TIMER_EXPIRED:
+		return "TIMER_EXPIRED";
+	case DAHDI_EVENT_TIMER_PING:
+		return "TIMER_PING";
+	case DAHDI_EVENT_POLARITY:
+		return "POLARITY";
 	}
 	return "Unknown event";
 }

 static inline char *hookstate2str(int hookstate)
 {
-	switch(hookstate) {
-		case DAHDI_ONHOOK:		return "DAHDI_ONHOOK";
-		case DAHDI_START:		return "DAHDI_START";
-		case DAHDI_OFFHOOK:	return "DAHDI_OFFHOOK";
-		case DAHDI_WINK:		return "DAHDI_WINK";
-		case DAHDI_FLASH:		return "DAHDI_FLASH";
-		case DAHDI_RING:		return "DAHDI_RING";
-		case DAHDI_RINGOFF:	return "DAHDI_RINGOFF";
+	switch (hookstate) {
+	case DAHDI_ONHOOK:
+		return "DAHDI_ONHOOK";
+	case DAHDI_START:
+		return "DAHDI_START";
+	case DAHDI_OFFHOOK:
+		return "DAHDI_OFFHOOK";
+	case DAHDI_WINK:
+		return "DAHDI_WINK";
+	case DAHDI_FLASH:
+		return "DAHDI_FLASH";
+	case DAHDI_RING:
+		return "DAHDI_RING";
+	case DAHDI_RINGOFF:
+		return "DAHDI_RINGOFF";
 	}
 	return "Unknown hookstate";
 }
@@ -159,25 +215,42 @@ static inline char *hookstate2str(int hookstate)
 static inline char *sig2str(int sig)
 {
 	switch (sig) {
-		case DAHDI_SIG_FXSLS:	return "FXSLS";
-		case DAHDI_SIG_FXSKS:	return "FXSKS";
-		case DAHDI_SIG_FXSGS:	return "FXSGS";
-		case DAHDI_SIG_FXOLS:	return "FXOLS";
-		case DAHDI_SIG_FXOKS:	return "FXOKS";
-		case DAHDI_SIG_FXOGS:	return "FXOGS";
-		case DAHDI_SIG_EM:		return "E&M";
-		case DAHDI_SIG_EM_E1:	return "E&M-E1";
-		case DAHDI_SIG_CLEAR:	return "Clear";
-		case DAHDI_SIG_HDLCRAW:	return "HDLCRAW";
-		case DAHDI_SIG_HDLCFCS:	return "HDLCFCS";
-		case DAHDI_SIG_HDLCNET:	return "HDLCNET";
-		case DAHDI_SIG_SLAVE:	return "Slave";
-		case DAHDI_SIG_CAS:	return "CAS";
-		case DAHDI_SIG_DACS:	return "DACS";
-		case DAHDI_SIG_DACS_RBS:	return "DACS+RBS";
-		case DAHDI_SIG_SF:		return "SF (ToneOnly)";
-		case DAHDI_SIG_NONE:
-					break;
+	case DAHDI_SIG_FXSLS:
+		return "FXSLS";
+	case DAHDI_SIG_FXSKS:
+		return "FXSKS";
+	case DAHDI_SIG_FXSGS:
+		return "FXSGS";
+	case DAHDI_SIG_FXOLS:
+		return "FXOLS";
+	case DAHDI_SIG_FXOKS:
+		return "FXOKS";
+	case DAHDI_SIG_FXOGS:
+		return "FXOGS";
+	case DAHDI_SIG_EM:
+		return "E&M";
+	case DAHDI_SIG_EM_E1:
+		return "E&M-E1";
+	case DAHDI_SIG_CLEAR:
+		return "Clear";
+	case DAHDI_SIG_HDLCRAW:
+		return "HDLCRAW";
+	case DAHDI_SIG_HDLCFCS:
+		return "HDLCFCS";
+	case DAHDI_SIG_HDLCNET:
+		return "HDLCNET";
+	case DAHDI_SIG_SLAVE:
+		return "Slave";
+	case DAHDI_SIG_CAS:
+		return "CAS";
+	case DAHDI_SIG_DACS:
+		return "DACS";
+	case DAHDI_SIG_DACS_RBS:
+		return "DACS+RBS";
+	case DAHDI_SIG_SF:
+		return "SF (ToneOnly)";
+	case DAHDI_SIG_NONE:
+		break;
 	}
 	return "Unconfigured";
 }
@@ -185,18 +258,25 @@ static inline char *sig2str(int sig)
 static inline char *alarmbit2str(int alarmbit)
 {
 	/* from dahdi/kernel.h */
-	switch(1 << alarmbit) {
-		case DAHDI_ALARM_NONE:	return "NONE";
-		case DAHDI_ALARM_RECOVER:	return "RECOVER";
-		case DAHDI_ALARM_LOOPBACK:	return "LOOPBACK";
-		case DAHDI_ALARM_YELLOW:	return "YELLOW";
-		case DAHDI_ALARM_RED:	return "RED";
-		case DAHDI_ALARM_BLUE:	return "BLUE";
-		case DAHDI_ALARM_NOTOPEN:	return "NOTOPEN";
+	switch (1 << alarmbit) {
+	case DAHDI_ALARM_NONE:
+		return "NONE";
+	case DAHDI_ALARM_RECOVER:
+		return "RECOVER";
+	case DAHDI_ALARM_LOOPBACK:
+		return "LOOPBACK";
+	case DAHDI_ALARM_YELLOW:
+		return "YELLOW";
+	case DAHDI_ALARM_RED:
+		return "RED";
+	case DAHDI_ALARM_BLUE:
+		return "BLUE";
+	case DAHDI_ALARM_NOTOPEN:
+		return "NOTOPEN";
 	}
 	return "UNKNOWN";
 }

 void alarm2str(int alarm, char *buf, int buflen);

-#endif	/* DAHDI_DEBUG_H */
+#endif /* DAHDI_DEBUG_H */
--- a/drivers/dahdi/xpp/firmwares/FPGA_1141.hex
+++ b/drivers/dahdi/xpp/firmwares/FPGA_1141.hex
--- a/drivers/dahdi/xpp/firmwares/FPGA_1151.hex
+++ b/drivers/dahdi/xpp/firmwares/FPGA_1151.hex
--- a/drivers/dahdi/xpp/firmwares/FPGA_1161.201.hex
+++ b/drivers/dahdi/xpp/firmwares/FPGA_1161.201.hex
--- a/drivers/dahdi/xpp/firmwares/FPGA_FXS.hex
+++ b/drivers/dahdi/xpp/firmwares/FPGA_FXS.hex
--- a/drivers/dahdi/xpp/firmwares/Makefile
+++ b/drivers/dahdi/xpp/firmwares/Makefile
@@ -1,10 +1,12 @@
 # Install firmwares and initialization scripts for the Astribank
 # drivers

-FPGA_FW		= FPGA_FXS.hex FPGA_1141.hex FPGA_1151.hex FPGA_1161.hex
+USB_FW		= USB_FW.hex USB_FW.201.hex USB_RECOV.hex
+FPGA_FW		= FPGA_FXS.hex FPGA_1141.hex FPGA_1151.hex FPGA_1161.hex  \
+		  FPGA_1161.201.hex
 PIC_FW		= PIC_TYPE_1.hex PIC_TYPE_2.hex PIC_TYPE_3.hex PIC_TYPE_4.hex  
 OCT_FW		= $(wildcard OCT6104E-256D.ima)
-FIRMWARES	= USB_FW.hex $(FPGA_FW) $(PIC_FW) $(OCT_FW)
+FIRMWARES	= $(USB_FW) $(FPGA_FW) $(PIC_FW) $(OCT_FW)
 PROTO_VER	= 30
 SCRIPTS_BASE	= $(patsubst %,init_card_%_$(PROTO_VER),1 2 3 4 5)
 SCRIPTS		= $(SCRIPTS_BASE:%=../%)
--- a/drivers/dahdi/xpp/firmwares/USB_FW.201.hex
+++ b/drivers/dahdi/xpp/firmwares/USB_FW.201.hex
@@ -0,0 +1,578 @@
+#
+# $Id: USB_FW.201.hex 10402 2012-02-15 15:34:50Z dima $
+#
+:03004300021F0099
+:03005300021F0089
+:101F0000021E3100021E8E00021E7800021E4900D1
+:081F1000021C2000021BA900C5
+:101000001201000200000040AAAAAAAAAAAA01028C
+:1010100003010A0600020000004001000902370037
+:10102000020100C0000904000002FFFFFF040705E1
+:101030000202000200070586020002000904010006
+:1010400002FFFFFF050705040200020007058802F2
+:10105000000200001201000200000040E4E451110F
+:101060000000010203010A06000200000040010026
+:1010700009023700020100C0320904000002FFFF2C
+:10108000FF04070502024000000705860240000039
+:101090000904010002FFFFFF0507050402400000EC
+:1010A0000705880240000006040016001400120024
+:1010B0000A00260004030904160358006F0072009A
+:1010C00063006F006D0020004C00540044001403C6
+:1010D00041007300740072006900620061006E00DC
+:1010E0006B001203530065007200690061006C0020
+:1010F0004E006F000A0346005000470041002603DF
+:101100004D0061006E00610067006D0065006E00BB
+:101110007400500072006F0063006500730073007C
+:061120006F0072000000E8
+:050FF6000300000000F3
+:100F3C0041E0370041E0B60042E0B1000041E0384A
+:100F4C0000021BE0850218E07943E0B30000004D7D
+:0F0F5C00E03931303339354D202020202020005E
+:101D71008B538A548955E5581558AE57700215573B
+:101D81004E6014AB530555E555AA54700205541421
+:081D9100F9ED12077780DF2253
+:101BE6008B538A548955E55A155AAE5970021559C0
+:101BF6004E6026AB560558E558AA5770020557148D
+:101C0600F9120731FFAB530555E555AA5470020585
+:0A1C16005414F9EF12077780CD2275
+:101DC100D2B7E490E670F0F5B575B5E653B5E743E3
+:101DD100B28853B2FCC2B3D2B1C2B2C2B67F32FE34
+:061DE100121E07D2B6221B
+:101E6100538EF75389FB5389F74389015389FDE465
+:071E7100F58AF58CD2A922CD
+:1018B2008C448D45AA06A9077556018A5789587521
+:1018C2005900755A1C7B017AE0794C121BE690E0B4
+:1018D20064E0FCA3E0FDA3E0FEA3E064D1FFEE64BC
+:1018E2008DFEED644CFDEC6449FC90E064120853FB
+:1018F2007EE07F4C7D1C7C001213707EE07F4C7B6F
+:101902001C7A00AD45AC441214247D1C7C00AF450A
+:10191200AE441211F57D1C7C00AF45AE44021C564C
+:08183F008E448F458C468D4755
+:10184700C20712001290E15BEFF0BF5004D207808D
+:1018570057E490E15CF0A3F090E15CE0FEA3E0FFC9
+:10186700C39410EE648094805030E5472FF582E5ED
+:10187700463EF583E0FF90E15CE0FCA3E02545F5FB
+:1018870082E5443CF583E0B5071090E15DE004F0A4
+:1018970070C690E15CE004F080BE90E15CE070040B
+:0A18A700A3E064107002D207A2074C
+:0118B1002214
+:020E12008F410E
+:100E14001200128F42E4F546F547AD47AC46121472
+:100E2400DA74692547F582E434E0F583E543F00597
+:100E340047E54770020546C39408E54664809480FC
+:100E440040D8E541600490E069F090E069E0B4C006
+:100E540008754400754508800675441D754536754A
+:100E64004600754708C3E5479410E54664809480BE
+:100E740050231214D674692547F582E434E0F583CF
+:100E8400E543F00547E547700205460545E545702D
+:100E9400D4054480D07543FF75441D7545197546C6
+:100EA40000754710C3E547942CE546648094805050
+:100EB40033E542B4510E7B007A007943AD45AC442E
+:100EC400FF1214E274692547F582E434E0F583E502
+:100ED40043F00547E547700205460545E54570C4FE
+:100EE400054480C075441D75453EE4F543F546F55B
+:100EF40047C3E5479406E54664809480502FE54255
+:100F0400B4510A90E069E0B4C2031214D6744625C1
+:100F140047F582E434E0F583E543F00547E547709F
+:100F24000205460545E54570C8054480C490E0695E
+:070F3400E0B4C20374C0F039
+:010F3B002293
+:0A1988008E448F458B468A4789483C
+:101992007E00E5452DF54DEE3544F54C1200128FD3
+:1019A20049E5496451600BC3E5459410E544940050
+:1019B200503585444A85454BC3E54B954DE54A95DF
+:1019C2004C5024AB46AA47A948AD4BAC4AAF49128A
+:1019D2001740054BE54B7002054A74012548F5484E
+:0719E200E43547F54780D111
+:0119E90022DB
+:0617C7008B418A428943B8
+:1017CD00D2067556017557E0755869755900755AE9
+:1017DD00107B017AE07995121BE6E5432410F9E4BC
+:1017ED003542854156F5578958755900755A0C7B08
+:1017FD00017AE079A5121BE67EE07F957CE07D1AEB
+:10180D001218B27EE07F1AE543241CF9E43542FC40
+:10181D00AD0112183F5016AB41E5432410F9E435E4
+:10182D0042FA7D1C7F197E1D1219888002C206A204
+:01183D0006A4
+:01183E002287
+:101126007F03121D46EF2402FFE43EA90775410125
+:10113600F542894390E06AE0FFE50C2408F582E475
+:10114600350BF583EFF090E06BE0FFE50C2409F535
+:1011560082E4350BF583EFF090E06CE0FFE50C24BC
+:101166000AF582E4350BF583EFF090E06DE0FFE5DC
+:101176000C240BF582E4350BF583EFF090E06EE07E
+:10118600FFE50C240CF582E4350BF583EFF090E0D7
+:101196006FE0FFE50C240DF582E4350BF583EFF0E7
+:1011A6007F087E00E4FDEDC39408502874692FF58E
+:1011B60082E434E0F583E0FCAB41AA42A94375F032
+:1011C60002EDA4F58285F083EC1207890D0FBF00AE
+:1011D600010E80D2E5192404F582E43518F583E082
+:0E11E60030E0047F0180027F0090E037EFF0E0
+:0111F40022D8
+:101B250090E06CE02FFFE50C240AF582E4350BF517
+:101B350083EFF0E50C240BF582E4350BF583E0FE2D
+:101B4500E50C240AF582E4350BF583E0FDEDFF9005
+:101B5500E0B1EEF0A3EFF0D206121CBD90E680E0F6
+:041B650054F7F0221F
+:1016200090E600E054E74410F090E60174C0F090BA
+:10163000E6107420F000000090E611F00000009029
+:10164000E6047480F0000000740FF0000000E4F085
+:1016500000000090E6187410F0000000E490E61915
+:10166000F000000090E61A7408F0000000E490E634
+:101670001BF000000090E6497482F0000000F000CA
+:10168000000090E6247402F0000000E490E625F0EB
+:1016900000000090E6957480F0000000F00000006B
+:1016A00043AF017B017AE07914755700755806E461
+:0416B000FD021D71A9
+:061E0100D2837F0A7E007F
+:101E07007C007D181207ABEF1FAC0670011E4C70EB
+:021E1700F622B1
+:0A1A43008E418F428B438A4489458F
+:101A4D00E4F546F547C3E5479542E54695415036E1
+:101A5D00AB43AA44A94585478285468312074AFFB1
+:101A6D00E4FBFAC2B2EF1392B1EFC313FFD2B20B84
+:101A7D00BB00010AEB64084A70E9C2B20547E547AD
+:071A8D0070C3054680BFD3C2
+:011A9400222F
+:101E190090E60174C0F0C2B67FC27E01121E07D2DD
+:081E2900B67F327E00021E07A5
+:101EA400D287121E01C287121E03C2837F0A7E00DC
+:031EB400021E0704
+:021B6900AB07C8
+:101B6B00E4F9FAEBC413131354011392877F027E2B
+:101B7B0000121E07D2837F057E00121E07E925E0A7
+:101B8B00FFA2B3E4334FF97F057E00121E07EB254E
+:0D1B9B00E0FBC283121E030ABA08C8AF01A6
+:011BA800221A
+:061A95008B558A568957AB
+:101A9B00A2AFE433F55D121EA4E4F55CE55CC395DF
+:101AAB005B5027AB55AA56A957855C8275830012EC
+:101ABB00074AFF121B69AB58AA59A95A855C827554
+:101ACB008300EF120789055C80D2120036E55D2496
+:031ADB00FF92AFC8
+:011ADE0022E5
+:0B003600C287121E03121E01D2872297
+:101DE70075418F8F42755800755900755A4B755B51
+:0A1DF700027B007A007941021A9580
+:101C8C0078417C007D007BFF7A0F79F67E007F0522
+:101C9C0012070B30B415755800755900755A4175FB
+:101CAC005B057B007A007941121A95E5435401FFDC
+:011CBC002205
+:100B4E007541007542007543007545017546E075A7
+:100B5E0047007548017549E0754A08E4F551FFF5FF
+:100B6E00527B017AE07900F557755808FD121D7118
+:100B7E00AB45AA46A9477401120777E4F550E55034
+:100B8E00C454F0AB45AA46A94790000112078985C7
+:100B9E004858854959854A5A755B08121A95AB48CB
+:100BAE00AA49A94A90000212074AFE5403FFEE54C6
+:100BBE0070F55124E0602924F0604B24F0605D2430
+:100BCE00F0606F24406003020C5675410185184297
+:100BDE00851943EF24FE600624FE703B801C801FA7
+:100BEE00E5192401FDE43518A905754101F5428981
+:100BFE0043EF24FC60092402700A7552028052757C
+:100C0E005206804D8011E5192402FDE43518A90520
+:100C1E00754101F54289437552088035E519240363
+:100C2E00FDE43518A905754101F542894375520455
+:100C3E00801FE5192405FDE43518A905754101F558
+:100C4E00428943755298800975410075420075437B
+:100C5E0000E542454345416022AB41AA42A94312F9
+:100C6E000731FED395524006AD52AE0580008E443C
+:100C7E00120731C39544120777800CE55170047E3C
+:100C8E000180027E008E44744B2550F8A644055018
+:100C9E00E550C394055003020B8CAB45AA46A947F9
+:100CAE007488120777AB45E5472401F9E43546FA17
+:100CBE0075560075570075584B755900755A0512C3
+:100CCE001BE6854858854959854A5A755B08AB45D8
+:070CDE00AA46A947021A957E
+:1019EA008F4190E0B1E0FEA3E054F064607003EE32
+:1019FA00641160037F012290E037E070037F0F22B9
+:101A0A00E5417003308108E541B401062080037F77
+:101A1A00102290E0B6E0B541037F0122E4F511D22D
+:101A2A0006121CBDAF4190E0B6EFF024FF92B590CC
+:091A3A00E680E054F7F07F002281
+:04000E0090FC04F06E
+:1000120090E678E0541824F06008240870087F50B5
+:0800220080067F518002E4FF1B
+:01002A0022B3
+:0C14D600AD45AC447B007A007943AF4286
+:0C14E2008F488C498D4A8B4B8A4C894DF9
+:1014EE00E4F54EF54F755003FDF551F552A2AF33AD
+:1014FE00F553E54824AF600D047012754E00754F1C
+:10150E00017D018008754E00754F02E4FDE54860CF
+:10151E0051E54F454E604BE54990E0B3F0E54AA3E7
+:10152E00F074B32DF582E434E0AD82FCAB4FAF48DE
+:10153E001219227551008F527F0A7E00121ADFE5B2
+:10154E0052455160107CE07D687B01AF4812157BDF
+:10155E007551008F5290E068E0AB4BAA4CA94D122A
+:0C156E000777E55324FF92AFAE51AF5257
+:01157A00224E
+:0C1740008F4E8C4F8D508B518A52895374
+:10174C00E4F554F555755603FDF557F558A2AF332E
+:10175C00F559E54E24AF600D0470127554007555A3
+:10176C00027D018008755400755503E4FDE54E605B
+:10177C003FE55545546039E54F90E0B3F0E550A393
+:10178C00F0AB51AA52A95312073190E0B5F0C2B791
+:10179C0074B32DF582E434E0AD82FCAB55AF4E1240
+:1017AC0019227557008F587F0A7E00121ADFD2B7A4
+:0A17BC00E55924FF92AFAE57AF5875
+:0117C6002200
+:10005600E4F531F532F535F53CF53DF53EF53FE590
+:10006600AA5484600302063A90E694E0FE90E69570
+:10007600E0FBEEF53CEBF53DC39405E53C94004012
+:100086000790F404E0FD80027DFFED12085F00CECC
+:100096000102C30503080703580903D80B011E0E06
+:1000A60000E40F019411025E130541250401310499
+:1000B6005732046A3404B23504C93604E63703E518
+:1000C6004503F647000005BA75310075320790FC06
+:1000D600047481F0A37414F0E4A3F00205DD7F0F2D
+:1000E600121DE775310075320690FC047480F0E449
+:1000F600A3F0753505F511FE74002535F9EE34F4D7
+:10010600FA7B011217C7400690FC05740EF0E4FF57
+:10011600120E127F8F0202BD7F0E121DE77531008F
+:10012600753205748E12000E8F3F7B007A0079407F
+:10013600E4FDFC1214E2E53F64516019E53F6450AA
+:10014600601375310075320690FC047480F0A37458
+:100156000BF00205DD90E0B7E0FF120E12740025E9
+:1001660032F974FC3531FA7B01C0038B567557E0C2
+:10017600755869755900755A2CD003121BE6742CF4
+:100186002532F532E43531F5317F8E0202BD753107
+:100196000075320790FC047491F090E678E090FCCC
+:1001A60005F030B3047F0280027F0030B4047E0184
+:1001B60080027E00EE4F90FC06F074002532F97442
+:1001C600FC3531FA7B01755700755812E4FD121D96
+:1001D6007174002532F974FC3531FA7B01C0038B4A
+:1001E600567557E0755839755900755A06D0031279
+:1001F6001BE674062532F532E43531F531FE74001E
+:100206002532F974FC3EFA7B01C0038B567557E024
+:10021600755814755900755A06D003121BE67406F4
+:100226002532F532E43531F531FE74002532F974A4
+:10023600FC3EFA7B01C0038B567557E07558467530
+:100246005900755A06D003121BE674062532F5329C
+:10025600E43531F5310205DD7F13121DE7753100F6
+:1002660075321D749312000E8F3F75381D75390057
+:10027600753600753705D3E5399418E538941D5061
+:1002860034E53FB4510E7B007A007940AD39AC3885
+:10029600FF1214E274002537F58274FC3536F583B7
+:1002A600E540F00539E539700205380537E5377060
+:1002B600C5053680C17F93121DE70205DD75310045
+:1002C60075320690FC047480F0E4A3F090F405E027
+:1002D60090E038F0E0147071121E1930B31B755699
+:1002E600017557F4755806755900755A067B017ADB
+:1002F600E07914121BE60205DD90FC057401F0029C
+:1003060003D075310075320690FC047480F0E4A3C6
+:10031600F0753507AF35FEC3E53D9FF534E53C9EE8
+:10032600F53390E038E014702074002FF974F43E31
+:10033600FA7B01AF34AE33121A435004E40204C20E
+:1003460090FC05740CF00205DD90FC057403F002C8
+:1003560005DD75310075320690FC047480F0E4A367
+:10036600F090E038E014705CE4FFFE20B411C2B2F5
+:10037600D2B1D2B20FBF00010EEF640A4E70EC305C
+:10038600B43A90E6017403F07F647E00121E079073
+:10039600E0B7E0FF120E127EE07F697CE07DB812C6
+:1003A60018B27EE07FB8AD1CAC1B12183F50051288
+:1003B6000B4E801690FC05740EF0800E90FC0574B2
+:1003C6000DF0800690FC057403F0E490E038F0022E
+:1003D60005DDE4F531F5327F02121B250205DDE469
+:1003E600FF120E12121126E4FF1219EAE4FF800230
+:1003F6007F01121B25121E190205DD7531007532AB
+:100406000690FC047480F0E4A3F090F405E0F53E59
+:10041600E4F511E53E64016004E53E703290E0B11A
+:10042600E0FEA3E054F064607003EE6411600280A5
+:100436007290E037E070028058E5116401600AE5C9
+:1004460011700C121C8CEF6006853E110205DD80D2
+:100456005275310075320690FC0474B2F0A3E511B2
+:10046600F00205DD75310075320690FC047480F0EB
+:10047600E4A3F090F405E0F53EFF1219EAEF24F14B
+:10048600600F1460152410701AE4F531F532020578
+:10049600DD90FC05740FF00205DD90FC057410F08C
+:1004A6000205DD90FC057401F00205DD753100756D
+:1004B600320690FC0474B5F090E0B6E090FC05F0CE
+:1004C6000205DD75310075320690FC0474B6F0A2A3
+:1004D60080E43325E0FFA281E4334FA3F00205DD7B
+:1004E600853C31853D3290FC0474B7F0753505C303
+:1004F600E53D9535F534E53C9400F5337400253536
+:10050600F582E434F4F583E0648870030205DDAF18
+:10051600357E0074002FF9EE34F4FA7B01C003C077
+:100526000174002FF9EE34FC8B58F559895A85343D
+:100536005BD001D003121A950205DD7531007532C4
+:100546000590FC0474A5F01200128F3F7B007A0020
+:100556007940E4FDFC1214E290E036E0FF0532E556
+:1005660032AC3170020531142400F58274FC3CF57E
+:1005760083EFF090E0B7E0FF0532E532AC31700270
+:100586000531142400F58274FC3CF583EFF0053246
+:10059600E532AE3170020531142400F58274FC3E5A
+:1005A600F583E540F090E6017403F07F647E001267
+:1005B6001E07802375310075320690FC047480F0A6
+:1005C600C3E53D9405E53C94005006A37407F0800E
+:1005D6000690FC057406F090F404E0B48004A3E0F1
+:1005E600701290F404E06405600FE06407600AE0AE
+:1005F60064096005E490E038F0E5324531602CE5A9
+:1006060032FD90FC00F0E531FFA3F090F402E0909B
+:10061600FC02F090F403E090FC03F090E69CEFF00F
+:1006260000000090E69DEDF000000090E6957480D5
+:04063600F0000000D0
+:01063A00229D
+:02004100D322C8
+:0800030090E6BAE0F51DD322DE
+:101ECA0090E740E51DF0E490E68AF090E68B04F096
+:021EDA00D32211
+:08002B0090E6BAE0F51AD322B9
+:101EDC0090E740E51AF0E490E68AF090E68B04F087
+:021EEC00D322FF
+:101D990090E6B9E0242F600D04701990E604E0FF85
+:101DA900430780800890E604E0FF53077F000000A6
+:071DB900EFF08002D322C30A
+:011DC0002200
+:101E3100C0E0C083C082D2015391EF90E65D74018E
+:081E4100F0D082D083D0E03222
+:101E7800C0E0C083C0825391EF90E65D7404F0D057
+:061E880082D083D0E0329D
+:101E8E00C0E0C083C0825391EF90E65D7402F0D043
+:061E9E0082D083D0E03287
+:101C2000C0E0C083C08285120D85130E850E8285AB
+:101C30000D83A37402F085090F850A108510828533
+:101C40000F83A37407F05391EF90E65D7410F0D00A
+:061C500082D083D0E032D7
+:101E4900C0E0C083C082D2035391EF90E65D74086D
+:081E5900F0D082D083D0E0320A
+:101BA900C0E0C083C08290E680E030E72085090D5F
+:101BB900850A0E850E82850D83A37402F085120FA6
+:101BC900851310851082850F83A37407F05391EF55
+:0D1BD90090E65D7420F0D082D083D0E03221
+:101EB700000102020303040405050300000000C03B
+:031EC700C2000056
+:060F6B0001110001080065
+:03000B000212BC22
+:1012BC00C0E0C0F0C083C082C0D075D000C000C0F8
+:0D12CC0001C002C003C004C005C006C00779
+:1012D90078217C007D007BFF7A1E79C17E007F0525
+:1012E90012070B90E0B6E0F526C204752700E50861
+:1012F900600415088056750805E5117004C204805C
+:1013090043A280308101B3500B3081047F008030CB
+:101319007F01802C30B415755800755900755A2114
+:10132900755B057B007A007921121A95E523540132
+:10133900F527701090E0B6E060047F0080027F011D
+:0C1349008F26D204300405AF261219EAEA
+:10135500D007D006D005D004D003D002D001D000EC
+:0B136500D0D0D082D083D0F0D0E03296
+:100CE50078567CE17D017BFF7A1E79C67E007F0404
+:100CF50012070BC203C200D202C201121DC1121E8D
+:100D050061121620750B10750C00751410751512EF
+:100D1500750910750A1C75121075137085120F85EB
+:100D250013107516107517B412001290E154EFF0F8
+:100D35007B017AE17955E4FDFC1214E290E155E07E
+:100D4500FF90E036F0E490E0B7F0EF64C26059EF51
+:100D550064C06054E490E15AF090E15AE0FFC39416
+:100D650004504A74562FF582E434E1F583E0FF60C0
+:100D75003C120E127EE07F697CE07DB81218B27ECF
+:100D8500E07FB8AD1CAC1B12183F501490E15AE03F
+:100D95002456F582E434E1F583E090E0B7F0800D68
+:100DA50090E15AE004F080B1E4FF120E1212112610
+:100DB500D2E843D82090E668E04409F090E65CE08C
+:100DC500443DF012001290E154EFF07B017AE17995
+:100DD50055E4FDFC1214E290E155E064C26007E4BD
+:100DE50090E0B6F0C2B57F01121B25D2AFD28C536D
+:100DF5008EF8C203C2AF120056D2AF3001051209F8
+:0D0E050026C2013003EEC203121D1A80E761
+:0B00460090E50DE030E402C322D3225D
+:1009260090E6B9E070030209EB147003020A602432
+:10093600FE7003020ADB24FB70030209E514700350
+:100946000209DF1470030209D31470030209D924C3
+:10095600056003020B3A1200414003020B4690E683
+:10096600BBE024FE602714603E24FD60111460275E
+:1009760024067056E50B90E6B3F0E50C80421200B3
+:10098600465044E51490E6B3F0E5158033E50D9046
+:10099600E6B3F0E50E802985120F851310E50F905A
+:1009A600E6B3F0E510801990E6BAE0FF121D46AAFC
+:1009B60006A9077B01EA494B600DEE90E6B3F0EF1E
+:1009C60090E6B4F0020B46020B35020B35121EDC24
+:1009D600020B4612002B020B46120003020B4612B4
+:1009E6001ECA020B4690E6B8E0247F601514601913
+:1009F60024027063A200E43325E0FFA202E4334F31
+:100A06008041E490E740F0803F90E6BCE0547EFFF2
+:100A16007E00E0D394807C0040047D0180027D004E
+:100A2600EC4EFEED4F24B7F582741E3EF583E4933B
+:100A3600FF3395E0FEEF24A1FFEE34E68F82F583C7
+:100A4600E0540190E740F0E4A3F090E68AF090E6E7
+:100A56008B7402F0020B46020B3590E6B8E024FEDA
+:100A6600601624026003020B4690E6BAE0B4010564
+:100A7600C200020B46020B3590E6BAE0705590E6CE
+:100A8600BCE0547EFF7E00E0D394807C0040047D71
+:100A96000180027D00EC4EFEED4F24B7F582741EF8
+:100AA6003EF583E493FF3395E0FEEF24A1FFEE3499
+:100AB600E68F82F583E054FEF090E6BCE0548013A6
+:100AC6001313541FFFE0540F2F90E683F0E04420E9
+:100AD600F0806D805A90E6B8E024FE60192402701A
+:100AE6004E90E6BAE0B40104D200805490E6BAE033
+:100AF6006402604C803990E6BCE0547EFF7E00E0E4
+:100B0600D394807C0040047D0180027D00EC4EFE83
+:100B1600ED4F24B7F582741E3EF583E493FF3395BB
+:100B2600E0FEEF24A1FFEE34E68F82F583800D9080
+:100B3600E6A08008121D99500790E6A0E04401F057
+:070B460090E6A0E04480F0FE
+:010B4D002285
+:03003300020FFBBE
+:040FFB0053D8EF32A6
+:100F71006080E0D4292E43C9A2D87C013D3654A11A
+:100F8100ECF0061362A705F3C0C7738C98932BD9B5
+:100F9100BC4C82CA1E9B573CFDD4E01667426F18B9
+:100FA1008A17E512BE4EC4D6DA9EDE49A0FBF58E45
+:100FB100BB2FEE7AA968799115B2073F94C21089C7
+:100FC1000B225F21807F5D9A5A903227353ECCE714
+:100FD100BFF79703FF1930B348A5B5D1D75E922A61
+:100FE100AC56AAC64FB838D296A47DB676FC6BE251
+:040FF1009C7404F1F7
+:081370008C468D47AB07AA066D
+:10137800E4F548F549C3E5499547E5466480F8E54D
+:1013880048648098400302141FE54925E0FFE548BA
+:1013980033FE74D42FF58274E03EF583E0FF7E00BF
+:1013A800AC46AD471207BD8C4A8D4BE54925E0FF99
+:1013B800E54833FE74D52FF58274E03EF583E0FFEF
+:1013C8007E00AC46AD471207BD8C4C8D4DE54B6594
+:1013D8004D7004E54A654C6030EB254BF582EA35E3
+:1013E8004AF583E0F9EB254DF582EA354CF583E0C3
+:1013F800FFEB254BF582EA354AF583EFF0EB254DF7
+:10140800F582EA354CF583E9F00549E549600302C0
+:0B141800137D054802137D7E007F015C
+:0114230022A6
+:0C1424008E468F478C488D498A4A8B4BBE
+:10143000E54745466006E54945487004E4FEFF225D
+:10144000E4F54CF54DC3E54D954BE54A6480F8E570
+:101450004C648098507BE4F54EF54FE549254DF5F9
+:1014600082E548354CF583E4F0C3E54F954BE54AFA
+:101470006480F8E54E6480985049E54F254D24D4AA
+:10148000F582E434E0F583E0FFE547254FF582E59A
+:1014900046354EF583E0FEEF8EF0A4FFE549254D7D
+:1014A000F582E548354CF583E02FFFE549254DF5FC
+:1014B00082E548354CF583EFF0054FE54F70AA05FE
+:1014C0004E80A6054DE54D6003021445054C0214FF
+:0514D000457E007F01D4
+:0114D50022F4
+:101CEC00120731FF90000312074A12077790000386
+:101CFC00EF12078990000212074AFF9000011207A9
+:0E1D0C004A900002120789900001EF02078939
+:0811F5008E468F478C488D499E
+:1011FD00E4F54AF54BE549AE487802CEA2E713CEA9
+:10120D0013D8F8FFC3E54B9FEE6480F8E54A648080
+:10121D009840030212B7E54BAE4A7802C333CE3382
+:10122D00CED8F92547FFEE3546FAA9077B018B4C41
+:10123D00F54D894E74D5254BF582E434E0F583E008
+:10124D00541FFFE48F52F551F550F54F121CECABC6
+:10125D004CAA4DA94E120819C374209552F9F812D3
+:10126D000806C004C005C006C007A94E120819A97A
+:10127D0052A8011207F3D003D002D001D000EF4BDA
+:10128D00FFEE4AFEED49FDEC48FCAB4CAA4DA94ED4
+:10129D00120839AB4CAA4DA94E121CEC054BE54B6F
+:0E12AD006003021202054A0212027E007F0157
+:0112BB002210
+:101C5600D3ED9410EC64809480402AED1D70011C35
+:101C6600142FF582EE3CF583E0FB547F24D4F582F5
+:101C7600E434E0F583E0F9540F2FF582E43EF58372
+:051C8600E06BF080CBD3
+:011C8B002236
+:101D1A0090E682E030E004E020E60B90E682E030D4
+:101D2A00E119E030E71590E680E04401F07F147E87
+:0C1D3A0000121ADF90E680E054FEF02258
+:101CBD0030060990E680E0440AF0800790E680E067
+:101CCD004408F07FDC7E05121ADF90E65D74FFF0AC
+:0F1CDD0090E65FF05391EF90E680E054F7F0222D
+:101ADF008E5A8F5B90E600E054187012E55B24017C
+:101AEF00FFE4355AC313F55AEF13F55B801590E6F3
+:101AFF0000E05418FFBF100BE55B25E0F55BE55ADE
+:101B0F0033F55AE55B155BAE5A7002155A4E6005F8
+:061B1F00121EEE80EE2212
+:06157B008C548D55AE07F3
+:10158100EB70037F012290E678E020E6F990E6789F
+:101591007480F0EE25E0440190E679F090E678E081
+:1015A10030E0F990E678E020E26BE030E167BB01E2
+:1015B1000790E678E04420F090E679E0F5561BEBE1
+:1015C100603090E678E030E0F990E678E020E2459E
+:1015D100BB010790E678E04420F090E679E0FF0552
+:1015E10055E555AC547002055414F5828C83EFF027
+:1015F10080CC90E678E030E0F990E678E020E215E2
+:1016010090E678E04440F090E679E0855582855493
+:0E16110083F07F012290E678E04440F07F00F5
+:01161F0022A8
+:1019220090E678E020E6F990E6787480F0EF25E022
+:1019320090E679F090E678E030E0F990E678E02001
+:10194200E23AE030E136EBD3940040260DEDAE04EE
+:1019520070010C14F5828E83E090E679F01B90E61C
+:1019620078E030E0F990E678E020E210E020E1D67D
+:10197200800A90E678E04440F07F012290E678E029
+:051982004440F07F006D
+:01198700223D
+:021D4600A907EB
+:101D4800AE16AF178F828E83A3E064037017AD01C0
+:101D580019ED7001228F828E83E07C002FFDEC3E0E
+:081D6800FEAF0580DFE4FEFF81
+:011D70002250
+:101EEE007400F58690FDA57C05A3E582458370F907
+:011EFE0022C1
+:030000000216B431
+:0C16B400787FE4F6D8FD75815D0216FB1E
+:10063B00E709F608DFFA8046E709F208DFFA803EA1
+:10064B0088828C83E709F0A3DFFA8032E309F6088E
+:10065B00DFFA8078E309F208DFFA807088828C83F6
+:10066B00E309F0A3DFFA806489828A83E0A3F608AA
+:10067B00DFFA805889828A83E0A3F208DFFA804C84
+:10068B0080D280FA80C680D4806980F2803380105B
+:10069B0080A680EA809A80A880DA80E280CA8033C4
+:1006AB0089828A83ECFAE493A3C8C582C8CCC5833C
+:1006BB00CCF0A3C8C582C8CCC583CCDFE9DEE7800C
+:1006CB000D89828A83E493A3F608DFF9ECFAA9F08B
+:1006DB00EDFB2289828A83ECFAE0A3C8C582C8CCE1
+:1006EB00C583CCF0A3C8C582C8CCC583CCDFEADEFA
+:1006FB00E880DB89828A83E493A3F208DFF980CC5C
+:10070B0088F0EF60010E4E60C388F0ED2402B40454
+:10071B000050B9F582EB2402B4040050AF232345FB
+:06072B00822390068B738F
+:10073100BB010689828A83E0225002E722BBFE02C6
+:09074100E32289828A83E49322F9
+:10074A00BB010CE58229F582E5833AF583E0225064
+:10075A0006E92582F8E622BBFE06E92582F8E222AE
+:0D076A00E58229F582E5833AF583E49322C8
+:10077700BB010689828A83F0225002F722BBFE0161
+:02078700F3225B
+:10078900F8BB010DE58229F582E5833AF583E8F0A6
+:10079900225006E92582C8F622BBFE05E92582C852
+:0207A900F2223A
+:1007AB00EF8DF0A4A8F0CF8CF0A428CE8DF0A42E62
+:0207BB00FE221C
+:1007BD00C2D5EC30E709B2D5E4C39DFDE49CFCEE57
+:1007CD0030E715B2D5E4C39FFFE49EFE120885C342
+:1007DD00E49DFDE49CFC800312088530D507C3E43D
+:0607ED009FFFE49EFE22C6
+:1007F300E8600FECC313FCED13FDEE13FEEF13FFE4
+:03080300D8F12207
+:10080600E8600FEFC333FFEE33FEED33FDEC33FC50
+:03081600D8F122F4
+:10081900BB010789828A830208E65005E9F80208C4
+:10082900DABBFE05E9F80208F289828A830208FE2A
+:10083900BB010789828A830208535005E9F8020936
+:0A0849000EBBFE05E9F802091A22B1
+:0C085300ECF0A3EDF0A3EEF0A3EFF02218
+:10085F00D083D082F8E4937012740193700DA3A328
+:10086F0093F8740193F5828883E47374029368603C
+:06087F00EFA3A3A380DF3C
+:1016C000020CE5E493A3F8E493A34003F68001F24F
+:1016D00008DFF48029E493A3F85407240CC8C3332B
+:1016E000C4540F4420C8834004F456800146F6DFFA
+:1016F000E4800B0102040810204080900F3CE47E3F
+:10170000019360BCA3FF543F30E509541FFEE493EE
+:10171000A360010ECF54C025E060A840B8E493A3B5
+:10172000FAE493A3F8E493A3C8C582C8CAC583CAE0
+:10173000F0A3C8C582C8CAC583CADFE9DEE780BE98
+:010FF50000FB
+:10088500BC000BBE0029EF8DF084FFADF022E4CC57
+:10089500F875F008EF2FFFEE33FEEC33FCEE9DEC20
+:1008A500984005FCEE9DFE0FD5F0E9E4CEFD22ED66
+:1008B500F8F5F0EE8420D21CFEADF075F008EF2FB0
+:1008C500FFED33FD4007985006D5F0F222C398FDA1
+:0508D5000FD5F0EA223E
+:0C08DA00E6FC08E6FD08E6FE08E6FF224A
+:0C08E600E0FCA3E0FDA3E0FEA3E0FF2285
+:0C08F200E2FC08E2FD08E2FE08E2FF2242
+:1008FE00E493FC740193FD740293FE740393FF2240
+:0C090E00ECF608EDF608EEF608EFF62215
+:0C091A00ECF208EDF208EEF208EFF22219
+:00000001FF
--- a/drivers/dahdi/xpp/firmwares/USB_FW.hex
+++ b/drivers/dahdi/xpp/firmwares/USB_FW.hex
@@ -1,10 +1,10 @@
 # 
-# $Id: USB_FW.hex 10085 2011-11-13 14:33:46Z dima $
+# $Id: USB_FW.hex 10401 2012-02-15 15:30:24Z dima $
 # 
-:03004300021E009A
-:03005300021E008A
-:101E0000021E3000021E8D00021E7700021E4800D6
-:081E1000021C1B00021BA400D0
+:03004300021F0099
+:03005300021F0089
+:101F0000021E3400021E9100021E7B00021E4C00C5
+:081F1000021C1F00021BA800C7
 :101000001201000200000040AAAAAAAAAAAA01028C
 :1010100003010A0600020000004001000902370037
 :10102000020100C0000904000002FFFFFF040705E1
@@ -24,197 +24,199 @@
 :101100004D0061006E00610067006D0065006E00BB
 :101110007400500072006F0063006500730073007C
 :061120006F0072000000E8
-:050FF7000300000000F2
-:1011ED0041E0370041E0BB0042E0B6000041E0388D
-:1011FD0000021BE08A0218E07E43E0B800000052B6
-:10120D00E039393733343A393936344D50202020CE
-:04121D00202020006D
-:101D96008B508A518952E5551555AE54700215542B
-:101DA6004E6014AB500552E552AA5170020551140B
-:081DB600F9ED12077180DF2234
-:101BE1008B508A518952E5571557AE5670021556DA
-:101BF1004E6026AB530555E555AA547002055414A1
-:101C0100F912072BFFAB500552E552AA517002059C
-:0A1C11005114F9EF12077180CD2283
-:101D6C00C2B5C2B7E490E670F075B5E653B5EE4374
-:101D7C00B28053B2F4A2B53390E0BBF0C2B3C2B69A
-:0A1D8C007F327E00121DECD2B62259
-:101E6000538EF75389FB5389F74389015389FDE466
-:071E7000F58AF58CD2A922CE
-:1017B3008C428D43AA06A9077553018A548955752E
-:1017C300560075571C7B017AE07951121BE190E0BA
-:1017D30051E0B4C20374C0F090E069E0FCA3E0FD03
-:1017E300A3E0FEA3E064D1FFEE648DFEED644CFD47
-:1017F300EC6449FC90E06912084D7EE07F517D1C4A
-:101803007C001213607EE07F517B1C7A00AD43ACF9
-:10181300421214147D1C7C00AF43AE421211267D8C
-:0A1823001C7C00AF43AE42021C51D2
-:0818A5008E428F438C448D45F7
-:1018AD00C20712001290E160EFF0BF5004D2078022
-:1018BD0057E490E161F0A3F090E161E0FEA3E0FF59
-:1018CD00C39410EE648094805030E5452FF582E589
-:1018DD00443EF583E0FF90E161E0FCA3E02543F594
-:1018ED0082E5423CF583E0B5071090E162E004F03B
-:1018FD0070C690E161E004F080BE90E161E070049B
-:0A190D00A3E064107002D207A207E5
-:0119170022AD
-:020DE4008F3F3F
-:100DE6001200128F40E4F544F545AD45AC441214AB
-:100DF600CA746E2545F582E434E0F583E541F005D5
-:100E060045E54570020544C39408E5446480948032
-:100E160040D8E53F600490E06EF090E06EE0B4C02C
-:100E260008754200754308800675421D7543367580
-:100E36004400754508C3E5459410E54464809480F4
-:100E460050231214C6746E2545F582E434E0F5830A
-:100E5600E541F00545E545700205440543E5437067
-:100E6600D4054280D07541FF75421D7543197544FE
-:100E760000754510C3E545942CE544648094805084
-:100E860033E540B4510E7B007A007941AD43AC4264
-:100E9600FF1214D2746E2545F582E434E0F583E53D
-:100EA60041F00545E545700205440543E54370C438
-:100EB600054280C075421D75433EE4F541F544F593
-:100EC60045C3E5459406E54464809480502FE5408B
-:100ED600B4510A90E06EE0B4C2031214C6744B25F6
-:100EE60045F582E434E0F583E541F00545E54570D6
-:100EF6000205440543E54370C8054280C490E06E90
-:070F0600E0B4C20374C0F067
-:010F0D0022C1
-:0A197E008E428F438B448A45894650
-:101988007E00E5432DF54BEE3542F54A1200128FE5
-:1019980047E5476451600BC3E5439410E542940062
-:1019A8005035854248854349C3E549954BE54895F7
-:1019B8004A5024AB44AA45A946AD49AC48AF4712A2
-:1019C80017300549E5497002054874012546F54672
-:0719D800E43545F54580D11F
-:0119DF0022E5
-:06182D008B3F8A40894157
-:10183300D2067553017554E075556E75560075578C
-:10184300107B017AE0799A121BE1E5412410F9E457
-:101853003540853F53F554895575560075570C7BB4
-:10186300017AE079AA121BE17EE07F9A7CE07D1A7F
-:101873001217B37EE07F1AE541241CF9E43540FCDE
-:10188300AD011218A55016AB3FE5412410F9E4351C
-:1018930040FA7D1C7F197E1D12197E8002C206A2AA
-:0118A300063E
-:0118A4002221
-:100F0E007F03121D41EF2402FFE43EA907753F0146
-:100F1E00F540894190E06FE0FFE50C2408F582E48E
-:100F2E00350BF583EFF090E070E0FFE50C2409F54A
-:100F3E0082E4350BF583EFF090E071E0FFE50C24D1
-:100F4E000AF582E4350BF583EFF090E072E0FFE5F1
-:100F5E000C240BF582E4350BF583EFF090E073E093
-:100F6E00FFE50C240CF582E4350BF583EFF090E0F1
-:100F7E0074E0FFE50C240DF582E4350BF583EFF0FC
-:100F8E007F087E00E4FDEDC394085028746E2FF5A3
-:100F9E0082E434E0F583E0FCAB3FAA40A94175F052
-:100FAE0002EDA4F58285F083EC1207830D0FBF00CE
-:100FBE00010E80D2E5192404F582E43518F583E09C
-:0E0FCE0030E0047F0180027F0090E037EFF0FA
-:010FDC0022F2
-:101B200090E071E02FFFE50C240AF582E4350BF517
-:101B300083EFF0E50C240BF582E4350BF583E0FE32
-:101B4000E50C240AF582E4350BF583E0FDEDFF900A
-:101B5000E0B6EEF0A3EFF0D206121CB890E680E0FB
-:041B600054F7F02224
-:1016100090E600E054E74410F090E60174C0F090CA
-:10162000E6107420F000000090E611F00000009039
-:10163000E6047480F0000000740FF0000000E4F095
-:1016400000000090E6187410F0000000E490E61925
-:10165000F000000090E61A7408F0000000E490E644
-:101660001BF000000090E6497482F0000000F000DA
-:10167000000090E6247402F0000000E490E625F0FB
-:1016800000000090E6957480F0000000F00000007B
-:1016900043AF017B017AE07914755400755506E477
-:0416A000FD021D9694
-:061DE600D2877F0A7E0097
-:101DEC007C007D181207A5EF1FAC0670011E4C700D
-:021DFC00F622CD
-:0A1A39008E3F8F408B418A428943A3
-:101A4300E4F544F545C3E5459540E544953F503BF2
-:101A5300AB41AA42A943854582854483120744FFCB
-:101A6300E4FBFAC2B2EF1392B7EFC313FFD2B20B88
-:101A7300BB00010AEB64084A70E9C2B220B002C39A
-:0C1A8300220545E54570BE054480BAD33D
-:011A8F002234
-:101E180090E60174C0F0C2B67F967E00121DECD227
-:081E2800B67F327E00021DECC2
-:101EA300D2B1121DE6C2B1121DE8C2877F0A7E00BD
-:031EB300021DEC21
-:021B6400AB07CD
-:101B6600E4F9FAEBC413131354011392B17F027E06
-:101B760000121DECD2877F057E00121DECE925E0E0
-:101B8600FFA283E4334FF97F057E00121DECEB259F
-:0D1B9600E0FBC287121DE80ABA08C8AF01C3
-:011BA300221F
-:061A90008B538A548955B6
-:101A9600A2AFE433F55B121EA3E4F55AE55AC395EB
-:101AA600595027AB53AA54A955855A8275830012FB
-:101AB6000744FF121B64AB56AA57A958855A82756C
-:101AC6008300EF120783055A80D2120036E55B24A5
-:031AD600FF92AFCD
-:011AD90022EA
-:0B003600C2B1121DE8121DE6D2B1227B
-:100FDD00753F8F8F40755600755700755849755977
-:0A0FED00027B007A00793F021A909F
-:101C8700783F7C007D007BFF7A0F79F77E007F0528
-:101C970012070530B41575560075570075583F750E
-:101CA70059057B007A00793F121A90E5415401FFEC
-:011CB700220A
+:051EF1000300000000E9
+:1011F50041E0370041E0B70042E0B2000041E0388D
+:1012050000021BE0860218E07A43E0B40000004EBD
+:10121500E03931303339354D502020202020200051
+:101D9A008B518A528953E5561556AE557002155520
+:101DAA004E6014AB510553E553AA52700205521402
+:081DBA00F9ED12077180DF2230
+:101BE5008B518A528953E5581558AE5770021557CF
+:101BF5004E6026AB540556E556AA55700205551498
+:101C0500F912072BFFAB510553E553AA5270020594
+:0A1C15005214F9EF12077180CD227E
+:101D7000C2B5C2B7E490E670F075B5E653B5EE4370
+:101D8000B28053B2F4A2B53390E0B7F0C2B3C2B69A
+:0A1D90007F327E00121E0AD2B62236
+:101E6400538EF75389FB5389F74389015389FDE462
+:071E7400F58AF58CD2A922CA
+:1017B7008C428D43AA06A9077554018A5589567527
+:1017C700570075581C7B017AE0794D121BE590E0B4
+:1017D7004DE0B4C20374C0F090E065E0FCA3E0FD07
+:1017E700A3E0FEA3E064D1FFEE648DFEED644CFD43
+:1017F700EC6449FC90E06512084D7EE07F4D7D1C4E
+:101807007C001213647EE07F4D7B1C7A00AD43ACF5
+:10181700421214187D1C7C00AF43AE42120F367D76
+:0A1827001C7C00AF43AE42021C55CA
+:0818A9008E428F438C448D45F3
+:1018B100C20712001290E15CEFF0BF5004D2078022
+:1018C10057E490E15DF0A3F090E15DE0FEA3E0FF5D
+:1018D100C39410EE648094805030E5452FF582E585
+:1018E100443EF583E0FF90E15DE0FCA3E02543F594
+:1018F10082E5423CF583E0B5071090E15EE004F03B
+:1019010070C690E15DE004F080BE90E15DE070049E
+:0A191100A3E064107002D207A207E1
+:01191B0022A9
+:020E0C008F3F16
+:100E0E001200128F40E4F544F545AD45AC44121482
+:100E1E00CE746A2545F582E434E0F583E541F005AC
+:100E2E0045E54570020544C39408E544648094800A
+:100E3E0040D8E53F600490E06AF090E06AE0B4C00C
+:100E4E0008754200754308800675421D7543367558
+:100E5E004400754508C3E5459410E54464809480CC
+:100E6E0050231214CA746A2545F582E434E0F583E2
+:100E7E00E541F00545E545700205440543E543703F
+:100E8E00D4054280D07541FF75421D7543197544D6
+:100E9E0000754510C3E545942CE54464809480505C
+:100EAE0033E540B4510E7B007A007941AD43AC423C
+:100EBE00FF1214D6746A2545F582E434E0F583E515
+:100ECE0041F00545E545700205440543E54370C410
+:100EDE00054280C075421D75433EE4F541F544F56B
+:100EEE0045C3E5459406E54464809480502FE54063
+:100EFE00B4510A90E06AE0B4C2031214CA744725D2
+:100F0E0045F582E434E0F583E541F00545E54570AD
+:100F1E000205440543E54370C8054280C490E06A6B
+:070F2E00E0B4C20374C0F03F
+:010F35002299
+:0A1982008E428F438B448A4589464C
+:10198C007E00E5432DF54BEE3542F54A1200128FE1
+:10199C0047E5476451600BC3E5439410E54294005E
+:1019AC005035854248854349C3E549954BE54895F3
+:1019BC004A5024AB44AA45A946AD49AC48AF47129E
+:1019CC0017340549E5497002054874012546F5466A
+:0719DC00E43545F54580D11B
+:0119E30022E1
+:061831008B3F8A40894153
+:10183700D2067554017555E075566A755700755887
+:10184700107B017AE07996121BE5E5412410F9E453
+:101857003540853F54F555895675570075580C7BAB
+:10186700017AE079A6121BE57EE07F967CE07D1A7F
+:101877001217B77EE07F1AE541241CF9E43540FCD6
+:10188700AD011218A95016AB3FE5412410F9E43514
+:1018970040FA7D1C7F197E1D1219828002C206A2A2
+:0118A700063A
+:0118A800221D
+:101126007F03121D45EF2402FFE43EA907753F0128
+:10113600F540894190E06BE0FFE50C2408F582E478
+:10114600350BF583EFF090E06CE0FFE50C2409F534
+:1011560082E4350BF583EFF090E06DE0FFE50C24BB
+:101166000AF582E4350BF583EFF090E06EE0FFE5DB
+:101176000C240BF582E4350BF583EFF090E06FE07D
+:10118600FFE50C240CF582E4350BF583EFF090E0D7
+:1011960070E0FFE50C240DF582E4350BF583EFF0E6
+:1011A6007F087E00E4FDEDC394085028746A2FF58D
+:1011B60082E434E0F583E0FCAB3FAA40A94175F038
+:1011C60002EDA4F58285F083EC1207830D0FBF00B4
+:1011D600010E80D2E5192404F582E43518F583E082
+:0E11E60030E0047F0180027F0090E037EFF0E0
+:0111F40022D8
+:101B240090E06DE02FFFE50C240AF582E4350BF517
+:101B340083EFF0E50C240BF582E4350BF583E0FE2E
+:101B4400E50C240AF582E4350BF583E0FDEDFF9006
+:101B5400E0B2EEF0A3EFF0D206121CBC90E680E0F7
+:041B640054F7F02220
+:1016140090E600E054E74410F090E60174C0F090C6
+:10162400E6107420F000000090E611F00000009035
+:10163400E6047480F0000000740FF0000000E4F091
+:1016440000000090E6187410F0000000E490E61921
+:10165400F000000090E61A7408F0000000E490E640
+:101664001BF000000090E6497482F0000000F000D6
+:10167400000090E6247402F0000000E490E625F0F7
+:1016840000000090E6957480F0000000F000000077
+:1016940043AF017B017AE07914755500755606E471
+:0416A400FD021D9A8C
+:061E0400D2877F0A7E0078
+:101E0A007C007D181207A5EF1FAC0670011E4C70EE
+:021E1A00F622AE
+:0A1A3D008E3F8F408B418A4289439F
+:101A4700E4F544F545C3E5459540E544953F503BEE
+:101A5700AB41AA42A943854582854483120744FFC7
+:101A6700E4FBFAC2B2EF1392B7EFC313FFD2B20B84
+:101A7700BB00010AEB64084A70E9C2B220B002C396
+:0C1A8700220545E54570BE054480BAD339
+:011A93002230
+:101E1C0090E60174C0F0C2B67F967E00121E0AD204
+:081E2C00B67F327E00021E0A9F
+:101EA700D2B1121E04C2B1121E06C2877F0A7E007B
+:031EB700021E0AFE
+:021B6800AB07C9
+:101B6A00E4F9FAEBC413131354011392B17F027E02
+:101B7A0000121E0AD2877F057E00121E0AE925E09E
+:101B8A00FFA283E4334FF97F057E00121E0AEB257C
+:0D1B9A00E0FBC287121E060ABA08C8AF01A0
+:011BA700221B
+:061A94008B538A548955B2
+:101A9A00A2AFE433F55B121EA7E4F55AE55AC395E3
+:101AAA00595027AB53AA54A955855A8275830012F7
+:101ABA000744FF121B68AB56AA57A958855A827564
+:101ACA008300EF120783055A80D2120036E55B24A1
+:031ADA00FF92AFC9
+:011ADD0022E6
+:0B003600C2B1121E06121E04D2B1223D
+:101DEA00753F8F8F4075560075570075584975595C
+:0A1DFA00027B007A00793F021A9480
+:101C8B00783F7C007D007BFF7A1E79F17E007F051B
+:101C9B0012070530B41575560075570075583F750A
+:101CAB0059057B007A00793F121A94E5415401FFE4
+:011CBB002206
 :100B4800753F007540007541007543017544E075B7
-:100B580045007546017547E0754808E4FFF54F7B89
-:100B6800017AE07900F554755508FD121D96AB43DE
-:100B7800AA44A9457401120771E4F54EE54EC45420
-:100B8800F0AB43AA44A94590000112078385465655
-:100B9800854757854858755908121A90AB46AA4791
-:100BA800A948900002120744FF530770EF24E06041
-:100BB8001B24F0602A24F0603C24F0604E2440702E
-:100BC80060753F018518408519418024E519240185
-:100BD800FDE43518A905753F01F54089418011E507
-:100BE800192402FDE43518A905753F01F54089412E
-:100BF800754F088035E5192403FDE43518A90575F6
-:100C08003F01F5408941754F04801FE5192405FD12
-:100C1800E43518A905753F01F5408941754F98805D
-:100C280009753F00754000754100E5404541453F65
-:100C38006022AB3FAA40A94112072BFED3954F4033
-:100C480006AD4FAE0580008E4212072BC3954212A7
-:100C58000771800BEF70047E0180027E008E427463
-:100C680049254EF8A642054EE54EC39405500302A9
-:100C78000B84AB43AA44A9457488120771AB43E5BA
-:100C8800452401F9E43544FA755300755400755547
-:100C980049755600755705121BE185465685475715
-:0F0CA800854858755908AB43AA44A945021A90CC
-:1019E0008F3F90E0B6E0FEA3E054F064607003EE39
-:1019F000641160037F012290E037E070037F0F22C3
-:101A0000E53F7003308108E53FB401062080037F85
-:101A1000102290E0BBE0B53F037F0122E4F511D234
-:101A200006121CB8AF3F90E0BBEFF024FF92B590D8
-:091A3000E680E054F7F07F00228B
+:100B580045007546017547E0754808E4F54FFFF50F
+:100B6800507B017AE07900F555755608FD121D9AFB
+:100B7800AB43AA44A9457401120771E4F54EE54E4A
+:100B8800C454F0AB43AA44A94590000112078385D9
+:100B98004656854757854858755908121A94AB46E2
+:100BA800AA47A948900002120744FE5403FFEE54D6
+:100BB80070F54F24E0602924F0604B24F0605D2438
+:100BC800F0606F24406003020C50753F01851840A7
+:100BD800851941EF24FE600624FE703B801C801FAF
+:100BE800E5192401FDE43518A905753F01F540898B
+:100BF80041EF24FC60092402700A75500280527586
+:100C08005006804D8011E5192402FDE43518A90528
+:100C1800753F01F54089417550088035E519240371
+:100C2800FDE43518A905753F01F540894175500463
+:100C3800801FE5192405FDE43518A905753F01F560
+:100C48004089417550988009753F0075400075418D
+:100C580000E5404541453F6022AB3FAA40A941120B
+:100C6800072BFED395504006AD50AE0580008E424E
+:100C780012072BC39542120771800CE54F70047E52
+:100C88000180027E008E427449254EF8A642054E28
+:100C9800E54EC394055003020B86AB43AA44A9450D
+:100CA8007488120771AB43E5452401F9E43544FA29
+:100CB80075540075550075564975570075580512D5
+:100CC8001BE5854656854757854858755908AB43EF
+:070CD800AA44A945021A9489
+:1019E4008F3F90E0B2E0FEA3E054F064607003EE39
+:1019F400641160037F012290E037E070037F0F22BF
+:101A0400E53F7003308108E53FB401062080037F81
+:101A1400102290E0B7E0B53F037F0122E4F511D234
+:101A240006121CBCAF3F90E0B7EFF024FF92B590D4
+:091A3400E680E054F7F07F002287
 :04000E0090FC04F06E
 :1000120090E678E0541824F06008240870087F50B5
 :0800220080067F518002E4FF1B
 :01002A0022B3
-:0C14C600AD43AC427B007A007941AF409E
-:0C14D2008F468C478D488B498A4A894B15
-:1014DE00E4F54CF54D754E03FDF54FF550A2AF33C7
-:1014EE00F551E54624AF600D047012754C00754D34
-:1014FE00017D018008754C00754D02E4FDE54660E6
-:10150E0051E54D454C604BE54790E0B8F0E548A3FA
-:10151E00F074B82DF582E434E0AD82FCAB4DAF46ED
-:10152E00121918754F008F507F0A7E00121ADAE5D5
-:10153E0050454F60107CE07D6D7B01AF4612156B00
-:10154E00754F008F5090E06DE0AB49AA4AA94B123F
-:0C155E000771E55124FF92AFAE4FAF5073
-:01156A00225E
-:0C1730008F4C8C4D8D4E8B4F8A50895190
-:10173C00E4F552F553755403FDF555F556A2AF3348
-:10174C00F557E54C24AF600D0470127552007553BB
-:10175C00027D018008755200755303E4FDE54C6071
-:10176C003BE55345526035E54D90E0B8F0E54EA3AE
-:10177C00F0AB4FAA50A95112072B90E0BAF074B8F5
-:10178C002DF582E434E0AD82FCAB53AF4C1219184A
-:10179C007555008F567F0A7E00121ADAE55724FF22
-:0617AC0092AFAE55AF56EE
-:0117B2002214
+:0C14CA00AD43AC427B007A007941AF409A
+:0C14D6008F468C478D488B498A4A894B11
+:1014E200E4F54CF54D754E03FDF54FF550A2AF33C3
+:1014F200F551E54624AF600D047012754C00754D30
+:10150200017D018008754C00754D02E4FDE54660E1
+:1015120051E54D454C604BE54790E0B4F0E548A3FA
+:10152200F074B42DF582E434E0AD82FCAB4DAF46ED
+:1015320012191C754F008F507F0A7E00121ADEE5C9
+:1015420050454F60107CE07D697B01AF4612156FFC
+:10155200754F008F5090E069E0AB49AA4AA94B123F
+:0C1562000771E55124FF92AFAE4FAF506F
+:01156E00225A
+:0C1734008F4C8C4D8D4E8B4F8A5089518C
+:10174000E4F552F553755403FDF555F556A2AF3344
+:10175000F557E54C24AF600D0470127552007553B7
+:10176000027D018008755200755303E4FDE54C606D
+:101770003BE55345526035E54D90E0B4F0E54EA3AE
+:10178000F0AB4FAA50A95112072B90E0B6F074B4F9
+:101790002DF582E434E0AD82FCAB53AF4C12191C42
+:1017A0007555008F567F0A7E00121ADEE55724FF1A
+:0617B00092AFAE55AF56EA
+:0117B6002210
 :10005600E4F531F532F535F53AF53BF53CF53DE598
 :10006600AA5484600302063490E694E0FE90E69576
 :10007600E0FBEEF53AEBF53BC39405E53A94004018
@@ -224,67 +226,67 @@
 :1000B6004732045A3404A23504B93604D63703D578
 :1000C6004503E647000005B475310075320790FC1C
 :1000D600047481F0A37414F0E4A3F00205D77F0F33
-:1000E600120FDD75310075320690FC047480F0E461
+:1000E600121DEA75310075320690FC047480F0E446
 :1000F600A3F0753505F511FE74002535F9EE34F4D7
-:10010600FA7B0112182D400690FC05740EF0E4FFF0
-:10011600120DE47F8F0202B37F0E120FDD753100E0
+:10010600FA7B01121831400690FC05740EF0E4FFEC
+:10011600120E0C7F8F0202B37F0E121DEA7531009C
 :10012600753205748E12000E8F3D7B007A00793E83
-:10013600E4FDFC1214D2E53D64516019E53D6450BE
+:10013600E4FDFC1214D6E53D64516019E53D6450BA
 :10014600601375310075320690FC047480F0A37458
-:100156000BF00205D790E0BCE0FF120DE474002519
-:1001660032F974FC3531FA7B01C0038B537554E0C8
-:1001760075556E75560075572CD003121BE1742CFD
+:100156000BF00205D790E0B8E0FF120E0C740025F4
+:1001660032F974FC3531FA7B01C0038B547555E0C6
+:1001760075566A75570075582CD003121BE5742CFA
 :100186002532F532E43531F5317F8E0202B3753111
 :100196000075320790FC047491F090E678E090FCCC
 :1001A60005F030B4047F0180027F0090FC06EFF07A
-:1001B60074002532F974FC3531FA7B0175540075EB
-:1001C6005512E4FD121D9674002532F974FC353182
-:1001D600FA7B01C0038B537554E07555397556008B
-:1001E600755706D003121BE174062532F532E43545
+:1001B60074002532F974FC3531FA7B0175550075EA
+:1001C6005612E4FD121D9A74002532F974FC35317D
+:1001D600FA7B01C0038B547555E075563975570087
+:1001E600755806D003121BE574062532F532E43540
 :1001F60031F531FE74002532F974FC3EFA7B01C0FC
-:10020600038B537554E0755514755600755706D013
-:1002160003121BE174062532F532E43531F531FE61
-:1002260074002532F974FC3EFA7B01C0038B5375CA
-:1002360054E075554B755600755706D003121BE1F1
+:10020600038B547555E0755614755700755806D00E
+:1002160003121BE574062532F532E43531F531FE5D
+:1002260074002532F974FC3EFA7B01C0038B5475C9
+:1002360055E0755647755700755806D003121BE5ED
 :1002460074062532F532E43531F5310205D77F13D0
-:10025600120FDD75310075321D749312000E8F3D3D
+:10025600121DEA75310075321D749312000E8F3D22
 :1002660075381D753900753600753705D3E539942F
 :1002760018E538941D5034E53DB4510E7B007A00E4
-:10028600793EAD39AC38FF1214D274002537F582A9
+:10028600793EAD39AC38FF1214D674002537F582A5
 :1002960074FC3536F583E53EF00539E5397002051F
-:1002A600380537E53770C5053680C17F93120FDDF7
+:1002A600380537E53770C5053680C17F93121DEADC
 :1002B6000205D775310075320690FC047480F0E4AF
 :1002C600A3F090F405E090E038F0E014702A30B026
-:1002D6001E121E187553017554F475550675560091
-:1002E6007557067B017AE07914121BE10205D79057
+:1002D6001E121E1C7554017555F475560675570089
+:1002E6007558067B017AE07914121BE50205D79052
 :1002F600FC057401F00203C08056753100753206A4
 :1003060090FC047480F0E4A3F0753507AF35FEC3A6
 :10031600E53B9FF534E53A9EF53390E038E01470FE
 :100326002F20B00330B42074002FF974F43EFA7B0A
-:1003360001AF34AE33121A395004E40204B290FC11
+:1003360001AF34AE33121A3D5004E40204B290FC0D
 :1003460005740CF00205D790FC057402F00205D77F
 :1003560090FC057403F00205D775310075320690DE
 :10036600FC047480F0E4A3F090E038E014704530AB
-:10037600B43A90E6017403F07F647E00121DEC909F
-:10038600E0BCE0FF120DE47EE07F6E7CE07DBD12F6
-:1003960017B37EE07FBDAD1CAC1B1218A55005122D
+:10037600B43A90E6017403F07F647E00121E0A9080
+:10038600E0B8E0FF120E0C7EE07F6A7CE07DB912D9
+:1003960017B77EE07FB9AD1CAC1B1218A950051229
 :1003A6000B48801690FC05740EF0800E90FC0574C8
 :1003B6000DF0800690FC057403F0E490E038F0023E
-:1003C60005D7E4F531F5327F02121B200205D7E48A
-:1003D600FF120DE4120F0EE4FF1219E0E4FF800293
-:1003E6007F01121B20121E180205D77531007532C7
+:1003C60005D7E4F531F5327F02121B240205D7E486
+:1003D600FF120E0C121126E4FF1219E4E4FF80024C
+:1003E6007F01121B24121E1C0205D77531007532BF
 :1003F6000690FC047480F0E4A3F090F405E0F53C6C
-:10040600E4F511E53C64016004E53C703290E0B629
+:10040600E4F511E53C64016004E53C703290E0B22D
 :10041600E0FEA3E054F064607003EE6411600280B5
 :100426007290E037E070028058E5116401600AE5D9
-:1004360011700C121C87EF6006853C110205D780EF
+:1004360011700C121C8BEF6006853C110205D780EB
 :100446005275310075320690FC0474B2F0A3E511C2
 :10045600F00205D775310075320690FC047480F001
-:10046600E4A3F090F405E0F53CFF1219E0EF24F167
+:10046600E4A3F090F405E0F53CFF1219E4EF24F163
 :10047600600F1460152410701AE4F531F532020588
 :10048600D790FC05740FF00205D790FC057410F0A8
 :100496000205D790FC057401F00205D77531007589
-:1004A600320690FC0474B5F090E0BBE090FC05F0D9
+:1004A600320690FC0474B5F090E0B7E090FC05F0DD
 :1004B6000205D775310075320690FC0474B6F0A2B9
 :1004C60080E43325E0FFA281E4334FA3F00205D791
 :1004D600853A31853B3290FC0474B7F0753505C317
@@ -292,11 +294,11 @@
 :1004F600F582E434F4F583E0648870030205D7AF2F
 :10050600357E0074002FF9EE34F4FA7B01C003C087
 :100516000174002FF9EE34FC8B56F5578958853453
-:1005260059D001D003121A900205D77531007532E1
+:1005260059D001D003121A940205D77531007532DD
 :100536000590FC0474A5F01200128F3D7B007A0032
-:10054600793EE4FDFC1214D290E036E0FF0532E578
+:10054600793EE4FDFC1214D690E036E0FF0532E574
 :1005560032AC3170020531142400F58274FC3CF58E
-:1005660083EFF090E0BCE0FF0532E532AC3170027B
+:1005660083EFF090E0B8E0FF0532E532AC3170027F
 :100576000531142400F58274FC3CF583EFF0053256
 :10058600E532AE3170020531142400F58274FC3E6A
 :10059600F583E53EF00532E532AE317002053114E1
@@ -312,66 +314,66 @@
 :0106340022A3
 :02004100D322C8
 :0800030090E6BAE0F51DD322DE
-:101EC90090E740E51DF0E490E68AF090E68B04F097
-:021ED900D32212
+:101ECD0090E740E51DF0E490E68AF090E68B04F093
+:021EDD00D3220E
 :08002B0090E6BAE0F51AD322B9
-:101EDB0090E740E51AF0E490E68AF090E68B04F088
-:021EEB00D32200
-:101DBE0090E6B9E0242F600D04701990E604E0FF60
-:101DCE00430780800890E604E0FF53077F00000081
-:071DDE00EFF08002D322C3E5
-:011DE50022DB
-:101E3000C0E0C083C082D2015391EF90E65D74018F
-:081E4000F0D082D083D0E03223
-:101E7700C0E0C083C0825391EF90E65D7404F0D058
-:061E870082D083D0E0329E
-:101E8D00C0E0C083C0825391EF90E65D7402F0D044
-:061E9D0082D083D0E03288
-:101C1B00C0E0C083C08285120D85130E850E8285B0
-:101C2B000D83A37402F085090F850A108510828538
-:101C3B000F83A37407F05391EF90E65D7410F0D00F
-:061C4B0082D083D0E032DC
-:101E4800C0E0C083C082D2035391EF90E65D74086E
-:081E5800F0D082D083D0E0320B
-:101BA400C0E0C083C08290E680E030E72085090D64
-:101BB400850A0E850E82850D83A37402F085120FAB
-:101BC400851310851082850F83A37407F05391EF5A
-:0D1BD40090E65D7420F0D082D083D0E03226
-:101EB600000102020303040405050300000000C03C
-:031EC600C2000057
-:06122100011100010800AC
-:03000B000212AC32
-:1012AC00C0E0C0F0C083C082C0D075D000C000C008
-:0D12BC0001C002C003C004C005C006C00789
-:1012C90078217C007D007BFF7A1E79C07E007F0536
-:1012D90012070590E0BBE0F526C204752700E50872
-:1012E900600415088056750805E5117004C204806C
-:1012F90043A280308101B3500B3081047F008030DC
-:101309007F01802C30B4157556007557007558212A
-:101319007559057B007A007921121A90E523540149
-:10132900F527701090E0BBE060047F0080027F0128
-:0C1339008F26D204300405AF261219E004
-:10134500D007D006D005D004D003D002D001D000FC
-:0B135500D0D0D082D083D0F0D0E032A6
-:100CB700785B7CE17D017BFF7A1E79C57E007F042E
-:100CC700120705C203C200D202C201121D6C121E16
-:100CD70060121610750B10750C007514107515122F
-:100CE700750910750A1C75121075137085120F851A
-:100CF70013107516107517B412001290E159EFF022
-:100D07007B017AE1795AE4FDFC1214D290E15AE0B2
-:100D1700FF90E036F0E490E0BCF0EF64C26059EF7A
-:100D270064C06054E490E15FF090E15FE0FFC3943A
-:100D370004504A745B2FF582E434E1F583E0FF60E9
-:100D47003C120DE47EE07F6E7CE07DBD1217B37E22
-:100D5700E07FBDAD1CAC1B1218A5501490E15FE0FD
-:100D6700245BF582E434E1F583E090E0BCF0800D8C
-:100D770090E15FE004F080B1E4FF120DE4120F0E82
-:100D8700D2E843D82090E668E04409F090E65CE0BA
-:100D9700443DF012001290E159EFF07B017AE179BE
-:100DA7005AE4FDFC1214D290E15AE064C26007E4F1
-:100DB70090E0BBF0C2B57F01121B20D2AFD28C539B
-:100DC7008EF8C203C2AF120056D2AF300105120926
-:0D0DD70020C2013003EEC203121D1580E79B
+:101EDF0090E740E51AF0E490E68AF090E68B04F084
+:021EEF00D322FC
+:101DC20090E6B9E0242F600D04701990E604E0FF5C
+:101DD200430780800890E604E0FF53077F0000007D
+:071DE200EFF08002D322C3E1
+:011DE90022D7
+:101E3400C0E0C083C082D2015391EF90E65D74018B
+:081E4400F0D082D083D0E0321F
+:101E7B00C0E0C083C0825391EF90E65D7404F0D054
+:061E8B0082D083D0E0329A
+:101E9100C0E0C083C0825391EF90E65D7402F0D040
+:061EA10082D083D0E03284
+:101C1F00C0E0C083C08285120D85130E850E8285AC
+:101C2F000D83A37402F085090F850A108510828534
+:101C3F000F83A37407F05391EF90E65D7410F0D00B
+:061C4F0082D083D0E032D8
+:101E4C00C0E0C083C082D2035391EF90E65D74086A
+:081E5C00F0D082D083D0E03207
+:101BA800C0E0C083C08290E680E030E72085090D60
+:101BB800850A0E850E82850D83A37402F085120FA7
+:101BC800851310851082850F83A37407F05391EF56
+:0D1BD80090E65D7420F0D082D083D0E03222
+:101EBA00000102020303040405050300000000C038
+:031ECA00C2000053
+:06122500011100010800A8
+:03000B000212B02E
+:1012B000C0E0C0F0C083C082C0D075D000C000C004
+:0D12C00001C002C003C004C005C006C00785
+:1012CD0078217C007D007BFF7A1E79C47E007F052E
+:1012DD0012070590E0B7E0F526C204752700E50872
+:1012ED00600415088056750805E5117004C2048068
+:1012FD0043A280308101B3500B3081047F008030D8
+:10130D007F01802C30B41575560075570075582126
+:10131D007559057B007A007921121A94E523540141
+:10132D00F527701090E0B7E060047F0080027F0128
+:0C133D008F26D204300405AF261219E4FC
+:10134900D007D006D005D004D003D002D001D000F8
+:0B135900D0D0D082D083D0F0D0E032A2
+:100CDF0078577CE17D017BFF7A1E79C97E007F0406
+:100CEF00120705C203C200D202C201121D70121EEA
+:100CFF0064121614750B10750C00751410751512FF
+:100D0F00750910750A1C75121075137085120F85F1
+:100D1F0013107516107517B412001290E155EFF0FD
+:100D2F007B017AE17956E4FDFC1214D690E156E08E
+:100D3F00FF90E036F0E490E0B8F0EF64C26059EF56
+:100D4F0064C06054E490E15BF090E15BE0FFC3941A
+:100D5F0004504A74572FF582E434E1F583E0FF60C5
+:100D6F003C120E0C7EE07F6A7CE07DB91217B77ED5
+:100D7F00E07FB9AD1CAC1B1218A9501490E15BE0D9
+:100D8F002457F582E434E1F583E090E0B8F0800D6C
+:100D9F0090E15BE004F080B1E4FF120E0C1211261B
+:100DAF00D2E843D82090E668E04409F090E65CE092
+:100DBF00443DF012001290E155EFF07B017AE1799A
+:100DCF0056E4FDFC1214D690E156E064C26007E4CD
+:100DDF0090E0B7F0C2B57F01121B24D2AFD28C5373
+:100DEF008EF8C203C2AF120056D2AF3001051209FE
+:0D0DFF0020C2013003EEC203121D1980E76F
 :0B00460090E50DE030E402C322D3225D
 :1009200090E6B9E070030209E5147003020A5A2444
 :10093000FE7003020AD524FB70030209DF14700362
@@ -381,22 +383,22 @@
 :1009700024067056E50B90E6B3F0E50C80421200B9
 :10098000465044E51490E6B3F0E5158033E50D904C
 :10099000E6B3F0E50E802985120F851310E50F9060
-:1009A000E6B3F0E510801990E6BAE0FF121D41AA07
+:1009A000E6B3F0E510801990E6BAE0FF121D45AA03
 :1009B00006A9077B01EA494B600DEE90E6B3F0EF24
-:1009C00090E6B4F0020B40020B2F020B2F121EDB3D
+:1009C00090E6B4F0020B40020B2F020B2F121EDF39
 :1009D000020B4012002B020B40120003020B4012CC
-:1009E0001EC9020B4090E6B8E0247F601514601920
+:1009E0001ECD020B4090E6B8E0247F60151460191C
 :1009F00024027063A200E43325E0FFA202E4334F37
 :100A00008041E490E740F0803F90E6BCE0547EFFF8
 :100A10007E00E0D394807C0040047D0180027D0054
-:100A2000EC4EFEED4F24B6F582741E3EF583E49342
+:100A2000EC4EFEED4F24BAF582741E3EF583E4933E
 :100A3000FF3395E0FEEF24A1FFEE34E68F82F583CD
 :100A4000E0540190E740F0E4A3F090E68AF090E6ED
 :100A50008B7402F0020B40020B2F90E6B8E024FEEC
 :100A6000601624026003020B4090E6BAE0B4010570
 :100A7000C200020B40020B2F90E6BAE0705590E6E0
 :100A8000BCE0547EFF7E00E0D394807C0040047D77
-:100A90000180027D00EC4EFEED4F24B6F582741EFF
+:100A90000180027D00EC4EFEED4F24BAF582741EFB
 :100AA0003EF583E493FF3395E0FEEF24A1FFEE349F
 :100AB000E68F82F583E054FEF090E6BCE0548013AC
 :100AC0001313541FFFE0540F2F90E683F0E04420EF
@@ -404,110 +406,110 @@
 :100AE0004E90E6BAE0B40104D200805490E6BAE039
 :100AF0006402604C803990E6BCE0547EFF7E00E0EA
 :100B0000D394807C0040047D0180027D00EC4EFE89
-:100B1000ED4F24B6F582741E3EF583E493FF3395C2
+:100B1000ED4F24BAF582741E3EF583E493FF3395BE
 :100B2000E0FEEF24A1FFEE34E68F82F583800D9086
-:100B3000E6A08008121DBE500790E6A0E04401F038
+:100B3000E6A08008121DC2500790E6A0E04401F034
 :070B400090E6A0E04480F004
 :010B4700228B
-:03003300020FFCBD
-:040FFC0053D8EF32A5
-:101227006080E0D9292E43C9A2D87C013D3654A15C
-:10123700ECF0061362A705F3C0C7738C98932BD9FC
-:10124700BC4C82CA1E9B573CFDD4E01667426F1800
-:101257008A17E512BE4EC4D6DA9EDE49A0FBF58E8C
-:10126700BB2FEE7AA968799115B2073F94C210890E
-:101277000B225F21807F5D9A5A903227353ECCE75B
-:10128700BFF79703FF1930B348A5B5D1D75E922AA8
-:10129700AC56AAC64FB838D296A47DB676FC6BE298
-:0412A7009C7404F13E
-:081360008C448D45AB07AA0681
-:10136800E4F546F547C3E5479545E5446480F8E567
-:1013780046648098400302140FE54725E0FFE546E0
-:1013880033FE74D92FF58274E03EF583E0FF7E00CA
-:10139800AC44AD451207B78C488D49E54725E0FFB9
-:1013A800E54633FE74DA2FF58274E03EF583E0FFFC
-:1013B8007E00AC44AD451207B78C4A8D4BE54965B4
-:1013C8004B7004E548654A6030EB2549F582EA35FB
-:1013D80048F583E0F9EB254BF582EA354AF583E0D9
-:1013E800FFEB2549F582EA3548F583EFF0EB254B0D
-:1013F800F582EA354AF583E9F00547E547600302D7
-:0B140800136D054602136D7E007F018E
-:0114130022B6
-:0C1414008E448F458C468D478A488B49DA
-:10142000E54545446006E54745467004E4FEFF2275
-:10143000E4F54AF54BC3E54B9549E5486480F8E58A
-:101440004A648098507BE4F54CF54DE547254BF513
-:1014500082E546354AF583E4F0C3E54D9549E54814
-:101460006480F8E54C6480985049E54D254B24D9BB
-:10147000F582E434E0F583E0FFE545254DF582E5AE
-:1014800044354CF583E0FEEF8EF0A4FFE547254B95
-:10149000F582E546354AF583E02FFFE547254BF514
-:1014A00082E546354AF583EFF0054DE54D70AA0516
-:1014B0004C80A6054BE54B6003021435054A021427
-:0514C000357E007F01F4
-:0114C5002204
-:101CE70012072BFF9000031207441207719000039D
-:101CF700EF120783900002120744FF9000011207BA
-:0E1D070044900002120783900001EF02078350
-:081126008E448F458C468D4775
-:10112E00E4F548F549E547AE467802CEA2E713CE80
-:10113E0013D8F8FFC3E5499FEE6480F8E548648054
-:10114E009840030211E8E549AE487802C333CE3326
-:10115E00CED8F92545FFEE3544FAA9077B018B4A17
-:10116E00F54B894C74DA2549F582E434E0F583E0D9
-:10117E00541FFFE48F50F54FF54EF54D121CE7ABA3
-:10118E004AAA4BA94C120813C374209550F9F812B1
-:10119E000800C004C005C006C007A94C120813A958
-:1011AE0050A8011207EDD003D002D001D000EF4BB2
-:1011BE00FFEE4AFEED49FDEC48FCAB4AAA4BA94CAA
-:1011CE00120833AB4AAA4BA94C121CE70549E54954
-:0E11DE00600302113305480211337E007F01C9
-:0111EC0022E0
-:101C5100D3ED9410EC64809480402AED1D70011C3A
-:101C6100142FF582EE3CF583E0FB547F24D9F582F5
-:101C7100E434E0F583E0F9540F2FF582E43EF58377
-:051C8100E06BF080CBD8
-:011C8600223B
-:101D150090E682E030E004E020E60B90E682E030D9
-:101D2500E119E030E71590E680E04401F07F147E8C
-:0C1D350000121ADA90E680E054FEF02262
-:101CB80030060990E680E0440AF0800790E680E06C
-:101CC8004408F07FDC7E05121ADA90E65D74FFF0B6
-:0F1CD80090E65FF05391EF90E680E054F7F02232
-:101ADA008E588F5990E600E054187012E559240187
-:101AEA00FFE43558C313F558EF13F559801590E6FE
-:101AFA0000E05418FFBF100BE55925E0F559E558E9
-:101B0A0033F558E5591559AE58700215584E600507
-:061B1A00121EED80EE2218
-:06156B008C528D53AE0707
-:10157100EB70037F012290E678E020E6F990E678AF
-:101581007480F0EE25E0440190E679F090E678E091
-:1015910030E0F990E678E020E26BE030E167BB01F2
-:1015A1000790E678E04420F090E679E0F5541BEBF3
-:1015B100603090E678E030E0F990E678E020E245AE
-:1015C100BB010790E678E04420F090E679E0FF0562
-:1015D10053E553AC527002055214F5828C83EFF03F
-:1015E10080CC90E678E030E0F990E678E020E215F2
-:1015F10090E678E04440F090E679E08553828552A8
-:0E16010083F07F012290E678E04440F07F0005
-:01160F0022B8
-:1019180090E678E020E6F990E6787480F0EF25E02C
-:1019280090E679F090E678E030E0F990E678E0200B
-:10193800E23AE030E136EBD3940040260DEDAE04F8
-:1019480070010C14F5828E83E090E679F01B90E626
-:1019580078E030E0F990E678E020E210E020E1D687
-:10196800800A90E678E04440F07F012290E678E033
-:051978004440F07F0077
-:01197D002247
-:021D4100A907F0
-:101D4300AE16AF178F828E83A3E064037017AD01C5
-:101D530019ED7001228F828E83E07C002FFDEC3E13
-:081D6300FEAF0580DFE4FEFF86
-:011D6B002255
-:101EED007400F58690FDA57C05A3E582458370F908
-:011EFD0022C2
-:030000000216A441
-:0C16A400787FE4F6D8FD75815B0216EB40
+:03003300021EF6B4
+:041EF60053D8EF329C
+:10122B006080E0D5292E43C9A2D87C013D3654A15C
+:10123B00ECF0061362A705F3C0C7738C98932BD9F8
+:10124B00BC4C82CA1E9B573CFDD4E01667426F18FC
+:10125B008A17E512BE4EC4D6DA9EDE49A0FBF58E88
+:10126B00BB2FEE7AA968799115B2073F94C210890A
+:10127B000B225F21807F5D9A5A903227353ECCE757
+:10128B00BFF79703FF1930B348A5B5D1D75E922AA4
+:10129B00AC56AAC64FB838D296A47DB676FC6BE294
+:0412AB009C7404F13A
+:081364008C448D45AB07AA067D
+:10136C00E4F546F547C3E5479545E5446480F8E563
+:10137C00466480984003021413E54725E0FFE546D8
+:10138C0033FE74D52FF58274E03EF583E0FF7E00CA
+:10139C00AC44AD451207B78C488D49E54725E0FFB5
+:1013AC00E54633FE74D62FF58274E03EF583E0FFFC
+:1013BC007E00AC44AD451207B78C4A8D4BE54965B0
+:1013CC004B7004E548654A6030EB2549F582EA35F7
+:1013DC0048F583E0F9EB254BF582EA354AF583E0D5
+:1013EC00FFEB2549F582EA3548F583EFF0EB254B09
+:1013FC00F582EA354AF583E9F00547E547600302D3
+:0B140C00137105460213717E007F0182
+:0114170022B2
+:0C1418008E448F458C468D478A488B49D6
+:10142400E54545446006E54745467004E4FEFF2271
+:10143400E4F54AF54BC3E54B9549E5486480F8E586
+:101444004A648098507BE4F54CF54DE547254BF50F
+:1014540082E546354AF583E4F0C3E54D9549E54810
+:101464006480F8E54C6480985049E54D254B24D5BB
+:10147400F582E434E0F583E0FFE545254DF582E5AA
+:1014840044354CF583E0FEEF8EF0A4FFE547254B91
+:10149400F582E546354AF583E02FFFE547254BF510
+:1014A40082E546354AF583EFF0054DE54D70AA0512
+:1014B4004C80A6054BE54B6003021439054A02141F
+:0514C400397E007F01EC
+:0114C9002200
+:101CEB0012072BFF90000312074412077190000399
+:101CFB00EF120783900002120744FF9000011207B6
+:0E1D0B0044900002120783900001EF0207834C
+:080F36008E448F458C468D4767
+:100F3E00E4F548F549E547AE467802CEA2E713CE72
+:100F4E0013D8F8FFC3E5499FEE6480F8E548648046
+:100F5E00984003020FF8E549AE487802C333CE330A
+:100F6E00CED8F92545FFEE3544FAA9077B018B4A09
+:100F7E00F54B894C74D62549F582E434E0F583E0CF
+:100F8E00541FFFE48F50F54FF54EF54D121CEBAB91
+:100F9E004AAA4BA94C120813C374209550F9F812A3
+:100FAE000800C004C005C006C007A94C120813A94A
+:100FBE0050A8011207EDD003D002D001D000EF4BA4
+:100FCE00FFEE4AFEED49FDEC48FCAB4AAA4BA94C9C
+:100FDE00120833AB4AAA4BA94C121CEB0549E54942
+:0E0FEE006003020F430548020F437E007F019F
+:010FFC0022D2
+:101C5500D3ED9410EC64809480402AED1D70011C36
+:101C6500142FF582EE3CF583E0FB547F24D5F582F5
+:101C7500E434E0F583E0F9540F2FF582E43EF58373
+:051C8500E06BF080CBD4
+:011C8A002237
+:101D190090E682E030E004E020E60B90E682E030D5
+:101D2900E119E030E71590E680E04401F07F147E88
+:0C1D390000121ADE90E680E054FEF0225A
+:101CBC0030060990E680E0440AF0800790E680E068
+:101CCC004408F07FDC7E05121ADE90E65D74FFF0AE
+:0F1CDC0090E65FF05391EF90E680E054F7F0222E
+:101ADE008E588F5990E600E054187012E559240183
+:101AEE00FFE43558C313F558EF13F559801590E6FA
+:101AFE0000E05418FFBF100BE55925E0F559E558E5
+:101B0E0033F558E5591559AE58700215584E600503
+:061B1E00121F1880EE22E8
+:06156F008C528D53AE0703
+:10157500EB70037F012290E678E020E6F990E678AB
+:101585007480F0EE25E0440190E679F090E678E08D
+:1015950030E0F990E678E020E26BE030E167BB01EE
+:1015A5000790E678E04420F090E679E0F5541BEBEF
+:1015B500603090E678E030E0F990E678E020E245AA
+:1015C500BB010790E678E04420F090E679E0FF055E
+:1015D50053E553AC527002055214F5828C83EFF03B
+:1015E50080CC90E678E030E0F990E678E020E215EE
+:1015F50090E678E04440F090E679E08553828552A4
+:0E16050083F07F012290E678E04440F07F0001
+:0116130022B4
+:10191C0090E678E020E6F990E6787480F0EF25E028
+:10192C0090E679F090E678E030E0F990E678E02007
+:10193C00E23AE030E136EBD3940040260DEDAE04F4
+:10194C0070010C14F5828E83E090E679F01B90E622
+:10195C0078E030E0F990E678E020E210E020E1D683
+:10196C00800A90E678E04440F07F012290E678E02F
+:05197C004440F07F0073
+:011981002243
+:021D4500A907EC
+:101D4700AE16AF178F828E83A3E064037017AD01C1
+:101D570019ED7001228F828E83E07C002FFDEC3E0F
+:081D6700FEAF0580DFE4FEFF82
+:011D6F002251
+:101F18007400F58690FDA57C05A3E582458370F9DC
+:011F28002296
+:030000000216A83D
+:0C16A800787FE4F6D8FD75815B0216EF38
 :10063500E709F608DFFA8046E709F208DFFA803EA7
 :1006450088828C83E709F0A3DFFA8032E309F60894
 :10065500DFFA8078E309F208DFFA807088828C83FC
@@ -552,15 +554,15 @@
 :10085900D083D082F8E4937012740193700DA3A32E
 :1008690093F8740193F5828883E473740293686042
 :06087900EFA3A3A380DF42
-:1016B000020CB7E493A3F8E493A34003F68001F28D
-:1016C00008DFF48029E493A3F85407240CC8C3333B
-:1016D000C4540F4420C8834004F456800146F6DF0A
-:1016E000E4800B01020408102040809011EDE47E9C
-:1016F000019360BCA3FF543F30E509541FFEE493FF
-:10170000A360010ECF54C025E060A840B8E493A3C5
-:10171000FAE493A3F8E493A3C8C582C8CAC583CAF0
-:10172000F0A3C8C582C8CAC583CADFE9DEE780BEA8
-:0112AB000042
+:1016B400020CDFE493A3F8E493A34003F68001F261
+:1016C40008DFF48029E493A3F85407240CC8C33337
+:1016D400C4540F4420C8834004F456800146F6DF06
+:1016E400E4800B01020408102040809011F5E47E90
+:1016F400019360BCA3FF543F30E509541FFEE493FB
+:10170400A360010ECF54C025E060A840B8E493A3C1
+:10171400FAE493A3F8E493A3C8C582C8CAC583CAEC
+:10172400F0A3C8C582C8CAC583CADFE9DEE780BEA4
+:0112AF00003E
 :10087F00BC000BBE0029EF8DF084FFADF022E4CC5D
 :10088F00F875F008EF2FFFEE33FEEC33FCEE9DEC26
 :10089F00984005FCEE9DFE0FD5F0E9E4CEFD22ED6C
@@ -574,4 +576,3 @@
 :0C090800ECF608EDF608EEF608EFF6221B
 :0C091400ECF208EDF208EEF208EFF2221F
 :00000001FF
-
--- a/drivers/dahdi/xpp/firmwares/USB_RECOV.hex
+++ b/drivers/dahdi/xpp/firmwares/USB_RECOV.hex
@@ -0,0 +1,421 @@
+#
+# $Id: USB_RECOV.hex 9760 2011-09-05 12:33:27Z dima $
+#
+:03004300021600A2
+:0300530002160092
+:10160000021580000215C6000215B00002159800F0
+:081610000213F20002137B003B
+:100A00001201000200000040AAAAAAAAAAAA010292
+:100A100003010A060002000000400100090237003D
+:100A2000020100C0000904000002FFFFFF040705E7
+:100A3000020200020007058602000200090401000C
+:100A400002FFFFFF050705040200020007058802F8
+:100A5000000200001201000200000040E4E4511115
+:100A60000000010203010A0600020000004001002C
+:100A700009023700020100C0320904000002FFFF32
+:100A8000FF0407050202400000070586024000003F
+:100A90000904010002FFFFFF0507050402400000F2
+:100AA000070588024000000604001600140012002A
+:100AB0000A00260004030904160358006F007200A0
+:100AC00063006F006D0020004C00540044001403CC
+:100AD00041007300740072006900620061006E00E2
+:100AE0006B001203530065007200690061006C0026
+:100AF0004E006F000A0346005000470041002603E5
+:100B00004D0061006E00610067006D0065006E00C1
+:100B10007400500072006F00630065007300730082
+:060B20006F0072000000EE
+:08164300584F52434F4D2000A7
+:100E650041E0B20042E0AD0000021BE0810218E063
+:100E75007543E0AF0000004CE036393734364D207D
+:060E8500202020202000C7
+:101517008B2A8A2B892CE52F152FAE2E7002152EBC
+:101527004E6014AB2A052CE52CAA2B7002052B1450
+:08153700F9ED12019280DF22A0
+:1013B8008B328A338934E5391539AE3870021538DD
+:1013C8004E6026AB350537E537AA36700205361468
+:1013D800F912014CFFAB320534E534AA337002052B
+:0A13E8003314F9EF12019280CD22B8
+:1011FD008C2A8D2BAA06A9077535018A3689377574
+:10120D00380075391C7B017AE079481213B890E0EB
+:10121D0060E0FCA3E0FDA3E0FEA3E064D1FFEE647B
+:10122D008DFEED644CFDEC6449FC90E06012026EA5
+:10123D007EE07F487D1C7C00120CFF7EE07F487BAA
+:10124D001C7A00AD2BAC2A120DB37D1C7C00AF2B8C
+:10125D00AE2A120C387D1C7C00AF2BAE2A0214284E
+:08099F008E2A8F2B8C2C8D2D6C
+:1009A700C204121567BF5004D204803BE4F52EF54C
+:1009B7002FE52D252FF582E52C352EF583E0FFE574
+:1009C7002B252FF582E52A352EF583E0B5070E0591
+:1009D7002FE52F7002052E6410452E70D4E52F6485
+:0909E70010452E7002D204A20496
+:0109F00022E4
+:020875008F32C0
+:100877001215678F33E4F537F538AD38AC37120FFB
+:100887001474652538F582E434E0F583E534F00522
+:1008970038E53870020537C39408E53764809480DB
+:1008A70040D8E532600490E065F090E065E0B4C0C0
+:1008B70008753500753608800675351D7536367529
+:1008C7003700753808C3E5389410E537648094809D
+:1008D7005023120F1074652538F582E434E0F58350
+:1008E700E534F00538E538700205370536E536702A
+:1008F700D4053580D07534FF75351D7536197537B4
+:1009070000753810C3E538942CE53764809480501F
+:1009170033E533B4510E7B007A007934AD36AC350C
+:10092700FF120F1C74652538F582E434E0F583E582
+:1009370034F00538E538700205370536E53670C4FA
+:10094700053580C075351D75363EE4F534F537F548
+:1009570038C3E5389406E53764809480502FE53333
+:10096700B4510A90E065E0B4C203120F1074422537
+:1009770038F582E434E0F583E534F00538E538707E
+:100987000205370536E53670C8053580C490E06541
+:07099700E0B4C20374C0F0DC
+:01099E002236
+:0A12D3008E2A8F2B8B2C8A2D892E7A
+:1012DD007E00E52B2DF533EE352AF5321215678F8D
+:1012ED002FE52F6451600BC3E52B9410E52A940074
+:1012FD005035852A30852B31C3E5319533E5309551
+:10130D00325024AB2CAA2DA92EAD31AC30AF2F12FB
+:10131D00117A0531E531700205307401252EF52E57
+:07132D00E4352DF52D80D100
+:011334002296
+:020B26008F320C
+:100B28007F031214ECEF2402FFE43EA9077533019A
+:100B3800F534893578367C007D007BFF7A16794359
+:100B48007E007F08120126E532600464017054E5D6
+:100B58000C2408F582E4350BF58374B4F0E50C2415
+:100B680009F582E4350BF5837404F0E50C240AF5E5
+:100B780082E4350BF5837413F0E50C240BF582E45D
+:100B8800350BF5837486F0E50C240CF582E4350BFF
+:100B9800F583E4F0E50C240DF582E4350BF583E4E8
+:100BA800F0806C90E066E0FFE50C2408F582E435FF
+:100BB8000BF583EFF090E067E0FFE50C2409F58280
+:100BC800E4350BF583EFF090E068E0FFE50C240ACC
+:100BD800F582E4350BF583EFF090E069E0FFE50C72
+:100BE800240BF582E4350BF583EFF090E06AE0FF23
+:100BF800E50C240CF582E4350BF583EFF090E06BFF
+:100C0800E0FFE50C240DF582E4350BF583EFF0E405
+:100C1800FF74362FF8E6FEAB33AA34A93575F00217
+:0F0C2800EFA4F58285F083EE1201A40FBF08E25E
+:010C3700229A
+:10145E00E4F532E50C240BF582E4350BF583E0FE62
+:10146E00E50C240AF582E4350BF583E0FDEDFF90E3
+:10147E00E0ADEEF0A3EFF0D20412000390E680E0B0
+:03148E0054F7F020
+:011491002238
+:10105A0090E600E054E74410F090E60174C0F09086
+:10106A00E6107420F000000090E611F000000090F5
+:10107A00E6047480F0000000740FF0000000E4F051
+:10108A0000000090E6187410F0000000E490E619E1
+:10109A00F000000090E61A7408F0000000E490E600
+:1010AA001BF000000090E6497482F0000000F00096
+:1010BA00000090E6247402F0000000E490E625F0B7
+:1010CA0000000090E6957480F0000000F000000037
+:1010DA0043AF017B017AE07914752E00752F06E47F
+:0410EA00FD021517D7
+:1015DC007C007D181201C6EF1FAC0670011E4C700A
+:0215EC00F622E5
+:1015670090E678E0541824F06008240870087F504B
+:0815770080067F518002E4FFB1
+:01157F002249
+:0C0F1000AD36AC357B007A007934AF338D
+:0C0F1C008F398C3A8D3B8B3C8A3D893E1E
+:100F2800E4F53FF540754103FDF542F543A2AF33C3
+:100F3800F544E53924AF600D047012753F00754023
+:100F4800017D018008753F00754002E4FDE53960C8
+:100F580051E540453F604BE53A90E0AFF0E53BA3F3
+:100F6800F074AF2DF582E434E0AD82FCAB40AF39CC
+:100F780012126D7542008F437F0A7E00121335E509
+:100F880043454260107CE07D647B01AF39120FB5A8
+:100F98007542008F4390E064E0AB3CAA3DA93E1245
+:0C0FA8000192E54424FF92AFAE42AF433B
+:010FB400221A
+:0C117A008F348C358D368B378A388939DC
+:10118600E4F53AF53B753C03FDF53DF53EA2AF337C
+:10119600F53FE53424AF600D047012753A00753BD7
+:1011A600027D018008753A00753B03E4FDE5346075
+:1011B6003BE53B453A6035E53590E0AFF0E536A3D3
+:1011C600F0AB37AA38A93912014C90E0B1F074AFF0
+:1011D6002DF582E434E0AD82FCAB3BAF3412126DE8
+:1011E600753D008F3E7F0A7E00121335E53F24FFD2
+:0611F60092AFAE3DAF3EDA
+:0111FC0022D0
+:10054300E4F52AF52BF52CF52DF52EF52FF530E5F1
+:10055300AA5484600302071190E694E0FE90E695A6
+:10056300E0FBEEF52DEBF52EC39405E52D9400404D
+:100573000790F404E0FD80027DFFED24F570030293
+:10058300062524E6700302064F24E0700302062CBE
+:1005930024FE7003020649243960030206B3752A58
+:1005A30000752B0590FC04748EF01215678F30E5EF
+:1005B3003064516019E53064506013752A00752B5F
+:1005C3000690FC047480F0A3740BF00206D6121597
+:1005D300678F307B007A007931E4FDFC120F1CAF8A
+:1005E300311208757400252BF974FC352AFA7B0146
+:1005F300C0038B357536E075376575380075392C52
+:10060300D0031213B87400252BF58274FC352AF538
+:1006130083E531F0742C252BF52BE4352AF52A02DA
+:1006230006D6E4F52AF52B801D1215678F307B0063
+:100633007A007931E4FDFC120F1CAF311208757F8B
+:10064300C0120B26800012145E0206D6752A0075AE
+:100653002B0590FC0474A5F01215678F307B007A8C
+:10066300007931E4FDFC120F1C052BE52BAE2A703B
+:1006730002052A142400F58274FC3EF583E508F094
+:10068300052BE52BAE2A7002052A142400F582748B
+:10069300FC3EF583E515F0052BE52BAE2A7002052C
+:1006A3002A142400F58274FC3EF583E531F080239F
+:1006B300752A00752B0690FC047480F0C3E52E9414
+:1006C30005E52D94005006A37407F0800690FC0501
+:1006D3007406F0E52B452A602CE52BFD90FC00F019
+:1006E300E52AFFA3F090F402E090FC02F090F403FB
+:1006F300E090FC03F090E69CEFF000000090E69D94
+:0E070300EDF000000090E6957480F00000001C
+:0107110022C5
+:02004100D322C8
+:0800460090E6BAE0F51DD3229B
+:1015EE0090E740E51DF0E490E68AF090E68B04F07B
+:0215FE00D322F6
+:08163B0090E6BAE0F51AD32293
+:1016180090E740E51AF0E490E68AF090E68B04F053
+:02162800D322CB
+:10153F0090E6B9E0242F600D04701990E604E0FFE7
+:10154F00430780800890E604E0FF53077F00000008
+:07155F00EFF08002D322C36C
+:011566002262
+:10158000C0E0C083C082D2015391EF90E65D740148
+:08159000F0D082D083D0E032DC
+:1015B000C0E0C083C0825391EF90E65D7404F0D028
+:0615C00082D083D0E0326E
+:1015C600C0E0C083C0825391EF90E65D7402F0D014
+:0615D60082D083D0E03258
+:1013F200C0E0C083C08285110D85120E850E8285E4
+:101402000D83A37402F085090F850A108510828569
+:101412000F83A37407F05391EF90E65D7410F0D040
+:0614220082D083D0E0320D
+:10159800C0E0C083C082D2035391EF90E65D740827
+:0815A800F0D082D083D0E032C4
+:10137B00C0E0C083C08290E680E030E72085090D95
+:10138B00850A0E850E82850D83A37402F085110FDD
+:10139B00851210851082850F83A37407F05391EF8C
+:0D13AB0090E65D7420F0D082D083D0E03257
+:0E09F10000010202030304040505C0C2000059
+:1007120078237C007D007BFF7A0979FB7E007F04D1
+:10072200120126C203C200D202C20112105A750B74
+:100732000A750C0075130A75141275090A750A1CDC
+:1007420075110A75127085110F85121075160A75CA
+:1007520017B41215678F217B007A007922E4FDFC21
+:10076200120F1C852208E4F515F52774232527F8B6
+:10077200E6FF605C1208757EE07F657CE07DB31267
+:1007820011FD7EE07FB3AD1CAC1B12099F50387483
+:10079200232527F8E6F515652260277B007A007984
+:1007A200157D01E4FFFE1212D37B007A007922E468
+:1007B200FDFCAF21120F1CE52265156013751501B2
+:1007C200800E7515FF80090527E527C39404409B19
+:1007D200E5157059FB7A0079227D01FCAF21120FD9
+:1007E2001CE522752900F5287B007A0079227D021A
+:1007F2007C00AF21120F1CE5224229E52964E47036
+:1008020004E52864E470267515C0FB7A0079157D2D
+:1008120001FFFE1212D37B007A007922E4FDFCAFC5
+:1008220021120F1CE52265156003751501AF151223
+:100832000B26D2E843D82090E668E04409F090E61F
+:100842005CE0443DF0E51564C06005E515B4C20303
+:1008520012145ED2AF538EF8C203C2AF120543D256
+:10086200AF30010512031BC2013003EEC2031214A2
+:03087200C080E75C
+:0B00360090E50DE030E402C322D3226D
+:10031B0090E6B9E070030203E01470030204552465
+:10032B00FE70030204D024FB70030203DA14700383
+:10033B000203D41470030203C81470030203CE2407
+:10034B0005600302052F120041400302053B90E6B6
+:10035B00BBE024FE602714603E24FD60111460276F
+:10036B0024067056E50B90E6B3F0E50C80421200C4
+:10037B00365044E51390E6B3F0E5148033E50D9069
+:10038B00E6B3F0E50E802985110F851210E50F906D
+:10039B00E6B3F0E510801990E6BAE0FF1214ECAA70
+:1003AB0006A9077B01EA494B600DEE90E6B3F0EF2F
+:1003BB0090E6B4F002053B02052A02052A12161834
+:1003CB0002053B12163B02053B12004602053B128F
+:1003DB0015EE02053B90E6B8E0247F60151460191A
+:1003EB0024027063A200E43325E0FFA202E4334F42
+:1003FB008041E490E740F0803F90E6BCE0547EFF04
+:10040B007E00E0D394807C0040047D0180027D005F
+:10041B00EC4EFEED4F24F1F58274093EF583E49327
+:10042B00FF3395E0FEEF24A1FFEE34E68F82F583D8
+:10043B00E0540190E740F0E4A3F090E68AF090E6F8
+:10044B008B7402F002053B02052A90E6B8E024FE0D
+:10045B0060162402600302053B90E6BAE0B4010586
+:10046B00C20002053B02052A90E6BAE0705590E601
+:10047B00BCE0547EFF7E00E0D394807C0040047D82
+:10048B000180027D00EC4EFEED4F24F1F5827409E4
+:10049B003EF583E493FF3395E0FEEF24A1FFEE34AA
+:1004AB00E68F82F583E054FEF090E6BCE0548013B7
+:1004BB001313541FFFE0540F2F90E683F0E04420FA
+:1004CB00F0806D805A90E6B8E024FE60192402702B
+:1004DB004E90E6BAE0B40104D200805490E6BAE044
+:1004EB006402604C803990E6BCE0547EFF7E00E0F5
+:1004FB00D394807C0040047D0180027D00EC4EFE95
+:10050B00ED4F24F1F58274093EF583E493FF3395A7
+:10051B00E0FEEF24A1FFEE34E68F82F583800D9091
+:10052B00E6A0800812153F500790E6A0E04401F0CA
+:07053B0090E6A0E04480F00F
+:010542002296
+:0300330002004E7A
+:04004E0053D8EF3262
+:100E8B006080E0CF292E43C9A2D87C013D3654A106
+:100E9B00ECF0061362A705F3C0C7738C98932BD99C
+:100EAB00BC4C82CA1E9B573CFDD4E01667426F18A0
+:100EBB008A17E512BE4EC4D6DA9EDE49A0FBF58E2C
+:100ECB00BB2FEE7AA968799115B2073F94C21089AE
+:100EDB000B225F21807F5D9A5A903227353ECCE7FB
+:100EEB00BFF79703FF1930B348A5B5D1D75E922A48
+:100EFB00AC56AAC64FB838D296A47DB676FC6BE238
+:040F0B009C7404F1DD
+:080CFF008C2C8D2DAB07AA0619
+:100D0700E4F52EF52FC3E52F952DE52C6480F8E546
+:100D17002E6480984003020DAEE52F25E0FFE52EF7
+:100D270033FE74CF2FF58274E03EF583E0FF7E003B
+:100D3700AC2CAD2D1201D88C308D31E52F25E0FF7D
+:100D4700E52E33FE74D02FF58274E03EF583E0FF85
+:100D57007E00AC2CAD2D1201D88C328D33E5316578
+:100D6700337004E53065326030EB2531F582EA35C2
+:100D770030F583E0F9EB2533F582EA3532F583E088
+:100D8700FFEB2531F582EA3530F583EFF0EB2533BC
+:100D9700F582EA3532F583E9F0052FE52F60030286
+:0B0DA7000D0C052E020D0C7E007F01DC
+:010DB200221E
+:0C0DB3008E2C8F2D8C2E8D2F8A308B31D2
+:100DBF00E52D452C6006E52F452E7004E4FEFF223D
+:100DCF00E4F532F533C3E5339531E5306480F8E56A
+:100DDF0032648098507BE4F534F535E52F2533F5F3
+:100DEF0082E52E3532F583E4F0C3E5359531E530F4
+:100DFF006480F8E5346480985049E535253324CF75
+:100E0F00F582E434E0F583E0FFE52D2535F582E545
+:100E1F002C3534F583E0FEEF8EF0A4FFE52F25335C
+:100E2F00F582E52E3532F583E02FFFE52F2533F5DB
+:100E3F0082E52E3532F583EFF00535E53570AA05DD
+:100E4F003480A60533E5336003020DD40532020D5D
+:050E5F00D47E007F01BC
+:010E6400226B
+:1014920012014CFF900003120165120192900003A9
+:1014A200EF1201A4900002120165FF9000011201E7
+:0E14B200659000021201A4900001EF0201A457
+:080C38008E2C8F2D8C2E8D2FC8
+:100C4000E4F530F531E52FAE2E7802CEA2E713CED3
+:100C500013D8F8FFC3E5319FEE6480F8E530648077
+:100C6000984003020CFAE531AE307802C333CE333C
+:100C7000CED8F9252DFFEE352CFAA9077B018B3252
+:100C8000F533893474D02531F582E434E0F583E01E
+:100C9000541FFFE48F38F537F536F535121492AB53
+:100CA00032AA33A934120234C374209538F9F812E9
+:100CB0000221C004C005C006C007A934120234A92D
+:100CC00038A80112020ED003D002D001D000EF4BA1
+:100CD000FFEE4AFEED49FDEC48FCAB32AA33A934E5
+:100CE000120254AB32AA33A9341214920531E53101
+:0E0CF0006003020C450530020C457E007F01BA
+:010CFE0022D3
+:10142800D3ED9410EC64809480402AED1D70011C6B
+:10143800142FF582EE3CF583E0FB547F24CFF58230
+:10144800E434E0F583E0F9540F2FF582E43EF583A8
+:05145800E06BF080CB09
+:01145D00226C
+:1014C00090E682E030E004E020E60B90E682E03037
+:1014D000E119E030E71590E680E04401F07F147EEA
+:0C14E0000012133590E680E054FEF0226C
+:1000030030040990E680E0440AF0800790E680E03F
+:100013004408F07FDC7E0512133590E65D74FFF033
+:0F00230090E65FF05391EF90E680E054F7F02203
+:101335008E458F4690E600E054187012E54624016C
+:10134500FFE43545C313F545EF13F546801590E6E3
+:1013550000E05418FFBF100BE54625E0F546E545CE
+:1013650033F545E5461546AE45700215454E600513
+:0613750012162A80EE2290
+:060FB5008C458D46AE07DD
+:100FBB00EB70037F012290E678E020E6F990E6786B
+:100FCB007480F0EE25E0440190E679F090E678E04D
+:100FDB0030E0F990E678E020E26BE030E167BB01AE
+:100FEB000790E678E04420F090E679E0F5471BEBBC
+:100FFB00603090E678E030E0F990E678E020E2456A
+:10100B00BB010790E678E04420F090E679E0FF051D
+:10101B0046E546AC457002054514F5828C83EFF02E
+:10102B0080CC90E678E030E0F990E678E020E215AD
+:10103B0090E678E04440F090E679E085468285457D
+:0E104B0083F07F012290E678E04440F07F00C1
+:011059002274
+:10126D0090E678E020E6F990E6787480F0EF25E0DE
+:10127D0090E679F090E678E030E0F990E678E020BD
+:10128D00E23AE030E136EBD3940040260DEDAE04AA
+:10129D0070010C14F5828E83E090E679F01B90E6D8
+:1012AD0078E030E0F990E678E020E210E020E1D639
+:1012BD00800A90E678E04440F07F012290E678E0E5
+:0512CD004440F07F0029
+:0112D20022F9
+:0214EC00A9074E
+:1014EE00AE16AF178F828E83A3E064037017AD0123
+:1014FE0019ED7001228F828E83E07C002FFDEC3E71
+:08150E00FEAF0580DFE4FEFFE3
+:0115160022B2
+:10162A007400F58690FDA57C05A3E582458370F9D3
+:01163A00228D
+:030000000210EEFD
+:0C10EE00787FE4F6D8FD758147021135CB
+:10005600E709F608DFFA8046E709F208DFFA803E8C
+:1000660088828C83E709F0A3DFFA8032E309F60879
+:10007600DFFA8078E309F208DFFA807088828C83E1
+:10008600E309F0A3DFFA806489828A83E0A3F60895
+:10009600DFFA805889828A83E0A3F208DFFA804C6F
+:1000A60080D280FA80C680D4806980F28033801046
+:1000B60080A680EA809A80A880DA80E280CA8033AF
+:1000C60089828A83ECFAE493A3C8C582C8CCC58327
+:1000D600CCF0A3C8C582C8CCC583CCDFE9DEE780F7
+:1000E6000D89828A83E493A3F608DFF9ECFAA9F076
+:1000F600EDFB2289828A83ECFAE0A3C8C582C8CCCC
+:10010600C583CCF0A3C8C582C8CCC583CCDFEADEE4
+:10011600E880DB89828A83E493A3F208DFF980CC46
+:1001260088F0EF60010E4E60C388F0ED2402B4043F
+:100136000050B9F582EB2402B4040050AF232345E6
+:0601460082239000A67365
+:10014C00BB010689828A83E0225002E722BBFE02B1
+:09015C00E32289828A83E49322E4
+:10016500BB010CE58229F582E5833AF583E022504F
+:1001750006E92582F8E622BBFE06E92582F8E22299
+:0D018500E58229F582E5833AF583E49322B3
+:10019200BB010689828A83F0225002F722BBFE014C
+:0201A200F32246
+:1001A400F8BB010DE58229F582E5833AF583E8F091
+:1001B400225006E92582C8F622BBFE05E92582C83D
+:0201C400F22225
+:1001C600EF8DF0A4A8F0CF8CF0A428CE8DF0A42E4D
+:0201D600FE2207
+:1001D800C2D5EC30E709B2D5E4C39DFDE49CFCEE42
+:1001E80030E715B2D5E4C39FFFE49EFE12027AC33E
+:1001F800E49DFDE49CFC800312027A30D507C3E439
+:060208009FFFE49EFE22B0
+:10020E00E8600FECC313FCED13FDEE13FEEF13FFCE
+:03021E00D8F122F2
+:10022100E8600FEFC333FFEE33FEED33FDEC33FC3B
+:03023100D8F122DF
+:10023400BB010789828A830202DB5005E9F80202C6
+:10024400CFBBFE05E9F80202E789828A830202F342
+:10025400BB010789828A8302026E5005E9F8020312
+:0A02640003BBFE05E9F802030F22B8
+:0C026E00ECF0A3EDF0A3EEF0A3EFF02203
+:1010FA00020712E493A3F8E493A34003F68001F2F3
+:10110A0008DFF48029E493A3F85407240CC8C333F6
+:10111A00C4540F4420C8834004F456800146F6DFC5
+:10112A00E4800B0102040810204080900E65E47EE2
+:10113A00019360BCA3FF543F30E509541FFEE493BA
+:10114A00A360010ECF54C025E060A840B8E493A381
+:10115A00FAE493A3F8E493A3C8C582C8CAC583CAAC
+:10116A00F0A3C8C582C8CAC583CADFE9DEE780BE64
+:010F0F0000E1
+:10027A00BC000BBE0029EF8DF084FFADF022E4CC68
+:10028A00F875F008EF2FFFEE33FEEC33FCEE9DEC31
+:10029A00984005FCEE9DFE0FD5F0E9E4CEFD22ED77
+:1002AA00F8F5F0EE8420D21CFEADF075F008EF2FC1
+:1002BA00FFED33FD4007985006D5F0F222C398FDB2
+:0502CA000FD5F0EA224F
+:0C02CF00E6FC08E6FD08E6FE08E6FF225B
+:0C02DB00E0FCA3E0FDA3E0FEA3E0FF2296
+:0C02E700E2FC08E2FD08E2FE08E2FF2253
+:1002F300E493FC740193FD740293FE740393FF2251
+:0C030300ECF608EDF608EEF608EFF62226
+:0C030F00ECF208EDF208EEF208EFF2222A
+:00000001FF
--- a/drivers/dahdi/xpp/init_card_1_30
+++ b/drivers/dahdi/xpp/init_card_1_30
@@ -51,7 +51,7 @@ BEGIN { $init_dir = dirname($0); unshift(@INC, "$init_dir"); }
 use XppConfig $init_dir;
 my $unit_id;
 my %opts;
-my $vbat_48 = 0;
+my $eeprom_release_201 = 0;

 getopts('o:', \%opts);

@@ -94,7 +94,7 @@ if (-t STDERR) {
 	}
 	logit "XBUS_MODEL_STRING='$ENV{XBUS_MODEL_STRING}'";
 	if ($ENV{XBUS_MODEL_STRING} =~ m{.*/.*/201}) {
-		$vbat_48 = 1;
+		$eeprom_release_201 = 1;
 	}
 	$chipregs = sprintf "/sys/bus/xpds/devices/%02d:%1d:0/chipregs",
 		$ENV{XBUS_NUMBER}, $ENV{UNIT_NUMBER};
@@ -292,8 +292,8 @@ sub init_indirect_registers() {
 }

 sub init_early_direct_regs() {
-	my $lbv = ($vbat_48) ? "20" : "10";
-	my $vcm = ($vbat_48) ? "02" : "03";
+	my $lbv = ($eeprom_release_201) ? "20" : "10";
+	my $vcm = ($eeprom_release_201) ? "02" : "03";

 	return write_to_slic_file("#
 *	WD	08	00	# Audio Path Loopback Control
--- a/drivers/dahdi/xpp/mmapbus.c
+++ b/drivers/dahdi/xpp/mmapbus.c
@@ -7,7 +7,9 @@ static int mmap_match(struct device *dev, struct device_driver *driver)
 {
 	return !strncmp(dev_name(dev), driver->name, strlen(driver->name));
 }
-static int mmap_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+
+static int mmap_uevent(struct device *dev, char **envp, int num_envp,
+		       char *buffer, int buffer_size)
 {
 	envp[0] = buffer;
 	envp[1] = NULL;
@@ -33,8 +35,6 @@ static struct device mmap_bus = {
 	.release = mmap_bus_release,
 };

-
-
 int register_mmap_device(struct mmap_device *dev)
 {
 	dev->dev.bus = &mmap_bus_type;
@@ -43,12 +43,12 @@ int register_mmap_device(struct mmap_device *dev)
 	strncpy(dev->dev.bus_id, dev->name, BUS_ID_SIZE);
 	return device_register(&dev->dev);
 }
+EXPORT_SYMBOL(register_mmap_device);

 void unregister_mmap_device(struct mmap_device *dev)
 {
 	device_unregister(&dev->dev);
 }
-EXPORT_SYMBOL(register_mmap_device);
 EXPORT_SYMBOL(unregister_mmap_device);

 int register_mmap_driver(struct mmap_driver *driver)
@@ -56,12 +56,12 @@ int register_mmap_driver(struct mmap_driver *driver)
 	driver->driver.bus = &mmap_bus_type;
 	return driver_register(&driver->driver);
 }
+EXPORT_SYMBOL(register_mmap_driver);

 void unregister_mmap_driver(struct mmap_driver *driver)
 {
 	driver_unregister(&driver->driver);
 }
-EXPORT_SYMBOL(register_mmap_driver);
 EXPORT_SYMBOL(unregister_mmap_driver);

 int register_mmap_bus(void)
@@ -78,13 +78,13 @@ bus_reg:
 bus_type_reg:
 	return ret;
 }
+EXPORT_SYMBOL(register_mmap_bus);

 void unregister_mmap_bus(void)
 {
 	device_unregister(&mmap_bus);
 	bus_unregister(&mmap_bus_type);
 }
-EXPORT_SYMBOL(register_mmap_bus);
 EXPORT_SYMBOL(unregister_mmap_bus);

 MODULE_AUTHOR("Alexander Landau <landau.alex@gmail.com>");
--- a/drivers/dahdi/xpp/mmapdrv.c
+++ b/drivers/dahdi/xpp/mmapdrv.c
@@ -19,11 +19,13 @@
 #include "xframe_queue.h"

 /* Check at compile time that sizeof(xframe_t) is a multiple of 4 */
-typedef char sizeof_xframe_t_should_be_divisible_by_4[((sizeof(xframe_t) % 4) == 0) * 2 - 1];
+typedef char
+    sizeof_xframe_t_should_be_divisible_by_4[((sizeof(xframe_t) % 4) ==
+					      0) * 2 - 1];

 #define ssync()			__builtin_bfin_ssync()

-//#define AB_IN_BUF	PF5
+//#define AB_IN_BUF     PF5
 /* firmware pins */
 #define DATA            PG8
 #define NCONFIG         PG9
@@ -33,13 +35,13 @@ typedef char sizeof_xframe_t_should_be_divisible_by_4[((sizeof(xframe_t) % 4) ==

 #ifdef	DEBUG_VIA_GPIO
 /*
- * For debugging we can use the following two pins. 
+ * For debugging we can use the following two pins.
 * These two pins are not used *after initialization*
 */
 #define	DEBUG_GPIO1	CONF_DONE
 #define	DEBUG_GPIO2	NSTATUS

-static int	rx_intr_counter;
+static int rx_intr_counter;
 #endif

 #define FPGA_RX_IRQ	IRQ_PF7
@@ -49,9 +51,15 @@ static int	rx_intr_counter;
 #define END_OF_FRAME	0x0001
 #define GET_LEN		0x0002
 #define START_RD_BURST	0x0008
-#define AS_BF_MODE	0x0010 //stand alone Astribank without USB (Asterisk BlackFin Mode)
-#define EC_BF_MODE	0x0020 //all data between Astribank and USB routed thru BF(EchoCanceler BlackFin Mode)
-#define NO_BF_MODE	0x0040 //Astribank worke with USB only (no BlackFin Mode) 
+/* stand alone Astribank without USB (Asterisk BlackFin Mode) */
+#define AS_BF_MODE	0x0010
+/*
+ * all data between Astribank and USB routed
+ * thru BF(EchoCanceler BlackFin Mode)
+ */
+#define EC_BF_MODE	0x0020
+/* Astribank worke with USB only (no BlackFin Mode) */
+#define NO_BF_MODE	0x0040
 #define SET_XA_DIR	0x0080
 #define GET_XPD_STS	0x0100
 #define GET_CHECKSUM	0x0200
@@ -80,9 +88,8 @@ static void print_buffer(const char *msg, const char *buf, int len)
 {
 	int i;
 	printk(KERN_ERR "%s", msg);
-	for (i = 0; i < len; i++) {
+	for (i = 0; i < len; i++)
 		printk("%02X ", (unsigned char)buf[i]);
-	}
 	printk("\n");
 }

@@ -96,7 +103,8 @@ static void update_counter(struct counter *c, struct timeval *tv1)
 		c->intr_min = diff;
 	if (c->intr_max < diff)
 		c->intr_max = diff;
-	c->intr_avg = (c->intr_avg*c->intr_count + diff) / (c->intr_count+1);
+	c->intr_avg =
+	    (c->intr_avg * c->intr_count + diff) / (c->intr_count + 1);
 	c->intr_count++;
 }

@@ -105,7 +113,7 @@ static irqreturn_t xpp_mmap_rx_irq(int irq, void *dev_id)
 	unsigned short rxcnt;
 	xbus_t *xbus;
 	xframe_t *xframe;
-	byte *buf;
+	__u8 *buf;
 	bool in_use = 0;
 	struct timeval tv1;

@@ -115,7 +123,7 @@ static irqreturn_t xpp_mmap_rx_irq(int irq, void *dev_id)

 	xbus = xbus_num(global_xbus->num);
 	BUG_ON(!xbus);
-	if(!XBUS_GET(xbus)) {
+	if (!XBUS_GET(xbus)) {
 		if (printk_ratelimit())
 			XBUS_ERR(xbus, "Dropping packet. Is shutting down.\n");
 		goto out;
@@ -129,7 +137,7 @@ static irqreturn_t xpp_mmap_rx_irq(int irq, void *dev_id)
 			NOTICE("Got %d bytes\n", rxcnt);
 		goto out;
 	}
-	if(rxcnt >= XFRAME_DATASIZE) {
+	if (rxcnt >= XFRAME_DATASIZE) {
 		if (printk_ratelimit())
 			ERR("Bad rxcnt=%d\n", rxcnt);
 		goto out;
@@ -153,18 +161,22 @@ static irqreturn_t xpp_mmap_rx_irq(int irq, void *dev_id)
 	outw(START_RD_BURST, FPGA_BASE_ADDR + 4);
 	insw((unsigned long)FPGA_BASE_ADDR, buf, rxcnt / 2);
 #if 0
-	for (count = 0; count < rxcnt; count+=2) {
+	for (count = 0; count < rxcnt; count += 2) {
 		unsigned short v = inw(FPGA_BASE_ADDR);
 		buf[count] = v & 0xFF;
-		buf[count+1] = v >> 8;
+		buf[count + 1] = v >> 8;
 	}
 #endif
-	if (rxcnt & 1) 
-		buf[rxcnt-1] = inw(FPGA_BASE_ADDR);
-	/* Sanity check: length of first packet in frame should be no more than the frame length */
-	if (((buf[0] | (buf[1]<<8)) & 0x3FF) > rxcnt) {
+	if (rxcnt & 1)
+		buf[rxcnt - 1] = inw(FPGA_BASE_ADDR);
+	/*
+	 * Sanity check: length of first packet in frame
+	 * should be no more than the frame length
+	 */
+	if (((buf[0] | (buf[1] << 8)) & 0x3FF) > rxcnt) {
 		if (printk_ratelimit()) {
-			ERR("Packet len=%d, frame len=%d\n", (buf[0] | (buf[1]<<8)) & 0x3FF, rxcnt);
+			ERR("Packet len=%d, frame len=%d\n",
+			    (buf[0] | (buf[1] << 8)) & 0x3FF, rxcnt);
 			print_buffer("16 bytes of packet: ", buf, 16);
 		}
 		goto free;
@@ -199,7 +211,7 @@ static void send_buffer(unsigned char *buf, unsigned long len)
 		print_buffer("Sent: ", buf, len);
 	outsw((unsigned long)FPGA_BASE_ADDR, buf, len / 2);
 	if (len & 1)
-		outw((unsigned short)buf[len-1], FPGA_BASE_ADDR);
+		outw((unsigned short)buf[len - 1], FPGA_BASE_ADDR);
 	outw(END_OF_FRAME, FPGA_BASE_ADDR + 4);
 }

@@ -258,7 +270,10 @@ static int xframe_send_common(xbus_t *xbus, xframe_t *xframe, bool pcm)
 		if (pcm && pcm_in_pool_count >= 1) {
 			static int rate_limit;
 			if ((rate_limit++ % 1000) == 0)
-				XBUS_ERR(xbus, "Dropped PCM xframe (pcm_in_pool_count=%d).\n", pcm_in_pool_count);
+				XBUS_ERR(xbus,
+					 "Dropped PCM xframe "
+					 "(pcm_in_pool_count=%d).\n",
+					 pcm_in_pool_count);
 			FREE_SEND_XFRAME(xbus, xframe);
 			pcm_dropped++;
 		} else {
@@ -266,7 +281,9 @@ static int xframe_send_common(xbus_t *xbus, xframe_t *xframe, bool pcm)
 				static int rate_limit;
 				spin_unlock_irqrestore(&tx_ready_lock, flags);
 				if ((rate_limit++ % 1000) == 0)
-					XBUS_ERR(xbus, "Dropped xframe. Cannot enqueue.\n");
+					XBUS_ERR(xbus,
+						 "Dropped xframe. "
+						 "Cannot enqueue.\n");
 				FREE_SEND_XFRAME(xbus, xframe);
 				return -E2BIG;
 			}
@@ -284,10 +301,12 @@ static xframe_t *alloc_xframe(xbus_t *xbus, gfp_t gfp_flags)
 	if (!xframe) {
 		static int rate_limit;
 		if ((rate_limit++ % 1000) < 5)
-			XBUS_ERR(xbus, "frame allocation failed (%d)\n", rate_limit);
+			XBUS_ERR(xbus, "frame allocation failed (%d)\n",
+				 rate_limit);
 		return NULL;
 	}
-	xframe_init(xbus, xframe, ((byte*)xframe) + sizeof(xframe_t), XFRAME_DATASIZE, xbus);
+	xframe_init(xbus, xframe, ((__u8 *)xframe) + sizeof(xframe_t),
+		    XFRAME_DATASIZE, xbus);
 	return xframe;
 }

@@ -316,28 +335,26 @@ static struct xbus_ops xmmap_ops = {

 static int fill_proc_queue(char *p, struct xframe_queue *q)
 {
-	int	len;
+	int len;

 	len = sprintf(p,
-			"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02ld.%ld ms\n",
-				q->name,
-				q->steady_state_count,
-				q->count,
-				q->max_count,
-				q->worst_count,
-				q->overflows,
-				q->worst_lag_usec / 1000,
-				q->worst_lag_usec % 1000);
+		"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d "
+		"worst_lag %02ld.%ld ms\n",
+		q->name, q->steady_state_count, q->count, q->max_count,
+		q->worst_count, q->overflows, q->worst_lag_usec / 1000,
+		q->worst_lag_usec % 1000);
 	xframe_queue_clearstats(q);
 	return len;
 }

 static int fill_proc_counter(char *p, struct counter *c)
 {
-	return sprintf(p, "min=%ld\nmax=%ld\navg=%ld\ncount=%ld\n", c->intr_min, c->intr_max, c->intr_avg, c->intr_count);
+	return sprintf(p, "min=%ld\nmax=%ld\navg=%ld\ncount=%ld\n", c->intr_min,
+		       c->intr_max, c->intr_avg, c->intr_count);
 }

-static int xpp_mmap_proc_read(char *page, char **start, off_t off, int count, int *eof, void *data)
+static int xpp_mmap_proc_read(char *page, char **start, off_t off, int count,
+			      int *eof, void *data)
 {
 	int len = 0;
 	len += fill_proc_queue(page + len, &txpool);
@@ -347,7 +364,7 @@ static int xpp_mmap_proc_read(char *page, char **start, off_t off, int count, in
 	len += fill_proc_counter(page + len, &rx_counter);
 	len += sprintf(page + len, "\ntx_counter:\n");
 	len += fill_proc_counter(page + len, &tx_counter);
-	if (len <= off+count) {
+	if (len <= off + count) {
 		*eof = 1;
 		tx_counter.intr_min = rx_counter.intr_min = INT_MAX;
 		tx_counter.intr_max = rx_counter.intr_max = 0;
@@ -363,14 +380,15 @@ static int xpp_mmap_proc_read(char *page, char **start, off_t off, int count, in
 	return len;
 }

-static int xpp_mmap_proc_write(struct file *file, const char __user *buffer, unsigned long count, void *data)
+static int xpp_mmap_proc_write(struct file *file, const char __user *buffer,
+			       unsigned long count, void *data)
 {
 	int i = 0;
 	char *txchunk, *p, *endp;

-	if (count >= XFRAME_DATASIZE*3+10)
+	if (count >= XFRAME_DATASIZE * 3 + 10)
 		return -EINVAL;
-	p = txchunk = kmalloc(count+1, GFP_KERNEL);
+	p = txchunk = kmalloc(count + 1, GFP_KERNEL);
 	if (copy_from_user(txchunk, buffer, count)) {
 		count = -EFAULT;
 		goto out;
@@ -379,13 +397,15 @@ static int xpp_mmap_proc_write(struct file *file, const char __user *buffer, uns

 	while (*p) {
 		unsigned long value;
-		while (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r') p++;
-		if (*p == '\0') break;
+		while (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')
+			p++;
+		if (*p == '\0')
+			break;
 		value = simple_strtoul(p, &endp, 16);
 		if (endp == p || value > 0xFF) {
-		    INFO("%s: Bad input\n", __FUNCTION__);
-		    count = -EINVAL;
-		    goto out;
+			INFO("%s: Bad input\n", __func__);
+			count = -EINVAL;
+			goto out;
 		}
 		p = endp;
 		txchunk[i++] = (char)value;
@@ -399,8 +419,8 @@ out:
 static struct mmap_driver astribank_driver = {
 	.module = THIS_MODULE,
 	.driver = {
-		.name = "xpp_mmap",
-	},
+		   .name = "xpp_mmap",
+		   },
 };

 static struct mmap_device astribank_dev = {
@@ -408,42 +428,52 @@ static struct mmap_device astribank_dev = {
 	.driver = &astribank_driver,
 };

-static int __init xpp_mmap_load_fpga(u8 *data, size_t size)
+static int __init xpp_mmap_load_fpga(u8 * data, size_t size)
 {
 	size_t i;
-	bfin_write_PORTGIO_DIR(bfin_read_PORTGIO_DIR() | DATA | NCONFIG | DCLK); //set data, nconfig and dclk to port out
+	/* set data, nconfig and dclk to port out */
+	bfin_write_PORTGIO_DIR(bfin_read_PORTGIO_DIR() | DATA | NCONFIG | DCLK);
 	bfin_write_PORTG_FER(bfin_read_PORTG_FER() & ~(DATA | NCONFIG | DCLK));
-	bfin_write_PORTGIO_DIR(bfin_read_PORTGIO_DIR() & ~(CONF_DONE | NSTATUS));//set conf_done and nstatus to port in
-	bfin_write_PORTGIO_INEN(bfin_read_PORTGIO_INEN() & ~(DATA | NCONFIG | DCLK));
+	/* set conf_done and nstatus to port in */
+	bfin_write_PORTGIO_DIR(
+		bfin_read_PORTGIO_DIR() & ~(CONF_DONE | NSTATUS));
+	bfin_write_PORTGIO_INEN(
+		bfin_read_PORTGIO_INEN() & ~(DATA | NCONFIG | DCLK));
 	bfin_write_PORTGIO_INEN(bfin_read_PORTGIO_INEN() | CONF_DONE | NSTATUS);

-	bfin_write_PORTGIO_CLEAR(NCONFIG);       //reset fpga during configuration holds nCONFIG low
-	udelay(40);                            //Tcfg ~40us delay
-	bfin_write_PORTGIO_SET(NCONFIG);        //transition nCONFIG to high - reset end.
-	udelay(40);                            //Tcf2ck ~40us delay
+	/* reset fpga during configuration holds nCONFIG low */
+	bfin_write_PORTGIO_CLEAR(NCONFIG);
+	udelay(40);		/* Tcfg ~40us delay */
+	/* transition nCONFIG to high - reset end. */
+	bfin_write_PORTGIO_SET(NCONFIG);
+	udelay(40);		/* Tcf2ck ~40us delay */
 	if (!(bfin_read_PORTGIO() & NSTATUS))
-		return -EIO;                           //report reset faill - Tcf2st1 pass
+		return -EIO;	/* report reset faill - Tcf2st1 pass */

 #if 0
 	if (!(bfin_read_PORTGIO() & CONF_DONE))
 		return -EIO;
 #endif
 	bfin_write_PORTGIO_CLEAR(DCLK);
-	for (i=0; i<size; i++) { // loop EP2OUT buffer data to FPGA
+	for (i = 0; i < size; i++) {	/* loop EP2OUT buffer data to FPGA */
 		int j;
-		u8 byte = data[i];
-		for (j=0; j<8; j++)         //send the configuration data through the DATA0 pin one bit at a time.
+		u8 __u8 = data[i];
+		/*
+		 * Send the configuration data through the DATA0 pin
+		 * one bit at a time.
+		 */
+		for (j = 0; j < 8; j++)
 		{
-			if (byte & 1)
+			if (__u8 & 1)
 				bfin_write_PORTGIO_SET(DATA);
 			else
 				bfin_write_PORTGIO_CLEAR(DATA);
-			byte >>= 1;
+			__u8 >>= 1;
 			bfin_write_PORTGIO_SET(DCLK);
 			bfin_write_PORTGIO_CLEAR(DCLK);
 		}
 		if (!(bfin_read_PORTGIO() & NSTATUS))
-			return -EIO;                                   //check the nSTATUS
+			return -EIO;	/* check the nSTATUS */
 	}
 	bfin_write_PORTGIO_CLEAR(DATA);
 	udelay(1);
@@ -455,20 +485,29 @@ static int __init xpp_mmap_load_fpga(u8 *data, size_t size)
 	 * some pins that were used only during initialization
 	 * to be used for debugging from now on.
 	 */
-	bfin_write_PORTGIO_DIR(bfin_read_PORTGIO_DIR() | DEBUG_GPIO1 | DEBUG_GPIO2); //set to port out
-	bfin_write_PORTG_FER(bfin_read_PORTG_FER() & ~(DEBUG_GPIO1 | DEBUG_GPIO2));
-	bfin_write_PORTGIO_INEN(bfin_read_PORTGIO_INEN() & ~(DEBUG_GPIO1 | DEBUG_GPIO2));
+	/* set to port out */
+	bfin_write_PORTGIO_DIR(
+		bfin_read_PORTGIO_DIR() | DEBUG_GPIO1 | DEBUG_GPIO2);
+	bfin_write_PORTG_FER(bfin_read_PORTG_FER() &
+			     ~(DEBUG_GPIO1 | DEBUG_GPIO2));
+	bfin_write_PORTGIO_INEN(bfin_read_PORTGIO_INEN() &
+				~(DEBUG_GPIO1 | DEBUG_GPIO2));
 #endif
-	udelay(40); //tCD2UM - CONF_DONE high to user mode
+	udelay(40);		/* tCD2UM - CONF_DONE high to user mode */
 	return 0;
 }

 static void __exit xpp_mmap_unload_fpga(void)
 {
-        bfin_write_PORTGIO_CLEAR(NCONFIG);       //reset fpga during configuration holds nCONFIG low
-	udelay(40);                            //Tcfg ~40us delay	
-	bfin_write_PORTGIO_DIR(bfin_read_PORTGIO_DIR() & ~( DATA | NCONFIG | DCLK));	//disable output pin
-	bfin_write_PORTGIO_INEN(bfin_read_PORTGIO_INEN() & ~( CONF_DONE | NSTATUS));//disable input buffer
+	/* reset fpga during configuration holds nCONFIG low */
+	bfin_write_PORTGIO_CLEAR(NCONFIG);
+	udelay(40);		/* Tcfg ~40us delay */
+	/* disable output pin */
+	bfin_write_PORTGIO_DIR(
+		bfin_read_PORTGIO_DIR() & ~(DATA | NCONFIG | DCLK));
+	/* disable input buffer */
+	bfin_write_PORTGIO_INEN(
+		bfin_read_PORTGIO_INEN() & ~(CONF_DONE | NSTATUS));
 	INFO("FPGA Firmware unloaded\n");
 }

@@ -476,7 +515,8 @@ static int __init xpp_mmap_load_firmware(void)
 {
 	const struct firmware *fw;
 	int ret;
-	if ((ret = request_firmware(&fw, "astribank.bin", &astribank_dev.dev)) < 0)
+	if ((ret =
+	     request_firmware(&fw, "astribank.bin", &astribank_dev.dev)) < 0)
 		return ret;
 	xpp_mmap_load_fpga(fw->data, fw->size);
 	release_firmware(fw);
@@ -498,29 +538,33 @@ static int __init xpp_mmap_init(void)
 		ERR("xpp_mmap_load_firmware() failed, errno=%d\n", ret);
 		goto fail_fw;
 	}
-	
-	if ((ret = request_irq(FPGA_RX_IRQ, xpp_mmap_rx_irq, IRQF_TRIGGER_RISING, "xpp_mmap_rx", NULL)) < 0) {
+
+	if ((ret =
+	     request_irq(FPGA_RX_IRQ, xpp_mmap_rx_irq, IRQF_TRIGGER_RISING,
+			 "xpp_mmap_rx", NULL)) < 0) {
 		ERR("Unable to attach to RX interrupt %d\n", FPGA_RX_IRQ);
 		goto fail_irq_rx;
 	}
-	if ((ret = request_irq(FPGA_TX_IRQ, xpp_mmap_tx_irq, IRQF_TRIGGER_RISING, "xpp_mmap_tx", NULL)) < 0) {
+	if ((ret =
+	     request_irq(FPGA_TX_IRQ, xpp_mmap_tx_irq, IRQF_TRIGGER_RISING,
+			 "xpp_mmap_tx", NULL)) < 0) {
 		ERR("Unable to attach to TX interrupt %d\n", FPGA_TX_IRQ);
 		goto fail_irq_tx;
 	}
-	if (!request_region((resource_size_t)FPGA_BASE_ADDR, 8, "xpp_mmap")) {
+	if (!request_region((resource_size_t) FPGA_BASE_ADDR, 8, "xpp_mmap")) {
 		ERR("Unable to request memory region at %p\n", FPGA_BASE_ADDR);
 		goto fail_region;
 	}
-	outw(AS_BF_MODE, FPGA_BASE_ADDR + 4);	
+	outw(AS_BF_MODE, FPGA_BASE_ADDR + 4);

-	xframe_cache = kmem_cache_create("xframe_cache",
-			sizeof(xframe_t) + XFRAME_DATASIZE,
-			0, 0,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-			NULL, 
+	xframe_cache =
+	    kmem_cache_create("xframe_cache",
+			      sizeof(xframe_t) + XFRAME_DATASIZE, 0, 0,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+			      NULL,
 #endif
-			NULL);
-	if(!xframe_cache) {
+			      NULL);
+	if (!xframe_cache) {
 		ret = -ENOMEM;
 		goto fail_cache;
 	}
@@ -532,9 +576,11 @@ static int __init xpp_mmap_init(void)
 	}
 	strncpy(global_xbus->connector, "mmap", XBUS_DESCLEN);
 	strncpy(global_xbus->label, "mmap:0", LABEL_SIZE);
-	
+
 	xframe_queue_init(&txpool, 10, 200, "mmap_txpool", global_xbus);
-	if (!(proc_entry = create_proc_entry("xpp_mmap", 0, global_xbus->proc_xbus_dir))) {
+	if (!
+	    (proc_entry =
+	     create_proc_entry("xpp_mmap", 0, global_xbus->proc_xbus_dir))) {
 		ERR("create_proc_entry() failed\n");
 		ret = -EINVAL;
 		goto fail_proc;
@@ -552,7 +598,7 @@ fail_proc:
 fail_xbus:
 	kmem_cache_destroy(xframe_cache);
 fail_cache:
-	release_region((resource_size_t)FPGA_BASE_ADDR, 8);
+	release_region((resource_size_t) FPGA_BASE_ADDR, 8);
 fail_region:
 	free_irq(FPGA_TX_IRQ, NULL);
 fail_irq_tx:
@@ -579,7 +625,7 @@ static void __exit xpp_mmap_exit(void)
 	xbus_disconnect(xbus);
 	kmem_cache_destroy(xframe_cache);

-	release_region((resource_size_t)FPGA_BASE_ADDR, 8);
+	release_region((resource_size_t) FPGA_BASE_ADDR, 8);
 	free_irq(FPGA_RX_IRQ, NULL);
 	free_irq(FPGA_TX_IRQ, NULL);

--- a/drivers/dahdi/xpp/parport_debug.c
+++ b/drivers/dahdi/xpp/parport_debug.c
@@ -20,31 +20,26 @@
 *
 */
 #include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#  warning "This module is tested only with 2.6 kernels"
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/parport.h>
 #include "parport_debug.h"

-static struct parport	*debug_sync_parport = NULL;
-static int		parport_toggles[8];	/* 8 bit flip-flop */
+static struct parport *debug_sync_parport;
+static int parport_toggles[8];	/* 8 bit flip-flop */

 void flip_parport_bit(unsigned char bitnum)
 {
-	static unsigned char	last_value;
+	static unsigned char last_value;
 	DEFINE_SPINLOCK(lock);
-	unsigned long	flags;
-	unsigned char	mask;
-	unsigned char	value;
+	unsigned long flags;
+	unsigned char mask;
+	unsigned char value;

-	if(!debug_sync_parport) {
-		if(printk_ratelimit()) {
+	if (!debug_sync_parport) {
+		if (printk_ratelimit()) {
 			printk(KERN_NOTICE "%s: no debug parallel port\n",
-				THIS_MODULE->name);
+			       THIS_MODULE->name);
 		}
 		return;
 	}
@@ -52,7 +47,7 @@ void flip_parport_bit(unsigned char bitnum)
 	mask = 1 << bitnum;
 	spin_lock_irqsave(&lock, flags);
 	value = last_value & ~mask;
-	if(parport_toggles[bitnum] % 2)	/* square wave */
+	if (parport_toggles[bitnum] % 2)	/* square wave */
 		value |= mask;
 	last_value = value;
 	parport_toggles[bitnum]++;
@@ -63,10 +58,11 @@ EXPORT_SYMBOL(flip_parport_bit);

 static void parport_attach(struct parport *port)
 {
-	printk(KERN_INFO "%s: Using %s for debugging\n", THIS_MODULE->name, port->name);
-	if(debug_sync_parport) {
+	printk(KERN_INFO "%s: Using %s for debugging\n", THIS_MODULE->name,
+	       port->name);
+	if (debug_sync_parport) {
 		printk(KERN_ERR "%s: Using %s, ignore new attachment %s\n",
-			THIS_MODULE->name, debug_sync_parport->name, port->name);
+		       THIS_MODULE->name, debug_sync_parport->name, port->name);
 		return;
 	}
 	parport_get_port(port);
@@ -76,16 +72,16 @@ static void parport_attach(struct parport *port)
 static void parport_detach(struct parport *port)
 {
 	printk(KERN_INFO "%s: Releasing %s\n", THIS_MODULE->name, port->name);
-	if(debug_sync_parport != port) {
+	if (debug_sync_parport != port) {
 		printk(KERN_ERR "%s: Using %s, ignore new detachment %s\n",
-			THIS_MODULE->name, debug_sync_parport->name, port->name);
+		       THIS_MODULE->name, debug_sync_parport->name, port->name);
 		return;
 	}
 	parport_put_port(debug_sync_parport);
 	debug_sync_parport = NULL;
 }

-static struct parport_driver	debug_parport_driver = {
+static struct parport_driver debug_parport_driver = {
 	.name = "parport_debug",
 	.attach = parport_attach,
 	.detach = parport_detach,
@@ -93,7 +89,7 @@ static struct parport_driver	debug_parport_driver = {

 int __init parallel_dbg_init(void)
 {
-	int	ret;
+	int ret;

 	ret = parport_register_driver(&debug_parport_driver);
 	return ret;
--- a/drivers/dahdi/xpp/parport_debug.h
+++ b/drivers/dahdi/xpp/parport_debug.h
@@ -28,4 +28,4 @@ void flip_parport_bit(unsigned char bitnum);
 #define flip_parport_bit(bitnum)
 #endif

-#endif	/* PARPORT_DEBUG_H */
+#endif /* PARPORT_DEBUG_H */
--- a/drivers/dahdi/xpp/print_fxo_modes.c
+++ b/drivers/dahdi/xpp/print_fxo_modes.c
@@ -3,30 +3,35 @@
 int main(int argc, char *argv[])
 {
 	size_t i;
-	
-	for (i=0; i<(sizeof(fxo_modes)/sizeof(struct fxo_mode)); i++) {
-		if (fxo_modes[i].name == NULL) break;
-		int reg16=0, reg26=0, reg30=0, reg31=0x20;
-		char ring_osc[BUFSIZ]="", ring_x[BUFSIZ] = "";
-		
+
+	for (i = 0; i < (sizeof(fxo_modes) / sizeof(struct fxo_mode)); i++) {
+		if (fxo_modes[i].name == NULL)
+			break;
+		int reg16 = 0, reg26 = 0, reg30 = 0, reg31 = 0x20;
+		char ring_osc[BUFSIZ] = "", ring_x[BUFSIZ] = "";
+
 		reg16 |= (fxo_modes[i].ohs << 6);
 		reg16 |= (fxo_modes[i].rz << 1);
 		reg16 |= (fxo_modes[i].rt);
-		
+
 		reg26 |= (fxo_modes[i].dcv << 6);
 		reg26 |= (fxo_modes[i].mini << 4);
 		reg26 |= (fxo_modes[i].ilim << 1);
-		
+
 		reg30 = (fxo_modes[i].acim);
-		
+
 		reg31 |= (fxo_modes[i].ohs2 << 3);

 		if (fxo_modes[i].ring_osc)
-			snprintf(ring_osc, BUFSIZ, "ring_osc=%04X", fxo_modes[i].ring_osc);
+			snprintf(ring_osc, BUFSIZ, "ring_osc=%04X",
+				 fxo_modes[i].ring_osc);
 		if (fxo_modes[i].ring_x)
-			snprintf(ring_x, BUFSIZ, "ring_x=%04X", fxo_modes[i].ring_x);
-		printf("%-15s\treg16=%02X\treg26=%02X\treg30=%02X\treg31=%02X\t%s\t%s\n",
-		       fxo_modes[i].name, reg16, reg26, reg30, reg31, ring_osc, ring_x);
+			snprintf(ring_x, BUFSIZ, "ring_x=%04X",
+				 fxo_modes[i].ring_x);
+		printf("%-15s\treg16=%02X\treg26=%02X\treg30=%02X\t"
+			"reg31=%02X\t%s\t%s\n",
+			fxo_modes[i].name, reg16, reg26, reg30, reg31,
+			ring_osc, ring_x);
 	}
 	return 0;
 }
--- a/drivers/dahdi/xpp/xbus-core.c
+++ b/drivers/dahdi/xpp/xbus-core.c
--- a/drivers/dahdi/xpp/xbus-core.h
+++ b/drivers/dahdi/xpp/xbus-core.h
@@ -39,10 +39,10 @@ struct xbus_workqueue;
 #ifdef	__KERNEL__

 struct xbus_ops {
-	int (*xframe_send_pcm)(xbus_t *xbus, xframe_t *xframe);
-	int (*xframe_send_cmd)(xbus_t *xbus, xframe_t *xframe);
-	xframe_t *(*alloc_xframe)(xbus_t *xbus, gfp_t gfp_flags);
-	void (*free_xframe)(xbus_t *xbus, xframe_t *xframe);
+	int (*xframe_send_pcm) (xbus_t *xbus, xframe_t *xframe);
+	int (*xframe_send_cmd) (xbus_t *xbus, xframe_t *xframe);
+	xframe_t *(*alloc_xframe) (xbus_t *xbus, gfp_t gfp_flags);
+	void (*free_xframe) (xbus_t *xbus, xframe_t *xframe);
 };

 /*
@@ -67,19 +67,11 @@ enum {

 /* yucky, make an instance so we can size it... */
 static struct xbus_counters {
-	char	*name;
+	char *name;
 } xbus_counters[] = {
-	C_(UNITS),
-	C_(TX_XFRAME_PCM),
-	C_(RX_XFRAME_PCM),
-	C_(TX_PACK_PCM),
-	C_(RX_PACK_PCM),
-	C_(TX_BYTES),
-	C_(RX_BYTES),
-	C_(TX_PCM_FRAG),
-	C_(RX_CMD),
-	C_(TX_CMD),
-};
+C_(UNITS), C_(TX_XFRAME_PCM), C_(RX_XFRAME_PCM), C_(TX_PACK_PCM),
+	    C_(RX_PACK_PCM), C_(TX_BYTES), C_(RX_BYTES),
+	    C_(TX_PCM_FRAG), C_(RX_CMD), C_(TX_CMD),};

 #undef C_

@@ -99,17 +91,17 @@ enum xbus_state {
 const char *xbus_statename(enum xbus_state st);

 struct xbus_transport {
-	struct xbus_ops		*ops;
-	void			*priv;
-	struct device		*transport_device;
-	ushort			max_send_size;
-	enum xbus_state		xbus_state;
-	unsigned long		transport_flags;
-	spinlock_t		state_lock;
-	atomic_t		transport_refcount;
-	wait_queue_head_t	transport_unused;
-	spinlock_t		lock;
-	char			model_string[MAX_ENV_STR];
+	struct xbus_ops *ops;
+	void *priv;
+	struct device *transport_device;
+	ushort max_send_size;
+	enum xbus_state xbus_state;
+	unsigned long transport_flags;
+	spinlock_t state_lock;
+	atomic_t transport_refcount;
+	wait_queue_head_t transport_unused;
+	spinlock_t lock;
+	char model_string[MAX_ENV_STR];
 };

 #define	MAX_SEND_SIZE(xbus)	((xbus)->transport.max_send_size)
@@ -118,7 +110,8 @@ struct xbus_transport {
 #define	TRANSPORT_EXIST(xbus)	((xbus)->transport.ops != NULL)

 #define	XBUS_FLAG_CONNECTED	0
-#define	XBUS_FLAGS(xbus, flg)	test_bit(XBUS_FLAG_ ## flg, &((xbus)->transport.transport_flags))
+#define	XBUS_FLAGS(xbus, flg) \
+	test_bit(XBUS_FLAG_ ## flg, &((xbus)->transport.transport_flags))

 struct xbus_ops *transportops_get(xbus_t *xbus);
 void transportops_put(xbus_t *xbus);
@@ -127,35 +120,39 @@ void transportops_put(xbus_t *xbus);
 * Encapsulate all poll related data of a single xbus.
 */
 struct xbus_workqueue {
-	struct workqueue_struct	*wq;
-	struct work_struct	xpds_init_work;
-	bool			xpds_init_done;
-	struct list_head	card_list;
-	int			num_units;
-	int			num_units_initialized;
-	wait_queue_head_t	wait_for_xpd_initialization;
-	spinlock_t		worker_lock;
-	struct semaphore	running_initialization;
+	struct workqueue_struct *wq;
+	struct work_struct xpds_init_work;
+	bool xpds_init_done;
+	struct list_head card_list;
+	int num_units;
+	int num_units_initialized;
+	wait_queue_head_t wait_for_xpd_initialization;
+	spinlock_t worker_lock;
+	struct semaphore running_initialization;
 };

 /*
 * Allocate/Free an xframe from pools of empty xframes.
- * Calls to {get,put}_xframe are wrapped in
+ * Calls to {get, put}_xframe are wrapped in
 * the macros bellow, so we take/return it
 * to the correct pool.
 */
 xframe_t *get_xframe(struct xframe_queue *q);
 void put_xframe(struct xframe_queue *q, xframe_t *xframe);

-#define	ALLOC_SEND_XFRAME(xbus)	get_xframe(&(xbus)->send_pool)
-#define	ALLOC_RECV_XFRAME(xbus)	get_xframe(&(xbus)->receive_pool)
-#define	FREE_SEND_XFRAME(xbus, xframe)	put_xframe(&(xbus)->send_pool, (xframe))
-#define	FREE_RECV_XFRAME(xbus, xframe)	put_xframe(&(xbus)->receive_pool, (xframe))
+#define	ALLOC_SEND_XFRAME(xbus) \
+		get_xframe(&(xbus)->send_pool)
+#define	ALLOC_RECV_XFRAME(xbus) \
+		get_xframe(&(xbus)->receive_pool)
+#define	FREE_SEND_XFRAME(xbus, xframe) \
+		put_xframe(&(xbus)->send_pool, (xframe))
+#define	FREE_RECV_XFRAME(xbus, xframe) \
+		put_xframe(&(xbus)->receive_pool, (xframe))

-xbus_t	*xbus_num(uint num);
-xbus_t	*get_xbus(const char *msg, uint num);
-void	put_xbus(const char *msg, xbus_t *xbus);
-int	refcount_xbus(xbus_t *xbus);
+xbus_t *xbus_num(uint num);
+xbus_t *get_xbus(const char *msg, uint num);
+void put_xbus(const char *msg, xbus_t *xbus);
+int refcount_xbus(xbus_t *xbus);

 /*
 * Echo canceller related data
@@ -163,17 +160,17 @@ int	refcount_xbus(xbus_t *xbus);
 #define	ECHO_TIMESLOTS	128

 struct echoops {
-	int	(*ec_set)(xpd_t *xpd, int pos, bool on);
-	int	(*ec_get)(xpd_t *xpd, int pos);
-	int	(*ec_update)(xbus_t *xbus);
-	void	(*ec_dump)(xbus_t *xbus);
+	int (*ec_set) (xpd_t *xpd, int pos, bool on);
+	int (*ec_get) (xpd_t *xpd, int pos);
+	int (*ec_update) (xbus_t *xbus);
+	void (*ec_dump) (xbus_t *xbus);
 };

 struct xbus_echo_state {
-	const struct echoops	*echoops;
-	byte			timeslots[ECHO_TIMESLOTS];
-	int			xpd_idx;
-	struct device_attribute	*da[MAX_XPDS];
+	const struct echoops *echoops;
+	__u8 timeslots[ECHO_TIMESLOTS];
+	int xpd_idx;
+	struct device_attribute *da[MAX_XPDS];
 };
 #define	ECHOOPS(xbus)			((xbus)->echo_state.echoops)
 #define	EC_METHOD(name, xbus)		(ECHOOPS(xbus)->name)
@@ -183,126 +180,128 @@ struct xbus_echo_state {
 * An xbus is a transport layer for Xorcom Protocol commands
 */
 struct xbus {
-	char			busname[XBUS_NAMELEN];	/* set by xbus_new() */
+	char busname[XBUS_NAMELEN];	/* set by xbus_new() */

 	/* low-level bus drivers set these 2 fields */
-	char			connector[XBUS_DESCLEN];
-	char			label[LABEL_SIZE];
-	byte			revision;		/* Protocol revision */
-	struct xbus_transport	transport;
-	struct dahdi_device	*ddev;
+	char connector[XBUS_DESCLEN];
+	char label[LABEL_SIZE];
+	__u8 revision;		/* Protocol revision */
+	struct xbus_transport transport;
+	struct dahdi_device *ddev;

-	int			num;
-	struct xpd		*xpds[MAX_XPDS];
-	struct xbus_echo_state	echo_state;
+	int num;
+	struct xpd *xpds[MAX_XPDS];
+	struct xbus_echo_state echo_state;

-	int			command_tick_counter;
-	int			usec_nosend;		/* Firmware flow control */
-	struct xframe_queue	command_queue;
-	wait_queue_head_t	command_queue_empty;
+	int command_tick_counter;
+	int usec_nosend;	/* Firmware flow control */
+	struct xframe_queue command_queue;
+	wait_queue_head_t command_queue_empty;

-	struct xframe_queue	send_pool;		/* empty xframes for send */
-	struct xframe_queue	receive_pool;		/* empty xframes for receive */
+	struct xframe_queue send_pool;	/* empty xframes for send */
+	struct xframe_queue receive_pool;	/* empty xframes for receive */

 	/* tasklet processing */
-	struct xframe_queue	receive_queue;
-	struct tasklet_struct	receive_tasklet;
-	int			cpu_rcv_intr[NR_CPUS];
-	int			cpu_rcv_tasklet[NR_CPUS];
+	struct xframe_queue receive_queue;
+	struct tasklet_struct receive_tasklet;
+	int cpu_rcv_intr[NR_CPUS];
+	int cpu_rcv_tasklet[NR_CPUS];

 	struct quirks {
 		unsigned int has_fxo:1;
 		unsigned int has_digital_span:1;
-	}			quirks;
-	bool			self_ticking;
-	enum sync_mode		sync_mode;
+	} quirks;
+	bool self_ticking;
+	enum sync_mode sync_mode;
 	/* Managed by low-level drivers: */
-	enum sync_mode		sync_mode_default;
-	struct timer_list	command_timer;
-	unsigned int		xbus_frag_count;
-	struct xframe_queue	pcm_tospan;
+	enum sync_mode sync_mode_default;
+	struct timer_list command_timer;
+	unsigned int xbus_frag_count;
+	struct xframe_queue pcm_tospan;

-	struct xpp_ticker	ticker;		/* for tick rate */
-	struct xpp_drift	drift;		/* for tick offset */
+	struct xpp_ticker ticker;	/* for tick rate */
+	struct xpp_drift drift;	/* for tick offset */

-	atomic_t		pcm_rx_counter;
-	unsigned int		global_counter;
+	atomic_t pcm_rx_counter;
+	unsigned int global_counter;

 	/* Device-Model */
-	struct device		astribank;
+	struct device astribank;
 #define	dev_to_xbus(dev)	container_of(dev, struct xbus, astribank)
-	struct kref		kref;
+	struct kref kref;
 #define kref_to_xbus(k) container_of(k, struct xbus, kref)

-	spinlock_t		lock;
+	spinlock_t lock;

 	/* PCM metrics */
-	struct timeval		last_tx_sync;
-	struct timeval		last_rx_sync;
-	unsigned long		max_tx_sync;
-	unsigned long		min_tx_sync;
-	unsigned long		max_rx_sync;
-	unsigned long		min_rx_sync;
-	unsigned long		max_rx_process;		/* packet processing time (usec) */
+	struct timeval last_tx_sync;
+	struct timeval last_rx_sync;
+	unsigned long max_tx_sync;
+	unsigned long min_tx_sync;
+	unsigned long max_rx_sync;
+	unsigned long min_rx_sync;
+	unsigned long max_rx_process;	/* packet processing time (usec) */
 #ifdef	SAMPLE_TICKS
 #define	SAMPLE_SIZE	1000
-	int			sample_ticks[SAMPLE_SIZE];
-	bool			sample_running;
-	int			sample_pos;
+	int sample_ticks[SAMPLE_SIZE];
+	bool sample_running;
+	int sample_pos;
 #endif

-	struct xbus_workqueue	worker;
+	struct xbus_workqueue worker;

 	/*
 	 * Sync adjustment
 	 */
-	int			sync_adjustment;
-	int			sync_adjustment_offset;
-	long			pll_updated_at;
+	int sync_adjustment;
+	int sync_adjustment_offset;
+	long pll_updated_at;

-	atomic_t		num_xpds;
+	atomic_t num_xpds;

 #ifdef CONFIG_PROC_FS
-	struct proc_dir_entry	*proc_xbus_dir;
-	struct proc_dir_entry	*proc_xbus_summary;
+	struct proc_dir_entry *proc_xbus_dir;
+	struct proc_dir_entry *proc_xbus_summary;
 #ifdef	PROTOCOL_DEBUG
-	struct proc_dir_entry	*proc_xbus_command;
+	struct proc_dir_entry *proc_xbus_command;
 #endif
 #endif

 	/* statistics */
-	int		counters[XBUS_COUNTER_MAX];
+	int counters[XBUS_COUNTER_MAX];
 };
 #endif

 #define	XFRAME_MAGIC	123456L

 struct xframe {
-	unsigned long		xframe_magic;
-	struct list_head	frame_list;
-	atomic_t		frame_len;
-	xbus_t			*xbus;
-	struct timeval		tv_created;
-	struct timeval		tv_queued;
-	struct timeval		tv_submitted;
-	struct timeval		tv_received;
+	unsigned long xframe_magic;
+	struct list_head frame_list;
+	atomic_t frame_len;
+	xbus_t *xbus;
+	struct timeval tv_created;
+	struct timeval tv_queued;
+	struct timeval tv_submitted;
+	struct timeval tv_received;
 	/* filled by transport layer */
-	size_t			frame_maxlen;
-	byte			*packets;	/* max XFRAME_DATASIZE */
-	byte			*first_free;
-	int			usec_towait;	/* prevent overflowing AB */
-	void			*priv;
+	size_t frame_maxlen;
+	__u8 *packets;		/* max XFRAME_DATASIZE */
+	__u8 *first_free;
+	int usec_towait;	/* prevent overflowing AB */
+	void *priv;
 };

-void xframe_init(xbus_t *xbus, xframe_t *xframe, void *buf, size_t maxsize, void *priv);
+void xframe_init(xbus_t *xbus, xframe_t *xframe, void *buf, size_t maxsize,
+		 void *priv);

 #define XFRAME_LEN(frame)	atomic_read(&(frame)->frame_len)

-int xbus_core_init(void);		/* Initializer */
-void xbus_core_shutdown(void);		/* Terminator */
+int xbus_core_init(void);	/* Initializer */
+void xbus_core_shutdown(void);	/* Terminator */

 /* Frame handling */
-void dump_xframe(const char msg[], const xbus_t *xbus, const xframe_t *xframe, int debug);
+void dump_xframe(const char msg[], const xbus_t *xbus, const xframe_t *xframe,
+		 int debug);
 int send_cmd_frame(xbus_t *xbus, xframe_t *xframe);

 /*
@@ -316,58 +315,45 @@ xpacket_t *xframe_next_packet(xframe_t *xframe, int len);
 /*
 * Map: unit+subunit <--> index in xbus->xpds[]
 */
-#define	XPD_IDX(unit,subunit)	((unit) * MAX_SUBUNIT + (subunit))
+#define	XPD_IDX(unit, subunit)	((unit) * MAX_SUBUNIT + (subunit))
 #define	XBUS_UNIT(idx)		((idx) / MAX_SUBUNIT)
 #define	XBUS_SUBUNIT(idx)	((idx) % MAX_SUBUNIT)

-xpd_t	*xpd_of(const xbus_t *xbus, int xpd_num);
-xpd_t	*xpd_byaddr(const xbus_t *xbus, uint unit, uint subunit);
-int	xbus_check_unique(xbus_t *xbus);
-bool	xbus_setstate(xbus_t *xbus, enum xbus_state newstate);
-bool	xbus_setflags(xbus_t *xbus, int flagbit, bool on);
-xbus_t	*xbus_new(struct xbus_ops *ops, ushort max_send_size, struct device *transport_device, void *priv);
-void	xbus_free(xbus_t *xbus);
-int	xbus_connect(xbus_t *xbus);
-int	xbus_activate(xbus_t *xbus);
-void	xbus_deactivate(xbus_t *xbus);
-void	xbus_disconnect(xbus_t *xbus);
-void	xbus_receive_xframe(xbus_t *xbus, xframe_t *xframe);
-int	xbus_process_worker(xbus_t *xbus);
-int	waitfor_xpds(xbus_t *xbus, char *buf);
+xpd_t *xpd_of(const xbus_t *xbus, int xpd_num);
+xpd_t *xpd_byaddr(const xbus_t *xbus, uint unit, uint subunit);
+int xbus_check_unique(xbus_t *xbus);
+bool xbus_setstate(xbus_t *xbus, enum xbus_state newstate);
+bool xbus_setflags(xbus_t *xbus, int flagbit, bool on);
+xbus_t *xbus_new(struct xbus_ops *ops, ushort max_send_size,
+		 struct device *transport_device, void *priv);
+void xbus_free(xbus_t *xbus);
+int xbus_connect(xbus_t *xbus);
+int xbus_activate(xbus_t *xbus);
+void xbus_deactivate(xbus_t *xbus);
+void xbus_disconnect(xbus_t *xbus);
+void xbus_receive_xframe(xbus_t *xbus, xframe_t *xframe);
+int xbus_process_worker(xbus_t *xbus);
+int waitfor_xpds(xbus_t *xbus, char *buf);

-int	xbus_xpd_bind(xbus_t *xbus, xpd_t *xpd, int unit, int subunit);
-int	xbus_xpd_unbind(xbus_t *xbus, xpd_t *xpd);
+int xbus_xpd_bind(xbus_t *xbus, xpd_t *xpd, int unit, int subunit);
+int xbus_xpd_unbind(xbus_t *xbus, xpd_t *xpd);

 /* sysfs */
-int	xpd_device_register(xbus_t *xbus, xpd_t *xpd);
-void	xpd_device_unregister(xpd_t *xpd);
-int	echocancel_xpd(xpd_t *xpd, int on);
+int xpd_device_register(xbus_t *xbus, xpd_t *xpd);
+void xpd_device_unregister(xpd_t *xpd);
+int echocancel_xpd(xpd_t *xpd, int on);

-int	xbus_is_registered(xbus_t *xbus);
-int	xbus_register_dahdi_device(xbus_t *xbus);
-void	xbus_unregister_dahdi_device(xbus_t *xbus);
+int xbus_is_registered(xbus_t *xbus);
+int xbus_register_dahdi_device(xbus_t *xbus);
+void xbus_unregister_dahdi_device(xbus_t *xbus);

-int	xpp_driver_init(void);
-void	xpp_driver_exit(void);
-int	xbus_sysfs_transport_create(xbus_t *xbus);
-void	xbus_sysfs_transport_remove(xbus_t *xbus);
-int	xbus_sysfs_create(xbus_t *xbus);
-void	xbus_sysfs_remove(xbus_t *xbus);
+int xpp_driver_init(void);
+void xpp_driver_exit(void);
+int xbus_sysfs_transport_create(xbus_t *xbus);
+void xbus_sysfs_transport_remove(xbus_t *xbus);
+int xbus_sysfs_create(xbus_t *xbus);
+void xbus_sysfs_remove(xbus_t *xbus);

-#ifdef	OLD_HOTPLUG_SUPPORT_269
-/* Copy from new kernels lib/kobject_uevent.c */
-enum kobject_action {
-	KOBJ_ADD,
-	KOBJ_REMOVE,
-	KOBJ_CHANGE,
-	KOBJ_MOUNT,
-	KOBJ_UMOUNT,
-	KOBJ_OFFLINE,
-	KOBJ_ONLINE,
-};
-#endif
-
-void	astribank_uevent_send(xbus_t *xbus, enum kobject_action act);
-
-#endif	/* XBUS_CORE_H */
+void astribank_uevent_send(xbus_t *xbus, enum kobject_action act);

+#endif /* XBUS_CORE_H */
--- a/drivers/dahdi/xpp/xbus-pcm.c
+++ b/drivers/dahdi/xpp/xbus-pcm.c
--- a/drivers/dahdi/xpp/xbus-pcm.h
+++ b/drivers/dahdi/xpp/xbus-pcm.h
@@ -33,10 +33,10 @@
 #ifdef	__KERNEL__

 enum sync_mode {
-	SYNC_MODE_NONE	= 0x00,
-	SYNC_MODE_AB	= 0x01,		/* Astribank sync */
-	SYNC_MODE_PLL	= 0x03,		/* Adjust XPD's PLL according to HOST */
-	SYNC_MODE_QUERY	= 0x80,
+	SYNC_MODE_NONE = 0x00,
+	SYNC_MODE_AB = 0x01,	/* Astribank sync */
+	SYNC_MODE_PLL = 0x03,	/* Adjust XPD's PLL according to HOST */
+	SYNC_MODE_QUERY = 0x80,
 };

 /*
@@ -46,7 +46,7 @@ enum sync_mode {
 * time representations.
 */
 struct xpp_timestamp {
-	struct timeval	tv;
+	struct timeval tv;
 };

 /*
@@ -58,12 +58,12 @@ struct xpp_timestamp {
 *     from other dahdi devices).
 */
 struct xpp_ticker {		/* for rate calculation */
-	int			count;
-	int			cycle;
-	struct xpp_timestamp	first_sample;
-	struct xpp_timestamp	last_sample;
-	int			tick_period;	/* usec/tick */
-	spinlock_t		lock;
+	int count;
+	int cycle;
+	struct xpp_timestamp first_sample;
+	struct xpp_timestamp last_sample;
+	int tick_period;	/* usec/tick */
+	spinlock_t lock;
 };

 /*
@@ -71,66 +71,65 @@ struct xpp_ticker {		/* for rate calculation */
 * xbus ticker to a reference ticker.
 */
 struct xpp_drift {
-	int			delta_tick;		/* from ref_ticker */
-	int			lost_ticks;		/* occurances */
-	int			lost_tick_count;
-	int			sync_inaccuracy;
-	struct xpp_timestamp	last_lost_tick;
-	long			delta_sum;
-	int			offset_prev;
-	int			offset_range;
-	int			offset_min;
-	int			offset_max;
-	int			min_speed;
-	int			max_speed;
-	spinlock_t		lock;
+	int delta_tick;		/* from ref_ticker */
+	int lost_ticks;		/* occurances */
+	int lost_tick_count;
+	int sync_inaccuracy;
+	struct xpp_timestamp last_lost_tick;
+	long delta_sum;
+	int offset_prev;
+	int offset_range;
+	int offset_min;
+	int offset_max;
+	int min_speed;
+	int max_speed;
+	spinlock_t lock;
 };

 void xpp_drift_init(xbus_t *xbus);

-static inline long usec_diff(const struct timeval *tv1, const struct timeval *tv2)
+static inline long usec_diff(const struct timeval *tv1,
+			     const struct timeval *tv2)
 {
-	long			diff_sec;
-	long			diff_usec;
+	long diff_sec;
+	long diff_usec;

 	diff_sec = tv1->tv_sec - tv2->tv_sec;
 	diff_usec = tv1->tv_usec - tv2->tv_usec;
 	return diff_sec * 1000000 + diff_usec;
 }

-
-int		xbus_pcm_init(void *top);
-void		xbus_pcm_shutdown(void);
-int		send_pcm_frame(xbus_t *xbus, xframe_t *xframe);
-void		pcm_recompute(xpd_t *xpd, xpp_line_t tmp_pcm_mask);
-void		xframe_receive_pcm(xbus_t *xbus, xframe_t *xframe);
-void		update_wanted_pcm_mask(xpd_t *xpd, xpp_line_t new_mask, uint new_pcm_len);
-void		generic_card_pcm_recompute(xpd_t *xpd, xpp_line_t pcm_mask);
-void		generic_card_pcm_fromspan(xpd_t *xpd, xpacket_t *pack);
-void		generic_card_pcm_tospan(xpd_t *xpd, xpacket_t *pack);
-int		generic_timing_priority(xpd_t *xpd);
-int		generic_echocancel_timeslot(xpd_t *xpd, int pos);
-int		generic_echocancel_setmask(xpd_t *xpd, xpp_line_t ec_mask);
-void		fill_beep(u_char *buf, int num, int duration);
-const char	*sync_mode_name(enum sync_mode mode);
-void		xbus_set_command_timer(xbus_t *xbus, bool on);
-void		xbus_request_sync(xbus_t *xbus, enum sync_mode mode);
-void		got_new_syncer(xbus_t *xbus, enum sync_mode mode, int drift);
-int		xbus_command_queue_tick(xbus_t *xbus);
-void		xbus_reset_counters(xbus_t *xbus);
-void		elect_syncer(const char *msg);
-int		exec_sync_command(const char *buf, size_t count);
-int		fill_sync_string(char *buf, size_t count);
+int xbus_pcm_init(void *top);
+void xbus_pcm_shutdown(void);
+int send_pcm_frame(xbus_t *xbus, xframe_t *xframe);
+void pcm_recompute(xpd_t *xpd, xpp_line_t tmp_pcm_mask);
+void xframe_receive_pcm(xbus_t *xbus, xframe_t *xframe);
+void update_wanted_pcm_mask(xpd_t *xpd, xpp_line_t new_mask, uint new_pcm_len);
+void generic_card_pcm_recompute(xpd_t *xpd, xpp_line_t pcm_mask);
+void generic_card_pcm_fromspan(xpd_t *xpd, xpacket_t *pack);
+void generic_card_pcm_tospan(xpd_t *xpd, xpacket_t *pack);
+int generic_timing_priority(xpd_t *xpd);
+int generic_echocancel_timeslot(xpd_t *xpd, int pos);
+int generic_echocancel_setmask(xpd_t *xpd, xpp_line_t ec_mask);
+void fill_beep(u_char *buf, int num, int duration);
+const char *sync_mode_name(enum sync_mode mode);
+void xbus_set_command_timer(xbus_t *xbus, bool on);
+void xbus_request_sync(xbus_t *xbus, enum sync_mode mode);
+void got_new_syncer(xbus_t *xbus, enum sync_mode mode, int drift);
+int xbus_command_queue_tick(xbus_t *xbus);
+void xbus_reset_counters(xbus_t *xbus);
+void elect_syncer(const char *msg);
+int exec_sync_command(const char *buf, size_t count);
+int fill_sync_string(char *buf, size_t count);
 #ifdef	DAHDI_SYNC_TICK
-void		dahdi_sync_tick(struct dahdi_span *span, int is_master);
+void dahdi_sync_tick(struct dahdi_span *span, int is_master);
 #endif

 #ifdef	DEBUG_PCMTX
-extern int	pcmtx;
-extern int	pcmtx_chan;
+extern int pcmtx;
+extern int pcmtx_chan;
 #endif

-#endif	/* __KERNEL__ */
-
-#endif	/* XBUS_PCM_H */
+#endif /* __KERNEL__ */

+#endif /* XBUS_PCM_H */
--- a/drivers/dahdi/xpp/xbus-sysfs.c
+++ b/drivers/dahdi/xpp/xbus-sysfs.c
--- a/drivers/dahdi/xpp/xdefs.h
+++ b/drivers/dahdi/xpp/xdefs.h
@@ -34,18 +34,21 @@
 /* This is to enable user-space programs to include this. */

 #include <stdint.h>
-typedef uint8_t  __u8;
+typedef uint8_t __u8;
 typedef uint32_t __u32;

 #include <stdio.h>

-#define	DBG(fmt, ...)		printf("DBG: %s: " fmt, __FUNCTION__, ## __VA_ARGS__)
+#define	DBG(fmt, ...)		printf("DBG: %s: " fmt, __func__, ## __VA_ARGS__)
 #define	INFO(fmt, ...)		printf("INFO: " fmt, ## __VA_ARGS__)
 #define	NOTICE(fmt, ...)	printf("NOTICE: " fmt, ## __VA_ARGS__)
 #define	ERR(fmt, ...)		printf("ERR: " fmt, ## __VA_ARGS__)
 #define	__user

-struct list_head { struct list_head *next; struct list_head *prev; };
+struct list_head {
+	struct list_head *next;
+	struct list_head *prev;
+};

 #endif

@@ -53,15 +56,15 @@ struct list_head { struct list_head *next; struct list_head *prev; };

 #define	ALL_LINES		((lineno_t)-1)

-#ifndef	BIT	/* added in 2.6.24 */
+#ifndef	BIT			/* added in 2.6.24 */
 #define	BIT(i)		(1UL << (i))
 #endif
-#define	BIT_SET(x,i)	((x) |= BIT(i))
-#define	BIT_CLR(x,i)	((x) &= ~BIT(i))
-#define	IS_SET(x,i)	(((x) & BIT(i)) != 0)
+#define	BIT_SET(x, i)	((x) |= BIT(i))
+#define	BIT_CLR(x, i)	((x) &= ~BIT(i))
+#define	IS_SET(x, i)	(((x) & BIT(i)) != 0)
 #define	BITMASK(i)	(((u64)1 << (i)) - 1)

-#define	MAX_PROC_WRITE	100	/* Largest buffer we allow writing our /proc files */
+#define	MAX_PROC_WRITE	100	/* Longest write allowed to our /proc files */
 #define	CHANNELS_PERXPD	32	/* Depends on xpp_line_t and protocol fields */

 #define	MAX_SPANNAME	20	/* From dahdi/kernel.h */
@@ -77,7 +80,8 @@ struct list_head { struct list_head *next; struct list_head *prev; };
 #define	UNIT_BITS	3	/* Bit for Astribank unit number */
 #define	SUBUNIT_BITS	3	/* Bit for Astribank subunit number */

-#define	MAX_UNIT	(1 << UNIT_BITS)	/* 1 FXS + 3 FXS/FXO | 1 BRI + 3 FXS/FXO */
+/* 1 FXS + 3 FXS/FXO | 1 BRI + 3 FXS/FXO */
+#define	MAX_UNIT	(1 << UNIT_BITS)
 #define	MAX_SUBUNIT	(1 << SUBUNIT_BITS)	/* 8 port BRI */

 /*
@@ -95,74 +99,70 @@ struct list_head { struct list_head *next; struct list_head *prev; };

 #define	VALID_XPD_NUM(x)	((x) < MAX_XPDS && (x) >= 0)

-#define	CHAN_BITS		5       /* 0-31 for E1 */
+#define	CHAN_BITS		5	/* 0-31 for E1 */

-typedef char			*charp;
-typedef unsigned char		byte;
+typedef char *charp;
 #ifdef __KERNEL__

 /* Kernel versions... */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
 #define	KMEM_CACHE_T	kmem_cache_t
-#else 
+#else
 #define	KMEM_CACHE_T	struct kmem_cache
-#endif 
+#endif

 #define	KZALLOC(size, gfp)	my_kzalloc(size, gfp)
-#define	KZFREE(p)		do {					\
-					memset((p), 0, sizeof(*(p)));	\
-					kfree(p);			\
-				} while(0);
+#define	KZFREE(p) \
+		do {					\
+			memset((p), 0, sizeof(*(p)));	\
+			kfree(p);			\
+		} while (0);

-/*
- * Hotplug replaced with uevent in 2.6.16
- */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#define	OLD_HOTPLUG_SUPPORT	// for older kernels
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-#define	OLD_HOTPLUG_SUPPORT_269// for way older kernels
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
-#define	DEVICE_ATTR_READER(name,dev,buf)	\
-		ssize_t name(struct device *dev, struct device_attribute *attr, char *buf)
-#define	DEVICE_ATTR_WRITER(name,dev,buf, count)	\
-		ssize_t name(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#define	DEVICE_ATTR_READER(name, dev, buf) \
+		ssize_t name(struct device *dev, \
+		struct device_attribute *attr, char *buf)
+#define	DEVICE_ATTR_WRITER(name, dev, buf, count) \
+		ssize_t name(struct device *dev, \
+		struct device_attribute *attr, \
+		const char *buf, size_t count)
 #else
-#define	DEVICE_ATTR_READER(name,dev,buf)	\
+#define	DEVICE_ATTR_READER(name, dev, buf) \
 		ssize_t name(struct device *dev, char *buf)
-#define	DEVICE_ATTR_WRITER(name,dev,buf, count)	\
+#define	DEVICE_ATTR_WRITER(name, dev, buf, count) \
 		ssize_t name(struct device *dev, const char *buf, size_t count)
 #endif
-#define	DRIVER_ATTR_READER(name,drv,buf)	\
+#define	DRIVER_ATTR_READER(name, drv, buf) \
 		ssize_t name(struct device_driver *drv, char * buf)

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-#define	SET_PROC_DIRENTRY_OWNER(p)	do { (p)->owner = THIS_MODULE; } while(0);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+#define	SET_PROC_DIRENTRY_OWNER(p) \
+		do { \
+			(p)->owner = THIS_MODULE; \
+		} while (0);
 #else
-#define	SET_PROC_DIRENTRY_OWNER(p)	do { } while(0);
+#define	SET_PROC_DIRENTRY_OWNER(p) do { } while (0);
 #endif

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-/* Also don't define this for later RHEL >= 5.2 . hex_asc is from the 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+/* Also don't define this for later RHEL >= 5.2 . hex_asc is from the
 * same linux-2.6-net-infrastructure-updates-to-mac80211-iwl4965.patch
 * as is the bool typedef. */
-#if LINUX_VERSION_CODE != KERNEL_VERSION(2,6,18)  || !  defined(hex_asc)
-typedef int			bool;
+#if LINUX_VERSION_CODE != KERNEL_VERSION(2, 6, 18)  || !defined(hex_asc)
+typedef int bool;
 #endif
 #endif
 #else
-typedef int			bool;
+typedef int bool;
 #endif
-typedef struct xbus		xbus_t;
-typedef	struct xpd		xpd_t;
-typedef	struct xframe		xframe_t;
-typedef	struct xpacket		xpacket_t;
-typedef	__u32			xpp_line_t;	/* at most 31 lines for E1 */
-typedef	byte			lineno_t;
-typedef byte			xportno_t;
+typedef struct xbus xbus_t;
+typedef struct xpd xpd_t;
+typedef struct xframe xframe_t;
+typedef struct xpacket xpacket_t;
+typedef __u32 xpp_line_t;	/* at most 31 lines for E1 */
+typedef __u8 lineno_t;
+typedef __u8 xportno_t;

 #define	PORT_BROADCAST		255

-#endif	/* XDEFS_H */
+#endif /* XDEFS_H */
--- a/drivers/dahdi/xpp/xframe_queue.c
+++ b/drivers/dahdi/xpp/xframe_queue.c
@@ -7,7 +7,9 @@ extern int debug;
 static xframe_t *transport_alloc_xframe(xbus_t *xbus, gfp_t gfp_flags);
 static void transport_free_xframe(xbus_t *xbus, xframe_t *xframe);

-void xframe_queue_init(struct xframe_queue *q, unsigned int steady_state_count, unsigned int max_count, const char *name, void *priv)
+void xframe_queue_init(struct xframe_queue *q,
+	unsigned int steady_state_count, unsigned int max_count,
+	const char *name, void *priv)
 {
 	memset(q, 0, sizeof(*q));
 	spin_lock_init(&q->lock);
@@ -17,61 +19,60 @@ void xframe_queue_init(struct xframe_queue *q, unsigned int steady_state_count,
 	q->name = name;
 	q->priv = priv;
 }
+EXPORT_SYMBOL(xframe_queue_init);

 void xframe_queue_clearstats(struct xframe_queue *q)
 {
 	q->worst_count = 0;
-	//q->overflows = 0;	/* Never clear overflows */
+	//q->overflows = 0;     /* Never clear overflows */
 	q->worst_lag_usec = 0L;
 }
+EXPORT_SYMBOL(xframe_queue_clearstats);

 static void __xframe_dump_queue(struct xframe_queue *q)
 {
-	xframe_t	*xframe;
-	int		i = 0;
-	char		prefix[30];
-	struct timeval	now;
+	xframe_t *xframe;
+	int i = 0;
+	char prefix[30];
+	struct timeval now;

 	do_gettimeofday(&now);
 	printk(KERN_DEBUG "%s: dump queue '%s' (first packet in each frame)\n",
-		THIS_MODULE->name,
-		q->name);
+	       THIS_MODULE->name, q->name);
 	list_for_each_entry_reverse(xframe, &q->head, frame_list) {
-		xpacket_t	*pack = (xpacket_t *)&xframe->packets[0];
-		long		usec = usec_diff(&now, &xframe->tv_queued);
+		xpacket_t *pack = (xpacket_t *)&xframe->packets[0];
+		long usec = usec_diff(&now, &xframe->tv_queued);
 		snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5ld.%03ld msec",
-			i++, usec / 1000, usec % 1000);
+			 i++, usec / 1000, usec % 1000);
 		dump_packet(prefix, pack, 1);
 	}
 }

 static bool __xframe_enqueue(struct xframe_queue *q, xframe_t *xframe)
 {
-	int			ret = 1;
-	static int		overflow_cnt = 0;
+	int ret = 1;
+	static int overflow_cnt;

-	if(unlikely(q->disabled)) {
+	if (unlikely(q->disabled)) {
 		ret = 0;
 		goto out;
 	}
-	if(q->count >= q->max_count) {
+	if (q->count >= q->max_count) {
 		q->overflows++;
 		if ((overflow_cnt++ % 1000) < 5) {
-			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02ld.%ld ms\n",
-				q->name,
-				q->steady_state_count,
-				q->count,
-				q->max_count,
-				q->worst_count,
-				q->overflows,
-				q->worst_lag_usec / 1000,
-				q->worst_lag_usec % 1000);
+			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d "
+				"worst %3d, overflows %3d "
+				"worst_lag %02ld.%ld ms\n",
+			     q->name, q->steady_state_count, q->count,
+			     q->max_count, q->worst_count, q->overflows,
+			     q->worst_lag_usec / 1000,
+			     q->worst_lag_usec % 1000);
 			__xframe_dump_queue(q);
 		}
 		ret = 0;
 		goto out;
 	}
-	if(++q->count > q->worst_count)
+	if (++q->count > q->worst_count)
 		q->worst_count = q->count;
 	list_add_tail(&xframe->frame_list, &q->head);
 	do_gettimeofday(&xframe->tv_queued);
@@ -81,33 +82,36 @@ out:

 bool xframe_enqueue(struct xframe_queue *q, xframe_t *xframe)
 {
-	unsigned long	flags;
-	int		ret;
+	unsigned long flags;
+	int ret;

 	spin_lock_irqsave(&q->lock, flags);
 	ret = __xframe_enqueue(q, xframe);
 	spin_unlock_irqrestore(&q->lock, flags);
 	return ret;
 }
+EXPORT_SYMBOL(xframe_enqueue);

 static xframe_t *__xframe_dequeue(struct xframe_queue *q)
 {
-	xframe_t		*frm = NULL;
-	struct list_head	*h;
-	struct timeval		now;
-	unsigned long		usec_lag;
+	xframe_t *frm = NULL;
+	struct list_head *h;
+	struct timeval now;
+	unsigned long usec_lag;

-	if(list_empty(&q->head))
+	if (list_empty(&q->head))
 		goto out;
 	h = q->head.next;
 	list_del_init(h);
 	--q->count;
 	frm = list_entry(h, xframe_t, frame_list);
 	do_gettimeofday(&now);
-	usec_lag =	
-		(now.tv_sec - frm->tv_queued.tv_sec)*1000*1000 +
-		(now.tv_usec - frm->tv_queued.tv_usec);
-	if(q->worst_lag_usec < usec_lag)
+	usec_lag =
+	    (now.tv_sec - frm->tv_queued.tv_sec) * 1000 * 1000 + (now.tv_usec -
+								  frm->
+								  tv_queued.
+								  tv_usec);
+	if (q->worst_lag_usec < usec_lag)
 		q->worst_lag_usec = usec_lag;
 out:
 	return frm;
@@ -115,59 +119,68 @@ out:

 xframe_t *xframe_dequeue(struct xframe_queue *q)
 {
-	unsigned long	flags;
-	xframe_t	*frm;
+	unsigned long flags;
+	xframe_t *frm;

 	spin_lock_irqsave(&q->lock, flags);
 	frm = __xframe_dequeue(q);
 	spin_unlock_irqrestore(&q->lock, flags);
 	return frm;
 }
+EXPORT_SYMBOL(xframe_dequeue);
+
 void xframe_queue_disable(struct xframe_queue *q, bool disabled)
 {
 	q->disabled = disabled;
 }
+EXPORT_SYMBOL(xframe_queue_disable);

 void xframe_queue_clear(struct xframe_queue *q)
 {
-	xframe_t	*xframe;
-	xbus_t		*xbus = q->priv;
-	int		i = 0;
+	xframe_t *xframe;
+	xbus_t *xbus = q->priv;
+	int i = 0;

 	xframe_queue_disable(q, 1);
-	while((xframe = xframe_dequeue(q)) != NULL) {
+	while ((xframe = xframe_dequeue(q)) != NULL) {
 		transport_free_xframe(xbus, xframe);
 		i++;
 	}
-	XBUS_DBG(DEVICES, xbus, "%s: finished queue clear (%d items)\n", q->name, i);
+	XBUS_DBG(DEVICES, xbus, "%s: finished queue clear (%d items)\n",
+		 q->name, i);
 }
+EXPORT_SYMBOL(xframe_queue_clear);

 uint xframe_queue_count(struct xframe_queue *q)
 {
 	return q->count;
 }
+EXPORT_SYMBOL(xframe_queue_count);

 /*------------------------- Frame Alloc/Dealloc --------------------*/

 static xframe_t *transport_alloc_xframe(xbus_t *xbus, gfp_t gfp_flags)
 {
-	struct xbus_ops	*ops;
-	xframe_t	*xframe;
-	unsigned long	flags;
+	struct xbus_ops *ops;
+	xframe_t *xframe;
+	unsigned long flags;

 	BUG_ON(!xbus);
 	ops = transportops_get(xbus);
-	if(unlikely(!ops)) {
+	if (unlikely(!ops)) {
 		XBUS_ERR(xbus, "Missing transport\n");
 		return NULL;
 	}
 	spin_lock_irqsave(&xbus->transport.lock, flags);
-	//XBUS_INFO(xbus, "%s (transport_refcount=%d)\n", __FUNCTION__, atomic_read(&xbus->transport.transport_refcount));
+#if 0
+	XBUS_INFO(xbus, "%s (transport_refcount=%d)\n",
+		__func__, atomic_read(&xbus->transport.transport_refcount));
+#endif
 	xframe = ops->alloc_xframe(xbus, gfp_flags);
-	if(!xframe) {
+	if (!xframe) {
 		static int rate_limit;

-		if((rate_limit++ % 3001) == 0)
+		if ((rate_limit++ % 3001) == 0)
 			XBUS_ERR(xbus,
 				"Failed xframe allocation from transport (%d)\n",
 				rate_limit);
@@ -180,14 +193,17 @@ static xframe_t *transport_alloc_xframe(xbus_t *xbus, gfp_t gfp_flags)

 static void transport_free_xframe(xbus_t *xbus, xframe_t *xframe)
 {
-	struct xbus_ops	*ops;
-	unsigned long	flags;
+	struct xbus_ops *ops;
+	unsigned long flags;

 	BUG_ON(!xbus);
 	ops = xbus->transport.ops;
 	BUG_ON(!ops);
 	spin_lock_irqsave(&xbus->transport.lock, flags);
-	//XBUS_INFO(xbus, "%s (transport_refcount=%d)\n", __FUNCTION__, atomic_read(&xbus->transport.transport_refcount));
+#if 0
+	XBUS_INFO(xbus, "%s (transport_refcount=%d)\n",
+		__func__, atomic_read(&xbus->transport.transport_refcount));
+#endif
 	ops->free_xframe(xbus, xframe);
 	transportops_put(xbus);
 	spin_unlock_irqrestore(&xbus->transport.lock, flags);
@@ -195,45 +211,48 @@ static void transport_free_xframe(xbus_t *xbus, xframe_t *xframe)

 static bool xframe_queue_adjust(struct xframe_queue *q)
 {
-	xbus_t		*xbus;
-	xframe_t	*xframe;
-	int		delta;
-	unsigned long	flags;
-	int		ret = 0;
+	xbus_t *xbus;
+	xframe_t *xframe;
+	int delta;
+	unsigned long flags;
+	int ret = 0;

 	BUG_ON(!q);
 	xbus = q->priv;
 	BUG_ON(!xbus);
 	spin_lock_irqsave(&q->lock, flags);
 	delta = q->count - q->steady_state_count;
-	if(delta < -XFRAME_QUEUE_MARGIN) {
+	if (delta < -XFRAME_QUEUE_MARGIN) {
 		/* Increase pool by one frame */
 		//XBUS_INFO(xbus, "%s(%d): Allocate one\n", q->name, delta);
 		xframe = transport_alloc_xframe(xbus, GFP_ATOMIC);
-		if(!xframe) {
+		if (!xframe) {
 			static int rate_limit;

-			if((rate_limit++ % 3001) == 0)
-				XBUS_ERR(xbus, "%s: failed frame allocation\n", q->name);
+			if ((rate_limit++ % 3001) == 0)
+				XBUS_ERR(xbus, "%s: failed frame allocation\n",
+					 q->name);
 			goto out;
 		}
-		if(!__xframe_enqueue(q, xframe)) {
+		if (!__xframe_enqueue(q, xframe)) {
 			static int rate_limit;

-			if((rate_limit++ % 3001) == 0)
-				XBUS_ERR(xbus, "%s: failed enqueueing frame\n", q->name);
+			if ((rate_limit++ % 3001) == 0)
+				XBUS_ERR(xbus, "%s: failed enqueueing frame\n",
+					 q->name);
 			transport_free_xframe(xbus, xframe);
 			goto out;
 		}
-	} else if(delta > XFRAME_QUEUE_MARGIN) {
+	} else if (delta > XFRAME_QUEUE_MARGIN) {
 		/* Decrease pool by one frame */
 		//XBUS_INFO(xbus, "%s(%d): Free one\n", q->name, delta);
 		xframe = __xframe_dequeue(q);
-		if(!xframe) {
+		if (!xframe) {
 			static int rate_limit;

-			if((rate_limit++ % 3001) == 0)
-				XBUS_ERR(xbus, "%s: failed dequeueing frame\n", q->name);
+			if ((rate_limit++ % 3001) == 0)
+				XBUS_ERR(xbus, "%s: failed dequeueing frame\n",
+					 q->name);
 			goto out;
 		}
 		transport_free_xframe(xbus, xframe);
@@ -246,19 +265,20 @@ out:

 xframe_t *get_xframe(struct xframe_queue *q)
 {
-	xframe_t	*xframe;
-	xbus_t		*xbus;
+	xframe_t *xframe;
+	xbus_t *xbus;

 	BUG_ON(!q);
 	xbus = (xbus_t *)q->priv;
 	BUG_ON(!xbus);
 	xframe_queue_adjust(q);
 	xframe = xframe_dequeue(q);
-	if(!xframe) {
+	if (!xframe) {
 		static int rate_limit;

-		if((rate_limit++ % 3001) == 0)
-			XBUS_ERR(xbus, "%s STILL EMPTY (%d)\n", q->name, rate_limit);
+		if ((rate_limit++ % 3001) == 0)
+			XBUS_ERR(xbus, "%s STILL EMPTY (%d)\n", q->name,
+				 rate_limit);
 		return NULL;
 	}
 	BUG_ON(xframe->xframe_magic != XFRAME_MAGIC);
@@ -273,34 +293,25 @@ xframe_t *get_xframe(struct xframe_queue *q)
 	 *
 	 * memset(xframe->packets, 0, xframe->frame_maxlen);
 	 */
-	//XBUS_INFO(xbus, "%s\n", __FUNCTION__);
+	//XBUS_INFO(xbus, "%s\n", __func__);
 	return xframe;
 }
+EXPORT_SYMBOL(get_xframe);

 void put_xframe(struct xframe_queue *q, xframe_t *xframe)
 {
-	xbus_t		*xbus;
+	xbus_t *xbus;

 	BUG_ON(!q);
 	xbus = (xbus_t *)q->priv;
 	BUG_ON(!xbus);
-	//XBUS_INFO(xbus, "%s\n", __FUNCTION__);
+	//XBUS_INFO(xbus, "%s\n", __func__);
 	BUG_ON(!TRANSPORT_EXIST(xbus));
-	if(unlikely(!xframe_enqueue(q, xframe))) {
+	if (unlikely(!xframe_enqueue(q, xframe))) {
 		XBUS_ERR(xbus, "Failed returning xframe to %s\n", q->name);
 		transport_free_xframe(xbus, xframe);
 		return;
 	}
 	xframe_queue_adjust(q);
 }
-
-
-EXPORT_SYMBOL(xframe_queue_init);
-EXPORT_SYMBOL(xframe_queue_clearstats);
-EXPORT_SYMBOL(xframe_enqueue);
-EXPORT_SYMBOL(xframe_dequeue);
-EXPORT_SYMBOL(xframe_queue_disable);
-EXPORT_SYMBOL(xframe_queue_clear);
-EXPORT_SYMBOL(xframe_queue_count);
-EXPORT_SYMBOL(get_xframe);
 EXPORT_SYMBOL(put_xframe);
--- a/drivers/dahdi/xpp/xframe_queue.h
+++ b/drivers/dahdi/xpp/xframe_queue.h
@@ -8,23 +8,22 @@
 #define	XFRAME_QUEUE_MARGIN	10

 struct xframe_queue {
-	struct list_head	head;
-	bool			disabled;
-	unsigned int		count;
-	unsigned int		max_count;
-	unsigned int		steady_state_count;
-	spinlock_t		lock;
-	const char		*name;
-	void			*priv;
+	struct list_head head;
+	bool disabled;
+	unsigned int count;
+	unsigned int max_count;
+	unsigned int steady_state_count;
+	spinlock_t lock;
+	const char *name;
+	void *priv;
 	/* statistics */
-	unsigned int		worst_count;
-	unsigned int		overflows;
-	unsigned long		worst_lag_usec;	/* since xframe creation */
+	unsigned int worst_count;
+	unsigned int overflows;
+	unsigned long worst_lag_usec;	/* since xframe creation */
 };

-void xframe_queue_init(struct xframe_queue *q,
-	unsigned int steady_state_count, unsigned int max_count,
-	const char *name, void *priv);
+void xframe_queue_init(struct xframe_queue *q, unsigned int steady_state_count,
+		       unsigned int max_count, const char *name, void *priv);
 __must_check bool xframe_enqueue(struct xframe_queue *q, xframe_t *xframe);
 __must_check xframe_t *xframe_dequeue(struct xframe_queue *q);
 void xframe_queue_clearstats(struct xframe_queue *q);
@@ -32,4 +31,4 @@ void xframe_queue_disable(struct xframe_queue *q, bool disabled);
 void xframe_queue_clear(struct xframe_queue *q);
 uint xframe_queue_count(struct xframe_queue *q);

-#endif	/* XFRAME_QUEUE_ */
+#endif /* XFRAME_QUEUE_ */
--- a/drivers/dahdi/xpp/xpd.h
+++ b/drivers/dahdi/xpp/xpd.h
@@ -31,71 +31,60 @@
 #include <linux/device.h>
 #include <linux/version.h>
 #include <asm/atomic.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
 #include <linux/semaphore.h>
 #else
 #include <asm/semaphore.h>
 #endif
 #include <linux/moduleparam.h>
-#endif	/* __KERNEL__ */
+#endif /* __KERNEL__ */

 #include <dahdi/kernel.h>

 #ifdef __KERNEL__
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-/* also added in RHEL kernels with the OpenInfiniband backport: */
-#if LINUX_VERSION_CODE != KERNEL_VERSION(2,6,9) || !defined(DEFINE_SPINLOCK)
-typedef	unsigned gfp_t;		/* Added in 2.6.14 */
-#endif
-#endif

+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
 /*
 * FIXME: Kludge for 2.6.19
 * bool is now defined as a proper boolean type (gcc _Bool)
 * but the command line parsing framework handles it as int.
 */
-#define	DEF_PARM_BOOL(name,init,perm,desc)	\
-	int name = init;	\
-	module_param(name, bool, perm);		\
+#define	DEF_PARM_BOOL(name, init, perm, desc) \
+	int name = init; \
+	module_param(name, bool, perm); \
 	MODULE_PARM_DESC(name, desc " [default " #init "]")
-
-#define	DEF_PARM(type,name,init,perm,desc)	\
-	type name = init;	\
-	module_param(name, type, perm);		\
-	MODULE_PARM_DESC(name, desc " [default " #init "]")
-
-#if	LINUX_VERSION_CODE	< KERNEL_VERSION(2,6,10)
-/*
- * Old 2.6 kernels had module_param_array() macro that receive the counter
- * by value.
- */
-#define	DEF_ARRAY(type,name,count,init,desc)	\
-	unsigned int name ## _num_values;	\
-	type name[count] = { [0 ... ((count)-1)] = (init) };			\
-	module_param_array(name, type, name ## _num_values, 0644);	\
-	MODULE_PARM_DESC(name, desc " ( 1-" __MODULE_STRING(count) ")")
 #else
-#define	DEF_ARRAY(type,name,count,init,desc)	\
-	unsigned int name ## _num_values;	\
-	type name[count] = {[0 ... ((count)-1)] = init};			\
-	module_param_array(name, type, &name ## _num_values, 0644);	\
-	MODULE_PARM_DESC(name, desc " ( 1-" __MODULE_STRING(count) ")")
+#define	DEF_PARM_BOOL(name, init, perm, desc) \
+	bool name = init; \
+	module_param(name, bool, perm); \
+	MODULE_PARM_DESC(name, desc " [default " #init "]")
 #endif
-#endif	// __KERNEL__
+
+#define	DEF_PARM(type, name, init, perm, desc) \
+	type name = init; \
+	module_param(name, type, perm); \
+	MODULE_PARM_DESC(name, desc " [default " #init "]")
+
+#define	DEF_ARRAY(type, name, count, init, desc) \
+	unsigned int name ## _num_values; \
+	type name[count] = {[0 ... ((count)-1)] = init}; \
+	module_param_array(name, type, &name ## _num_values, 0644); \
+	MODULE_PARM_DESC(name, desc " ( 1-" __MODULE_STRING(count) ")")
+#endif // __KERNEL__

 #define	CARD_DESC_MAGIC	0xca9dde5c

-struct	card_desc_struct {
-	struct list_head	card_list;
-	u32			magic;
-	byte			type;		/* LSB: 1 - to_phone, 0 - to_line */
-	byte			subtype;
-	struct xpd_addr		xpd_addr;
-	byte			numchips;
-	byte			ports_per_chip;
-	byte			ports;
-	byte			port_dir;
-	struct xpd_addr		ec_addr;	/* echo canceler address */
+struct card_desc_struct {
+	struct list_head card_list;
+	u32 magic;
+	__u8 type;		/* LSB: 1 - to_phone, 0 - to_line */
+	__u8 subtype;
+	struct xpd_addr xpd_addr;
+	__u8 numchips;
+	__u8 ports_per_chip;
+	__u8 ports;
+	__u8 port_dir;
+	struct xpd_addr ec_addr;	/* echo canceler address */
 };

 typedef enum xpd_direction {
@@ -120,12 +109,9 @@ enum {

 /* yucky, make an instance so we can size it... */
 static struct xpd_counters {
-	char	*name;
+	char *name;
 } xpd_counters[] = {
-	C_(PCM_READ),
-	C_(PCM_WRITE),
-	C_(RECV_ERRORS),
-};
+C_(PCM_READ), C_(PCM_WRITE), C_(RECV_ERRORS),};

 #undef C_

@@ -138,43 +124,43 @@ enum xpd_state {
 	XPD_STATE_NOHW,
 };

-bool		xpd_setstate(xpd_t *xpd, enum xpd_state newstate);
-const char	*xpd_statename(enum xpd_state st);
+bool xpd_setstate(xpd_t *xpd, enum xpd_state newstate);
+const char *xpd_statename(enum xpd_state st);

 #define	PHONEDEV(xpd)		((xpd)->phonedev)
 #define	IS_PHONEDEV(xpd)	(PHONEDEV(xpd).phoneops)

 struct phonedev {
-	const struct phoneops	*phoneops;	/* Card level operations */
-	struct dahdi_span	span;
-	struct dahdi_chan	*chans[32];
-#define	XPD_CHAN(xpd,chan)	(PHONEDEV(xpd).chans[(chan)])
+	const struct phoneops *phoneops;	/* Card level operations */
+	struct dahdi_span span;
+	struct dahdi_chan *chans[32];
+#define	XPD_CHAN(xpd, chan)	(PHONEDEV(xpd).chans[(chan)])
 	struct dahdi_echocan_state *ec[32];

-	int		channels;
-	xpd_direction_t	direction;		/* TO_PHONE, TO_PSTN */
-	xpp_line_t	no_pcm;			/* Temporary: disable PCM (for USB-1) */
-	xpp_line_t	offhook_state;		/* Actual chip state: 0 - ONHOOK, 1 - OFHOOK */
-	xpp_line_t	oht_pcm_pass;		/* Transfer on-hook PCM */
+	int channels;
+	xpd_direction_t direction;	/* TO_PHONE, TO_PSTN */
+	xpp_line_t no_pcm;		/* Temporary: disable PCM (for USB-1) */
+	xpp_line_t offhook_state;	/* chip state: 0 - ONHOOK, 1 - OFHOOK */
+	xpp_line_t oht_pcm_pass;	/* Transfer on-hook PCM */
 	/* Voice Mail Waiting Indication: */
-	unsigned int	msg_waiting[CHANNELS_PERXPD];
-	xpp_line_t	digital_outputs;	/* 0 - no, 1 - yes */
-	xpp_line_t	digital_inputs;		/* 0 - no, 1 - yes */
-	xpp_line_t	digital_signalling;	/* BRI signalling channels */
-	uint		timing_priority;	/* from 'span' directives in chan_dahdi.conf */
+	unsigned int msg_waiting[CHANNELS_PERXPD];
+	xpp_line_t digital_outputs;	/* 0 - no, 1 - yes */
+	xpp_line_t digital_inputs;	/* 0 - no, 1 - yes */
+	xpp_line_t digital_signalling;	/* BRI signalling channels */
+	uint timing_priority;	/* from 'span' directives in chan_dahdi.conf */

 	/* Assure atomicity of changes to pcm_len and wanted_pcm_mask */
-	spinlock_t	lock_recompute_pcm;
+	spinlock_t lock_recompute_pcm;
 	/* maintained by card drivers */
-	uint		pcm_len;		/* allocation length of PCM packet (dynamic) */
-	xpp_line_t	wanted_pcm_mask;
-	xpp_line_t	silence_pcm;		/* inject silence during next tick */
-	xpp_line_t	mute_dtmf;
+	uint pcm_len;		/* allocation length of PCM packet (dynamic) */
+	xpp_line_t wanted_pcm_mask;
+	xpp_line_t silence_pcm;	/* inject silence during next tick */
+	xpp_line_t mute_dtmf;

-	bool		ringing[CHANNELS_PERXPD];
+	bool ringing[CHANNELS_PERXPD];

-	atomic_t	dahdi_registered;	/* Am I fully registered with dahdi */
-	atomic_t	open_counter;	/* Number of open channels */
+	atomic_t dahdi_registered;	/* Am I fully registered with dahdi */
+	atomic_t open_counter;	/* Number of open channels */

 	/* Echo cancelation */
 	u_char ec_chunk1[CHANNELS_PERXPD][DAHDI_CHUNKSIZE];
@@ -186,51 +172,52 @@ struct phonedev {
 */
 struct xpd {
 	char xpdname[XPD_NAMELEN];
-	struct phonedev	phonedev;
+	struct phonedev phonedev;

-	const struct xops	*xops;
-	xpd_type_t	type;
-	const char	*type_name;
-	byte		subtype;
-	int		subunits;		/* all siblings */
-	enum xpd_state	xpd_state;
-	struct device	xpd_dev;
+	const struct xops *xops;
+	xpd_type_t type;
+	const char *type_name;
+	__u8 subtype;
+	int subunits;		/* all siblings */
+	enum xpd_state xpd_state;
+	struct device xpd_dev;
 #define	dev_to_xpd(dev)	container_of(dev, struct xpd, xpd_dev)
-	struct kref		kref;
+	struct kref kref;
 #define kref_to_xpd(k) container_of(k, struct xpd, kref)

-	xbus_t *xbus;			/* The XBUS we are connected to */
-	struct device	*echocancel;
+	xbus_t *xbus;		/* The XBUS we are connected to */
+	struct device *echocancel;

-	spinlock_t	lock;
+	spinlock_t lock;

-	int		flags;
-	unsigned long	blink_mode;	/* bitmask of blinking ports */
+	int flags;
+	unsigned long blink_mode;	/* bitmask of blinking ports */
 #define	DEFAULT_LED_PERIOD	(1000/8)	/* in tick */

 #ifdef CONFIG_PROC_FS
-	struct proc_dir_entry	*proc_xpd_dir;
-	struct proc_dir_entry	*proc_xpd_summary;
+	struct proc_dir_entry *proc_xpd_dir;
+	struct proc_dir_entry *proc_xpd_summary;
 #endif

-	int		counters[XPD_COUNTER_MAX];
+	int counters[XPD_COUNTER_MAX];

-	const xproto_table_t	*xproto;	/* Card level protocol table */
-	void		*priv;			/* Card level private data */
-	bool		card_present;
-	reg_cmd_t	requested_reply;
-	reg_cmd_t	last_reply;
+	const xproto_table_t *xproto;	/* Card level protocol table */
+	void *priv;		/* Card level private data */
+	bool card_present;
+	reg_cmd_t requested_reply;
+	reg_cmd_t last_reply;

-	unsigned long	last_response;	/* in jiffies */
-	unsigned	xbus_idx;	/* index in xbus->xpds[] */
-	struct xpd_addr	addr;
+	unsigned long last_response;	/* in jiffies */
+	unsigned xbus_idx;	/* index in xbus->xpds[] */
+	struct xpd_addr addr;
 	struct list_head xpd_list;
-	unsigned int	timer_count;
+	unsigned int timer_count;
 };

-#define	for_each_line(xpd,i)	for((i) = 0; (i) < PHONEDEV(xpd).channels; (i)++)
+#define	for_each_line(xpd, i) \
+		for ((i) = 0; (i) < PHONEDEV(xpd).channels; (i)++)
 #define	IS_BRI(xpd)		((xpd)->type == XPD_TYPE_BRI)
-#define	TICK_TOLERANCE		500 /* usec */
+#define	TICK_TOLERANCE		500	/* usec */

 #ifdef	DEBUG_SYNC_PARPORT
 void xbus_flip_bit(xbus_t *xbus, unsigned int bitnum0, unsigned int bitnum1);
@@ -240,27 +227,28 @@ void xbus_flip_bit(xbus_t *xbus, unsigned int bitnum0, unsigned int bitnum1);

 static inline void *my_kzalloc(size_t size, gfp_t flags)
 {
-	void	*p;
+	void *p;

 	p = kmalloc(size, flags);
-	if(p)
+	if (p)
 		memset(p, 0, size);
 	return p;
 }

 struct xpd_driver {
-	xpd_type_t	type;
+	xpd_type_t type;

-	struct device_driver	driver;
-#define   driver_to_xpd_driver(driver) container_of(driver, struct xpd_driver, driver)
+	struct device_driver driver;
+#define	driver_to_xpd_driver(driver) \
+		container_of(driver, struct xpd_driver, driver)
 };

-int	xpd_driver_register(struct device_driver *driver);
-void	xpd_driver_unregister(struct device_driver *driver);
-xpd_t	*get_xpd(const char *msg, xpd_t *xpd);
-void	put_xpd(const char *msg, xpd_t *xpd);
-int	refcount_xpd(xpd_t *xpd);
+int xpd_driver_register(struct device_driver *driver);
+void xpd_driver_unregister(struct device_driver *driver);
+xpd_t *get_xpd(const char *msg, xpd_t *xpd);
+void put_xpd(const char *msg, xpd_t *xpd);
+int refcount_xpd(xpd_t *xpd);

 #endif

-#endif	/* XPD_H */
+#endif /* XPD_H */
--- a/drivers/dahdi/xpp/xpp_dahdi.c
+++ b/drivers/dahdi/xpp/xpp_dahdi.c
--- a/drivers/dahdi/xpp/xpp_dahdi.h
+++ b/drivers/dahdi/xpp/xpp_dahdi.h
@@ -30,37 +30,40 @@ int xpd_dahdi_preregister(xpd_t *xpd, unsigned offset);
 int xpd_dahdi_postregister(xpd_t *xpd);
 void xpd_dahdi_preunregister(xpd_t *xpd);
 void xpd_dahdi_postunregister(xpd_t *xpd);
-int create_xpd(xbus_t *xbus, const xproto_table_t *proto_table,
-		int unit, int subunit, byte type, byte subtype, int subunits, int subunit_ports, byte port_dir);
-xpd_t *xpd_alloc(xbus_t *xbus, int unit, int subunit, int subtype, int subunits, size_t privsize, const xproto_table_t *proto_table, int channels);
+int create_xpd(xbus_t *xbus, const xproto_table_t *proto_table, int unit,
+	       int subunit, __u8 type, __u8 subtype, int subunits,
+	       int subunit_ports, __u8 port_dir);
+xpd_t *xpd_alloc(xbus_t *xbus, int unit, int subunit, int subtype, int subunits,
+		 size_t privsize, const xproto_table_t *proto_table,
+		 int channels);
 void xpd_free(xpd_t *xpd);
 void xpd_remove(xpd_t *xpd);
 void update_xpd_status(xpd_t *xpd, int alarm_flag);
 const char *xpp_echocan_name(const struct dahdi_chan *chan);
-int xpp_echocan_create(struct dahdi_chan *chan,
-				struct dahdi_echocanparams *ecp,
-				struct dahdi_echocanparam *p,
-				struct dahdi_echocan_state **ec);
+int xpp_echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
+		       struct dahdi_echocanparam *p,
+		       struct dahdi_echocan_state **ec);
 void hookstate_changed(xpd_t *xpd, int pos, bool good);
 int xpp_open(struct dahdi_chan *chan);
 int xpp_close(struct dahdi_chan *chan);
 int xpp_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long arg);
 int xpp_hooksig(struct dahdi_chan *chan, enum dahdi_txsig txsig);
 int xpp_maint(struct dahdi_span *span, int cmd);
+int xpp_watchdog(struct dahdi_span *span, int cause);
 void xpp_span_assigned(struct dahdi_span *span);
 void report_bad_ioctl(const char *msg, xpd_t *xpd, int pos, unsigned int cmd);
 int total_registered_spans(void);
 void oht_pcm(xpd_t *xpd, int pos, bool pass);
 void mark_offhook(xpd_t *xpd, int pos, bool to_offhook);
-#define	IS_OFFHOOK(xpd,pos)	IS_SET((xpd)->phonedev.offhook_state, (pos))
+#define	IS_OFFHOOK(xpd, pos)	IS_SET((xpd)->phonedev.offhook_state, (pos))
 void notify_rxsig(xpd_t *xpd, int pos, enum dahdi_rxsig rxsig);

 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>

-extern struct proc_dir_entry	*xpp_proc_toplevel;
+extern struct proc_dir_entry *xpp_proc_toplevel;
 #endif

 #define	SPAN_REGISTERED(xpd)	atomic_read(&PHONEDEV(xpd).dahdi_registered)

-#endif	/* XPP_DAHDI_H */
+#endif /* XPP_DAHDI_H */
--- a/drivers/dahdi/xpp/xpp_usb.c
+++ b/drivers/dahdi/xpp/xpp_usb.c
--- a/drivers/dahdi/xpp/xproto.c
+++ b/drivers/dahdi/xpp/xproto.c
@@ -30,7 +30,7 @@

 static const char rcsid[] = "$Id$";

-extern	int debug;
+extern int debug;

 static const xproto_table_t *xprotocol_tables[XPD_TYPE_NOMODULE];

@@ -40,12 +40,15 @@ static const xproto_table_t *xprotocol_tables[XPD_TYPE_NOMODULE];

 bool valid_xpd_addr(const struct xpd_addr *addr)
 {
-	return ((addr->subunit & ~BITMASK(SUBUNIT_BITS)) == 0) && ((addr->unit & ~BITMASK(UNIT_BITS)) == 0);
+	return ((addr->subunit & ~BITMASK(SUBUNIT_BITS)) == 0)
+	    && ((addr->unit & ~BITMASK(UNIT_BITS)) == 0);
 }
+EXPORT_SYMBOL(valid_xpd_addr);

-/*---------------- General Protocol Management ----------------------------*/
+/*------ General Protocol Management ----------------------------*/

-const xproto_entry_t *xproto_card_entry(const xproto_table_t *table, byte opcode)
+const xproto_entry_t *xproto_card_entry(const xproto_table_t *table,
+					__u8 opcode)
 {
 	const xproto_entry_t *xe;

@@ -53,8 +56,9 @@ const xproto_entry_t *xproto_card_entry(const xproto_table_t *table, byte opcode
 	xe = &table->entries[opcode];
 	return (xe->handler != NULL) ? xe : NULL;
 }
+EXPORT_SYMBOL(xproto_card_entry);

-const xproto_entry_t *xproto_global_entry(byte opcode)
+const xproto_entry_t *xproto_global_entry(__u8 opcode)
 {
 	const xproto_entry_t *xe;

@@ -62,42 +66,52 @@ const xproto_entry_t *xproto_global_entry(byte opcode)
 	//DBG(GENERAL, "opcode=0x%X xe=%p\n", opcode, xe);
 	return xe;
 }
+EXPORT_SYMBOL(xproto_global_entry);

-xproto_handler_t xproto_global_handler(byte opcode)
+xproto_handler_t xproto_global_handler(__u8 opcode)
 {
 	return xproto_card_handler(&PROTO_TABLE(GLOBAL), opcode);
 }

 static const xproto_table_t *xproto_table(xpd_type_t cardtype)
 {
-	if(cardtype >= XPD_TYPE_NOMODULE)
+	if (cardtype >= XPD_TYPE_NOMODULE)
 		return NULL;
 	return xprotocol_tables[cardtype];
 }

+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#define MODULE_REFCOUNT_FORMAT "%s refcount was %d\n"
+#else
+#define MODULE_REFCOUNT_FORMAT "%s refcount was %lu\n"
+#endif
+
 const xproto_table_t *xproto_get(xpd_type_t cardtype)
 {
 	const xproto_table_t *xtable;

-	if(cardtype >= XPD_TYPE_NOMODULE)
+	if (cardtype >= XPD_TYPE_NOMODULE)
 		return NULL;
 	xtable = xprotocol_tables[cardtype];
-	if(!xtable) {	/* Try to load the relevant module */
+	if (!xtable) {		/* Try to load the relevant module */
 		int ret = request_module(XPD_TYPE_PREFIX "%d", cardtype);
-		if(ret != 0) {
-			NOTICE("%s: Failed to load module for type=%d. exit status=%d.\n",
-					__FUNCTION__, cardtype, ret);
+		if (ret != 0) {
+			NOTICE("%s: Failed to load module for type=%d. "
+				"exit status=%d.\n",
+				__func__, cardtype, ret);
 			/* Drop through: we may be lucky... */
 		}
 		xtable = xprotocol_tables[cardtype];
 	}
-	if(xtable) {
+	if (xtable) {
 		BUG_ON(!xtable->owner);
 #ifdef CONFIG_MODULE_UNLOAD
-		DBG(GENERAL, "%s refcount was %d\n", xtable->name, module_refcount(xtable->owner));
+		DBG(GENERAL, MODULE_REFCOUNT_FORMAT, xtable->name,
+		    module_refcount(xtable->owner));
 #endif
-		if(!try_module_get(xtable->owner)) {
-			ERR("%s: try_module_get for %s failed.\n", __FUNCTION__, xtable->name);
+		if (!try_module_get(xtable->owner)) {
+			ERR("%s: try_module_get for %s failed.\n", __func__,
+			    xtable->name);
 			return NULL;
 		}
 	}
@@ -108,13 +122,15 @@ void xproto_put(const xproto_table_t *xtable)
 {
 	BUG_ON(!xtable);
 #ifdef CONFIG_MODULE_UNLOAD
-	DBG(GENERAL, "%s refcount was %d\n", xtable->name, module_refcount(xtable->owner));
+	DBG(GENERAL, MODULE_REFCOUNT_FORMAT, xtable->name,
+	    module_refcount(xtable->owner));
 	BUG_ON(module_refcount(xtable->owner) <= 0);
 #endif
 	module_put(xtable->owner);
 }

-xproto_handler_t xproto_card_handler(const xproto_table_t *table, byte opcode)
+xproto_handler_t xproto_card_handler(const xproto_table_t *table,
+	__u8 opcode)
 {
 	const xproto_entry_t *xe;

@@ -123,78 +139,89 @@ xproto_handler_t xproto_card_handler(const xproto_table_t *table, byte opcode)
 	return xe->handler;
 }

-void notify_bad_xpd(const char *funcname, xbus_t *xbus, const struct xpd_addr addr, const char *msg)
+void notify_bad_xpd(const char *funcname, xbus_t *xbus,
+		    const struct xpd_addr addr, const char *msg)
 {
-	XBUS_NOTICE(xbus, "%s: non-existing address (%1d%1d): %s\n",
-			funcname, addr.unit, addr.subunit, msg);
+	XBUS_NOTICE(xbus, "%s: non-existing address (%1d%1d): %s\n", funcname,
+		    addr.unit, addr.subunit, msg);
 }
+EXPORT_SYMBOL(notify_bad_xpd);

 static int packet_process(xbus_t *xbus, xpacket_t *pack)
 {
-	byte			op;
-	const xproto_entry_t	*xe;
-	xproto_handler_t	handler;
-	xproto_table_t		*table;
-	xpd_t			*xpd;
-	int			ret = -EPROTO;
+	__u8 op;
+	const xproto_entry_t *xe;
+	xproto_handler_t handler;
+	xproto_table_t *table;
+	xpd_t *xpd;
+	int ret = -EPROTO;

 	BUG_ON(!pack);
-	if(!valid_xpd_addr(&XPACKET_ADDR(pack))) {
-		if(printk_ratelimit()) {
+	if (!valid_xpd_addr(&XPACKET_ADDR(pack))) {
+		if (printk_ratelimit()) {
 			XBUS_NOTICE(xbus, "%s: from %d%d: bad address.\n",
-					__FUNCTION__,
-					XPACKET_ADDR_UNIT(pack), XPACKET_ADDR_SUBUNIT(pack));
-			dump_packet("packet_process -- bad address", pack, debug);
+				    __func__, XPACKET_ADDR_UNIT(pack),
+				    XPACKET_ADDR_SUBUNIT(pack));
+			dump_packet("packet_process -- bad address", pack,
+				    debug);
 		}
 		goto out;
 	}
 	op = XPACKET_OP(pack);
-	xpd = xpd_byaddr(xbus, XPACKET_ADDR_UNIT(pack), XPACKET_ADDR_SUBUNIT(pack));
+	xpd =
+	    xpd_byaddr(xbus, XPACKET_ADDR_UNIT(pack),
+		       XPACKET_ADDR_SUBUNIT(pack));
 	/* XPD may be NULL (e.g: during bus polling */
 	xe = xproto_global_entry(op);
 	/*-------- Validations -----------*/
-	if(!xe) {
+	if (!xe) {
 		const xproto_table_t *xtable;
-		
-		if(!xpd) {
-			if(printk_ratelimit()) {
-				XBUS_NOTICE(xbus, "%s: from %d%d opcode=0x%02X: no such global command.\n",
-						__FUNCTION__,
-						XPACKET_ADDR_UNIT(pack), XPACKET_ADDR_SUBUNIT(pack), op);
-				dump_packet("packet_process -- no such global command", pack, 1);
+
+		if (!xpd) {
+			if (printk_ratelimit()) {
+				XBUS_NOTICE(xbus,
+					"%s: from %d%d opcode=0x%02X: "
+					"no such global command.\n",
+					__func__, XPACKET_ADDR_UNIT(pack),
+					XPACKET_ADDR_SUBUNIT(pack), op);
+				dump_packet
+				    ("packet_process -- no such global command",
+				     pack, 1);
 			}
 			goto out;
 		}
 		xtable = xproto_table(xpd->type);
-		if(!xtable) {
-			if(printk_ratelimit())
-				XPD_ERR(xpd, "%s: no protocol table (type=%d)\n",
-					__FUNCTION__,
-					xpd->type);
+		if (!xtable) {
+			if (printk_ratelimit())
+				XPD_ERR(xpd,
+					"%s: no protocol table (type=%d)\n",
+					__func__, xpd->type);
 			goto out;
 		}
 		xe = xproto_card_entry(xtable, op);
-		if(!xe) {
-			if(printk_ratelimit()) {
-				XPD_NOTICE(xpd, "%s: bad command (type=%d,opcode=0x%x)\n",
-					__FUNCTION__,
-					xpd->type, op);
-				dump_packet("packet_process -- bad command", pack, 1);
+		if (!xe) {
+			if (printk_ratelimit()) {
+				XPD_NOTICE(xpd,
+					"%s: bad command (type=%d,opcode=0x%x)\n",
+					__func__, xpd->type, op);
+				dump_packet("packet_process -- bad command",
+					pack, 1);
 			}
 			goto out;
 		}
 	}
 	table = xe->table;
 	BUG_ON(!table);
-	if(!table->packet_is_valid(pack)) {
-		if(printk_ratelimit()) {
+	if (!table->packet_is_valid(pack)) {
+		if (printk_ratelimit()) {
 			ERR("xpp: %s: wrong size %d for opcode=0x%02X\n",
-					__FUNCTION__, XPACKET_LEN(pack), op);
-			dump_packet("packet_process -- wrong size", pack, debug);
+			    __func__, XPACKET_LEN(pack), op);
+			dump_packet("packet_process -- wrong size", pack,
+				    debug);
 		}
 		goto out;
 	}
-	ret = 0;	/* All well */
+	ret = 0;		/* All well */
 	handler = xe->handler;
 	BUG_ON(!handler);
 	XBUS_COUNTER(xbus, RX_BYTES) += XPACKET_LEN(pack);
@@ -205,13 +232,13 @@ out:

 static int xframe_receive_cmd(xbus_t *xbus, xframe_t *xframe)
 {
-	byte		*xframe_end;
-	xpacket_t	*pack;
-	byte		*p;
-	int		len;
-	int		ret;
+	__u8 *xframe_end;
+	xpacket_t *pack;
+	__u8 *p;
+	int len;
+	int ret;

-	if(debug & DBG_COMMANDS)
+	if (debug & DBG_COMMANDS)
 		dump_xframe("RX-CMD", xbus, xframe, DBG_ANY);
 	p = xframe->packets;
 	xframe_end = p + XFRAME_LEN(xframe);
@@ -219,31 +246,34 @@ static int xframe_receive_cmd(xbus_t *xbus, xframe_t *xframe)
 		pack = (xpacket_t *)p;
 		len = XPACKET_LEN(pack);
 		/* Sanity checks */
-		if(unlikely(XPACKET_OP(pack) == XPROTO_NAME(GLOBAL,PCM_READ))) {
-			static int	rate_limit;
+		if (unlikely(XPACKET_OP(pack) == XPROTO_NAME(GLOBAL, PCM_READ))) {
+			static int rate_limit;

-			if((rate_limit++ % 1003) == 0) {
-				XBUS_DBG(GENERAL, xbus, "A PCM packet within a Non-PCM xframe\n");
-				dump_xframe("In Non-PCM xframe", xbus, xframe, debug);
+			if ((rate_limit++ % 1003) == 0) {
+				XBUS_DBG(GENERAL, xbus,
+					"A PCM packet within a Non-PCM xframe\n");
+				dump_xframe("In Non-PCM xframe",
+					xbus, xframe, debug);
 			}
 			ret = -EPROTO;
 			goto out;
 		}
 		p += len;
-		if(p > xframe_end || len < RPACKET_HEADERSIZE) {
-			static int	rate_limit;
+		if (p > xframe_end || len < RPACKET_HEADERSIZE) {
+			static int rate_limit;

-			if((rate_limit++ % 1003) == 0) {
-				XBUS_NOTICE(xbus, "Invalid packet length %d\n", len);
+			if ((rate_limit++ % 1003) == 0) {
+				XBUS_NOTICE(xbus, "Invalid packet length %d\n",
+					    len);
 				dump_xframe("BAD LENGTH", xbus, xframe, debug);
 			}
 			ret = -EPROTO;
 			goto out;
 		}
 		ret = packet_process(xbus, pack);
-		if(unlikely(ret < 0))
+		if (unlikely(ret < 0))
 			break;
-	} while(p < xframe_end);
+	} while (p < xframe_end);
 out:
 	FREE_RECV_XFRAME(xbus, xframe);
 	return ret;
@@ -251,22 +281,22 @@ out:

 int xframe_receive(xbus_t *xbus, xframe_t *xframe)
 {
-	int		ret = 0;
-	struct timeval	now;
-	struct timeval	tv_received;
-	int		usec;
+	int ret = 0;
+	struct timeval now;
+	struct timeval tv_received;
+	int usec;

-	if(XFRAME_LEN(xframe) < RPACKET_HEADERSIZE) {
-		static int	rate_limit;
+	if (XFRAME_LEN(xframe) < RPACKET_HEADERSIZE) {
+		static int rate_limit;

-		if((rate_limit++ % 1003) == 0) {
+		if ((rate_limit++ % 1003) == 0) {
 			XBUS_NOTICE(xbus, "short xframe\n");
 			dump_xframe("short xframe", xbus, xframe, debug);
 		}
 		FREE_RECV_XFRAME(xbus, xframe);
 		return -EPROTO;
 	}
-	if(!XBUS_FLAGS(xbus, CONNECTED)) {
+	if (!XBUS_FLAGS(xbus, CONNECTED)) {
 		XBUS_DBG(GENERAL, xbus, "Dropped xframe. Is shutting down.\n");
 		return -ENODEV;
 	}
@@ -274,8 +304,8 @@ int xframe_receive(xbus_t *xbus, xframe_t *xframe)
 	/*
 	 * We want to check that xframes do not mix PCM and other commands
 	 */
-	if(XPACKET_IS_PCM((xpacket_t *)xframe->packets)) {
-		if(!XBUS_IS(xbus, READY))
+	if (XPACKET_IS_PCM((xpacket_t *)xframe->packets)) {
+		if (!XBUS_IS(xbus, READY))
 			FREE_RECV_XFRAME(xbus, xframe);
 		else
 			xframe_receive_pcm(xbus, xframe);
@@ -285,47 +315,48 @@ int xframe_receive(xbus_t *xbus, xframe_t *xframe)
 	}
 	/* Calculate total processing time */
 	do_gettimeofday(&now);
-	usec = (now.tv_sec - tv_received.tv_sec) * 1000000 +
-		now.tv_usec - tv_received.tv_usec;
-	if(usec > xbus->max_rx_process)
+	usec =
+	    (now.tv_sec - tv_received.tv_sec) * 1000000 + now.tv_usec -
+	    tv_received.tv_usec;
+	if (usec > xbus->max_rx_process)
 		xbus->max_rx_process = usec;
 	return ret;
 }
+EXPORT_SYMBOL(xframe_receive);

 #define	VERBOSE_DEBUG		1
 #define	ERR_REPORT_LIMIT	20

 void dump_packet(const char *msg, const xpacket_t *packet, bool debug)
 {
-	byte	op = XPACKET_OP(packet);
-	byte	*addr = (byte *)&XPACKET_ADDR(packet);
+	__u8 op = XPACKET_OP(packet);
+	__u8 *addr = (__u8 *)&XPACKET_ADDR(packet);

-	if(!debug)
+	if (!debug)
 		return;
-	printk(KERN_DEBUG "%s: XPD=%1X-%1X%c (0x%X) OP=0x%02X LEN=%d",
-			msg,
-			XPACKET_ADDR_UNIT(packet),
-			XPACKET_ADDR_SUBUNIT(packet),
-			(XPACKET_ADDR_SYNC(packet))?'+':' ',
-			*addr,
-			op,
-			XPACKET_LEN(packet));
+	printk(KERN_DEBUG "%s: XPD=%1X-%1X%c (0x%X) OP=0x%02X LEN=%d", msg,
+	       XPACKET_ADDR_UNIT(packet), XPACKET_ADDR_SUBUNIT(packet),
+	       (XPACKET_ADDR_SYNC(packet)) ? '+' : ' ', *addr, op,
+	       XPACKET_LEN(packet));
 #if VERBOSE_DEBUG
 	{
 		int i;
-		byte	*p = (byte *)packet;
+		__u8 *p = (__u8 *)packet;

 		printk(" BYTES: ");
-		for(i = 0; i < XPACKET_LEN(packet); i++) {
-			static int limiter = 0;
+		for (i = 0; i < XPACKET_LEN(packet); i++) {
+			static int limiter;

-			if(i >= sizeof(xpacket_t)) {
-				if(limiter < ERR_REPORT_LIMIT) {
-					ERR("%s: length overflow i=%d > sizeof(xpacket_t)=%lu\n",
-						__FUNCTION__, i+1, (long)sizeof(xpacket_t));
-				} else if(limiter == ERR_REPORT_LIMIT) {
-					ERR("%s: error packet #%d... squelsh reports.\n",
-						__FUNCTION__, limiter);
+			if (i >= sizeof(xpacket_t)) {
+				if (limiter < ERR_REPORT_LIMIT) {
+					ERR("%s: length overflow "
+						"i=%d > sizeof(xpacket_t)=%lu\n",
+						__func__, i + 1,
+						(long)sizeof(xpacket_t));
+				} else if (limiter == ERR_REPORT_LIMIT) {
+					ERR("%s: error packet #%d... "
+						"squelsh reports.\n",
+						__func__, limiter);
 				}
 				limiter++;
 				break;
@@ -337,112 +368,121 @@ void dump_packet(const char *msg, const xpacket_t *packet, bool debug)
 #endif
 	printk("\n");
 }
+EXPORT_SYMBOL(dump_packet);

 void dump_reg_cmd(const char msg[], bool writing, xbus_t *xbus,
-		byte unit, xportno_t port, const reg_cmd_t *regcmd)
+	__u8 unit, xportno_t port, const reg_cmd_t *regcmd)
 {
-	char		action;
-	char		modifier;
-	char		port_buf[MAX_PROC_WRITE];
-	char		reg_buf[MAX_PROC_WRITE];
-	char		data_buf[MAX_PROC_WRITE];
+	char action;
+	char modifier;
+	char port_buf[MAX_PROC_WRITE];
+	char reg_buf[MAX_PROC_WRITE];
+	char data_buf[MAX_PROC_WRITE];

-	if(regcmd->bytes > sizeof(*regcmd) - 1) {	/* The size byte is not included */
-		PORT_NOTICE(xbus, unit, port, "%s: %s: Too long: regcmd->bytes = %d\n",
-			__FUNCTION__, msg, regcmd->bytes);
+	/* The size byte is not included */
+	if (regcmd->bytes > sizeof(*regcmd) - 1) {
+		PORT_NOTICE(xbus, unit, port,
+			    "%s: %s: Too long: regcmd->bytes = %d\n", __func__,
+			    msg, regcmd->bytes);
 		return;
 	}
-	if(regcmd->is_multibyte) {
-		char		buf[MAX_PROC_WRITE + 1];
-		int		i;
-		int		n = 0;
-		size_t		len = regcmd->bytes;
-		const byte	*p = REG_XDATA(regcmd);
+	if (regcmd->is_multibyte) {
+		char buf[MAX_PROC_WRITE + 1];
+		int i;
+		int n = 0;
+		size_t len = regcmd->bytes;
+		const __u8 *p = REG_XDATA(regcmd);

 		buf[0] = '\0';
-		for(i = 0; i < len && n < MAX_PROC_WRITE; i++)
-			n += snprintf(&buf[n], MAX_PROC_WRITE - n, "%02X ", p[i]);
+		for (i = 0; i < len && n < MAX_PROC_WRITE; i++)
+			n += snprintf(&buf[n], MAX_PROC_WRITE - n, "%02X ",
+				      p[i]);
 		PORT_DBG(REGS, xbus, unit, port,
-			"UNIT-%d PORT-%d: Multibyte(eoframe=%d) %s[0..%zd]: %s%s\n",
-			unit, port, regcmd->eoframe,
-			msg, len-1, buf, (n >= MAX_PROC_WRITE)?"...":"");
+			"UNIT-%d PORT-%d: Multibyte(eoframe=%d) "
+			"%s[0..%zd]: %s%s\n",
+			unit, port, regcmd->eoframe, msg, len - 1, buf,
+			(n >= MAX_PROC_WRITE) ? "..." : "");
 		return;
 	}
-	if(regcmd->bytes != sizeof(*regcmd) - 1) {	/* The size byte is not included */
-		PORT_NOTICE(xbus, unit, port, "%s: %s: Wrong size: regcmd->bytes = %d\n",
-			__FUNCTION__, msg, regcmd->bytes);
+	/* The size byte is not included */
+	if (regcmd->bytes != sizeof(*regcmd) - 1) {
+		PORT_NOTICE(xbus, unit, port,
+			    "%s: %s: Wrong size: regcmd->bytes = %d\n",
+			    __func__, msg, regcmd->bytes);
 		return;
 	}
-	snprintf(port_buf, MAX_PROC_WRITE, "%d%s",
-			regcmd->portnum,
-			(REG_FIELD(regcmd, all_ports_broadcast)) ? "*" : "");
+	snprintf(port_buf, MAX_PROC_WRITE, "%d%s", regcmd->portnum,
+		 (REG_FIELD(regcmd, all_ports_broadcast)) ? "*" : "");
 	action = (REG_FIELD(regcmd, read_request)) ? 'R' : 'W';
 	modifier = 'D';
-	if(REG_FIELD(regcmd, do_subreg)) {
-		snprintf(reg_buf, MAX_PROC_WRITE, "%02X %02X", 
-			REG_FIELD(regcmd, regnum),
-			REG_FIELD(regcmd, subreg));
+	if (REG_FIELD(regcmd, do_subreg)) {
+		snprintf(reg_buf, MAX_PROC_WRITE, "%02X %02X",
+			 REG_FIELD(regcmd, regnum), REG_FIELD(regcmd, subreg));
 		modifier = 'S';
 	} else {
-		snprintf(reg_buf, MAX_PROC_WRITE, "%02X", 
-			REG_FIELD(regcmd, regnum));
+		snprintf(reg_buf, MAX_PROC_WRITE, "%02X",
+			 REG_FIELD(regcmd, regnum));
 	}
-	if(REG_FIELD(regcmd, read_request)) {
+	if (REG_FIELD(regcmd, read_request)) {
 		data_buf[0] = '\0';
-	} else if(REG_FIELD(regcmd, do_datah)) {
-		snprintf(data_buf, MAX_PROC_WRITE, "%02X %02X", 
-			REG_FIELD(regcmd, data_low),
-			REG_FIELD(regcmd, data_high));
+	} else if (REG_FIELD(regcmd, do_datah)) {
+		snprintf(data_buf, MAX_PROC_WRITE, "%02X %02X",
+			 REG_FIELD(regcmd, data_low), REG_FIELD(regcmd,
+								data_high));
 		modifier = 'I';
 	} else {
-		snprintf(data_buf, MAX_PROC_WRITE, "%02X", 
-			REG_FIELD(regcmd, data_low));
+		snprintf(data_buf, MAX_PROC_WRITE, "%02X",
+			 REG_FIELD(regcmd, data_low));
 	}
-	PORT_DBG(REGS, xbus, unit, port, "%s: %s %c%c %s %s\n",
-			msg, port_buf, action, modifier,
-			reg_buf, data_buf);
+	PORT_DBG(REGS, xbus, unit, port, "%s: %s %c%c %s %s\n", msg, port_buf,
+		 action, modifier, reg_buf, data_buf);
 }
+EXPORT_SYMBOL(dump_reg_cmd);

 const char *xproto_name(xpd_type_t xpd_type)
 {
-	const xproto_table_t	*proto_table;
+	const xproto_table_t *proto_table;

 	BUG_ON(xpd_type >= XPD_TYPE_NOMODULE);
 	proto_table = xprotocol_tables[xpd_type];
-	if(!proto_table)
+	if (!proto_table)
 		return NULL;
 	return proto_table->name;
 }
+EXPORT_SYMBOL(xproto_name);

 #define	CHECK_XOP(xops, f)	\
-		if(!(xops)->f) { \
-			ERR("%s: missing xmethod %s [%s (%d)]\n", __FUNCTION__, #f, name, type);	\
+		if (!(xops)->f) { \
+			ERR("%s: missing xmethod %s [%s (%d)]\n", \
+				__func__, #f, name, type);	\
 			return -EINVAL;	\
 		}

 #define	CHECK_PHONEOP(phoneops, f)	\
-		if(!(phoneops)->f) { \
-			ERR("%s: missing phone method %s [%s (%d)]\n", __FUNCTION__, #f, name, type);	\
+		if (!(phoneops)->f) { \
+			ERR("%s: missing phone method %s [%s (%d)]\n", \
+				__func__, #f, name, type);	\
 			return -EINVAL;	\
 		}

 int xproto_register(const xproto_table_t *proto_table)
 {
-	int			type;
-	const char		*name;
-	const struct xops	*xops;
-	const struct phoneops	*phoneops;
-	
+	int type;
+	const char *name;
+	const struct xops *xops;
+	const struct phoneops *phoneops;
+
 	BUG_ON(!proto_table);
 	type = proto_table->type;
 	name = proto_table->name;
-	if(type >= XPD_TYPE_NOMODULE) {
-		NOTICE("%s: Bad xproto type %d\n", __FUNCTION__, type);
+	if (type >= XPD_TYPE_NOMODULE) {
+		NOTICE("%s: Bad xproto type %d\n", __func__, type);
 		return -EINVAL;
 	}
 	DBG(GENERAL, "%s (%d)\n", name, type);
-	if(xprotocol_tables[type])
-		NOTICE("%s: overriding registration of %s (%d)\n", __FUNCTION__, name, type);
+	if (xprotocol_tables[type])
+		NOTICE("%s: overriding registration of %s (%d)\n", __func__,
+		       name, type);
 	xops = proto_table->xops;
 	CHECK_XOP(xops, card_new);
 	CHECK_XOP(xops, card_init);
@@ -460,38 +500,30 @@ int xproto_register(const xproto_table_t *proto_table)
 		CHECK_PHONEOP(phoneops, card_dahdi_preregistration);
 		CHECK_PHONEOP(phoneops, card_dahdi_postregistration);
 		/* optional method -- call after testing: */
-		/*CHECK_PHONEOP(phoneops, card_ioctl);*/
+		/*CHECK_PHONEOP(phoneops, card_ioctl); */
 	}

 	xprotocol_tables[type] = proto_table;
 	return 0;
 }
+EXPORT_SYMBOL(xproto_register);

 void xproto_unregister(const xproto_table_t *proto_table)
 {
-	int		type;
-	const char	*name;
-	
+	int type;
+	const char *name;
+
 	BUG_ON(!proto_table);
 	type = proto_table->type;
 	name = proto_table->name;
 	DBG(GENERAL, "%s (%d)\n", name, type);
-	if(type >= XPD_TYPE_NOMODULE) {
-		NOTICE("%s: Bad xproto type %s (%d)\n", __FUNCTION__, name, type);
+	if (type >= XPD_TYPE_NOMODULE) {
+		NOTICE("%s: Bad xproto type %s (%d)\n", __func__, name, type);
 		return;
 	}
-	if(!xprotocol_tables[type])
-		NOTICE("%s: xproto type %s (%d) is already unregistered\n", __FUNCTION__, name, type);
+	if (!xprotocol_tables[type])
+		NOTICE("%s: xproto type %s (%d) is already unregistered\n",
+		       __func__, name, type);
 	xprotocol_tables[type] = NULL;
 }
-
-EXPORT_SYMBOL(dump_packet);
-EXPORT_SYMBOL(dump_reg_cmd);
-EXPORT_SYMBOL(xframe_receive);
-EXPORT_SYMBOL(notify_bad_xpd);
-EXPORT_SYMBOL(valid_xpd_addr);
-EXPORT_SYMBOL(xproto_global_entry);
-EXPORT_SYMBOL(xproto_card_entry);
-EXPORT_SYMBOL(xproto_name);
-EXPORT_SYMBOL(xproto_register);
 EXPORT_SYMBOL(xproto_unregister);
--- a/drivers/dahdi/xpp/xproto.h
+++ b/drivers/dahdi/xpp/xproto.h
@@ -35,25 +35,25 @@
 #define	XPP_PROTOCOL_VERSION	30

 struct xpd_addr {
-	uint8_t		subunit:SUBUNIT_BITS;
-	uint8_t		reserved:1;
-	uint8_t		unit:UNIT_BITS;
-	uint8_t		sync_master:1;
+	uint8_t subunit:SUBUNIT_BITS;
+	uint8_t reserved:1;
+	uint8_t unit:UNIT_BITS;
+	uint8_t sync_master:1;
 } PACKED;

 #define	MKADDR(p, u, s)	do {	\
 				(p)->unit = (u);	\
 				(p)->subunit = (s);	\
 				(p)->sync_master = 0;	\
-			} while(0)
+			} while (0)

 struct xpacket_header {
-	uint16_t	packet_len:10;
-	uint16_t	reserved:1;
-	uint16_t	is_pcm:1;
-	uint16_t	pcmslot:4;
-	uint8_t		opcode;
-	struct xpd_addr	addr;
+	uint16_t packet_len:10;
+	uint16_t reserved:1;
+	uint16_t is_pcm:1;
+	uint16_t pcmslot:4;
+	uint8_t opcode;
+	struct xpd_addr addr;
 } PACKED;

 #define	XPACKET_OP(p)		((p)->head.opcode)
@@ -71,8 +71,8 @@ struct xpacket_header {

 /*
 * The LSB of the type number signifies:
- * 	0 - TO_PSTN
- * 	1 - TO_PHONE
+ *	0 - TO_PSTN
+ *	1 - TO_PHONE
 */
 #define	XPD_TYPE_FXS		1	// TO_PHONE
 #define	XPD_TYPE_FXO		2	// TO_PSTN
@@ -81,60 +81,61 @@ struct xpacket_header {
 #define	XPD_TYPE_ECHO		5	// Octasic echo canceller
 #define	XPD_TYPE_NOMODULE	7

-typedef	byte	xpd_type_t;
+typedef __u8 xpd_type_t;

 #define	XPD_TYPE_PREFIX	"xpd-type-"

-#define	MODULE_ALIAS_XPD(type)	\
+#define	MODULE_ALIAS_XPD(type) \
 	MODULE_ALIAS(XPD_TYPE_PREFIX __stringify(type))

 #define	PCM_CHUNKSIZE	(CHANNELS_PERXPD * 8)	/* samples of 8 bytes */

 bool valid_xpd_addr(const struct xpd_addr *addr);

-#define	XPROTO_NAME(card,op)	card ## _ ## op
-#define	XPROTO_HANDLER(card,op)	XPROTO_NAME(card,op ## _handler)
-#define	XPROTO_CALLER(card,op)	XPROTO_NAME(card,op ## _send)
+#define	XPROTO_NAME(card, op)	card ## _ ## op
+#define	XPROTO_HANDLER(card, op)	XPROTO_NAME(card, op ## _handler)
+#define	XPROTO_CALLER(card, op)	XPROTO_NAME(card, op ## _send)

-#define	HANDLER_DEF(card,op)	\
-	static int XPROTO_HANDLER(card,op) (	\
+#define	HANDLER_DEF(card, op) \
+	static int XPROTO_HANDLER(card, op) (	\
 		xbus_t *xbus,			\
 		xpd_t *xpd,			\
 		const xproto_entry_t *cmd,	\
 		xpacket_t *pack)

-#define	CALL_PROTO(card,op, ...)	XPROTO_CALLER(card,op)( __VA_ARGS__ )
+#define	CALL_PROTO(card, op, ...)	XPROTO_CALLER(card, op)(__VA_ARGS__)

-#define	DECLARE_CMD(card,op, ...)	\
-	int CALL_PROTO(card, op, xbus_t *xbus, xpd_t *xpd, ## __VA_ARGS__ )
+#define	DECLARE_CMD(card, op, ...) \
+	int CALL_PROTO(card, op, xbus_t *xbus, xpd_t *xpd, ## __VA_ARGS__)

-#define	HOSTCMD(card, op, ...)					\
-		DECLARE_CMD(card, op, ## __VA_ARGS__ )
+#define	HOSTCMD(card, op, ...) \
+		DECLARE_CMD(card, op, ## __VA_ARGS__)

-#define	RPACKET_NAME(card,op)	XPROTO_NAME(RPACKET_ ## card, op)
-#define	RPACKET_TYPE(card,op)	struct RPACKET_NAME(card, op)
+#define	RPACKET_NAME(card, op)	XPROTO_NAME(RPACKET_ ## card, op)
+#define	RPACKET_TYPE(card, op)	struct RPACKET_NAME(card, op)

-#define	DEF_RPACKET_DATA(card,op, ...)		\
-	RPACKET_TYPE(card,op) {			\
+#define	DEF_RPACKET_DATA(card, op, ...) \
+	RPACKET_TYPE(card, op) {		\
 		struct xpacket_header	head;	\
 		__VA_ARGS__			\
 	} PACKED
 #define	RPACKET_HEADERSIZE		sizeof(struct xpacket_header)
-#define	RPACKET_FIELD(p,card,op,field)	(((RPACKET_TYPE(card,op) *)(p))->field)
-#define	RPACKET_SIZE(card,op)		sizeof(RPACKET_TYPE(card,op))
+#define	RPACKET_FIELD(p, card, op, field) \
+		(((RPACKET_TYPE(card, op) *)(p))->field)
+#define	RPACKET_SIZE(card, op)		sizeof(RPACKET_TYPE(card, op))

-#define	XENTRY(prototab,module,op)			\
-	[ XPROTO_NAME(module,op) ] = {			\
-		.handler = XPROTO_HANDLER(module,op),	\
-		.datalen = RPACKET_SIZE(module,op),	\
+#define	XENTRY(prototab, module, op) \
+	[ XPROTO_NAME(module, op) ] = {			\
+		.handler = XPROTO_HANDLER(module, op),	\
+		.datalen = RPACKET_SIZE(module, op),	\
 		.name = #op,				\
 		.table = &PROTO_TABLE(prototab)		\
 	}

-#define	XPACKET_INIT(p, card, op, to, pcm, pcmslot)		\
+#define	XPACKET_INIT(p, card, op, to, pcm, pcmslot) \
 		do {						\
-			XPACKET_OP(p) = XPROTO_NAME(card,op);	\
-			XPACKET_LEN(p) = RPACKET_SIZE(card,op);	\
+			XPACKET_OP(p) = XPROTO_NAME(card, op);	\
+			XPACKET_LEN(p) = RPACKET_SIZE(card, op);	\
 			XPACKET_IS_PCM(p) = (pcm);		\
 			XPACKET_PCMSLOT(p) = (pcmslot);		\
 			XPACKET_RESERVED(p) = 0;		\
@@ -142,138 +143,138 @@ bool valid_xpd_addr(const struct xpd_addr *addr);
 			XPACKET_ADDR_SUBUNIT(p) = XBUS_SUBUNIT(to);	\
 			XPACKET_ADDR_SYNC(p) = 0;		\
 			XPACKET_ADDR_RESERVED(p) = 0;		\
-		} while(0)
+		} while (0)

-#define	XFRAME_NEW_CMD(frm, p, xbus, card, op, to)		\
+#define	XFRAME_NEW_CMD(frm, p, xbus, card, op, to) \
 	do {							\
-		int		pack_len = RPACKET_SIZE(card,op);	\
+		int	pack_len = RPACKET_SIZE(card, op);	\
 								\
-		if(!XBUS_FLAGS(xbus, CONNECTED))		\
+		if (!XBUS_FLAGS(xbus, CONNECTED))		\
 			return -ENODEV;				\
 		(frm) = ALLOC_SEND_XFRAME(xbus);		\
-		if(!(frm))					\
+		if (!(frm))					\
 			return -ENOMEM;				\
 		(p) = xframe_next_packet(frm, pack_len);	\
-		if(!(p))					\
+		if (!(p))					\
 			return -ENOMEM;				\
 		XPACKET_INIT(p, card, op, to, 0, 0);		\
 		(frm)->usec_towait = 0;				\
-	} while(0)
+	} while (0)

 #endif

-/*--------------------------- register handling --------------------------------*/
+/*----------------- register handling --------------------------------*/

 #define	MULTIBYTE_MAX_LEN	5	/* FPGA firmware limitation */

 typedef struct reg_cmd {
-	byte		bytes:3;		/* Length (for Multibyte)	*/
-	byte		eoframe:1;		/* For BRI -- end of frame	*/
-	byte		portnum:3;		/* For port specific registers	*/
-	byte		is_multibyte:1;
+	__u8 bytes:3;		/* Length (for Multibyte)       */
+	__u8 eoframe:1;		/* For BRI -- end of frame      */
+	__u8 portnum:3;		/* For port specific registers  */
+	__u8 is_multibyte:1;
 	union {
 		struct {
-			byte		reserved:4;
-			byte		do_datah:1;
-			byte		do_subreg:1;
-			byte		read_request:1;
-			byte		all_ports_broadcast:1;
-			byte		regnum;
-			byte		subreg;
-			byte		data_low;
-			byte		data_high;
+			__u8 reserved:4;
+			__u8 do_datah:1;
+			__u8 do_subreg:1;
+			__u8 read_request:1;
+			__u8 all_ports_broadcast:1;
+			__u8 regnum;
+			__u8 subreg;
+			__u8 data_low;
+			__u8 data_high;
 		} PACKED r;
 		/* For Write-Multibyte commands in BRI */
 		struct {
-			byte	xdata[MULTIBYTE_MAX_LEN];
+			__u8 xdata[MULTIBYTE_MAX_LEN];
 		} PACKED d;
 	} PACKED alt;
 } PACKED reg_cmd_t;

 /* Shortcut access macros */
-#define	REG_FIELD(regptr,member)	((regptr)->alt.r.member)
+#define	REG_FIELD(regptr, member)	((regptr)->alt.r.member)
 #define	REG_XDATA(regptr)		((regptr)->alt.d.xdata)

 #ifdef __KERNEL__
-/*--------------------------- protocol tables ----------------------------------*/
+/*----------------- protocol tables ----------------------------------*/

-typedef struct xproto_entry	xproto_entry_t;
-typedef struct xproto_table	xproto_table_t;
+typedef struct xproto_entry xproto_entry_t;
+typedef struct xproto_table xproto_table_t;

-typedef int (*xproto_handler_t)(
-		xbus_t *xbus,
-		xpd_t *xpd,
-		const xproto_entry_t *cmd,
-		xpacket_t *pack);
+typedef int (*xproto_handler_t) (xbus_t *xbus, xpd_t *xpd,
+				 const xproto_entry_t *cmd, xpacket_t *pack);

 const xproto_table_t *xproto_get(xpd_type_t cardtype);
 void xproto_put(const xproto_table_t *xtable);
-const xproto_entry_t *xproto_card_entry(const xproto_table_t *table, byte opcode);
-xproto_handler_t xproto_card_handler(const xproto_table_t *table, byte opcode);
+const xproto_entry_t *xproto_card_entry(const xproto_table_t *table,
+					__u8 opcode);
+xproto_handler_t xproto_card_handler(const xproto_table_t *table,
+	__u8 opcode);

-const xproto_entry_t *xproto_global_entry(byte opcode);
-xproto_handler_t xproto_global_handler(byte opcode);
+const xproto_entry_t *xproto_global_entry(__u8 opcode);
+xproto_handler_t xproto_global_handler(__u8 opcode);

 /*
 * XMETHOD() resolve to method pointer (NULL for optional methods)
 * CALL_XMETHOD() calls the method, passing mandatory arguments
 */
 #define	XMETHOD(name, xpd)	((xpd)->xops->name)
-#define	CALL_XMETHOD(name, xpd, ...)                              \
-		(XMETHOD(name, (xpd))((xpd)->xbus, (xpd), ## __VA_ARGS__ ))
+#define	CALL_XMETHOD(name, xpd, ...) \
+		(XMETHOD(name, (xpd))((xpd)->xbus, (xpd), ## __VA_ARGS__))

 /*
 * PHONE_METHOD() resolve to method pointer (NULL for optional methods)
 * CALL_PHONE_METHOD() calls the method, passing mandatory arguments
 */
 #define	PHONE_METHOD(name, xpd)	(PHONEDEV(xpd).phoneops->name)
-#define	CALL_PHONE_METHOD(name, xpd, ...)                              \
-		(PHONE_METHOD(name, (xpd))((xpd), ## __VA_ARGS__ ))
+#define	CALL_PHONE_METHOD(name, xpd, ...) \
+		(PHONE_METHOD(name, (xpd))((xpd), ## __VA_ARGS__))

 struct phoneops {
-	void (*card_pcm_recompute)(xpd_t *xpd, xpp_line_t pcm_mask);
-	void (*card_pcm_fromspan)(xpd_t *xpd, xpacket_t *pack);
-	void (*card_pcm_tospan)(xpd_t *xpd, xpacket_t *pack);
-	int (*echocancel_timeslot)(xpd_t *xpd, int pos);
-	int (*echocancel_setmask)(xpd_t *xpd, xpp_line_t ec_mask);
-	int (*card_timing_priority)(xpd_t *xpd);
-	int (*card_dahdi_preregistration)(xpd_t *xpd, bool on);
-	int (*card_dahdi_postregistration)(xpd_t *xpd, bool on);
-	int (*card_hooksig)(xpd_t *xpd, int pos, enum dahdi_txsig txsig);
-	int (*card_ioctl)(xpd_t *xpd, int pos, unsigned int cmd, unsigned long arg);
-	int (*card_open)(xpd_t *xpd, lineno_t pos);
-	int (*card_close)(xpd_t *xpd, lineno_t pos);
-	int (*card_state)(xpd_t *xpd, bool on);
+	void (*card_pcm_recompute) (xpd_t *xpd, xpp_line_t pcm_mask);
+	void (*card_pcm_fromspan) (xpd_t *xpd, xpacket_t *pack);
+	void (*card_pcm_tospan) (xpd_t *xpd, xpacket_t *pack);
+	int (*echocancel_timeslot) (xpd_t *xpd, int pos);
+	int (*echocancel_setmask) (xpd_t *xpd, xpp_line_t ec_mask);
+	int (*card_timing_priority) (xpd_t *xpd);
+	int (*card_dahdi_preregistration) (xpd_t *xpd, bool on);
+	int (*card_dahdi_postregistration) (xpd_t *xpd, bool on);
+	int (*card_hooksig) (xpd_t *xpd, int pos, enum dahdi_txsig txsig);
+	int (*card_ioctl) (xpd_t *xpd, int pos, unsigned int cmd,
+			   unsigned long arg);
+	int (*card_open) (xpd_t *xpd, lineno_t pos);
+	int (*card_close) (xpd_t *xpd, lineno_t pos);
+	int (*card_state) (xpd_t *xpd, bool on);
 };

 struct xops {
-	 xpd_t *(*card_new)(xbus_t *xbus, int unit, int subunit,
-		const xproto_table_t *proto_table, byte subtype,
-		int subunits, int subunit_ports, bool to_phone);
-	int (*card_init)(xbus_t *xbus, xpd_t *xpd);
-	int (*card_remove)(xbus_t *xbus, xpd_t *xpd);
-	int (*card_tick)(xbus_t *xbus, xpd_t *xpd);
-	int (*card_register_reply)(xbus_t *xbus, xpd_t *xpd, reg_cmd_t *reg);
+	xpd_t *(*card_new) (xbus_t *xbus, int unit, int subunit,
+			    const xproto_table_t *proto_table, __u8 subtype,
+			    int subunits, int subunit_ports, bool to_phone);
+	int (*card_init) (xbus_t *xbus, xpd_t *xpd);
+	int (*card_remove) (xbus_t *xbus, xpd_t *xpd);
+	int (*card_tick) (xbus_t *xbus, xpd_t *xpd);
+	int (*card_register_reply) (xbus_t *xbus, xpd_t *xpd, reg_cmd_t *reg);
 };

 struct xproto_entry {
-	xproto_handler_t	handler;
-	int			datalen;
-	const char		*name;
-	xproto_table_t		*table;
+	xproto_handler_t handler;
+	int datalen;
+	const char *name;
+	xproto_table_t *table;
 };

 struct xproto_table {
-	struct module		*owner;
-	xproto_entry_t		entries[256];	/* Indexed by opcode */
-	const struct xops	*xops;		/* Card level operations */
-	const struct phoneops	*phoneops;	/* DAHDI operations */
-	const struct echoops	*echoops;	/* Echo Canceller operations */
-	xpd_type_t	type;
-	byte		ports_per_subunit;
-	const char	*name;
-	bool (*packet_is_valid)(xpacket_t *pack);
-	void (*packet_dump)(const char *msg, xpacket_t *pack);
+	struct module *owner;
+	xproto_entry_t entries[256];	/* Indexed by opcode */
+	const struct xops *xops;	/* Card level operations */
+	const struct phoneops *phoneops;	/* DAHDI operations */
+	const struct echoops *echoops;	/* Echo Canceller operations */
+	xpd_type_t type;
+	__u8 ports_per_subunit;
+	const char *name;
+	bool (*packet_is_valid) (xpacket_t *pack);
+	void (*packet_dump) (const char *msg, xpacket_t *pack);
 };

 #include "card_global.h"
@@ -282,11 +283,10 @@ struct xproto_table {
 #include "card_bri.h"
 #include "card_pri.h"

-
-#define	MEMBER(card,op)	RPACKET_TYPE(card,op)	RPACKET_NAME(card,op)
+#define	MEMBER(card, op)	RPACKET_TYPE(card, op)	RPACKET_NAME(card, op)

 struct xpacket {
-	struct xpacket_header	head;
+	struct xpacket_header head;
 	union {
 		MEMBER(GLOBAL, NULL_REPLY);
 		MEMBER(GLOBAL, PCM_WRITE);
@@ -297,20 +297,22 @@ struct xpacket {
 		MEMBER(FXS, SIG_CHANGED);
 		MEMBER(FXO, SIG_CHANGED);

-		byte	data[0];
+		__u8 data[0];
 	};
 	/* Last byte is chksum */
 } PACKED;

 void dump_packet(const char *msg, const xpacket_t *packet, bool debug);
-void dump_reg_cmd(const char msg[], bool writing, xbus_t *xbus, byte unit, xportno_t port, const reg_cmd_t *regcmd);
+void dump_reg_cmd(const char msg[], bool writing, xbus_t *xbus,
+	__u8 unit, xportno_t port, const reg_cmd_t *regcmd);
 int xframe_receive(xbus_t *xbus, xframe_t *xframe);
-void notify_bad_xpd(const char *funcname, xbus_t *xbus, const struct xpd_addr addr, const char *msg);
+void notify_bad_xpd(const char *funcname, xbus_t *xbus,
+		    const struct xpd_addr addr, const char *msg);
 int xproto_register(const xproto_table_t *proto_table);
 void xproto_unregister(const xproto_table_t *proto_table);
-const xproto_entry_t *xproto_global_entry(byte opcode);
+const xproto_entry_t *xproto_global_entry(__u8 opcode);
 const char *xproto_name(xpd_type_t xpd_type);

-#endif	/* __KERNEL__ */
+#endif /* __KERNEL__ */

-#endif	/* XPROTO_H */
+#endif /* XPROTO_H */
--- a/include/dahdi/dahdi_config.h
+++ b/include/dahdi/dahdi_config.h
@@ -21,9 +21,6 @@

 #ifdef __KERNEL__
 #include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-#include <linux/config.h>
-#endif
 #endif

 /* DAHDI compile time options */
@@ -76,10 +73,8 @@
 /* You can still override them below */
 #if defined(CONFIG_HDLC) || defined(CONFIG_HDLC_MODULE)
 #define DAHDI_HDLC_TYPE_TRANS
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3)
 #define HDLC_MAINTAINERS_ARE_MORE_STUPID_THAN_I_THOUGHT
 #endif
-#endif

 /*
 * Uncomment CONFIG_DAHDI_NET to enable SyncPPP, CiscoHDLC, and Frame Relay
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -6,7 +6,7 @@
 * written by Jim Dixon <jim@lambdatel.com>.
 *
 * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
- * Copyright (C) 2001 - 2010 Digium, Inc.
+ * Copyright (C) 2001 - 2012 Digium, Inc.
 *
 * All rights reserved.
 *
@@ -38,9 +38,6 @@

 #include <dahdi/dahdi_config.h>
 #include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-#include <linux/config.h>
-#endif
 #include <linux/fs.h>
 #include <linux/device.h>
 #include <linux/module.h>
@@ -60,11 +57,7 @@

 #include <linux/poll.h>

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
 #define dahdi_pci_module pci_register_driver
-#else
-#define dahdi_pci_module pci_module_init
-#endif

 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
 #define DAHDI_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id)
@@ -72,37 +65,39 @@
 #define DAHDI_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id, struct pt_regs *regs)
 #endif

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+#ifdef CONFIG_PCI
+#include <linux/pci-aspm.h>
+#endif
+#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 #define HAVE_NET_DEVICE_OPS
 #endif

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 #define DAHDI_IRQ_SHARED IRQF_SHARED
 #define DAHDI_IRQ_DISABLED IRQF_DISABLED
 #define DAHDI_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED
-#else
-#define DAHDI_IRQ_SHARED SA_SHIRQ
-#define DAHDI_IRQ_DISABLED SA_INTERRUPT
-#define DAHDI_IRQ_SHARED_DISABLED SA_SHIRQ | SA_INTERRUPT
-#endif

-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
-#ifndef dev_notice
-#define dev_notice(dev, format, arg...)         \
-        dev_printk(KERN_NOTICE , dev , format , ## arg)
-#endif
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 #  ifdef RHEL_RELEASE_VERSION
 #    if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6)
 #define dev_name(dev)		((dev)->bus_id)
+#define dev_set_name(dev, format, ...) \
+	snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__)
+#    else
+#define dev_set_name(dev, format, ...) \
+	do { \
+		kobject_set_name(&(dev)->kobj, format, ## __VA_ARGS__); \
+		snprintf((dev)->bus_id, BUS_ID_SIZE, \
+			kobject_name(&(dev)->kobj));	\
+	} while (0)
 #    endif
 #  else
 #define dev_name(dev)		((dev)->bus_id)
-#  endif
 #define dev_set_name(dev, format, ...) \
-	snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__);
+	snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__)
+#  endif
 #endif

 /*! Default chunk size for conferences and such -- static right now, might make
@@ -112,7 +107,7 @@
 #define DAHDI_MIN_CHUNKSIZE	 DAHDI_CHUNKSIZE
 #define DAHDI_DEFAULT_CHUNKSIZE	 DAHDI_CHUNKSIZE
 #define DAHDI_MAX_CHUNKSIZE 	 DAHDI_CHUNKSIZE
-#define DAHDI_CB_SIZE		 2
+#define DAHDI_CB_SIZE		 (1 << 3)

 /* DAHDI operates at 8Khz by default */
 #define DAHDI_MS_TO_SAMPLES(ms) ((ms) * 8)
@@ -496,10 +491,7 @@ struct dahdi_chan {
 	
 	int		numbufs;			/*!< How many buffers in channel */
 	int		txbufpolicy;			/*!< Buffer policy */
-	int		rxbufpolicy;			/*!< Buffer policy */
 	int		txdisable;				/*!< Disable transmitter */
-	int 	rxdisable;				/*!< Disable receiver */
-	
 	
 	/* Tone zone stuff */
 	struct dahdi_zone *curzone;		/*!< Zone for selecting tones */
@@ -544,7 +536,6 @@ struct dahdi_chan {

 	short	getlin[DAHDI_MAX_CHUNKSIZE];			/*!< Last transmitted samples */
 	unsigned char getraw[DAHDI_MAX_CHUNKSIZE];		/*!< Last received raw data */
-	short	getlin_lastchunk[DAHDI_MAX_CHUNKSIZE];	/*!< Last transmitted samples from last chunk */
 	short	putlin[DAHDI_MAX_CHUNKSIZE];			/*!< Last received samples */
 	unsigned char putraw[DAHDI_MAX_CHUNKSIZE];		/*!< Last received raw data */
 	short	conflast[DAHDI_MAX_CHUNKSIZE];			/*!< Last conference sample -- base part of channel */
@@ -797,6 +788,23 @@ struct dahdi_count {
 #define DAHDI_FLAG_TXUNDERRUN	DAHDI_FLAG(TXUNDERRUN)
 #define DAHDI_FLAG_RXOVERRUN	DAHDI_FLAG(RXOVERRUN)

+enum spantypes {
+	SPANTYPE_INVALID	= 0,
+	SPANTYPE_ANALOG_FXS,
+	SPANTYPE_ANALOG_FXO,
+	SPANTYPE_ANALOG_MIXED,
+	SPANTYPE_DIGITAL_E1,
+	SPANTYPE_DIGITAL_T1,
+	SPANTYPE_DIGITAL_J1,
+	SPANTYPE_DIGITAL_BRI_NT,
+	SPANTYPE_DIGITAL_BRI_TE,
+	SPANTYPE_DIGITAL_BRI_SOFT,
+};
+const char *dahdi_spantype2str(enum spantypes st);
+enum spantypes dahdi_str2spantype(const char *name);
+const char *dahdi_lineconfig_bit_name(int lineconfig_bit);
+ssize_t lineconfig_str(int lineconfig, char buf[], size_t size);
+
 struct file;

 struct dahdi_span_ops {
@@ -895,7 +903,7 @@ struct dahdi_span_ops {

 	/*! Called when the spantype / linemode is changed before the span is
 	 * assigned a number. */
-	int (*set_spantype)(struct dahdi_span *span, const char *spantype);
+	int (*set_spantype)(struct dahdi_span *span, enum spantypes st);
 };

 /**
@@ -926,7 +934,7 @@ struct dahdi_span {
 	spinlock_t lock;
 	char name[40];			/*!< Span name */
 	char desc[80];			/*!< Span description */
-	const char *spantype;		/*!< span type in text form */
+	enum spantypes spantype;	/*!< span type */
 	int deflaw;			/*!< Default law (DAHDI_MULAW or DAHDI_ALAW) */
 	int alarms;			/*!< Pending alarms on span */
 	unsigned long flags;
@@ -1101,6 +1109,9 @@ struct dahdi_dynamic_driver {

 	struct list_head list;
 	struct module *owner;
+
+	/*! Numberic id of next device created by this driver. */
+	unsigned int id;
 };

 /*! \brief Receive a dynamic span message */
@@ -1262,8 +1273,13 @@ extern u_char __dahdi_lin2mu[16384];
 extern u_char __dahdi_lin2a[16384];
 #endif

+struct dahdi_dynamic_ops {
+	struct module *owner;
+	int (*ioctl)(unsigned int cmd, unsigned long data);
+};
+
 /*! \brief Used by dynamic DAHDI -- don't use directly */
-void dahdi_set_dynamic_ioctl(int (*func)(unsigned int cmd, unsigned long data));
+void dahdi_set_dynamic_ops(const struct dahdi_dynamic_ops *ops);

 /*! \brief Used by DAHDI HPEC module -- don't use directly */
 void dahdi_set_hpec_ioctl(int (*func)(unsigned int cmd, unsigned long data));
@@ -1382,6 +1398,16 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss)
 #define fatal_signal_pending(p) \
 	(signal_pending((p)) && sigismember(&(p)->pending.signal, SIGKILL))

+#ifdef CONFIG_PCI
+#ifndef PCIE_LINK_STATE_L0S
+#define PCIE_LINK_STATE_L0S	1
+#define PCIE_LINK_STATE_L1	2
+#define PCIE_LINK_STATE_CLKPM	4
+#endif
+#define pci_disable_link_state dahdi_pci_disable_link_state
+void dahdi_pci_disable_link_state(struct pci_dev *pdev, int state);
+#endif /* CONFIG_PCI */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)

 #ifndef __packed                                                                                         
@@ -1409,60 +1435,7 @@ static inline int strcasecmp(const char *s1, const char *s2)
 	return c1 - c2;
 }
 #endif /* clamp_val */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
-static inline void list_replace(struct list_head *old, struct list_head *new)
-{
-        new->next = old->next;
-        new->next->prev = new;
-        new->prev = old->prev;
-        new->prev->next = new;
-}

-#ifndef WARN_ON_ONCE
-#define WARN_ON_ONCE(__condition) do {         \
-	static int __once = 1;                 \
-	if (unlikely(__condition)) {           \
-		if (__once) {                  \
-			__once = 0;            \
-			WARN_ON(0);            \
-		}                              \
-	}                                      \
-} while (0)
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 17)
-#ifndef POLLRDHUP
-#define POLLRDHUP 0
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14)
-#define kzalloc(a, b) kcalloc(1, a, b)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
-#define synchronize_rcu() synchronize_kernel()
-#define kasprintf dahdi_kasprintf
-char *dahdi_kasprintf(gfp_t gfp, const char *fmt, ...);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11)
-#if !defined(HAVE_WAIT_FOR_COMPLETION_TIMEOUT)
-static inline unsigned long
-wait_for_completion_interruptible_timeout(struct completion *x,
-					  unsigned long timeout)
-{
-	/* There is a race condition here.  If x->done is reset to 0
-	 * before the call to wait_for_completion after this thread wakes.
-	 */
-	timeout = wait_event_interruptible_timeout(x->wait, x->done, timeout);
-	if (timeout)
-		wait_for_completion(x);
-
-	return timeout;
-}
-#endif
-typedef u32 __bitwise pm_message_t;
-#endif /* 2.6.11 */
-#endif /* 2.6.12 */
-#endif /* 2.6.14 */
-#endif /* 2.6.17 */
-#endif /* 2.6.18 */
 #endif /* 2.6.22 */
 #endif /* 2.6.25 */
 #endif /* 2.6.26 */
@@ -1516,6 +1489,10 @@ struct mutex {
 #define	DAHDI_PSEUDO	255

 /* prink-wrapper macros */
+
+#define module_printk(level, fmt, args...) \
+		printk(level "%s: " fmt, THIS_MODULE->name, ## args)
+
 #define	DAHDI_PRINTK(level, category, fmt, ...)	\
 	printk(KERN_ ## level "%s%s-%s: " fmt, #level, category, \
 			THIS_MODULE->name, ## __VA_ARGS__)
@@ -1523,7 +1500,7 @@ struct mutex {
 	printk(KERN_ ## level "%s%s-%s: span-%d: " fmt, #level,	\
 		category, THIS_MODULE->name, (span)->spanno, ## __VA_ARGS__)
 #define	chan_printk(level, category, chan, fmt, ...)	\
-	printk(KERN_ ## level "%s%s-%s: %d: " fmt, #level,	\
+	printk(KERN_ ## level "%s%s-%s: chan-%d: " fmt, #level,	\
 		category, THIS_MODULE->name, (chan)->channo, ## __VA_ARGS__)
 #define	dahdi_err(fmt, ...)	DAHDI_PRINTK(ERR, "", fmt, ## __VA_ARGS__)
 #define	span_info(span, fmt, ...)	span_printk(INFO, "", span, fmt, \