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/xbus-sysfs.c | |
| 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/xbus-sysfs.c')
| -rw-r--r-- | kernel/xpp/xbus-sysfs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/xpp/xbus-sysfs.c b/kernel/xpp/xbus-sysfs.c index 04bc24e..87a58f1 100644 --- a/kernel/xpp/xbus-sysfs.c +++ b/kernel/xpp/xbus-sysfs.c @@ -46,7 +46,7 @@ static const char rcsid[] = "$Id$"; /* Command line parameters */ -extern int print_dbg; +extern int debug; /* Kernel versions... */ @@ -355,6 +355,9 @@ void xbus_sysfs_remove(xbus_t *xbus) XBUS_DBG(GENERAL, xbus, "\n"); astribank = &xbus->astribank; BUG_ON(!astribank); + if(!astribank->driver_data) + return; + BUG_ON(astribank->driver_data != xbus); #ifdef SAMPLE_TICKS device_remove_file(&xbus->astribank, &dev_attr_samples); #endif @@ -379,7 +382,7 @@ int xbus_sysfs_create(xbus_t *xbus) astribank->bus = &xpp_bus_type; astribank->parent = &xpp_bus; snprintf(astribank->bus_id, BUS_ID_SIZE, "xbus-%02d", xbus->num); - astribank->driver_data = NULL; /* FIXME: add some usefull data */ + astribank->driver_data = NULL; /* override below */ astribank->release = xpp_dev_release; ret = device_register(astribank); if(ret) { @@ -418,6 +421,7 @@ int xbus_sysfs_create(xbus_t *xbus) goto out; } #endif + astribank->driver_data = xbus; /* Everything is good */ out: return ret; } |