Branch 1.4 is back in sync (currently: xorcom rev. 3332):

* Performance improvements for multi-XPD (span) devices.
* Astribank BRI driver (in next commit).
* Changes under /proc:
  - XBUS and XPD numbers have two digits.
  - Every script wildcard should be replaced from XBUS-? to XBUS-[0-9]*
  - Added /proc/xpp/XBUS-*/XPD-*/blink: echo 1 to start and 0 to stop.
* Several countries (South Africa, UAE, anybody else) require a shorter
  ring delay. Adjust FXO reg 0x17 (23)'s bits 0:2 to 011.
* Use tasklets to move most of the interrupt PCM copying out of the interrupt.
* Debugfs-based code to dump data to userspace (used to debug BRI D channel).
* Pretend every 2.6.9 actually has later RHEL's typedefs.
* fpga_load supports /dev/bus/usb .
* Fixed physical order sorting in genzaptelconf.
* Reverse polarity and power denial detection.
* A short led flash at registration time.
* Add a real version of the xpp modules to them (independent of the Zaptel
  version).
* Update our line status even when not registered.
* Fixed a false SIG_CHANGED when inserting or removing cable to FXO.
* Fixed compilation fixes for 2.6.20 (Bug #8982)
* A cleaner fix for the bool changes of 2.6.19 .
* Automatically detect echo_can_state_t at debug time.
* Automaitcally set XPP_DEBUGFS (depending on debugfs) at compile time.
* Bug-fixes to zaptel-helper. Moved to xpp/utils .
* Xbus protocol version: 2.4 (Zaptel 1.2.12/1.4.0 had 2.3).
 XPS Init scripts renamed accordingly.

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

1 files changed, 9 insertions, 5 deletions

diff --git a/xpp/xdefs.h b/xpp/xdefs.h
index d4d0573..e6e48f6 100644
--- a/xpp/xdefs.h
+++ b/xpp/xdefs.h
@@ -22,20 +22,19 @@
  *
  */
 
+#include "xpp_version.h"
+
 #ifdef	__KERNEL__
 
 #include <linux/kernel.h>
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#define LINUX26
-#endif
-
 #else
 
 /* This is to enable user-space programs to include this. */
 
 #include <stdint.h>
+typedef uint8_t  __u8;
 typedef uint32_t __u32;
 
 #include <stdio.h>
@@ -77,6 +76,7 @@ struct list_head { struct list_head *next; struct list_head *prev; };
 
 #define	MAX_UNIT	BIT(UNIT_BITS)		/* 1 FXS + 3 FXS/FXO | 1 BRI + 3 FXS/FXO */
 #define	MAX_SUBUNIT	BIT(SUBUNIT_BITS)	/* 8 port BRI */
+#define	SUBUNIT_PCM_SHIFT	4		/* shift in PCM highway */
 
 /*
  * Compile time sanity checks
@@ -100,12 +100,16 @@ struct list_head { struct list_head *next; struct list_head *prev; };
 
 typedef char			*charp;
 typedef unsigned char		byte;
+#ifdef __KERNEL__
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 typedef int			bool;
 #endif
+#else
+typedef int			bool;
+#endif
 typedef struct xbus		xbus_t;
 typedef	struct xpd		xpd_t;
-typedef	struct xpacket_raw	xpacket_raw_t;
+typedef	struct xframe		xframe_t;
 typedef	struct xpacket		xpacket_t;
 typedef struct xops		xops_t;
 typedef	__u32			xpp_line_t;	/* at most 31 lines for E1 */