diff options
| -rw-r--r-- | environment_pcb_debian5 | 7 | ||||
| -rw-r--r-- | tdm/xivo_tdm.c | 10 | ||||
| -rw-r--r-- | tdm/xivo_tdm_api.h | 10 | ||||
| -rw-r--r-- | xhfc/base.c | 2 | ||||
| -rw-r--r-- | xivovp/base.c | 18 |
5 files changed, 26 insertions, 21 deletions
diff --git a/environment_pcb_debian5 b/environment_pcb_debian5 deleted file mode 100644 index 1e17988..0000000 --- a/environment_pcb_debian5 +++ /dev/null @@ -1,7 +0,0 @@ -export KSRC=/usr/src/linux-headers-2.6.26-2-686 -export KERNEL_SOURCE_ROOT=$KSRC -export DAHDI_SYMVERS=/root/xivo-drivers/dahdi-linux-2.4.0/drivers/dahdi/Module.symvers -export DAHDI_INCLUDE=/root/xivo-drivers/dahdi-linux-2.4.0/include -export ICP_ROOT=/EP805XX -export VP_API=/home/xilun/hard/zarlink/Le71SDKAPIL_P2.17.0 -export XIVO_AUDIO=1 diff --git a/tdm/xivo_tdm.c b/tdm/xivo_tdm.c index f48366d..28cf9be 100644 --- a/tdm/xivo_tdm.c +++ b/tdm/xivo_tdm.c @@ -1500,10 +1500,20 @@ static enum hrtimer_restart debug_trace(struct hrtimer *timer) #endif /* DEBUGFS_MY_STUFF */ + +static inline void my_add_taint_module(struct module *mod, unsigned flag) +{ + add_taint(flag); + mod->taints |= (1U << flag); +} + + static int __init xivo_tdm_init(void) { int rc; + my_add_taint_module(THIS_MODULE, TAINT_CRAP); + #ifdef DEBUGFS_MY_STUFF spin_lock_init(&debug_lock); debug_index = -1; diff --git a/tdm/xivo_tdm_api.h b/tdm/xivo_tdm_api.h index fddc6d4..78626e5 100644 --- a/tdm/xivo_tdm_api.h +++ b/tdm/xivo_tdm_api.h @@ -18,13 +18,13 @@ #ifndef XIVO_TDM_API_H #define XIVO_TDM_API_H -/* XXX matches with ICP_HSSDRV_PORT_XHFC_MEGREZ_PROTO_XIVO_CONFIG */ -#define XHFC_MEGREZ_PROTO_XIVO_CONFIG (4) +/* XXX matches with ICP_HSSDRV_PORT_XHFC_XIOH_CONFIG */ +#define XHFC_XIOH_CONFIG (4) -/* XXX matches with ICP_HSSDRV_PORT_LE89316_MEGREZ_PROTO_XIVO_CONFIG */ -#define LE89316_MEGREZ_PROTO_XIVO_CONFIG (5) +/* XXX matches with ICP_HSSDRV_PORT_LE89316_XIOH_CONFIG */ +#define LE89316_XIOH_CONFIG (5) -#define LE89316_ASYNC_MEGREZ_PROTO_XIVO_CONFIG (6) +#define LE89316_ASYNC_XIOH_CONFIG (6) /* fixed: */ #define XIVO_TDM_TS_NUM (32) diff --git a/xhfc/base.c b/xhfc/base.c index 7b48703..0694287 100644 --- a/xhfc/base.c +++ b/xhfc/base.c @@ -1188,7 +1188,7 @@ static int __devinit xhfc_init_one(struct pci_dev *pdev, /* TDM started on the XHFC side, XHFC is MASTER */ /* Now it's possible to start the TDM bus on the EP80579 side, as SLAVE: */ if ((rc = xivo_tdm_config_port(pi->tdm_port, - XHFC_MEGREZ_PROTO_XIVO_CONFIG, + XHFC_XIOH_CONFIG, cs_n2)) < 0) { printk(KERN_ERR "%s %s: xivo_tdm_config_port failed (err=%d)\n", DRIVER_NAME, __func__, rc); diff --git a/xivovp/base.c b/xivovp/base.c index a8b8562..9f3cb1c 100644 --- a/xivovp/base.c +++ b/xivovp/base.c @@ -836,13 +836,13 @@ test_evb_ve890_init(void) } #ifdef AUDIO - if(wait_port0) + if (wait_port0) { /* UGLY EVIL HACK -1 */ xivo_tdm_register_port0_configured( xivovp.tdm_port, xivovp_port0_configured_cb, NULL); - else { + } else { xivovp_port0_configured_cb(NULL); xivovp_port0_started_cb(NULL); } @@ -877,7 +877,7 @@ xivovp_port0_configured_cb(void *data) printk(KERN_ERR "%s START\n", __func__); if ((rc = xivo_tdm_config_port(xivovp.tdm_port, - LE89316_MEGREZ_PROTO_XIVO_CONFIG, + LE89316_XIOH_CONFIG, NULL)) < 0) { printk(KERN_CRIT "%s: xivo_tdm_config_port returned %d\n", @@ -890,11 +890,13 @@ xivovp_port0_configured_cb(void *data) if (rc < 0) goto err_vp_init; - /* UGLY EVIL HACK */ - xivo_tdm_register_port0_started( - xivovp.tdm_port, - xivovp_port0_started_cb, - NULL); + if (wait_port0) { + /* UGLY EVIL HACK */ + xivo_tdm_register_port0_started( + xivovp.tdm_port, + xivovp_port0_started_cb, + NULL); + } mod_timer(&xivovp.vp_tick_timer, jiffies + VP_TICK_JIFFIES); |