diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-13 21:08:09 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-13 21:08:09 +0000 |
| commit | d7e54a785544ac40abc4a88383df3a913ca466e8 (patch) | |
| tree | abf630c8372e7c81407172ad31190fa8a617a8ed /kernel/xpp/xpd.h | |
| parent | 823cf303caf13cc6e4fd2c2173804f0990b29532 (diff) | |
xpp r5723: Includes, among others:
* New firmware protocol version: 3.0 .
* New numbers for the device types: (e.g. in card_init* scripts)
- FXS: 1 (was: 3)
- FXO: 2 (was: 4)
- BRI: 3 (was: 6 for TE, 7 for NT)
- PRI: 4 (was: 9)
* Init scripts of FXS and FXO modules are now written in Perl as well
(be sure to have File::Basename, e.g: perl-modules in Debian).
* calibrate_slics merged into init_card_1_30 .
* Module parameter print_dbg replaced with debug . Same meaning.
* init_fxo_modes removed: content moved into init_card_2_30, verified
at build time.
* Code tested with sparse. Most warnings were fixed.
* Set ZT_SIG_DACS for the bchans in the PRI and BRI modules to not get
ignored by ztscan.
* Handle null config_desc we get from some crazy USB controllers.
* genzaptelconf: Fix reporting of empty slots in list mode.
* xpp_blink can now blink a single analog port.
* "slics" has been renamed "chipregs".
* Fixed a small typo in fpga_load(8).
* Fixed bashism in xpp_fxloader.
Merged revisions 4264 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4266 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/xpd.h')
| -rw-r--r-- | kernel/xpp/xpd.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kernel/xpp/xpd.h b/kernel/xpp/xpd.h index 3187227..8c7c514 100644 --- a/kernel/xpp/xpd.h +++ b/kernel/xpp/xpd.h @@ -91,12 +91,14 @@ typedef unsigned gfp_t; /* Added in 2.6.14 */ struct card_desc_struct { struct list_head card_list; u32 magic; - xbus_t *xbus; - byte rev; /* Revision number */ byte type; /* LSB: 1 - to_phone, 0 - to_line */ byte subtype; struct xpd_addr xpd_addr; - xpp_line_t line_status; /* Initial line status (offhook) */ + byte numchips; + byte ports_per_chip; + byte ports; + byte port_dir; + struct xpd_addr ec_addr; /* echo canceler address */ }; typedef enum xpd_direction { @@ -139,12 +141,12 @@ struct xpd { char xpdname[XPD_NAMELEN]; struct zt_span span; struct zt_chan *chans; - int channels; + int channels; xpd_type_t type; const char *type_name; byte subtype; - byte revision; /* Card revision */ xpd_direction_t direction; /* TO_PHONE, TO_PSTN */ + int subunits; /* all siblings */ xpp_line_t no_pcm; /* Temporary: disable PCM (for USB-1) */ xpp_line_t offhook; /* Actual chip state: 0 - ONHOOK, 1 - OFHOOK */ xpp_line_t cid_on; @@ -177,6 +179,7 @@ struct xpd { struct proc_dir_entry *proc_xpd_summary; struct proc_dir_entry *proc_xpd_ztregister; struct proc_dir_entry *proc_xpd_blink; + struct proc_dir_entry *proc_xpd_chipregs; #endif int counters[XPD_COUNTER_MAX]; @@ -199,7 +202,7 @@ struct xpd { }; #define for_each_line(xpd,i) for((i) = 0; (i) < (xpd)->channels; (i)++) -#define IS_BRI(xpd) ((xpd)->type == XPD_TYPE_BRI_NT || (xpd)->type == XPD_TYPE_BRI_TE) +#define IS_BRI(xpd) ((xpd)->type == XPD_TYPE_BRI) #define TICK_TOLERANCE 500 /* usec */ #ifdef DEBUG_SYNC_PARPORT |