diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-08-04 15:52:49 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-08-04 15:52:49 +0000 |
| commit | 64f72ae8855f0eb7985a1b4b09c0eda769d739c8 (patch) | |
| tree | 87de502479311b224f6c52bca5f3128f7504768d /kernel/xpp/xpp_zap.c | |
| parent | eeff62d36576880696ca8c64e415a13ca7437386 (diff) | |
Merged revisions 4451-4455 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2
........
r4451 | tzafrir | 2008-08-04 18:11:01 +0300 (Mon, 04 Aug 2008) | 9 lines
Firmware update: 5959 (DTMF and BRI ID)
(From DAHDI rev. 4695)
* Fix some cases of double digits.
* Fix some rare cases of a BRI unit providing incorrect directionality.
* Extra debugging code in card_fxs.c to trace future DTMF issues.
* Properly note DAHDI (as opposed to Zaptel) ioctls.
........
r4452 | tzafrir | 2008-08-04 18:36:19 +0300 (Mon, 04 Aug 2008) | 2 lines
Make it formally bashism.
........
r4453 | tzafrir | 2008-08-04 18:38:10 +0300 (Mon, 04 Aug 2008) | 2 lines
Kbuild: A more robust check for the bri_dchan patch.
........
r4454 | tzafrir | 2008-08-04 18:39:01 +0300 (Mon, 04 Aug 2008) | 2 lines
Minor BRI initlization improvements.
........
r4455 | tzafrir | 2008-08-04 18:43:32 +0300 (Mon, 04 Aug 2008) | 7 lines
Add channel alarms in Zaptel-perl and lszaptel specifically.
* Zaptel::Chans now provides a method alarms() for a list (or number of)
alarms.
* lszaptel uses it for a more correct display of channel status.
* Also update PCI hardware list.
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4456 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/xpp_zap.c')
| -rw-r--r-- | kernel/xpp/xpp_zap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/xpp/xpp_zap.c b/kernel/xpp/xpp_zap.c index 9c1805e..3ce9bff 100644 --- a/kernel/xpp/xpp_zap.c +++ b/kernel/xpp/xpp_zap.c @@ -737,7 +737,11 @@ int xpp_close(struct zt_chan *chan) void report_bad_ioctl(const char *msg, xpd_t *xpd, int pos, unsigned int cmd) { - XPD_NOTICE(xpd, "%s: Bad ioctl\n", msg); + char *extra_msg = ""; + + if(_IOC_TYPE(cmd) == 0xDA) + extra_msg = " (for DAHDI driver)"; + XPD_NOTICE(xpd, "%s: Bad ioctl%s\n", msg, extra_msg); XPD_NOTICE(xpd, "ENOTTY: chan=%d cmd=0x%x\n", pos, cmd); XPD_NOTICE(xpd, " IOC_TYPE=0x%02X\n", _IOC_TYPE(cmd)); XPD_NOTICE(xpd, " IOC_DIR=0x%02X\n", _IOC_DIR(cmd)); |