[dahdi-commits] sruffell: branch linux/sruffell/dahdi-linux-transcoder r5559 - in /linux/team...
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Tue Dec 16 12:04:06 CST 2008
Author: sruffell
Date: Tue Dec 16 12:04:05 2008
New Revision: 5559
URL: http://svn.digium.com/view/dahdi?view=rev&rev=5559
Log:
Merged revisions 5481-5486,5492,5497-5498,5503-5504,5509,5523,5534-5535,5549 via svnmerge from
https://origsvn.digium.com/svn/dahdi/linux/trunk
........
r5481 | sruffell | 2008-12-11 08:43:53 -0800 (Thu, 11 Dec 2008) | 3 lines
wctc4xxp: Fix compilation issues on 2.6.15 and below kernels. Thanks
tzafrir.
........
r5482 | tzafrir | 2008-12-11 08:44:19 -0800 (Thu, 11 Dec 2008) | 2 lines
Fixed a typo that broke building dahdi-base with kernels < 2.6.13
........
r5483 | tzafrir | 2008-12-11 08:46:36 -0800 (Thu, 11 Dec 2008) | 2 lines
A bit less maigc with OLD_HOTPLUG_SUPPORT
........
r5484 | tzafrir | 2008-12-11 08:48:48 -0800 (Thu, 11 Dec 2008) | 2 lines
Remove an include that is not available before 2.6.15 and is not needed
........
r5485 | tzafrir | 2008-12-11 08:51:27 -0800 (Thu, 11 Dec 2008) | 2 lines
Yet Another directory in which to ignore modules.order
........
r5486 | tzafrir | 2008-12-11 08:53:18 -0800 (Thu, 11 Dec 2008) | 3 lines
Fix building dahdi_dummy for kernels 2.6.13, 2.6.14:
Those kernels don't have RTC yet.
........
r5492 | tzafrir | 2008-12-11 10:57:14 -0800 (Thu, 11 Dec 2008) | 2 lines
Fix the xpp OLD_HOTPLUG fix.
........
r5497 | sruffell | 2008-12-11 12:19:18 -0800 (Thu, 11 Dec 2008) | 2 lines
dahdi_dummy: If we're using the system tick, don't use the hrtimer interface.
........
r5498 | tzafrir | 2008-12-11 12:24:42 -0800 (Thu, 11 Dec 2008) | 2 lines
Add a separate case for hotplug of kernels <= 2.6.9 .
........
r5503 | tzafrir | 2008-12-11 12:51:15 -0800 (Thu, 11 Dec 2008) | 7 lines
Send all samples to OSLEC, rather than just the first.
(closes issue #14036)
Reported by: marcotasto
Patches:
dahdi_echocan_oslec.patch uploaded by marcotasto (license 635)
........
r5504 | tzafrir | 2008-12-11 13:03:59 -0800 (Thu, 11 Dec 2008) | 2 lines
One more place whe old-but-not-ancient hotplug is used.
........
r5509 | sruffell | 2008-12-11 13:46:09 -0800 (Thu, 11 Dec 2008) | 2 lines
Add definition of dev_notice for kernels < 2.6.17.
........
r5523 | kpfleming | 2008-12-12 06:32:10 -0800 (Fri, 12 Dec 2008) | 1 line
use a format string for request_module, so the compiler will do the right thing
........
r5534 | sruffell | 2008-12-15 12:30:26 -0800 (Mon, 15 Dec 2008) | 2 lines
wcte12xp: do not release a spinlock that we did not acquire.
........
r5535 | sruffell | 2008-12-15 12:31:27 -0800 (Mon, 15 Dec 2008) | 2 lines
live_dahdi: Use the nonrelative path for the dahdi-tools folder in live_dahdi.
........
r5549 | sruffell | 2008-12-16 08:35:43 -0800 (Tue, 16 Dec 2008) | 2 lines
wcte12xp: Quiet some warnings about possible use of uninitialized variables.
........
Modified:
linux/team/sruffell/dahdi-linux-transcoder/ (props changed)
linux/team/sruffell/dahdi-linux-transcoder/build_tools/live_dahdi
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi-base.c
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_dummy.c
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_echocan_oslec.c
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcb4xxp/ (props changed)
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcb4xxp/base.c
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcte12xp/base.c
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-core.h
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-sysfs.c
linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xdefs.h
linux/team/sruffell/dahdi-linux-transcoder/include/dahdi/kernel.h
Propchange: linux/team/sruffell/dahdi-linux-transcoder/
------------------------------------------------------------------------------
automerge = yes
Propchange: linux/team/sruffell/dahdi-linux-transcoder/
------------------------------------------------------------------------------
automerge-email = sruffell at digium.com
Propchange: linux/team/sruffell/dahdi-linux-transcoder/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 16 12:04:05 2008
@@ -1,1 +1,1 @@
-/linux/trunk:1-5470
+/linux/trunk:1-5558
Modified: linux/team/sruffell/dahdi-linux-transcoder/build_tools/live_dahdi
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/build_tools/live_dahdi?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/build_tools/live_dahdi (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/build_tools/live_dahdi Tue Dec 16 12:04:05 2008
@@ -3,7 +3,7 @@
set -e
LINUX_DIR=${LINUX_DIR:=..}
-TOOLS_DIR=${TOOLS_DIR:=../../dahdi-tools}
+TOOLS_DIR=${TOOLS_DIR:=`(cd ../../dahdi-tools; pwd)`}
DESTDIR=$PWD/live
KVERS=${KVERS:-`uname -r`}
MODULES_DIR="$DESTDIR/lib/modules/$KVERS/dahdi"
Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi-base.c?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi-base.c Tue Dec 16 12:04:05 2008
@@ -175,7 +175,7 @@
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
#define CLASS_DEV_DESTROY(class, devt) \
class_device_destroy(class, devt)
-#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
#define CLASS_DEV_DESTROY(class, devt) \
class_simple_device_remove(devt)
#else
@@ -1146,7 +1146,7 @@
*c = tolower(*d);
}
- request_module(modname_buf);
+ request_module("%s", modname_buf);
tried_once = 1;
Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_dummy.c
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_dummy.c?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_dummy.c (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_dummy.c Tue Dec 16 12:04:05 2008
@@ -54,7 +54,7 @@
* the #define USE_RTC should be commented out.
*/
#if defined(__i386__) || defined(__x86_64__)
-#if LINUX_VERSION_CODE >= VERSION_CODE(2,6,13)
+#if LINUX_VERSION_CODE >= VERSION_CODE(2,6,15)
/* The symbol hrtimer_forward is only exported as of 2.6.22: */
#if defined(CONFIG_HIGH_RES_TIMERS) && LINUX_VERSION_CODE >= VERSION_CODE(2,6,22)
#define USE_HIGHRESTIMER
@@ -220,8 +220,7 @@
/* use kernel system tick timer if PC architecture RTC is not available */
static void dahdi_dummy_timer(unsigned long param)
{
- hrtimer_set_expires(timer, jiffies + 1);
- add_timer(&timer);
+ mod_timer(&timer, jiffies + 1);
ztd->counter += DAHDI_TIME;
while (ztd->counter >= HZ) {
Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_echocan_oslec.c
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_echocan_oslec.c?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_echocan_oslec.c (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/dahdi_echocan_oslec.c Tue Dec 16 12:04:05 2008
@@ -46,7 +46,14 @@
static void echo_can_update(struct echo_can_state *ec, short *iref, short *isig)
{
- oslec_update((struct oslec_state *)ec, *iref, *isig);
+ unsigned int SampleNum;
+
+ for (SampleNum = 0; SampleNum < DAHDI_CHUNKSIZE; SampleNum++, iref++)
+ {
+ short iCleanSample;
+ iCleanSample = (short) oslec_update((struct oslec_state *)ec, *iref, *isig);
+ *isig++ = iCleanSample;
+ }
}
static int echo_can_create(struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p,
@@ -57,8 +64,7 @@
return -EINVAL;
}
- /* TODO: get adaption mode from EC parameters? */
- *ec = (struct echo_can_state *)oslec_create(ecp->tap_length, 0);
+ *ec = (struct echo_can_state *)oslec_create(ecp->tap_length, ECHO_CAN_USE_ADAPTION | ECHO_CAN_USE_NLP | ECHO_CAN_USE_CLIP | ECHO_CAN_USE_TX_HPF | ECHO_CAN_USE_RX_HPF);
return *ec ? 0 : -ENOTTY;
}
Propchange: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcb4xxp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec 16 12:04:05 2008
@@ -1,3 +1,4 @@
*.ko
.*.cmd
*.mod.c
+modules.order
Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcb4xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcb4xxp/base.c Tue Dec 16 12:04:05 2008
@@ -34,7 +34,6 @@
#include <linux/delay.h>
#include <asm/io.h>
#include <linux/spinlock.h>
-#include <linux/mutex.h>
#include <linux/device.h> /* dev_err() */
#include <linux/interrupt.h>
#include <asm/system.h> /* cli(), *_flags */
Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcte12xp/base.c
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcte12xp/base.c?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wcte12xp/base.c Tue Dec 16 12:04:05 2008
@@ -203,9 +203,9 @@
}
}
-static inline int t1_setreg_full(struct t1 *wc, int addr, int val, int inisr, int vpm_num)
-{
- unsigned long flags;
+static inline int t1_setreg_full(struct t1 *wc, int addr, int val, const int inisr, int vpm_num)
+{
+ unsigned long flags = 0;
int hit;
int ret;
@@ -225,8 +225,8 @@
}
if (inisr)
break;
-
- spin_unlock_irqrestore(&wc->reglock, flags);
+ else
+ spin_unlock_irqrestore(&wc->reglock, flags);
if (hit < 0) {
if ((ret = schluffen(&wc->regq)))
return ret;
@@ -301,9 +301,9 @@
return ret;
}
-static inline int t1_getreg_full(struct t1 *wc, int addr, int inisr, int vpm_num)
-{
- unsigned long flags;
+static inline int t1_getreg_full(struct t1 *wc, int addr, const int inisr, int vpm_num)
+{
+ unsigned long flags = 0;
int hit;
int ret = 0;
@@ -356,9 +356,9 @@
return t1_getreg_full(wc, addr, inisr, NOT_VPM);
}
-static inline int t1_setleds(struct t1 *wc, int leds, int inisr)
-{
- unsigned long flags;
+static inline int t1_setleds(struct t1 *wc, int leds, const int inisr)
+{
+ unsigned long flags = 0;
int hit;
int ret = 0;
Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-core.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-core.h?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-core.h (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-core.h Tue Dec 16 12:04:05 2008
@@ -319,7 +319,7 @@
int xbus_sysfs_create(xbus_t *xbus);
void xbus_sysfs_remove(xbus_t *xbus);
-#ifdef OLD_HOTPLUG_SUPPORT
+#ifdef OLD_HOTPLUG_SUPPORT_269
/* Copy from new kernels lib/kobject_uevent.c */
enum kobject_action {
KOBJ_ADD,
Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-sysfs.c
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-sysfs.c?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-sysfs.c (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xbus-sysfs.c Tue Dec 16 12:04:05 2008
@@ -319,20 +319,22 @@
XBUS_DBG(DEVICES, xbus, "SYFS bus_id=%s action=%d\n",
xbus->astribank.bus_id, act);
-#ifdef OLD_HOTPLUG_SUPPORT
- {
- /* Copy from new kernels lib/kobject_uevent.c */
- static const char *str[] = {
- [KOBJ_ADD] "add",
- [KOBJ_REMOVE] "remove",
- [KOBJ_CHANGE] "change",
- [KOBJ_MOUNT] "mount",
- [KOBJ_UMOUNT] "umount",
- [KOBJ_OFFLINE] "offline",
- [KOBJ_ONLINE] "online"
- };
- kobject_hotplug(str[act], kobj);
- }
+#if defined(OLD_HOTPLUG_SUPPORT_269)
+ {
+ /* Copy from new kernels lib/kobject_uevent.c */
+ static const char *str[] = {
+ [KOBJ_ADD] "add",
+ [KOBJ_REMOVE] "remove",
+ [KOBJ_CHANGE] "change",
+ [KOBJ_MOUNT] "mount",
+ [KOBJ_UMOUNT] "umount",
+ [KOBJ_OFFLINE] "offline",
+ [KOBJ_ONLINE] "online"
+ };
+ kobject_hotplug(str[act], kobj);
+ }
+#elif defined(OLD_HOTPLUG_SUPPORT)
+ kobject_hotplug(kobj, act);
#else
kobject_uevent(kobj, act);
#endif
Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xdefs.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xdefs.h?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xdefs.h (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/xpp/xdefs.h Tue Dec 16 12:04:05 2008
@@ -120,6 +120,9 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
#define OLD_HOTPLUG_SUPPORT // for older kernels
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+#define OLD_HOTPLUG_SUPPORT_269// for way older kernels
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
#define DEVICE_ATTR_READER(name,dev,buf) \
Modified: linux/team/sruffell/dahdi-linux-transcoder/include/dahdi/kernel.h
URL: http://svn.digium.com/view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/include/dahdi/kernel.h?view=diff&rev=5559&r1=5558&r2=5559
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/include/dahdi/kernel.h (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/include/dahdi/kernel.h Tue Dec 16 12:04:05 2008
@@ -76,6 +76,13 @@
#define DAHDI_IRQ_SHARED SA_SHIRQ
#define DAHDI_IRQ_DISABLED SA_INTERRUPT
#define DAHDI_IRQ_SHARED_DISABLED SA_SHIRQ | SA_INTERRUPT
+#endif
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+#ifndef dev_notice
+#define dev_notice(dev, format, arg...) \
+ dev_printk(KERN_NOTICE , dev , format , ## arg)
+#endif
#endif
/*! Default chunk size for conferences and such -- static right now, might make
More information about the dahdi-commits
mailing list