diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-03 22:12:07 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-03 22:12:07 +0000 |
| commit | 951177e02d11f64d9072c8a9fb973e530c2a2b71 (patch) | |
| tree | 73dd8aa6317a97482c9b31057f2fb3e586feb338 /xpp/xpd.h | |
| parent | c88eaa22e13bd4c092b367a28e57064659660466 (diff) | |
xpp.r4415: (from 1.2 r2811)
* Show Astribank 6+2 as 6/2 channels and not 8/8 channels.
- Added as a "subtype" to the device type (r4391).
* Fixed a panic in BRI span shutdown method (r4393).
* Changes to debug macros.
* Add proper sysfs support (r4406)
- A bus on whuch all of the Astribanks reside.
- Replaces useless sysfs code that existed in the module.
- Currently used to set the sync source automatically at device
adition / removal.
* BRI: We do need the T1 timer in NT. If it gets into G2 state (r4407).
Merged revisions 2812 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
* Ignore generated files on the new wctdm24xxp dir. (from 1.2 r2796)
* Ignore two extra man pages on xpp/utils .
Merged revisions 2797 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
* Generate list of Zaptel Modules directories automatically.
* Evaluate PERLLIBDIR only once.
Closes: #10223 (Xorcom changeset:4379, from 1.2 r2758)
Merged revisions 2759 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2814 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/xpd.h')
| -rw-r--r-- | xpp/xpd.h | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -160,6 +160,7 @@ struct card_desc_struct { xbus_t *xbus; byte rev; /* Revision number */ byte type; /* LSB: 1 - to_phone, 0 - to_line */ + byte subtype; xpd_addr_t xpd_addr; xpp_line_t line_status; /* Initial line status (offhook) */ }; @@ -202,7 +203,8 @@ struct xbus { int max_packet_size; /* Device-Model */ - struct device the_bus; + struct device astribank; +#define dev_to_xbus(dev) container_of(dev, struct xbus, astribank) /* Simulator data */ xbus_type_t bus_type; @@ -298,14 +300,16 @@ struct xpd { int channels; xpd_type_t type; const char *type_name; + byte subtype; byte revision; /* Card revision */ xpd_direction_t direction; /* TO_PHONE, TO_PSTN */ 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; + xpp_line_t msg_waiting; /* Voice Mail Waiting Indication */ 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 */ + xpp_line_t digital_signalling; /* PRI/BRI signalling channels */ /* maintained by card drivers */ uint pcm_len; /* allocation length of PCM packet (dynamic) */ |