diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-03-19 20:08:29 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-03-19 20:08:29 +0000 |
commit | d8562c778088ff6ab3383df5ceead41eff4bf124 (patch) | |
tree | 43e394ae225fd7183018c2ae08d3fb1e5bcb12cb /kernel/xpp/xpd.h | |
parent | b6b3226735f5e3b3fb000fa92daa7a574265c817 (diff) |
xpp: a massive backport from DAHDI. From Xorcom branch-rel-6839-r6908 .
Sun Mar 1 2009 Oron Peled <oron@actcom.co.il> - xpp.r6795
* Fix cases where the command_queue overflowed during initialization.
- Also add a 'command_queue_length' parameter to xpp.ko
* More migrations to sysfs:
- Add a 'transport' attribute to our astribank devices which
points to the usb device we use. E.g:
/sys/bus/astribanks/devices/xbus-00/transport is symlinked to
../../../../../../devices/pci0000:00/0000:00:10.4/usb5/5-4
- Move /proc/xpp/XBUS-??/XPD-??/span to
/sys/bus/xpds/devices/??:?:?/span
- Migrate from /proc/xpp/sync to:
/sys/bus/astribanks/drivers/xppdrv/sync
- New 'offhook' attribute in:
/sys/bus/xpds/devices/??:?:?/offhook
* PRI: change the "timing" priority to match the convention used by
other PRI cards -- I.e: lower numbers (not 0) have higher
priority.
* FXO:
- Power denial: create two module parameters instead of hard-coded
constants (power_denial_safezone, power_denial_minlen).
For sites that get non-standard power-denial signals from central
office on offhook.
- Don't hangup on power-denial, just notify Dahdi and wait for
- Fix caller-id detection for the case central office sends it before
first ring without any indication before.
Asterisk's desicion.
Mon, Dec 8 2008 Oron Peled <oron@actcom.co.il> - xpp.r6430
* PRI:
- Match our span clocking priorities (in system.conf)
to Digium -- this is a reversal of the previous state.
Now lower numbers (greater than 0) are better.
- Synchronization fixes for PRI ports other than 0.
- Fix T1 CRC for some countries (e.g: China).
* FXS: fix bug in VMWI detection if using old asterisk
which does not provide ZT_VMWI ioctl().
* FXO:
- Improve caller_id_style module parameter. This provide a workaround
for countries that send this information without any notification
(reverse polarity, ring, etc.)
- Don't force on-hook upon power-denial. So, loopstart devices
would ignore these as expected.
* Implement a flow-control to prevent user space (init_card_* scripts)
from pressuring our command queue.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4631 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/xpd.h')
-rw-r--r-- | kernel/xpp/xpd.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/kernel/xpp/xpd.h b/kernel/xpp/xpd.h index 7f85890..717e68d 100644 --- a/kernel/xpp/xpd.h +++ b/kernel/xpp/xpd.h @@ -29,6 +29,7 @@ #ifdef __KERNEL__ #include <linux/kernel.h> #include <linux/device.h> +#include <linux/version.h> #include <asm/atomic.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) #include <linux/semaphore.h> @@ -138,6 +139,16 @@ static struct xpd_counters { #define XPD_COUNTER_MAX (sizeof(xpd_counters)/sizeof(xpd_counters[0])) +enum xpd_state { + XPD_STATE_START, + XPD_STATE_INIT_REGS, + XPD_STATE_READY, + XPD_STATE_NOHW, +}; + +bool xpd_setstate(xpd_t *xpd, enum xpd_state newstate); +const char *xpd_statename(enum xpd_state st); + /* * An XPD is a single Xorcom Protocol Device */ @@ -162,6 +173,10 @@ struct xpd { xpp_line_t digital_signalling; /* BRI signalling channels */ uint timing_priority; /* from 'span' directives in zapata.conf */ + enum xpd_state xpd_state; + struct device xpd_dev; +#define dev_to_xpd(dev) container_of(dev, struct xpd, xpd_dev) + /* Assure atomicity of changes to pcm_len and wanted_pcm_mask */ spinlock_t lock_recompute_pcm; /* maintained by card drivers */ @@ -185,10 +200,12 @@ struct xpd { #ifdef CONFIG_PROC_FS struct proc_dir_entry *proc_xpd_dir; struct proc_dir_entry *proc_xpd_summary; +#ifdef OLD_PROC struct proc_dir_entry *proc_xpd_ztregister; struct proc_dir_entry *proc_xpd_blink; struct proc_dir_entry *proc_xpd_chipregs; #endif +#endif int counters[XPD_COUNTER_MAX]; @@ -229,6 +246,18 @@ static inline void *my_kzalloc(size_t size, gfp_t flags) return p; } +struct xpd_driver { + xpd_type_t type; + + struct device_driver driver; +#define driver_to_xpd_driver(driver) container_of(driver, struct xpd_driver, driver) +}; + +int xpd_driver_register(struct device_driver *driver); +void xpd_driver_unregister(struct device_driver *driver); +xpd_t *get_xpd(const char *msg, xpd_t *xpd); +void put_xpd(const char *msg, xpd_t *xpd); + #endif #endif /* XPD_H */ |