diff options
| -rw-r--r-- | gpio/common.h | 94 | ||||
| -rw-r--r-- | gpio/gpio.c | 90 | ||||
| -rw-r--r-- | gpio/gpio.h | 98 | ||||
| -rw-r--r-- | xhfc/xhfc.c | 48 | ||||
| -rw-r--r-- | xhfc/xhfc.h | 8 | ||||
| -rw-r--r-- | xhfc/xhfc24sucd.h | 18 | ||||
| -rw-r--r-- | xhfc/xhfc_leb.c | 46 | ||||
| -rw-r--r-- | xhfc/xhfc_tdm_iface.h | 6 | ||||
| -rw-r--r-- | xhfc/xhfc_timers_state.c | 4 | ||||
| -rw-r--r-- | xivovp/base.c | 12 |
10 files changed, 212 insertions, 212 deletions
diff --git a/gpio/common.h b/gpio/common.h index 22eda01..7191381 100644 --- a/gpio/common.h +++ b/gpio/common.h @@ -1,62 +1,62 @@ /* - * This file is provided under a dual BSD/GPLv2 license. When using or + * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license. - * + * * GPL LICENSE SUMMARY - * + * * Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify + * + * This program is free software; you can redistribute it and/or modify * it under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * The full GNU General Public License is included in this distribution + * The full GNU General Public License is included in this distribution * in the file called LICENSE.GPL. - * + * * Contact Information: * Intel Corporation - * - * BSD LICENSE - * + * + * BSD LICENSE + * * Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * + * + * * version: Embedded.L.1.0.3-144 */ @@ -65,21 +65,21 @@ * gpio * * Abstract: - * This header file is to be included by the gpio.c file only. + * This header file is to be included by the gpio.c file only. * It is OS independent. * * Revision: - * + * * *****************************************************************************/ #ifndef COMMON_H #define COMMON_H -#define SEL 2 -#define LVL 2 +#define SEL 2 +#define LVL 2 -//offset into low pin count(LPC) config space of the GPIO base address +//offset into low pin count(LPC) config space of the GPIO base address #define GPIO_BAR_OFFSET 0x48 //vendor and device IDs of LPC device @@ -115,8 +115,8 @@ /****************************************************************************** Description: - This structure contains an IO address to each of the gpio registers - contained in the hardware device memory. Each register can then be + This structure contains an IO address to each of the gpio registers + contained in the hardware device memory. Each register can then be accessed using the IO address. *****************************************************************************/ struct gpio_regs diff --git a/gpio/gpio.c b/gpio/gpio.c index d35e192..0fb8a0f 100644 --- a/gpio/gpio.c +++ b/gpio/gpio.c @@ -1,62 +1,62 @@ /* - * This file is provided under a dual BSD/GPLv2 license. When using or + * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license. - * + * * GPL LICENSE SUMMARY - * + * * Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify + * + * This program is free software; you can redistribute it and/or modify * it under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * The full GNU General Public License is included in this distribution + * The full GNU General Public License is included in this distribution * in the file called LICENSE.GPL. - * + * * Contact Information: * Intel Corporation - * - * BSD LICENSE - * + * + * BSD LICENSE + * * Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * + * + * * version: Embedded.L.1.0.3-144 */ @@ -193,7 +193,7 @@ void gpio_close(void) printk("%s:gpio_close-Driver unload complete\n", DRIVERNAME); } -int gpio_set_to_gpio_(int signal, int gpio) +int gpio_set_to_gpio_(int signal, int gpio) { u32 bitstr, io_addr; @@ -207,17 +207,17 @@ int gpio_set_to_gpio_(int signal, int gpio) /* get the register contents */ bitstr = inl(io_addr); - + if (gpio) /* set bit to use pin for gpio */ set_bit(signal%GPIO_REG_BITS, (void*)&bitstr); else /* clear bit to use pin for alternative function */ clear_bit(signal%GPIO_REG_BITS, (void*)&bitstr); - + /* write the modified string back to the gpio register */ outl(bitstr, io_addr); - + return 0; } int gpio_set_to_gpio(int signal) { return gpio_set_to_gpio_(signal, 1); } @@ -321,7 +321,7 @@ int gpio_set_blink(int signal, int blink) return 0; } -int gpio_inverted_input(int signal, int inverted) +int gpio_inverted_input(int signal, int inverted) { u32 bitstr; diff --git a/gpio/gpio.h b/gpio/gpio.h index 44ae744..5e2dbc7 100644 --- a/gpio/gpio.h +++ b/gpio/gpio.h @@ -1,62 +1,62 @@ /* - * This file is provided under a dual BSD/GPLv2 license. When using or + * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license. - * + * * GPL LICENSE SUMMARY - * + * * Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify + * + * This program is free software; you can redistribute it and/or modify * it under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * The full GNU General Public License is included in this distribution + * The full GNU General Public License is included in this distribution * in the file called LICENSE.GPL. - * + * * Contact Information: * Intel Corporation - * - * BSD LICENSE - * + * + * BSD LICENSE + * * Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * + * + * * version: Embedded.L.1.0.3-144 */ @@ -65,7 +65,7 @@ * gpio * * Abstract: - * This header file is to be included by the gpio.c file only. + * This header file is to be included by the gpio.c file only. * * Revision: * TBD @@ -78,15 +78,15 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/socket.h> -#include <linux/poll.h> +#include <linux/poll.h> #include <linux/init.h> -#include <linux/fs.h> -#include <linux/errno.h> -#include <linux/types.h> +#include <linux/fs.h> +#include <linux/errno.h> +#include <linux/types.h> #include <linux/proc_fs.h> -#include <linux/fcntl.h> +#include <linux/fcntl.h> #include <linux/interrupt.h> -#include <asm/system.h> +#include <asm/system.h> #include <asm/uaccess.h> #include <linux/pci.h> @@ -96,10 +96,10 @@ /****************************************************************************** - + Description: This structure contains data that is used for most driver operations. - + *****************************************************************************/ struct drvr_data { diff --git a/xhfc/xhfc.c b/xhfc/xhfc.c index e2c142a..aa48b54 100644 --- a/xhfc/xhfc.c +++ b/xhfc/xhfc.c @@ -236,13 +236,13 @@ void xhfc_config_d_chan_on_fifo(struct xhfc *x, int fifo, int direction) SET_V_FIFO_DIR(r_fifo, direction); SET_V_CH_FDIR(a_channel, direction); - write_xhfc(x, R_FIFO, r_fifo); - xhfc_waitbusy(x); - write_xhfc(x, A_CON_HDLC, a_con_hdlc); - write_xhfc(x, A_CHANNEL, a_channel); - write_xhfc(x, A_SUBCH_CFG, a_subch_cfg); - write_xhfc(x, A_INC_RES_FIFO, a_inc_res_fifo); - xhfc_waitbusy(x); + write_xhfc(x, R_FIFO, r_fifo); + xhfc_waitbusy(x); + write_xhfc(x, A_CON_HDLC, a_con_hdlc); + write_xhfc(x, A_CHANNEL, a_channel); + write_xhfc(x, A_SUBCH_CFG, a_subch_cfg); + write_xhfc(x, A_INC_RES_FIFO, a_inc_res_fifo); + xhfc_waitbusy(x); } void xhfc_config_b_chan_on_fifo(struct xhfc *x, int fifo, int slot, int direction) @@ -261,7 +261,7 @@ void xhfc_config_b_chan_on_fifo(struct xhfc *x, int fifo, int slot, int directio SET_V_SL_DIR(r_slot, direction); SET_V_SL_NUM(r_slot, slot); - + SET_V_CH_SDIR(a_sl_cfg, direction); SET_V_CH_SNUM(a_sl_cfg, fifo); SET_V_ROUT(a_sl_cfg, 3); /* '11': receive data from STIO1, output to STIO2 */ @@ -316,7 +316,7 @@ static void hdlc_signal_complete(struct xhfc_span *xhfc_span, u8 stat) if (DBG_HDLC && DBG_SPANFILTER) { xhfc_info(xhfc, "(span %d) Frame " /*"%d" */ "is good!\n", - xhfc_span->port + + xhfc_span->port 1 /*, xhfc_span->frames_in */ ); } dahdi_hdlc_finish(xhfc_span->sigchan); @@ -354,7 +354,7 @@ static int hdlc_rx_frame(struct xhfc_span *xhfc_span) debug_fz(x, fifo, __func__, debugbuf); if (!flen && !zlen) { - if (DBG_VERBOSE_HDLC && DBG_SPANFILTER) + if (DBG_VERBOSE_HDLC && DBG_SPANFILTER) xhfc_info(x, "%s, nothing to receive (%ld).\n", debugbuf, xhfc_span->non_rx_cnt); xhfc_span->non_rx_cnt++; if (DBG_HDLC && DBG_SPANFILTER && 0 == xhfc_span->non_rx_cnt % 2000) @@ -521,8 +521,8 @@ static int hdlc_tx_frame(struct xhfc_span *xhfc_span) xhfc_info(xhfc_span->xhfc, "hdlc_tx_frame(span %d): DAHDI gave %d " - "bytes for FIFO %d (res = %d): %s\n", - xhfc_span->port + 1, + "bytes for FIFO %d (res = %d): %s\n", + xhfc_span->port + 1, size, fifo, res, debugbuf); if (size && res != 0) @@ -570,14 +570,14 @@ irqreturn_t xhfc_interrupt(int irq, void *dev_id, struct pt_regs* ptregs) struct xhfc_pi *pi = dev_id; struct xhfc *xhfc; - + int i; u8 r_su_irq; u8 misc_irq; xhfc = &pi->xhfc; - /* ommit IRQs for other HW with shared IRQ */ + /* ommit IRQs for other HW with shared IRQ */ if (!(read_xhfc(xhfc, R_IRQ_OVIEW))) return IRQ_NONE; @@ -587,7 +587,7 @@ irqreturn_t xhfc_interrupt(int irq, void *dev_id, struct pt_regs* ptregs) /* check for Timer IRQ */ if (misc_irq & M_TI_IRQMSK) xhfc->ticks++; - + for (i = 0; i < SPANS_PER_CHIP; i++) { struct xhfc_span* s = &xhfc->spans[i]; @@ -710,7 +710,7 @@ void xhfc_init_and_configure(struct xhfc* x) /* In DAHDI's driver's this part is "stage 1" */ xhfc_reset(x); - + /* Make sure interrupts disabled */ disable_interrupts(x); @@ -770,7 +770,7 @@ int xhfc_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) xhfc_info(xhfc, "WARNING: This driver can't configure the ports yet, " "expect problems if port %d isn't configured in %s " - "mode.\n", xhfc_span->port, xhfc_span->nt ? "NT" : "TE"); + "mode.\n", xhfc_span->port, xhfc_span->nt ? "NT" : "TE"); if (lc->sync < 0) { xhfc_info(xhfc, "Span %d has invalid sync priority (%d), " \ @@ -883,7 +883,7 @@ void init_spans(struct xhfc* x) xhfc_span = &x->spans[i]; dahdi_span = &xhfc_span->span; - + xhfc_span->xhfc = x; xhfc_span->port = i; @@ -911,7 +911,7 @@ void init_spans(struct xhfc* x) dahdi_span->channels = CHANS_PER_SPAN; dahdi_span->flags = 0; dahdi_span->deflaw = DAHDI_LAW_ALAW; - dahdi_span->linecompat = + dahdi_span->linecompat = DAHDI_CONFIG_TERM | DAHDI_CONFIG_NTTE | DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS ; @@ -975,7 +975,7 @@ int __devinit xhfc_init_one(struct pci_dev *pdev, struct xhfc_pi * pi; unsigned long base, size; int rc = -ENOMEM; - + printk(KERN_DEBUG "entering xhfc_init_one.\n"); @@ -1084,10 +1084,10 @@ int __devinit xhfc_init_one(struct pci_dev *pdev, } init_spans(&pi->xhfc); - + xhfc_init_and_configure(&pi->xhfc); - for (span = 0; span < SPANS_PER_CHIP; span++) + for (span = 0; span < SPANS_PER_CHIP; span++) if (dahdi_register(&pi->xhfc.spans[span].span, /*prefmaster*/ 0)) { printk(KERN_WARNING "%s %s: couldn't register spans.\n", pi->name, __FUNCTION__); rc = -EINVAL; @@ -1127,10 +1127,10 @@ void __devexit xhfc_remove_one(struct pci_dev *pdev) pi = pci_get_drvdata(pdev); if (DBG) - printk(KERN_INFO "%s %s: removing card\n", + printk(KERN_INFO "%s %s: removing card\n", pi->name, __FUNCTION__); - for (i = 0; i < SPANS_PER_CHIP; i++) + for (i = 0; i < SPANS_PER_CHIP; i++) dahdi_unregister(&pi->xhfc.spans[i].span); release_card_irq(pi); diff --git a/xhfc/xhfc.h b/xhfc/xhfc.h index 7611a78..b2aac2b 100644 --- a/xhfc/xhfc.h +++ b/xhfc/xhfc.h @@ -21,7 +21,7 @@ #define CHIP_ID_2SU 0x61 #endif -#define SPANS_PER_CHIP 4 +#define SPANS_PER_CHIP 4 #define CHANS_PER_SPAN 3 #define XHFC_ZMIN 0x00 @@ -76,7 +76,7 @@ enum { XHFC_T1, XHFC_T2, XHFC_T3, XHFC_T4 }; #ifndef MIN # define MIN(a, b) (((a) < (b))? (a) : (b)) #endif - + enum data_dir { TRANSMIT = 0, RECEIVE = 1 }; #define xhfc_info(x, format, arg...) \ @@ -114,7 +114,7 @@ struct xhfc_span { int newalarm; unsigned long alarmtimer; struct dahdi_chan* sigchan; - int sigactive; + int sigactive; unsigned long hfc_timers[4]; /* T1, T2, T3, T4 */ int hfc_timer_on[4]; /* 1=timer active */ @@ -142,7 +142,7 @@ struct xhfc_pi { struct tlp_leb_regs __iomem *regs; u8 __iomem *cs_n0; int irq; - + char name[16]; /* 'XHFC_PI0' = ProcessorInterface no. 0 */ struct xhfc xhfc; /* mem for one XHFC */ diff --git a/xhfc/xhfc24sucd.h b/xhfc/xhfc24sucd.h index 2275c55..2a79477 100644 --- a/xhfc/xhfc24sucd.h +++ b/xhfc/xhfc24sucd.h @@ -2,16 +2,16 @@ * XHFC-2S4U / XHFC-4SU register definitions * (C) 2007 Copyright Cologne Chip AG * - * This software is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software + * This software is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software * Foundation; either version 2, or (at your option) any later version. * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * This software is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this software; if not, write to the Free Software Foundation, Inc., 675 Mass + * You should have received a copy of the GNU General Public License along with + * this software; if not, write to the Free Software Foundation, Inc., 675 Mass * Ave, Cambridge, MA 02139, USA. * * __________________________________________________________________________________ @@ -22,13 +22,13 @@ * Creator: Genero 3.6 * Data base: HFC XML 1.9 for XHFC-1SU, XHFC-2SU, XHFC-2S4U and XHFC-4SU * Address range: 0x00 - 0xFF - * + * * The information presented can not be considered as assured characteristics. * Data can change without notice. Please check version numbers in case of doubt. - * + * * For further information or questions please contact support@CologneChip.com * __________________________________________________________________________________ - * + * * WARNING: This file has been generated automatically and should not be * changed to maintain compatibility with later versions. * __________________________________________________________________________________ diff --git a/xhfc/xhfc_leb.c b/xhfc/xhfc_leb.c index 00c622b..7722249 100644 --- a/xhfc/xhfc_leb.c +++ b/xhfc/xhfc_leb.c @@ -97,26 +97,26 @@ * 1 => 8-bit data bus */ #define LEB_TCS_BYTE_EN ( 1u << 0) -void leb_init(struct xhfc_pi *leb) -{ - struct tlp_leb_regs __iomem *regs = leb->regs; - - writel( LEB_TCS_CS_EN - | LEB_TCS_T1_ADDR_TM(3) - | LEB_TCS_T2_SU_CS_TM(3) - | LEB_TCS_T3_STRB_TM(3) - | LEB_TCS_T4_HOLD_TM(3) - | LEB_TCS_T5_RCVRY_TM(3) - | LEB_TCS_CYC_TYPE_INTEL - | LEB_TCS_CNFG_512_B /* 256_B does not exist */ - | LEB_TCS_MUX_EN - | LEB_TCS_SPLT_EN - | LEB_TCS_WR_EN - | LEB_TCS_BYTE_EN, - ®s->timing_cs[0]); - - /* We are true paranoiacs: */ - (void)readl(®s->timing_cs[0]); - - /* That's it! :-) */ -} +void leb_init(struct xhfc_pi *leb) +{ + struct tlp_leb_regs __iomem *regs = leb->regs; + + writel( LEB_TCS_CS_EN + | LEB_TCS_T1_ADDR_TM(3) + | LEB_TCS_T2_SU_CS_TM(3) + | LEB_TCS_T3_STRB_TM(3) + | LEB_TCS_T4_HOLD_TM(3) + | LEB_TCS_T5_RCVRY_TM(3) + | LEB_TCS_CYC_TYPE_INTEL + | LEB_TCS_CNFG_512_B /* 256_B does not exist */ + | LEB_TCS_MUX_EN + | LEB_TCS_SPLT_EN + | LEB_TCS_WR_EN + | LEB_TCS_BYTE_EN, + ®s->timing_cs[0]); + + /* We are true paranoiacs: */ + (void)readl(®s->timing_cs[0]); + + /* That's it! :-) */ +} diff --git a/xhfc/xhfc_tdm_iface.h b/xhfc/xhfc_tdm_iface.h index 9314d14..e82825a 100644 --- a/xhfc/xhfc_tdm_iface.h +++ b/xhfc/xhfc_tdm_iface.h @@ -10,14 +10,14 @@ * void activate_tdm(void); void deactivate_tdm(void); - * + * * The mapping between timeslots and physical/DAHDI channels is done by * registering a mapping between a timeslot and buffers at initialization of * the XHFC driver module * void tdm_read_add(uint ts, u8 *readchunk); void tdm_write_add(uint ts, u8 *writechunk); - * + * * The TDM driver is then able to read/write in the buffers and then call a * function to process them. This function calls the buffer processing function * of DAHDI, dahdi_receive, dahdi_transmit, and dahdi_ec_span. @@ -39,7 +39,7 @@ void xhfc_rxtx(void); * Done by updating the counters in struct dahdi_count count. * The TDM driver reports errors to the XHFC driver which reports them to * DAHDI? - * + * * - should all the error reporting be done through DAHDI? should low level TDM * errors even be transmitted to the XHFC driver module? */ diff --git a/xhfc/xhfc_timers_state.c b/xhfc/xhfc_timers_state.c index a258ea5..8ac53c7 100644 --- a/xhfc/xhfc_timers_state.c +++ b/xhfc/xhfc_timers_state.c @@ -87,7 +87,7 @@ static void hfc_stop_st(struct xhfc_span *s) hfc_stop_all_timers(s); write_xhfc(xhfc, R_SU_SEL, s->port); - write_xhfc(xhfc, A_SU_WR_STA, + write_xhfc(xhfc, A_SU_WR_STA, SET_V_SU_ACT(a_su_wr_sta, V_SU_ACT_DEACTIVATE)); } @@ -97,7 +97,7 @@ void hfc_start_st(struct xhfc_span *s) struct xhfc *xhfc = s->xhfc; write_xhfc(xhfc, R_SU_SEL, s->port); - write_xhfc(xhfc, A_SU_WR_STA, + write_xhfc(xhfc, A_SU_WR_STA, SET_V_SU_ACT(a_su_wr_sta, V_SU_ACT_ACTIVATE)); /* start T1 if in NT mode, T3 if in TE mode */ diff --git a/xivovp/base.c b/xivovp/base.c index f767593..e391df3 100644 --- a/xivovp/base.c +++ b/xivovp/base.c @@ -91,7 +91,7 @@ static struct xivovp_line* xivovp_line_from_ctx(VpLineCtxType* line_ctx) if (!line_ctx) panic(DRV_NAME ": LineCtx == NULL\n"); - + line_obj = line_ctx->pLineObj; for (i = 0; i < ARRAY_SIZE(xivovp.line); i++) @@ -109,13 +109,13 @@ static void vp_set_debug_select_running(void) for (i = 0; i < ARRAY_SIZE(xivovp.line); i++) { debug_select = DEBUG_SELECT_RUNNING; - VpSetOption(&xivovp.line[i].vp_ctx, NULL, + VpSetOption(&xivovp.line[i].vp_ctx, NULL, VP_OPTION_ID_DEBUG_SELECT, &debug_select); } debug_select = DEBUG_SELECT_RUNNING; - VpSetOption(NULL, &xivovp.dev_ctx, VP_OPTION_ID_DEBUG_SELECT, + VpSetOption(NULL, &xivovp.dev_ctx, VP_OPTION_ID_DEBUG_SELECT, &debug_select); debug_select = DEBUG_SELECT_RUNNING; @@ -200,7 +200,7 @@ static void xivovp_handle_txsig_queue(void) spin_unlock_irqrestore(&xivovp.line[i].lock, flags); for (k = 0; k < j; k++) - xivovp_hooksig_pvt(&xivovp.line[i], + xivovp_hooksig_pvt(&xivovp.line[i], txsig_queue[k]); } else if (!said) { said = 1; @@ -391,11 +391,11 @@ span_init(void) { struct xivovp_line* l; dahdi_copy_string(xivovp.span.name, "XivoVP", sizeof(xivovp.span.name)); - dahdi_copy_string(xivovp.span.desc, + dahdi_copy_string(xivovp.span.desc, "FXO/FXS driver for Avencall's XiVO IPBX OpenHardware " "platform", sizeof(xivovp.span.desc)); xivovp.span.manufacturer = "Avencall"; - dahdi_copy_string(xivovp.span.devicetype, "Ve890", + dahdi_copy_string(xivovp.span.devicetype, "Ve890", sizeof(xivovp.span.devicetype)); xivovp.span.ops = &xivovp_span_ops; xivovp.span.channels = ARRAY_SIZE(xivovp.chans); |