diff options
| -rw-r--r-- | xhfc/Makefile | 2 | ||||
| -rw-r--r-- | xhfc/base.c | 16 |
2 files changed, 4 insertions, 14 deletions
diff --git a/xhfc/Makefile b/xhfc/Makefile index 4940c92..346544d 100644 --- a/xhfc/Makefile +++ b/xhfc/Makefile @@ -2,7 +2,7 @@ PWD := $(shell pwd) KSRC ?= /bad__ksrc__not_set DAHDI_INCLUDE ?= /bad__dahdi_include__not_set -CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(abspath $(src)/../) -DUSE_GPIO +CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(abspath $(src)/../) -DUSE_GPIO -DAUDIO obj-m := xivoxhfc.o diff --git a/xhfc/base.c b/xhfc/base.c index 42fb14b..93b7fe0 100644 --- a/xhfc/base.c +++ b/xhfc/base.c @@ -45,14 +45,11 @@ int exit_after_reset = 0; uint ntte = 0x3; #ifdef USE_GPIO -static uint reset_gpio = 21; +static uint reset_gpio = 28; #endif -int softconf = 0; - module_param(debug, uint, S_IRUGO | S_IWUSR); module_param(dbg_spanfilter, uint, S_IRUGO | S_IWUSR); -module_param(softconf, bool, S_IRUGO); module_param(ntte, uint, S_IRUGO); module_param(exit_after_reset, bool, S_IRUGO); #ifdef USE_GPIO @@ -72,8 +69,6 @@ MODULE_PARM_DESC(debug, "Debug bitfield:\n" MODULE_PARM_DESC(dbg_spanfilter, "bitfield, filter debug info by span."); MODULE_PARM_DESC(ntte, "bitfield, configuration of the physical ports. " "ex: 0x3 = 0 NT, 1 NT, 2 TE, 3 TE."); -MODULE_PARM_DESC(softconf, - "Configure the S/T port line interface in software."); #ifdef USE_GPIO MODULE_PARM_DESC(reset_gpio, "Reset the XHFC using this GPIO"); #endif @@ -148,12 +143,7 @@ void xhfc_config_st(struct xhfc *x, int port, int nt) SET_V_B1_RX_EN(a_su_ctrl2, 1); SET_V_B2_RX_EN(a_su_ctrl2, 1); SET_V_SU_ACT(a_su_wr_sta, 3); /* activation */ - SET_V_SU_CLK_DLY(a_su_clk_dly, nt ? 0xC : 0xE); /* normal operation - * WARNING: if the - * interface is - * softconfigured, this - * should always be - * 0xC XXX */ + SET_V_SU_CLK_DLY(a_su_clk_dly, 0xC); /* OxE for TE not softconfigured */ SET_V_ST_SMPL(a_su_clk_dly, nt ? 0x6 : 0x0); /* default value */ write_xhfc(x, R_SU_SEL, r_su_sel); @@ -617,7 +607,7 @@ irqreturn_t xhfc_interrupt(int irq, void *dev_id, struct pt_regs* ptregs) for (i = 0; i < SPANS_PER_CHIP; i++) { handle_st_timers(&xhfc->spans[i]); - if (r_su_irq & (1 << i) || 2 == xhfc->ticks /* bootstrap XXX WTF*/) + if (r_su_irq & (1 << i)) handle_state_change(&xhfc->spans[i]); } } |