diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-02 12:21:11 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-02 12:21:11 +0000 |
| commit | c88eaa22e13bd4c092b367a28e57064659660466 (patch) | |
| tree | 2978dd7342b09b60bf9dbe5e333d043fb43d9114 /xpp/xdefs.h | |
| parent | 183cf9c2af77e6444450cf5d2b5c62ca6b875fbe (diff) | |
Merge xpp r4372:
* Update to zaptel-1.2.18 and zaptel-1.4.3 (r4308 onward)
* Fix a critical race with zaptel synchronization (r4362)
* Added a /proc/xpp/cmds for statistics about command timing (r4360)
* Fix a digit mapping bug with hardware dtmf detection (r4357)
* In xpp/utils/Makefile add perl syntax checks to our scripts (r4337)
* Better USB data error checking (r4336)
* udev rules (xpp.rules) avoid false calls from wrong nodes (r4331)
* Improve hardware detection and reporting in lszaptel,
zaptel_hardware. zapconf is basically functional.
* Leds are blinked synchronously on all Astribanks now (r4262)
* Fix a BRI bug if OPTIMIZE_CHANMUTE was compiled into zaptel (r4258)
(This feature was not yet accepted into official zaptel)
* Removed compile warning about HZ != 1000 (r4218)
* Firmware updates.
* fpga_load now supports USB pathes without zeros (r4211)
* XPD numbers have changed to '<Unit><Subunit>' (r4196)
* Proper support for ZT_VMWI ioctl, if used in zaptel (r4092)
* Fix FXO power denial detection (r4054)
* FXO could accidentally go off-hook with some compilers (r4048)
(From branches/1.2 r2732, r2735 - branches/1.4 2736)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2813 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/xdefs.h')
| -rw-r--r-- | xpp/xdefs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xpp/xdefs.h b/xpp/xdefs.h index e6e48f6..4c3def9 100644 --- a/xpp/xdefs.h +++ b/xpp/xdefs.h @@ -57,10 +57,10 @@ struct list_head { struct list_head *next; struct list_head *prev; }; #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) (BIT(i) - 1) +#define BITMASK(i) (((u64)1 << (i)) - 1) #define MAX_PROC_WRITE 100 /* Largest buffer we allow writing our /proc files */ -#define CHANNELS_PERXPD 30 /* Depends on xpp_line_t and protocol fields */ +#define CHANNELS_PERXPD 32 /* Depends on xpp_line_t and protocol fields */ #define MAX_SPANNAME 20 /* From zaptel.h */ #define MAX_SPANDESC 40 /* From zaptel.h */ |