ISDN: Update for net-next
Subsystems (2)
cover ISDN: Update for net-next
Hi Dave,
This is the collection of ISDN patches for net-next, you can pull them from
git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6-net-next for_david
The first 4 patches make the isdnhdlc code usable for other ISDN drivers and fix minor bugs and lot of cosmetic issues in this code.
The 5. patch moved a function implemented in all mISDN HW drivers in a commom place.
Patch 6-10 add new hardware driver to mISDN, now nearly all PCI HW which was supported by HiSax is also supported by mISDN and we can start migration.
Patch 11 was posted some time ago from Julia Lawall and remove some unnecessary NULL tests
Patch 12 was posted last week from Stoyan Gaydarov to use ARRAY_SIZE. Modified to avoid extra defines by me.
Patch 13 is a bugfix for hfcmulti.
Julia Lawall (1):
drivers/isdn: Drop unnecessary NULL test
Karsten Keil (12):
ISDN: Make isdnhdlc usable for other ISDN drivers
ISDN: Clean up isdnhdlc code
ISDN: Add support for none reverse bitstreams to isdnhdc
ISDN: Fix isdnhdlc for one byte hdlc packets
mISDN: Make clearing B-channel a common function
mISDN: Add driver for Infineon ISDN chipset family
mISDN: Driver for AVM Fritz!CARD PCI
mISDN: Add support for Speedfax+ cards
mISDN: Add driver for Winbond cards
mISDN: Add support for Traverse Technologies NETJet PCI cards
ISDN: ARRAY_SIZE changes
mISDN: hfcmulti display real PCI ids for not supported cards
drivers/isdn/Kconfig | 6 +- drivers/isdn/act2000/capi.c | 3 +- drivers/isdn/act2000/module.c | 31 +- drivers/isdn/hardware/eicon/message.c | 4 +- drivers/isdn/hardware/eicon/os_4bri.c | 3 +- drivers/isdn/hardware/mISDN/Kconfig | 51 + drivers/isdn/hardware/mISDN/Makefile | 8 + drivers/isdn/hardware/mISDN/avmfritz.c | 1152 ++++++++++++++++++ drivers/isdn/hardware/mISDN/hfcmulti.c | 23 +- drivers/isdn/hardware/mISDN/hfcpci.c | 16 +- drivers/isdn/hardware/mISDN/hfcsusb.c | 16 +- drivers/isdn/hardware/mISDN/iohelper.h | 109 ++ drivers/isdn/hardware/mISDN/ipac.h | 405 +++++++ drivers/isdn/hardware/mISDN/isar.h | 269 +++++ drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1178 ++++++++++++++++++ drivers/isdn/hardware/mISDN/mISDNipac.c | 1655 +++++++++++++++++++++++++ drivers/isdn/hardware/mISDN/mISDNisar.c | 1726 +++++++++++++++++++++++++++ drivers/isdn/hardware/mISDN/netjet.c | 1156 ++++++++++++++++++ drivers/isdn/hardware/mISDN/netjet.h | 58 + drivers/isdn/hardware/mISDN/speedfax.c | 526 ++++++++ drivers/isdn/hardware/mISDN/w6692.c | 1440 ++++++++++++++++++++++ drivers/isdn/hardware/mISDN/w6692.h | 190 +++ drivers/isdn/hisax/Kconfig | 6 +- drivers/isdn/hisax/Makefile | 4 - drivers/isdn/hisax/amd7930_fn.c | 2 - drivers/isdn/hisax/callc.c | 4 +- drivers/isdn/hisax/hfc_pci.c | 2 - drivers/isdn/hisax/hfc_sx.c | 2 - drivers/isdn/hisax/icc.c | 2 - drivers/isdn/hisax/isac.c | 2 - drivers/isdn/hisax/isdnhdlc.c | 603 ---------- drivers/isdn/hisax/isdnhdlc.h | 70 -- drivers/isdn/hisax/isdnl1.c | 12 +- drivers/isdn/hisax/isdnl2.c | 4 +- drivers/isdn/hisax/isdnl3.c | 4 +- drivers/isdn/hisax/l3_1tr6.c | 20 +- drivers/isdn/hisax/l3dss1.c | 26 +- drivers/isdn/hisax/l3ni1.c | 26 +- drivers/isdn/hisax/q931.c | 24 +- drivers/isdn/hisax/st5481.h | 2 +- drivers/isdn/hisax/st5481_b.c | 5 +- drivers/isdn/hisax/st5481_d.c | 2 +- drivers/isdn/hisax/st5481_usb.c | 11 +- drivers/isdn/hisax/tei.c | 4 +- drivers/isdn/hisax/w6692.c | 2 - drivers/isdn/i4l/Kconfig | 11 + drivers/isdn/i4l/Makefile | 1 + drivers/isdn/i4l/isdnhdlc.c | 630 ++++++++++ drivers/isdn/mISDN/hwchannel.c | 15 +- drivers/isdn/mISDN/layer2.c | 2 - include/linux/isdn/hdlc.h | 82 ++ include/linux/mISDNhw.h | 1 + include/linux/mISDNif.h | 16 +- 53 files changed, 10758 insertions(+), 864 deletions(-) create mode 100644 drivers/isdn/hardware/mISDN/avmfritz.c create mode 100644 drivers/isdn/hardware/mISDN/iohelper.h create mode 100644 drivers/isdn/hardware/mISDN/ipac.h create mode 100644 drivers/isdn/hardware/mISDN/isar.h create mode 100644 drivers/isdn/hardware/mISDN/mISDNinfineon.c create mode 100644 drivers/isdn/hardware/mISDN/mISDNipac.c create mode 100644 drivers/isdn/hardware/mISDN/mISDNisar.c create mode 100644 drivers/isdn/hardware/mISDN/netjet.c create mode 100644 drivers/isdn/hardware/mISDN/netjet.h create mode 100644 drivers/isdn/hardware/mISDN/speedfax.c create mode 100644 drivers/isdn/hardware/mISDN/w6692.c create mode 100644 drivers/isdn/hardware/mISDN/w6692.h delete mode 100644 drivers/isdn/hisax/isdnhdlc.c delete mode 100644 drivers/isdn/hisax/isdnhdlc.h create mode 100644 drivers/isdn/i4l/isdnhdlc.c create mode 100644 include/linux/isdn/hdlc.h
PATCH 1/13 ISDN: Make isdnhdlc usable for other ISDN drivers
isdnhdlc is useful for other ISDN drivers as well. Move the include file to a central location and the source to the central isdn location.
--- drivers/isdn/Kconfig | 6 +- drivers/isdn/hisax/Kconfig | 6 +- drivers/isdn/hisax/Makefile | 4 - drivers/isdn/hisax/isdnhdlc.c | 603 ----------------------------------------- drivers/isdn/hisax/isdnhdlc.h | 70 ----- drivers/isdn/hisax/st5481.h | 2 +- drivers/isdn/i4l/Kconfig | 11 + drivers/isdn/i4l/Makefile | 1 + drivers/isdn/i4l/isdnhdlc.c | 603 +++++++++++++++++++++++++++++++++++++++++ include/linux/isdn/hdlc.h | 70 +++++ 10 files changed, 689 insertions(+), 687 deletions(-) delete mode 100644 drivers/isdn/hisax/isdnhdlc.c delete mode 100644 drivers/isdn/hisax/isdnhdlc.h create mode 100644 drivers/isdn/i4l/isdnhdlc.c create mode 100644 include/linux/isdn/hdlc.h
drivers/isdn/Kconfig +2 -4
@@ -21,8 +21,6 @@ menuconfig ISDN if ISDN -source "drivers/isdn/mISDN/Kconfig" - menuconfig ISDN_I4L tristate "Old ISDN4Linux (deprecated)" ---help---
@@ -41,9 +39,9 @@ menuconfig ISDN_I4L It is still available, though, for use with adapters that are not supported by the new CAPI subsystem yet. -if ISDN_I4L +source "drivers/isdn/mISDN/Kconfig" + source "drivers/isdn/i4l/Kconfig" -endif menuconfig ISDN_CAPI tristate "CAPI 2.0 subsystem"
drivers/isdn/hisax/Kconfig +1 -5
@@ -391,6 +391,7 @@ comment "HiSax sub driver modules" config HISAX_ST5481 tristate "ST5481 USB ISDN modem (EXPERIMENTAL)" depends on USB && EXPERIMENTAL + select ISDN_HDLC select CRC_CCITT select BITREVERSE help
@@ -418,11 +419,6 @@ config HISAX_FRITZ_PCIPNP (the latter also needs you to select "ISA Plug and Play support" from the menu "Plug and Play configuration") -config HISAX_HDLC - bool - depends on HISAX_ST5481 - default y - config HISAX_AVM_A1_PCMCIA bool depends on HISAX_AVM_A1_CS
drivers/isdn/hisax/Makefile +0 -4
@@ -16,10 +16,6 @@ obj-$(CONFIG_HISAX_HFCUSB) += hfc_usb.o obj-$(CONFIG_HISAX_HFC4S8S) += hfc4s8s_l1.o obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o -ifdef CONFIG_HISAX_HDLC -obj-$(CONFIG_ISDN_DRV_HISAX) += isdnhdlc.o -endif - # Multipart objects. hisax_st5481-y := st5481_init.o st5481_usb.o st5481_d.o \
drivers/isdn/hisax/isdnhdlc.c deleted +0 -603
603 lines not on this page · raw message
drivers/isdn/hisax/isdnhdlc.h deleted +0 -70
70 lines not on this page · raw message
drivers/isdn/hisax/st5481.h +1 -1
@@ -226,7 +226,7 @@ printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) #define INFO(format, arg...) \ printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) -#include "isdnhdlc.h" +#include <linux/isdn/hdlc.h> #include "fsm.h" #include "hisax_if.h" #include <linux/skbuff.h>
drivers/isdn/i4l/Kconfig +11 -0
@@ -2,6 +2,8 @@ # Old ISDN4Linux config # +if ISDN_I4L + config ISDN_PPP bool "Support synchronous PPP" depends on INET
@@ -135,3 +137,12 @@ source "drivers/isdn/act2000/Kconfig" source "drivers/isdn/hysdn/Kconfig" endmenu +# end ISDN_I4L +endif + +config ISDN_HDLC + tristate + depends on HISAX_ST5481 + select CRC_CCITT + select BITREVERSE +
drivers/isdn/i4l/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_ISDN_I4L) += isdn.o obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o +obj-$(CONFIG_ISDN_HDLC) += isdnhdlc.o # Multipart objects.
drivers/isdn/i4l/isdnhdlc.c new file +603 -0
603 lines not on this page · raw message
include/linux/isdn/hdlc.h new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 2/13 ISDN: Clean up isdnhdlc code
In reply to Karsten KeilClean up isdnhdlc to meet current code standard. Remove hint to already removed bit reversal table.
--- drivers/isdn/i4l/isdnhdlc.c | 366 +++++++++++++++++++++++-------------------- include/linux/isdn/hdlc.h | 68 +++++---- 2 files changed, 231 insertions(+), 203 deletions(-)
drivers/isdn/i4l/isdnhdlc.c +194 -172
@@ -1,23 +1,24 @@/* * isdnhdlc.c -- General purpose ISDN HDLC decoder. * -*Copyright (C) 2002 Wolfgang Mües <[email protected]> -* 2001 Frode Isaksen <[email protected]> -* 2001 Kai Germaschewski <[email protected]> +* Copyright (C) +* 2002 Wolfgang Mües <[email protected]> +* 2001 Frode Isaksen <[email protected]> +* 2001 Kai Germaschewski <[email protected]> * -* This program 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 of the License, or -* (at your option) any later version. +* This program 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 of the License, or +* (at your option) any later version. * -* 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. +* 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 -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/module.h>
@@ -36,20 +37,20 @@ MODULE_LICENSE("GPL");/*-------------------------------------------------------------------*/ enum { -HDLC_FAST_IDLE ,HDLC_GET_FLAG_B0 ,HDLC_GETFLAG_B1A6 ,HDLC_GETFLAG_B7 , -HDLC_GET_DATA ,HDLC_FAST_FLAG +HDLC_FAST_IDLE ,HDLC_GET_FLAG_B0 ,HDLC_GETFLAG_B1A6 ,HDLC_GETFLAG_B7 , +HDLC_GET_DATA ,HDLC_FAST_FLAG };enum { -HDLC_SEND_DATA ,HDLC_SEND_CRC1 ,HDLC_SEND_FAST_FLAG , -HDLC_SEND_FIRST_FLAG ,HDLC_SEND_CRC2 ,HDLC_SEND_CLOSING_FLAG , -HDLC_SEND_IDLE1 ,HDLC_SEND_FAST_IDLE ,HDLC_SENDFLAG_B0 , -HDLC_SENDFLAG_B1A6 ,HDLC_SENDFLAG_B7 ,STOPPED +HDLC_SEND_DATA ,HDLC_SEND_CRC1 ,HDLC_SEND_FAST_FLAG , +HDLC_SEND_FIRST_FLAG ,HDLC_SEND_CRC2 ,HDLC_SEND_CLOSING_FLAG , +HDLC_SEND_IDLE1 ,HDLC_SEND_FAST_IDLE ,HDLC_SENDFLAG_B0 , +HDLC_SENDFLAG_B1A6 ,HDLC_SENDFLAG_B7 ,STOPPED }; -void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc,int do_adapt56) +void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc,int do_adapt56) { - hdlc->bit_shift =0 ; + hdlc->bit_shift =0 ; hdlc->hdlc_bits1 =0 ; hdlc->data_bits =0 ; hdlc->ffbit_shift =0 ;
@@ -63,10 +64,12 @@ void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc, int do_adapt56) hdlc->ffvalue =0 ; hdlc->dstpos =0 ; } +EXPORT_SYMBOL (isdnhdlc_out_init); -void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc,int is_d_channel,int do_adapt56) +void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc,int is_d_channel, +int do_adapt56) { - hdlc->bit_shift =0 ; + hdlc->bit_shift =0 ; hdlc->hdlc_bits1 =0 ; hdlc->data_bits =0 ; hdlc->ffbit_shift =0 ;
@@ -83,7 +86,7 @@ void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc, int is_d_channel, int do_ada } hdlc->cbin =0x7e ; hdlc->bit_shift =0 ; -if (do_adapt56){ +if (do_adapt56) { hdlc->do_adapt56 =1 ; hdlc->data_bits =0 ; hdlc->state =HDLC_SENDFLAG_B0 ;
@@ -93,6 +96,25 @@ void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc, int is_d_channel, int do_ada } hdlc->shift_reg =0 ; } +EXPORT_SYMBOL (isdnhdlc_rcv_init); + +static int +check_frame (struct isdnhdlc_vars *hdlc) +{ +int status; + +if (hdlc->dstpos <2 )/* too small - framing error */ + status = -HDLC_FRAMING_ERROR ; +else if (hdlc->crc !=0xf0b8 )/* crc error */ + status = -HDLC_CRC_ERROR ; +else { +/* remove CRC */ + hdlc->dstpos -=2 ; +/* good frame */ + status = hdlc->dstpos; + } +return status; +}/* isdnhdlc_decode - decodes HDLC frames from a transparent bit stream.
@@ -121,40 +143,63 @@ void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc, int is_d_channel, int do_adareturns - number of decoded bytes in the destination buffer and status flag. */ -int isdnhdlc_decode (struct isdnhdlc_vars *hdlc,const unsigned char *src, -int slen,int *count,unsigned char *dst,int dsize) +int isdnhdlc_decode (struct isdnhdlc_vars *hdlc,const u8 *src,int slen, +int *count,u8 *dst,int dsize) { -int status=0 ; +int status =0 ; -static const unsigned char fast_flag[]={ -0x00 ,0x00 ,0x00 ,0x20 ,0x30 ,0x38 ,0x3c ,0x3e ,0x3f +static const unsigned char fast_flag[] = { +0x00 ,0x00 ,0x00 ,0x20 ,0x30 ,0x38 ,0x3c ,0x3e ,0x3f }; -static const unsigned char fast_flag_value[]={ -0x00 ,0x7e ,0xfc ,0xf9 ,0xf3 ,0xe7 ,0xcf ,0x9f ,0x3f +static const unsigned char fast_flag_value[] = { +0x00 ,0x7e ,0xfc ,0xf9 ,0xf3 ,0xe7 ,0xcf ,0x9f ,0x3f }; -static const unsigned char fast_abort[]={ -0x00 ,0x00 ,0x80 ,0xc0 ,0xe0 ,0xf0 ,0xf8 ,0xfc ,0xfe ,0xff +static const unsigned char fast_abort[] = { +0x00 ,0x00 ,0x80 ,0xc0 ,0xe0 ,0xf0 ,0xf8 ,0xfc ,0xfe ,0xff }; +#define handle_fast_flag (h) \ + do {\ + if (h->cbin == fast_flag[h->bit_shift]) {\ + h->ffvalue = fast_flag_value[h->bit_shift];\ + h->state = HDLC_FAST_FLAG;\ + h->ffbit_shift = h->bit_shift;\ + h->bit_shift = 1;\ + } else {\ + h->state = HDLC_GET_DATA;\ + h->data_received = 0;\ + } \ + } while (0) + +#define handle_abort (h) \ + do {\ + h->shift_reg = fast_abort[h->ffbit_shift - 1];\ + h->hdlc_bits1 = h->ffbit_shift - 2;\ + if (h->hdlc_bits1 < 0)\ + h->hdlc_bits1 = 0;\ + h->data_bits = h->ffbit_shift - 1;\ + h->state = HDLC_GET_DATA;\ + h->data_received = 0;\ + } while (0) + *count = slen; -while (slen >0 ){ -if (hdlc->bit_shift==0 ){ +while (slen >0 ) { +if (hdlc->bit_shift ==0 ) { hdlc->cbin = *src++; slen--; hdlc->bit_shift =8 ; -if (hdlc->do_adapt56){ - hdlc->bit_shift --; - } +if (hdlc->do_adapt56) + hdlc->bit_shift--; } -switch (hdlc->state){ +switch (hdlc->state) {case STOPPED :return 0 ;case HDLC_FAST_IDLE : -if (hdlc->cbin ==0xff ){ +if (hdlc->cbin ==0xff ) { hdlc->bit_shift =0 ;break ; }
@@ -163,32 +208,30 @@ int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->bit_shift =8 ;break ;case HDLC_GET_FLAG_B0 : -if (!(hdlc->cbin &0x80 )) { +if (!(hdlc->cbin &0x80 )) { hdlc->state =HDLC_GETFLAG_B1A6 ; hdlc->hdlc_bits1 =0 ; }else { -if (!hdlc->do_adapt56){ -if (++hdlc->hdlc_bits1 >=8 )if (hdlc->bit_shift==1 ) +if ((!hdlc->do_adapt56) && + (++hdlc->hdlc_bits1 >=8 ) && + (hdlc->bit_shift ==1 )) hdlc->state =HDLC_FAST_IDLE ; - } } - hdlc->cbin<<=1 ; - hdlc->bit_shift --; + hdlc->cbin <<=1 ; + hdlc->bit_shift--;break ;case HDLC_GETFLAG_B1A6 : -if (hdlc->cbin &0x80 ){ +if (hdlc->cbin &0x80 ) { hdlc->hdlc_bits1++; -if (hdlc->hdlc_bits1==6 ){ +if (hdlc->hdlc_bits1 ==6 ) hdlc->state =HDLC_GETFLAG_B7 ; - } - }else { + }else hdlc->hdlc_bits1 =0 ; - } - hdlc->cbin<<=1 ; - hdlc->bit_shift --; + hdlc->cbin <<=1 ; + hdlc->bit_shift--;break ;case HDLC_GETFLAG_B7 : -if (hdlc->cbin &0x80 ) { +if (hdlc->cbin &0x80 ) { hdlc->state =HDLC_GET_FLAG_B0 ; }else { hdlc->state =HDLC_GET_DATA ;
@@ -198,74 +241,55 @@ int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->data_bits =0 ; hdlc->data_received =0 ; } - hdlc->cbin<<=1 ; - hdlc->bit_shift --; + hdlc->cbin <<=1 ; + hdlc->bit_shift--;break ;case HDLC_GET_DATA : -if (hdlc->cbin &0x80 ){ +if (hdlc->cbin &0x80 ) { hdlc->hdlc_bits1++; -switch (hdlc->hdlc_bits1){ +switch (hdlc->hdlc_bits1) {case 6 :break ;case 7 : -if (hdlc->data_received) { -// bad frame +if (hdlc->data_received) +/* bad frame */ status = -HDLC_FRAMING_ERROR ; - } -if (!hdlc->do_adapt56){ -if (hdlc->cbin==fast_abort[hdlc->bit_shift+1 ]){ - hdlc->state =HDLC_FAST_IDLE ; - hdlc->bit_shift=1 ; +if (!hdlc->do_adapt56) { +if (hdlc->cbin == fast_abort + [hdlc->bit_shift +1 ]) { + hdlc->state = +HDLC_FAST_IDLE ; + hdlc->bit_shift =1 ;break ; } - }else { + }else hdlc->state =HDLC_GET_FLAG_B0 ; - }break ;default : - hdlc->shift_reg>>=1 ; + hdlc->shift_reg >>=1 ; hdlc->shift_reg |=0x80 ; hdlc->data_bits++;break ; } }else { -switch (hdlc->hdlc_bits1){ +switch (hdlc->hdlc_bits1) {case 5 :break ;case 6 : -if (hdlc->data_received){ -if (hdlc->dstpos <2 ) { - status = -HDLC_FRAMING_ERROR ; - }else if (hdlc->crc !=0xf0b8 ){ -// crc error - status = -HDLC_CRC_ERROR ; - }else { -// remove CRC - hdlc->dstpos -=2 ; -// good frame - status = hdlc->dstpos; - } - } +if (hdlc->data_received) + status =check_frame (hdlc); hdlc->crc =0xffff ; hdlc->shift_reg =0 ; hdlc->data_bits =0 ; -if (!hdlc->do_adapt56){ -if (hdlc->cbin==fast_flag[hdlc->bit_shift]){ - hdlc->ffvalue = fast_flag_value[hdlc->bit_shift]; - hdlc->state =HDLC_FAST_FLAG ; - hdlc->ffbit_shift = hdlc->bit_shift; - hdlc->bit_shift =1 ; - }else { - hdlc->state =HDLC_GET_DATA ; - hdlc->data_received =0 ; - } - }else { +if (!hdlc->do_adapt56) +handle_fast_flag (hdlc); +else { hdlc->state =HDLC_GET_DATA ; hdlc->data_received =0 ; }break ;default : - hdlc->shift_reg>>=1 ; + hdlc->shift_reg >>=1 ; hdlc->data_bits++;break ; }
@@ -278,16 +302,17 @@ int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->bit_shift--;return status; } -if (hdlc->data_bits==8 ){ +if (hdlc->data_bits ==8 ) { hdlc->data_bits =0 ; hdlc->data_received =1 ; - hdlc->crc =crc_ccitt_byte (hdlc->crc, hdlc->shift_reg); + hdlc->crc =crc_ccitt_byte (hdlc->crc, + hdlc->shift_reg); -// good byte received -if (hdlc->dstpos < dsize) { +/* good byte received */ +if (hdlc->dstpos < dsize) dst[hdlc->dstpos++] = hdlc->shift_reg; - }else { -// frame too long +else { +/* frame too long */ status = -HDLC_LENGTH_ERROR ; hdlc->dstpos =0 ; }
@@ -296,24 +321,18 @@ int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->bit_shift--;break ;case HDLC_FAST_FLAG : -if (hdlc->cbin==hdlc->ffvalue){ +if (hdlc->cbin == hdlc->ffvalue) { hdlc->bit_shift =0 ;break ; }else { -if (hdlc->cbin ==0xff ){ +if (hdlc->cbin ==0xff ) { hdlc->state =HDLC_FAST_IDLE ; - hdlc->bit_shift=0 ; - }else if (hdlc->ffbit_shift==8 ){ + hdlc->bit_shift =0 ; + }else if (hdlc->ffbit_shift ==8 ) { hdlc->state =HDLC_GETFLAG_B7 ;break ; - }else { - hdlc->shift_reg = fast_abort[hdlc->ffbit_shift-1 ]; - hdlc->hdlc_bits1 = hdlc->ffbit_shift-2 ; -if (hdlc->hdlc_bits1<0 )hdlc->hdlc_bits1 =0 ; - hdlc->data_bits = hdlc->ffbit_shift-1 ; - hdlc->state =HDLC_GET_DATA ; - hdlc->data_received =0 ; - } + }else +handle_abort (hdlc); }break ;default :
@@ -323,7 +342,7 @@ int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, *count -= slen;return 0 ; } - +EXPORT_SYMBOL (isdnhdlc_decode);/* isdnhdlc_encode - encodes HDLC frames to a transparent bit stream.
@@ -343,12 +362,11 @@ int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src,dsize - destination buffer size returns - number of encoded bytes in the destination buffer */ -int isdnhdlc_encode (struct isdnhdlc_vars *hdlc,const unsigned char *src, -unsigned short slen,int *count, -unsigned char *dst,int dsize) +int isdnhdlc_encode (struct isdnhdlc_vars *hdlc,const u8 *src,u16 slen, +int *count,u8 *dst,int dsize) {static const unsigned char xfast_flag_value[] = { -0x7e ,0x3f ,0x9f ,0xcf ,0xe7 ,0xf3 ,0xf9 ,0xfc ,0x7e +0x7e ,0x3f ,0x9f ,0xcf ,0xe7 ,0xf3 ,0xf9 ,0xfc ,0x7e };int len =0 ;
@@ -356,31 +374,34 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, *count = slen;while (dsize >0 ) { -if (hdlc->bit_shift==0 ){ -if (slen && !hdlc->do_closing){ +if (hdlc->bit_shift ==0 ) { +if (slen && !hdlc->do_closing) { hdlc->shift_reg = *src++; slen--;if (slen ==0 ) - hdlc->do_closing =1 ;/* closing sequence, CRC + flag(s) */ +/* closing sequence, CRC + flag(s) */ + hdlc->do_closing =1 ; hdlc->bit_shift =8 ; }else { -if (hdlc->state ==HDLC_SEND_DATA ){ -if (hdlc->data_received){ +if (hdlc->state ==HDLC_SEND_DATA ) { +if (hdlc->data_received) { hdlc->state =HDLC_SEND_CRC1 ; hdlc->crc ^=0xffff ; hdlc->bit_shift =8 ; - hdlc->shift_reg = hdlc->crc &0xff ; - }else if (!hdlc->do_adapt56){ - hdlc->state =HDLC_SEND_FAST_FLAG ; - }else { - hdlc->state =HDLC_SENDFLAG_B0 ; - } + hdlc->shift_reg = + hdlc->crc &0xff ; + }else if (!hdlc->do_adapt56) + hdlc->state = +HDLC_SEND_FAST_FLAG ; +else + hdlc->state = +HDLC_SENDFLAG_B0 ; } } } -switch (hdlc->state){ +switch (hdlc->state) {case STOPPED :while (dsize--) *dst++ =0xff ;
@@ -388,14 +409,15 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,return dsize;case HDLC_SEND_FAST_FLAG : hdlc->do_closing =0 ; -if (slen ==0 ){ +if (slen ==0 ) { *dst++ = hdlc->ffvalue; len++; dsize--;break ; } -if (hdlc->bit_shift==8 ){ - hdlc->cbin = hdlc->ffvalue>>(8 -hdlc->data_bits); +if (hdlc->bit_shift ==8 ) { + hdlc->cbin = hdlc->ffvalue >> + (8 - hdlc->data_bits); hdlc->state =HDLC_SEND_DATA ; hdlc->crc =0xffff ; hdlc->hdlc_bits1 =0 ;
@@ -413,17 +435,17 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->cbin <<=1 ; hdlc->data_bits++; hdlc->cbin++; -if (++hdlc->hdlc_bits1 ==6 ) +if (++hdlc->hdlc_bits1 ==6 ) hdlc->state =HDLC_SENDFLAG_B7 ;break ;case HDLC_SENDFLAG_B7 : hdlc->cbin <<=1 ; hdlc->data_bits++; -if (slen ==0 ){ +if (slen ==0 ) { hdlc->state =HDLC_SENDFLAG_B0 ;break ; } -if (hdlc->bit_shift==8 ){ +if (hdlc->bit_shift ==8 ) { hdlc->state =HDLC_SEND_DATA ; hdlc->crc =0xffff ; hdlc->hdlc_bits1 =0 ;
@@ -432,7 +454,7 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,break ;case HDLC_SEND_FIRST_FLAG : hdlc->data_received =1 ; -if (hdlc->data_bits==8 ){ +if (hdlc->data_bits ==8 ) { hdlc->state =HDLC_SEND_DATA ; hdlc->crc =0xffff ; hdlc->hdlc_bits1 =0 ;
@@ -440,11 +462,11 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, } hdlc->cbin <<=1 ; hdlc->data_bits++; -if (hdlc->shift_reg &0x01 ) +if (hdlc->shift_reg &0x01 ) hdlc->cbin++; hdlc->shift_reg >>=1 ; hdlc->bit_shift--; -if (hdlc->bit_shift==0 ){ +if (hdlc->bit_shift ==0 ) { hdlc->state =HDLC_SEND_DATA ; hdlc->crc =0xffff ; hdlc->hdlc_bits1 =0 ;
@@ -453,14 +475,14 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,case HDLC_SEND_DATA : hdlc->cbin <<=1 ; hdlc->data_bits++; -if (hdlc->hdlc_bits1 ==5 ){ +if (hdlc->hdlc_bits1 ==5 ) { hdlc->hdlc_bits1 =0 ;break ; } -if (hdlc->bit_shift==8 ){ - hdlc->crc =crc_ccitt_byte (hdlc->crc, hdlc->shift_reg); - } -if (hdlc->shift_reg &0x01 ){ +if (hdlc->bit_shift ==8 ) + hdlc->crc =crc_ccitt_byte (hdlc->crc, + hdlc->shift_reg); +if (hdlc->shift_reg &0x01 ) { hdlc->hdlc_bits1++; hdlc->cbin++; hdlc->shift_reg >>=1 ;
@@ -474,11 +496,11 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,case HDLC_SEND_CRC1 : hdlc->cbin <<=1 ; hdlc->data_bits++; -if (hdlc->hdlc_bits1 ==5 ){ +if (hdlc->hdlc_bits1 ==5 ) { hdlc->hdlc_bits1 =0 ;break ; } -if (hdlc->shift_reg &0x01 ){ +if (hdlc->shift_reg &0x01 ) { hdlc->hdlc_bits1++; hdlc->cbin++; hdlc->shift_reg >>=1 ;
@@ -488,7 +510,7 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->shift_reg >>=1 ; hdlc->bit_shift--; } -if (hdlc->bit_shift==0 ){ +if (hdlc->bit_shift ==0 ) { hdlc->shift_reg = (hdlc->crc >>8 ); hdlc->state =HDLC_SEND_CRC2 ; hdlc->bit_shift =8 ;
@@ -497,11 +519,11 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,case HDLC_SEND_CRC2 : hdlc->cbin <<=1 ; hdlc->data_bits++; -if (hdlc->hdlc_bits1 ==5 ){ +if (hdlc->hdlc_bits1 ==5 ) { hdlc->hdlc_bits1 =0 ;break ; } -if (hdlc->shift_reg &0x01 ){ +if (hdlc->shift_reg &0x01 ) { hdlc->hdlc_bits1++; hdlc->cbin++; hdlc->shift_reg >>=1 ;
@@ -511,7 +533,7 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->shift_reg >>=1 ; hdlc->bit_shift--; } -if (hdlc->bit_shift==0 ){ +if (hdlc->bit_shift ==0 ) { hdlc->shift_reg =0x7e ; hdlc->state =HDLC_SEND_CLOSING_FLAG ; hdlc->bit_shift =8 ;
@@ -520,33 +542,36 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,case HDLC_SEND_CLOSING_FLAG : hdlc->cbin <<=1 ; hdlc->data_bits++; -if (hdlc->hdlc_bits1 ==5 ){ +if (hdlc->hdlc_bits1 ==5 ) { hdlc->hdlc_bits1 =0 ;break ; } -if (hdlc->shift_reg &0x01 ){ +if (hdlc->shift_reg &0x01 ) hdlc->cbin++; - } hdlc->shift_reg >>=1 ; hdlc->bit_shift--; -if (hdlc->bit_shift==0 ){ - hdlc->ffvalue = xfast_flag_value[hdlc->data_bits]; -if (hdlc->dchannel){ +if (hdlc->bit_shift ==0 ) { + hdlc->ffvalue = + xfast_flag_value[hdlc->data_bits]; +if (hdlc->dchannel) { hdlc->ffvalue =0x7e ; hdlc->state =HDLC_SEND_IDLE1 ; hdlc->bit_shift =8 -hdlc->data_bits; -if (hdlc->bit_shift==0 ) - hdlc->state =HDLC_SEND_FAST_IDLE ; +if (hdlc->bit_shift ==0 ) + hdlc->state = +HDLC_SEND_FAST_IDLE ; }else { -if (!hdlc->do_adapt56){ - hdlc->state =HDLC_SEND_FAST_FLAG ; +if (!hdlc->do_adapt56) { + hdlc->state = +HDLC_SEND_FAST_FLAG ; hdlc->data_received =0 ; }else { hdlc->state =HDLC_SENDFLAG_B0 ; hdlc->data_received =0 ; } -// Finished with this frame, send flags -if (dsize >1 ) dsize =1 ; +/* Finished this frame, send flags */ +if (dsize >1 ) + dsize =1 ; } }break ;
@@ -556,7 +581,7 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->cbin++; hdlc->data_bits++; hdlc->bit_shift--; -if (hdlc->bit_shift==0 ){ +if (hdlc->bit_shift ==0 ) { hdlc->state =HDLC_SEND_FAST_IDLE ; hdlc->bit_shift =0 ; }
@@ -565,12 +590,13 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, hdlc->do_closing =0 ; hdlc->cbin =0xff ; hdlc->data_bits =8 ; -if (hdlc->bit_shift ==8 ){ +if (hdlc->bit_shift ==8 ) { hdlc->cbin =0x7e ; hdlc->state =HDLC_SEND_FIRST_FLAG ; }else { *dst++ = hdlc->cbin; - hdlc->bit_shift = hdlc->data_bits =0 ; + hdlc->bit_shift =0 ; + hdlc->data_bits =0 ; len++; dsize =0 ; }
@@ -578,14 +604,14 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,default :break ; } -if (hdlc->do_adapt56){ -if (hdlc->data_bits==7 ){ +if (hdlc->do_adapt56) { +if (hdlc->data_bits ==7 ) { hdlc->cbin <<=1 ; hdlc->cbin++; hdlc->data_bits++; } } -if (hdlc->data_bits==8 ){ +if (hdlc->data_bits ==8 ) { *dst++ = hdlc->cbin; hdlc->data_bits =0 ; len++;
@@ -596,8 +622,4 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,return len; } - -EXPORT_SYMBOL (isdnhdlc_rcv_init); -EXPORT_SYMBOL (isdnhdlc_decode); -EXPORT_SYMBOL (isdnhdlc_out_init);EXPORT_SYMBOL (isdnhdlc_encode);
include/linux/isdn/hdlc.h +37 -31
98 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 3/13 ISDN: Add support for none reverse bitstreams to isdnhdc
In reply to Karsten KeilThe original isdnhdlc code was developed for devices which had reversed bitorder in the byte stream. Adding code to handle normal bitstreams as well.
--- drivers/isdn/hisax/st5481_b.c | 5 ++- drivers/isdn/hisax/st5481_d.c | 2 +- drivers/isdn/hisax/st5481_usb.c | 11 ++++-- drivers/isdn/i4l/isdnhdlc.c | 70 +++++++++++++++++++------------------- include/linux/isdn/hdlc.h | 12 +++++-- 5 files changed, 56 insertions(+), 44 deletions(-)
drivers/isdn/hisax/st5481_b.c +4 -1
@@ -218,7 +218,10 @@ static void st5481B_mode(struct st5481_bcs *bcs, int mode)if (bcs->mode !=L1_MODE_NULL ) {// Open the B channel if (bcs->mode !=L1_MODE_TRANS ) { -isdnhdlc_out_init (&b_out->hdlc_state,0 , bcs->mode ==L1_MODE_HDLC_56K ); +u32 features =HDLC_BITREVERSE ; +if (bcs->mode ==L1_MODE_HDLC_56K ) + features |=HDLC_56KBIT ; +isdnhdlc_out_init (&b_out->hdlc_state, features); }st5481_usb_pipe_reset (adapter, (bcs->channel+1 )*2 ,NULL ,NULL );
drivers/isdn/hisax/st5481_d.c +1 -1
@@ -417,7 +417,7 @@ static void dout_start_xmit(struct FsmInst *fsm, int event, void *arg)DBG (2 ,"len=%d" ,skb->len); -isdnhdlc_out_init (&d_out->hdlc_state,1 ,0 ); +isdnhdlc_out_init (&d_out->hdlc_state,HDLC_DCHANNEL |HDLC_BITREVERSE );if (test_and_set_bit (buf_nr, &d_out->busy)) {WARNING ("ep %d urb %d busy %#lx" ,EP_D_OUT , buf_nr, d_out->busy);
drivers/isdn/hisax/st5481_usb.c +7 -4
@@ -637,10 +637,13 @@ void st5481_in_mode(struct st5481_in *in, int mode)usb_unlink_urb (in->urb[1 ]);if (in->mode !=L1_MODE_NULL ) { -if (in->mode !=L1_MODE_TRANS ) -isdnhdlc_rcv_init (&in->hdlc_state, - in->mode ==L1_MODE_HDLC_56K ); - +if (in->mode !=L1_MODE_TRANS ) { +u32 features =HDLC_BITREVERSE ; + +if (in->mode ==L1_MODE_HDLC_56K ) + features |=HDLC_56KBIT ; +isdnhdlc_rcv_init (&in->hdlc_state, features); + }st5481_usb_pipe_reset (in->adapter, in->ep,NULL ,NULL ); st5481_usb_device_ctrl_msg(in->adapter, in->counter, in->packet_size,
drivers/isdn/i4l/isdnhdlc.c +35 -35
131 lines not on this page · raw message
include/linux/isdn/hdlc.h +9 -3
@@ -6,6 +6,7 @@* controllers. * * Copyright (C) +* 2009 Karsten Keil <[email protected]> * 2002 Wolfgang Mües <[email protected]> * 2001 Frode Isaksen <[email protected]> * 2001 Kai Germaschewski <[email protected]>
@@ -50,8 +51,14 @@ struct isdnhdlc_vars { u32 do_adapt56:1;/* set if in closing phase (need to send CRC + flag) */ u32 do_closing:1; +/* set if data is bitreverse */ + u32 do_bitreverse:1; }; +/* Feature Flags */ +#define HDLC_56KBIT 0x01 +#define HDLC_DCHANNEL 0x02 +#define HDLC_BITREVERSE 0x04/* The return value from isdnhdlc_decode is
@@ -62,13 +69,12 @@ struct isdnhdlc_vars {#define HDLC_CRC_ERROR 2#define HDLC_LENGTH_ERROR 3 -extern void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc,int do_adapt56); +extern void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc,u32 features);extern int isdnhdlc_decode (struct isdnhdlc_vars *hdlc,const u8 *src,int slen,int *count,u8 *dst,int dsize); -extern void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc,int is_d_channel, -int do_adapt56); +extern void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc,u32 features);extern int isdnhdlc_encode (struct isdnhdlc_vars *hdlc,const u8 *src,u16 slen,int *count,u8 *dst,int dsize);
Signature · 1 line
1.6.0.2
PATCH 4/13 ISDN: Fix isdnhdlc for one byte hdlc packets
In reply to Karsten KeilNormally HDLC packets contain more as one byte (e.g a X25/X75 header). But if you use plain HDLC framing, the current code do not encode 1 byte payloads, this patch fix that.
--- drivers/isdn/i4l/isdnhdlc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/isdn/i4l/isdnhdlc.c +6 -1
@@ -47,7 +47,7 @@ enum {HDLC_SEND_DATA ,HDLC_SEND_CRC1 ,HDLC_SEND_FAST_FLAG ,HDLC_SEND_FIRST_FLAG ,HDLC_SEND_CRC2 ,HDLC_SEND_CLOSING_FLAG ,HDLC_SEND_IDLE1 ,HDLC_SEND_FAST_IDLE ,HDLC_SENDFLAG_B0 , -HDLC_SENDFLAG_B1A6 ,HDLC_SENDFLAG_B7 ,STOPPED +HDLC_SENDFLAG_B1A6 ,HDLC_SENDFLAG_B7 ,STOPPED ,HDLC_SENDFLAG_ONE };void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc,u32 features)
@@ -362,6 +362,9 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, u16 slen, *count = slen; +/* special handling for one byte frames */ +if ((slen ==1 ) && (hdlc->state ==HDLC_SEND_FAST_FLAG )) + hdlc->state =HDLC_SENDFLAG_ONE ;while (dsize >0 ) {if (hdlc->bit_shift ==0 ) {if (slen && !hdlc->do_closing) {
@@ -407,6 +410,8 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, u16 slen, dsize--;break ; } +/* fall through */ +case HDLC_SENDFLAG_ONE :if (hdlc->bit_shift ==8 ) { hdlc->cbin = hdlc->ffvalue >> (8 - hdlc->data_bits);
Signature · 1 line
1.6.0.2
PATCH 5/13 mISDN: Make clearing B-channel a common function
In reply to Karsten KeilClearing B-channel is needed in every driver, so it makes sense to have it as common function.
--- drivers/isdn/hardware/mISDN/hfcmulti.c | 16 +--------------- drivers/isdn/hardware/mISDN/hfcpci.c | 16 +--------------- drivers/isdn/hardware/mISDN/hfcsusb.c | 16 +--------------- drivers/isdn/mISDN/hwchannel.c | 15 +++++++++++++-- include/linux/mISDNhw.h | 1 + 5 files changed, 17 insertions(+), 47 deletions(-)
drivers/isdn/hardware/mISDN/hfcmulti.c +1 -15
@@ -3416,22 +3416,8 @@ deactivate_bchannel(struct bchannel *bch)u_long flags;spin_lock_irqsave (&hc->lock, flags); -if (test_and_clear_bit (FLG_TX_NEXT , &bch->Flags)) { -dev_kfree_skb (bch->next_skb); - bch->next_skb =NULL ; - } -if (bch->tx_skb) { -dev_kfree_skb (bch->tx_skb); - bch->tx_skb =NULL ; - } - bch->tx_idx =0 ; -if (bch->rx_skb) { -dev_kfree_skb (bch->rx_skb); - bch->rx_skb =NULL ; - } +mISDN_clear_bchannel (bch); hc->chan[bch->slot].coeff_count =0 ; -test_and_clear_bit (FLG_ACTIVE , &bch->Flags); -test_and_clear_bit (FLG_TX_BUSY , &bch->Flags); hc->chan[bch->slot].rx_off =0 ; hc->chan[bch->slot].conf =-1 ;mode_hfcmulti (hc, bch->slot,ISDN_P_NONE ,-1 ,0 ,-1 ,0 );
drivers/isdn/hardware/mISDN/hfcpci.c +1 -15
@@ -1522,22 +1522,8 @@ deactivate_bchannel(struct bchannel *bch)u_long flags;spin_lock_irqsave (&hc->lock, flags); -if (test_and_clear_bit (FLG_TX_NEXT , &bch->Flags)) { -dev_kfree_skb (bch->next_skb); - bch->next_skb =NULL ; - } -if (bch->tx_skb) { -dev_kfree_skb (bch->tx_skb); - bch->tx_skb =NULL ; - } - bch->tx_idx =0 ; -if (bch->rx_skb) { -dev_kfree_skb (bch->rx_skb); - bch->rx_skb =NULL ; - } +mISDN_clear_bchannel (bch);mode_hfcpci (bch, bch->nr,ISDN_P_NONE ); -test_and_clear_bit (FLG_ACTIVE , &bch->Flags); -test_and_clear_bit (FLG_TX_BUSY , &bch->Flags);spin_unlock_irqrestore (&hc->lock, flags); }
drivers/isdn/hardware/mISDN/hfcsusb.c +1 -15
@@ -1809,21 +1809,7 @@ deactivate_bchannel(struct bchannel *bch) hw->name, __func__, bch->nr);spin_lock_irqsave (&hw->lock, flags); -if (test_and_clear_bit (FLG_TX_NEXT , &bch->Flags)) { -dev_kfree_skb (bch->next_skb); - bch->next_skb =NULL ; - } -if (bch->tx_skb) { -dev_kfree_skb (bch->tx_skb); - bch->tx_skb =NULL ; - } - bch->tx_idx =0 ; -if (bch->rx_skb) { -dev_kfree_skb (bch->rx_skb); - bch->rx_skb =NULL ; - } -clear_bit (FLG_ACTIVE , &bch->Flags); -clear_bit (FLG_TX_BUSY , &bch->Flags); +mISDN_clear_bchannel (bch);spin_unlock_irqrestore (&hw->lock, flags);hfcsusb_setup_bch (bch,ISDN_P_NONE );hfcsusb_stop_endpoint (hw, bch->nr);
drivers/isdn/mISDN/hwchannel.c +13 -2
@@ -114,13 +114,14 @@ mISDN_freedchannel(struct dchannel *ch) }EXPORT_SYMBOL (mISDN_freedchannel); -int -mISDN_freebchannel (struct bchannel *ch) +void +mISDN_clear_bchannel (struct bchannel *ch) {if (ch->tx_skb) {dev_kfree_skb (ch->tx_skb); ch->tx_skb =NULL ; } + ch->tx_idx =0 ;if (ch->rx_skb) {dev_kfree_skb (ch->rx_skb); ch->rx_skb =NULL ;
@@ -129,6 +130,16 @@ mISDN_freebchannel(struct bchannel *ch)dev_kfree_skb (ch->next_skb); ch->next_skb =NULL ; } +test_and_clear_bit (FLG_TX_BUSY , &ch->Flags); +test_and_clear_bit (FLG_TX_NEXT , &ch->Flags); +test_and_clear_bit (FLG_ACTIVE , &ch->Flags); +} +EXPORT_SYMBOL (mISDN_clear_bchannel); + +int +mISDN_freebchannel (struct bchannel *ch) +{ +mISDN_clear_bchannel (ch);skb_queue_purge (&ch->rqueue); ch->rcount =0 ;flush_scheduled_work ();
include/linux/mISDNhw.h +1 -0
@@ -168,6 +168,7 @@ struct bchannel {extern int mISDN_initdchannel (struct dchannel *,int ,void *);extern int mISDN_initbchannel (struct bchannel *,int );extern int mISDN_freedchannel (struct dchannel *); +extern void mISDN_clear_bchannel (struct bchannel *);extern int mISDN_freebchannel (struct bchannel *);extern void queue_ch_frame (struct mISDNchannel *,u_int ,int ,struct sk_buff *);
Signature · 1 line
1.6.0.2
PATCH 6/13 mISDN: Add driver for Infineon ISDN chipset family
In reply to Karsten KeilThis driver supports cards with Infineon ISAC/HSCX, ISACX, IPAC and IPACX chips from various manufacturers.
--- drivers/isdn/hardware/mISDN/Kconfig | 14 + drivers/isdn/hardware/mISDN/Makefile | 3 + drivers/isdn/hardware/mISDN/iohelper.h | 109 ++ drivers/isdn/hardware/mISDN/ipac.h | 405 +++++++ drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1178 +++++++++++++++++++ drivers/isdn/hardware/mISDN/mISDNipac.c | 1655 +++++++++++++++++++++++++++ 6 files changed, 3364 insertions(+), 0 deletions(-) create mode 100644 drivers/isdn/hardware/mISDN/iohelper.h create mode 100644 drivers/isdn/hardware/mISDN/ipac.h create mode 100644 drivers/isdn/hardware/mISDN/mISDNinfineon.c create mode 100644 drivers/isdn/hardware/mISDN/mISDNipac.c
drivers/isdn/hardware/mISDN/Kconfig +14 -0
@@ -39,3 +39,17 @@ config MISDN_HFCUSB Enable support for USB ISDN TAs with Cologne Chip AG's HFC-S USB ISDN Controller +config MISDN_INFINEON + tristate "Support for cards with Infineon chipset" + depends on MISDN + depends on PCI + select MISDN_IPAC + help + Enable support for cards with ISAC + HSCX, IPAC or IPAC-SX + chip from Infineon (former manufacturer Siemens). + + +config MISDN_IPAC + tristate + depends on MISDN +
drivers/isdn/hardware/mISDN/Makefile +3 -0
@@ -6,3 +6,6 @@ obj-$(CONFIG_MISDN_HFCPCI) += hfcpci.o obj-$(CONFIG_MISDN_HFCMULTI) += hfcmulti.o obj-$(CONFIG_MISDN_HFCUSB) += hfcsusb.o +obj-$(CONFIG_MISDN_INFINEON) += mISDNinfineon.o +# chip modules +obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o
drivers/isdn/hardware/mISDN/iohelper.h new file +109 -0
110 lines not on this page · raw message
drivers/isdn/hardware/mISDN/ipac.h new file +405 -0
405 lines not on this page · raw message
drivers/isdn/hardware/mISDN/mISDNinfineon.c new file +1178 -0
1,178 lines not on this page · raw message
drivers/isdn/hardware/mISDN/mISDNipac.c new file +1655 -0
1,284 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.6.0.2
Part of the diff is not shown here. View the raw message.
PATCH 7/13 mISDN: Driver for AVM Fritz!CARD PCI
In reply to Karsten KeilAdd mISDN driver for AVM FRITZ!CARD PCI (all versions).
--- drivers/isdn/hardware/mISDN/Kconfig | 8 + drivers/isdn/hardware/mISDN/Makefile | 1 + drivers/isdn/hardware/mISDN/avmfritz.c | 1152 ++++++++++++++++++++++++++++++++ 3 files changed, 1161 insertions(+), 0 deletions(-) create mode 100644 drivers/isdn/hardware/mISDN/avmfritz.c
drivers/isdn/hardware/mISDN/Kconfig +8 -0
@@ -39,6 +39,14 @@ config MISDN_HFCUSB Enable support for USB ISDN TAs with Cologne Chip AG's HFC-S USB ISDN Controller +config MISDN_AVMFRITZ + tristate "Support for AVM FRITZ!CARD PCI" + depends on MISDN + depends on PCI + select MISDN_IPAC + help + Enable support for AVMs FRITZ!CARD PCI cards + config MISDN_INFINEON tristate "Support for cards with Infineon chipset" depends on MISDN
drivers/isdn/hardware/mISDN/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_MISDN_HFCPCI) += hfcpci.o obj-$(CONFIG_MISDN_HFCMULTI) += hfcmulti.o obj-$(CONFIG_MISDN_HFCUSB) += hfcsusb.o +obj-$(CONFIG_MISDN_AVMFRITZ) += avmfritz.o obj-$(CONFIG_MISDN_INFINEON) += mISDNinfineon.o # chip modules obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o
drivers/isdn/hardware/mISDN/avmfritz.c new file +1152 -0
1,152 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 8/13 mISDN: Add support for Speedfax+ cards
In reply to Karsten KeilAdd support for the Siemens ISAR DSP chip and cards based on it, including analog modem protocols.
--- drivers/isdn/hardware/mISDN/Kconfig | 13 + drivers/isdn/hardware/mISDN/Makefile | 2 + drivers/isdn/hardware/mISDN/isar.h | 269 +++++ drivers/isdn/hardware/mISDN/mISDNisar.c | 1726 +++++++++++++++++++++++++++++++ drivers/isdn/hardware/mISDN/speedfax.c | 526 ++++++++++ include/linux/mISDNif.h | 16 +- 6 files changed, 2551 insertions(+), 1 deletions(-) create mode 100644 drivers/isdn/hardware/mISDN/isar.h create mode 100644 drivers/isdn/hardware/mISDN/mISDNisar.c create mode 100644 drivers/isdn/hardware/mISDN/speedfax.c
drivers/isdn/hardware/mISDN/Kconfig +13 -0
@@ -47,6 +47,15 @@ config MISDN_AVMFRITZ help Enable support for AVMs FRITZ!CARD PCI cards +config MISDN_SPEEDFAX + tristate "Support for Sedlbauer Speedfax+" + depends on MISDN + depends on PCI + select MISDN_IPAC + select MISDN_ISAR + help + Enable support for Sedlbauer Speedfax+. + config MISDN_INFINEON tristate "Support for cards with Infineon chipset" depends on MISDN
@@ -61,3 +70,7 @@ config MISDN_IPAC tristate depends on MISDN +config MISDN_ISAR + tristate + depends on MISDN +
drivers/isdn/hardware/mISDN/Makefile +2 -0
@@ -7,6 +7,8 @@ obj-$(CONFIG_MISDN_HFCPCI) += hfcpci.o obj-$(CONFIG_MISDN_HFCMULTI) += hfcmulti.o obj-$(CONFIG_MISDN_HFCUSB) += hfcsusb.o obj-$(CONFIG_MISDN_AVMFRITZ) += avmfritz.o +obj-$(CONFIG_MISDN_SPEEDFAX) += speedfax.o obj-$(CONFIG_MISDN_INFINEON) += mISDNinfineon.o # chip modules obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o +obj-$(CONFIG_MISDN_ISAR) += mISDNisar.o
drivers/isdn/hardware/mISDN/isar.h new file +269 -0
269 lines not on this page · raw message
drivers/isdn/hardware/mISDN/mISDNisar.c new file +1726 -0
1,726 lines not on this page · raw message
drivers/isdn/hardware/mISDN/speedfax.c new file +526 -0
526 lines not on this page · raw message
include/linux/mISDNif.h +15 -1
@@ -37,7 +37,7 @@*/ #define MISDN_MAJOR_VERSION 1#define MISDN_MINOR_VERSION 1 -#define MISDN_RELEASE 20 +#define MISDN_RELEASE 21/* primitives for information exchange * generell format
@@ -153,6 +153,18 @@#define HFC_VOL_CHANGE_RX 0x2602#define HFC_SPL_LOOP_ON 0x2603#define HFC_SPL_LOOP_OFF 0x2604 +/* for T30 FAX and analog modem */ +#define HW_MOD_FRM 0x4000 +#define HW_MOD_FRH 0x4001 +#define HW_MOD_FTM 0x4002 +#define HW_MOD_FTH 0x4003 +#define HW_MOD_FTS 0x4004 +#define HW_MOD_CONNECT 0x4010 +#define HW_MOD_OK 0x4011 +#define HW_MOD_NOCARR 0x4012 +#define HW_MOD_FCERROR 0x4013 +#define HW_MOD_READY 0x4014 +#define HW_MOD_LASTDATA 0x4015/* DSP_TONE_PATT_ON parameter */ #define TONE_OFF 0x0000
@@ -224,6 +236,8 @@#define ISDN_P_B_L2DTMF 0x24#define ISDN_P_B_L2DSP 0x25#define ISDN_P_B_L2DSPHDLC 0x26 +#define ISDN_P_B_T30_FAX 0x27 +#define ISDN_P_B_MODEM_ASYNC 0x28#define OPTION_L2_PMX 1#define OPTION_L2_PTP 2
Signature · 1 line
1.6.0.2
PATCH 9/13 mISDN: Add driver for Winbond cards
In reply to Karsten KeilAdd driver for Winbond W6692 based PCI cards.
--- drivers/isdn/hardware/mISDN/Kconfig | 7 + drivers/isdn/hardware/mISDN/Makefile | 1 + drivers/isdn/hardware/mISDN/w6692.c | 1440 ++++++++++++++++++++++++++++++++++ drivers/isdn/hardware/mISDN/w6692.h | 190 +++++ 4 files changed, 1638 insertions(+), 0 deletions(-) create mode 100644 drivers/isdn/hardware/mISDN/w6692.c create mode 100644 drivers/isdn/hardware/mISDN/w6692.h
drivers/isdn/hardware/mISDN/Kconfig +7 -0
@@ -65,6 +65,13 @@ config MISDN_INFINEON Enable support for cards with ISAC + HSCX, IPAC or IPAC-SX chip from Infineon (former manufacturer Siemens). +config MISDN_W6692 + tristate "Support for cards with Winbond 6692" + depends on MISDN + depends on PCI + help + Enable support for Winbond 6692 PCI chip based cards. + config MISDN_IPAC tristate
drivers/isdn/hardware/mISDN/Makefile +1 -0
@@ -9,6 +9,7 @@ obj-$(CONFIG_MISDN_HFCUSB) += hfcsusb.o obj-$(CONFIG_MISDN_AVMFRITZ) += avmfritz.o obj-$(CONFIG_MISDN_SPEEDFAX) += speedfax.o obj-$(CONFIG_MISDN_INFINEON) += mISDNinfineon.o +obj-$(CONFIG_MISDN_W6692) += w6692.o # chip modules obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o obj-$(CONFIG_MISDN_ISAR) += mISDNisar.o
drivers/isdn/hardware/mISDN/w6692.c new file +1440 -0
1,440 lines not on this page · raw message
drivers/isdn/hardware/mISDN/w6692.h new file +190 -0
190 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 10/13 mISDN: Add support for Traverse Technologies NETJet PCI cards
In reply to Karsten KeilAdd support for cards based on the Tiger 300 and Tiger 320 ISDN PCI chip.
Currently only the ISAC ISDN line interface is supported.
--- drivers/isdn/hardware/mISDN/Kconfig | 9 + drivers/isdn/hardware/mISDN/Makefile | 1 + drivers/isdn/hardware/mISDN/netjet.c | 1156 ++++++++++++++++++++++++++++++++++ drivers/isdn/hardware/mISDN/netjet.h | 58 ++ 4 files changed, 1224 insertions(+), 0 deletions(-) create mode 100644 drivers/isdn/hardware/mISDN/netjet.c create mode 100644 drivers/isdn/hardware/mISDN/netjet.h
drivers/isdn/hardware/mISDN/Kconfig +9 -0
@@ -72,6 +72,15 @@ config MISDN_W6692 help Enable support for Winbond 6692 PCI chip based cards. +config MISDN_NETJET + tristate "Support for NETJet cards" + depends on MISDN + depends on PCI + select MISDN_IPAC + select ISDN_HDLC + help + Enable support for Traverse Technologies NETJet PCI cards. + config MISDN_IPAC tristate
drivers/isdn/hardware/mISDN/Makefile +1 -0
@@ -10,6 +10,7 @@ obj-$(CONFIG_MISDN_AVMFRITZ) += avmfritz.o obj-$(CONFIG_MISDN_SPEEDFAX) += speedfax.o obj-$(CONFIG_MISDN_INFINEON) += mISDNinfineon.o obj-$(CONFIG_MISDN_W6692) += w6692.o +obj-$(CONFIG_MISDN_NETJET) += netjet.o # chip modules obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o obj-$(CONFIG_MISDN_ISAR) += mISDNisar.o
drivers/isdn/hardware/mISDN/netjet.c new file +1156 -0
1,156 lines not on this page · raw message
drivers/isdn/hardware/mISDN/netjet.h new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 11/13 drivers/isdn: Drop unnecessary NULL test
In reply to Karsten KeilFrom: Julia Lawall <[email protected]>
The result of container_of should not be NULL. In particular, in this case the argument to the enclosing function has passed though INIT_WORK, which dereferences it, implying that its container cannot be NULL.
A simplified version of the semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
identifier fn,work,x,fld;
type T;
expression E1,E2;
statement S;
@@
static fn(struct work_struct *work) {
... when != work = E1
x = container_of(work,T,fld)
... when != x = E2
- if (x == NULL) S
...
}
// </smpl>
--- drivers/isdn/hisax/amd7930_fn.c | 2 -- drivers/isdn/hisax/hfc_pci.c | 2 -- drivers/isdn/hisax/hfc_sx.c | 2 -- drivers/isdn/hisax/icc.c | 2 -- drivers/isdn/hisax/isac.c | 2 -- drivers/isdn/hisax/w6692.c | 2 -- 6 files changed, 0 insertions(+), 12 deletions(-)
drivers/isdn/hisax/amd7930_fn.c +0 -2
@@ -238,8 +238,6 @@ Amd7930_bh(struct work_struct *work) container_of(work, struct IsdnCardState, tqueue);struct PStack *stptr; -if (!cs) -return ;if (test_and_clear_bit (D_CLEARBUSY , &cs->event)) {if (cs->debug)debugl1 (cs,"Amd7930: bh, D-Channel Busy cleared" );
drivers/isdn/hisax/hfc_pci.c +0 -2
@@ -1506,8 +1506,6 @@ hfcpci_bh(struct work_struct *work)u_long flags;// struct PStack *stptr; -if (!cs) -return ;if (test_and_clear_bit (D_L1STATECHANGE , &cs->event)) {if (!cs->hw.hfcpci.nt_mode)switch (cs->dc.hfcpci.ph_state) {
drivers/isdn/hisax/hfc_sx.c +0 -2
@@ -1255,8 +1255,6 @@ hfcsx_bh(struct work_struct *work) container_of(work, struct IsdnCardState, tqueue);u_long flags; -if (!cs) -return ;if (test_and_clear_bit (D_L1STATECHANGE , &cs->event)) {if (!cs->hw.hfcsx.nt_mode)switch (cs->dc.hfcsx.ph_state) {
drivers/isdn/hisax/icc.c +0 -2
@@ -83,8 +83,6 @@ icc_bh(struct work_struct *work) container_of(work, struct IsdnCardState, tqueue);struct PStack *stptr; -if (!cs) -return ;if (test_and_clear_bit (D_CLEARBUSY , &cs->event)) {if (cs->debug)debugl1 (cs,"D-Channel Busy cleared" );
drivers/isdn/hisax/isac.c +0 -2
@@ -86,8 +86,6 @@ isac_bh(struct work_struct *work) container_of(work, struct IsdnCardState, tqueue);struct PStack *stptr; -if (!cs) -return ;if (test_and_clear_bit (D_CLEARBUSY , &cs->event)) {if (cs->debug)debugl1 (cs,"D-Channel Busy cleared" );
drivers/isdn/hisax/w6692.c +0 -2
@@ -105,8 +105,6 @@ W6692_bh(struct work_struct *work) container_of(work, struct IsdnCardState, tqueue);struct PStack *stptr; -if (!cs) -return ;if (test_and_clear_bit (D_CLEARBUSY , &cs->event)) {if (cs->debug)debugl1 (cs,"D-Channel Busy cleared" );
Signature · 1 line
1.6.0.2
PATCH 12/13 ISDN: ARRAY_SIZE changes
In reply to Karsten KeilThese changes were a direct result of using a semantic patch More information can be found at http://www.emn.fr/x-info/coccinelle/
Modified some of the changes to avoid the extra define.
--- drivers/isdn/act2000/capi.c | 3 +-- drivers/isdn/act2000/module.c | 31 +++++++++++++++---------------- drivers/isdn/hardware/eicon/message.c | 4 +--- drivers/isdn/hardware/eicon/os_4bri.c | 3 +-- drivers/isdn/hisax/callc.c | 4 +--- drivers/isdn/hisax/isdnl1.c | 12 +++--------- drivers/isdn/hisax/isdnl2.c | 4 +--- drivers/isdn/hisax/isdnl3.c | 4 +--- drivers/isdn/hisax/l3_1tr6.c | 20 ++++++-------------- drivers/isdn/hisax/l3dss1.c | 26 ++++++++------------------ drivers/isdn/hisax/l3ni1.c | 26 ++++++++------------------ drivers/isdn/hisax/q931.c | 24 ++++++++++++------------ drivers/isdn/hisax/tei.c | 4 +--- drivers/isdn/mISDN/layer2.c | 2 -- 14 files changed, 59 insertions(+), 108 deletions(-)
drivers/isdn/act2000/capi.c +1 -2
@@ -78,7 +78,6 @@ static actcapi_msgdsc valid_msg[] = {#endif {{ 0x00, 0x00}, NULL}, }; -#define num_valid_msg (sizeof(valid_msg)/sizeof(actcapi_msgdsc)) #define num_valid_imsg 27 /* MANUFACTURER_IND */ /*
@@ -1025,7 +1024,7 @@ actcapi_debug_msg(struct sk_buff *skb, int direction)#ifdef DEBUG_DUMP_SKB dump_skb (skb);#endif -for (i =0 ; i < num_valid_msg; i++) +for (i =0 ; i <ARRAY_SIZE (valid_msg); i++)if ((msg->hdr.cmd.cmd == valid_msg[i].cmd.cmd) && (msg->hdr.cmd.subcmd == valid_msg[i].cmd.subcmd)) { descr = valid_msg[i].description;
drivers/isdn/act2000/module.c +15 -16
@@ -23,7 +23,6 @@ static unsigned short act2000_isa_ports[] =0x0200 ,0x0240 ,0x0280 ,0x02c0 ,0x0300 ,0x0340 ,0x0380 , 0xcfe0, 0xcfa0, 0xcf60, 0xcf20, 0xcee0, 0xcea0, 0xce60, }; -#define ISA_NRPORTS (sizeof(act2000_isa_ports)/sizeof(unsigned short))static act2000_card *cards = (act2000_card *)NULL ;
@@ -686,21 +685,21 @@ act2000_addcard(int bus, int port, int irq, char *id)* This may result in more than one card detected. */ switch (bus) { -case ACT2000_BUS_ISA : -for (i =0 ; i <ISA_NRPORTS ; i++) -if (act2000_isa_detect (act2000_isa_ports[i])) { -printk (KERN_INFO -"act2000: Detected ISA card at port 0x%x\n" , - act2000_isa_ports[i]); -act2000_alloccard (bus, act2000_isa_ports[i], irq, id); - } -break ; -case ACT2000_BUS_MCA : -case ACT2000_BUS_PCMCIA : -default : -printk (KERN_WARNING -"act2000: addcard: Invalid BUS type %d\n" , - bus); +case ACT2000_BUS_ISA : +for (i =0 ; i <ARRAY_SIZE (act2000_isa_ports); i++) +if (act2000_isa_detect (act2000_isa_ports[i])) { +printk (KERN_INFO "act2000: Detected " +"ISA card at port 0x%x\n" , + act2000_isa_ports[i]); +act2000_alloccard (bus, + act2000_isa_ports[i], irq, id); + } +break ; +case ACT2000_BUS_MCA : +case ACT2000_BUS_PCMCIA : +default : +printk (KERN_WARNING +"act2000: addcard: Invalid BUS type %d\n" , bus); } }if (!cards)
drivers/isdn/hardware/eicon/message.c +1 -3
@@ -551,9 +551,7 @@ word api_put(APPL * appl, CAPI_MSG * msg)dbug (1 ,dprintf ("com=%x" ,msg->header.command));for (j=0 ;j<MAX_MSG_PARMS +1 ;j++) msg_parms[j].length =0 ; -for (i=0 , ret = _BAD_MSG; - i<(sizeof (ftable)/sizeof (struct _ftable )); - i++) { +for (i=0 , ret = _BAD_MSG; i <ARRAY_SIZE (ftable); i++) {if (ftable[i].command==msg->header.command) {/* break loop if the message is correct, otherwise continue scan */
drivers/isdn/hardware/eicon/os_4bri.c +1 -2
@@ -149,8 +149,7 @@ int diva_4bri_init_card(diva_os_xdi_adapter_t * a)diva_os_xdi_adapter_t *diva_current;diva_os_xdi_adapter_t *adapter_list[4 ];PISDN_ADAPTER Slave; -unsigned long bar_length[sizeof (_4bri_bar_length) / -sizeof (_4bri_bar_length[0 ])]; +unsigned long bar_length[ARRAY_SIZE (_4bri_bar_length)];int v2 =_4bri_is_rev_2_card (a->CardOrdinal);int tasks =_4bri_is_rev_2_bri_card (a->CardOrdinal) ?1 :MQ_INSTANCE_COUNT ;int factor = (tasks ==1 ) ?1 :2 ;
drivers/isdn/hisax/callc.c +1 -3
@@ -833,8 +833,6 @@ static struct FsmNode fnlist[] __initdata = };/* *INDENT-ON* */ -#define FNCOUNT (sizeof(fnlist)/sizeof(struct FsmNode)) -int __init CallcNew (void ) {
@@ -842,7 +840,7 @@ CallcNew(void) callcfsm.event_count =EVENT_COUNT ; callcfsm.strEvent = strEvent; callcfsm.strState = strState; -return FsmNew (&callcfsm, fnlist,FNCOUNT ); +return FsmNew (&callcfsm, fnlist,ARRAY_SIZE (fnlist)); }void
drivers/isdn/hisax/isdnl1.c +3 -9
@@ -647,8 +647,6 @@ static struct FsmNode L1SFnList[] __initdata = {ST_L1_F8, EV_TIMER_DEACT, l1_timer_deact}, }; -#define L1S_FN_COUNT (sizeof(L1SFnList)/sizeof(struct FsmNode)) -#ifdef HISAX_UINTERFACE static void l1_deact_req_u (struct FsmInst *fi,int event,void *arg)
@@ -706,8 +704,6 @@ static struct FsmNode L1UFnList[] __initdata = {ST_L1_RESET, EV_TIMER_DEACT, l1_timer_deact}, }; -#define L1U_FN_COUNT (sizeof(L1UFnList)/sizeof(struct FsmNode)) - #endif static void
@@ -754,8 +750,6 @@ static struct FsmNode L1BFnList[] __initdata = {ST_L1_WAIT_DEACT, EV_TIMER_DEACT, l1b_timer_deact}, }; -#define L1B_FN_COUNT (sizeof(L1BFnList)/sizeof(struct FsmNode)) -int __init Isdnl1New (void ) {
@@ -765,7 +759,7 @@ Isdnl1New(void) l1fsm_s.event_count =L1_EVENT_COUNT ; l1fsm_s.strEvent = strL1Event; l1fsm_s.strState = strL1SState; - retval =FsmNew (&l1fsm_s, L1SFnList,L1S_FN_COUNT ); + retval =FsmNew (&l1fsm_s, L1SFnList,ARRAY_SIZE (L1SFnList));if (retval)return retval;
@@ -773,7 +767,7 @@ Isdnl1New(void) l1fsm_b.event_count =L1_EVENT_COUNT ; l1fsm_b.strEvent = strL1Event; l1fsm_b.strState = strL1BState; - retval =FsmNew (&l1fsm_b, L1BFnList,L1B_FN_COUNT ); + retval =FsmNew (&l1fsm_b, L1BFnList,ARRAY_SIZE (L1BFnList));if (retval) {FsmFree (&l1fsm_s);return retval;
@@ -783,7 +777,7 @@ Isdnl1New(void) l1fsm_u.event_count =L1_EVENT_COUNT ; l1fsm_u.strEvent = strL1Event; l1fsm_u.strState = strL1UState; - retval =FsmNew (&l1fsm_u, L1UFnList,L1U_FN_COUNT ); + retval =FsmNew (&l1fsm_u, L1UFnList,ARRAY_SIZE (L1UFnList));if (retval) {FsmFree (&l1fsm_s);FsmFree (&l1fsm_b);
drivers/isdn/hisax/isdnl2.c +1 -3
@@ -1623,8 +1623,6 @@ static struct FsmNode L2FnList[] __initdata = {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da}, }; -#define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode)) -static void isdnl2_l1l2 (struct PStack *st,int pr,void *arg) {
@@ -1836,7 +1834,7 @@ Isdnl2New(void) l2fsm.event_count =L2_EVENT_COUNT ; l2fsm.strEvent = strL2Event; l2fsm.strState = strL2State; -return FsmNew (&l2fsm, L2FnList,L2_FN_COUNT ); +return FsmNew (&l2fsm, L2FnList,ARRAY_SIZE (L2FnList)); }void
drivers/isdn/hisax/isdnl3.c +1 -3
@@ -543,8 +543,6 @@ static struct FsmNode L3FnList[] __initdata = };/* *INDENT-ON* */ -#define L3_FN_COUNT (sizeof(L3FnList)/sizeof(struct FsmNode)) -void l3_msg (struct PStack *st,int pr,void *arg) {
@@ -587,7 +585,7 @@ Isdnl3New(void) l3fsm.event_count =L3_EVENT_COUNT ; l3fsm.strEvent = strL3Event; l3fsm.strState = strL3State; -return FsmNew (&l3fsm, L3FnList,L3_FN_COUNT ); +return FsmNew (&l3fsm, L3FnList,ARRAY_SIZE (L3FnList)); }void
drivers/isdn/hisax/l3_1tr6.c +6 -14
@@ -698,9 +698,6 @@ static struct stateentry downstl[] = CC_T308_2, l3_1tr6_t308_2}, }; -#define DOWNSTL_LEN \ - (sizeof(downstl) / sizeof(struct stateentry)) -static struct stateentry datastln1[] = { {SBIT (0 ),
@@ -735,9 +732,6 @@ static struct stateentry datastln1[] = MT_N1_REL_ACK, l3_1tr6_rel_ack} }; -#define DATASTLN1_LEN \ - (sizeof(datastln1) / sizeof(struct stateentry)) -static struct stateentry manstatelist[] = { {SBIT (2 ),
@@ -746,8 +740,6 @@ static struct stateentry manstatelist[] = DL_RELEASE | INDICATION, l3_1tr6_dl_release}, }; -#define MANSLLEN \ - (sizeof(manstatelist) / sizeof(struct stateentry))/* *INDENT-ON* */ static void
@@ -840,11 +832,11 @@ up1tr6(struct PStack *st, int pr, void *arg) mt =MT_N1_INVALID ; } } -for (i =0 ; i <DATASTLN1_LEN ; i++) +for (i =0 ; i <ARRAY_SIZE (datastln1); i++)if ((mt == datastln1[i].primitive) && ((1 << proc->state) & datastln1[i].state))break ; -if (i ==DATASTLN1_LEN ) { +if (i ==ARRAY_SIZE (datastln1)) {dev_kfree_skb (skb);if (st->l3.debug &L3_DEB_STATE ) { sprintf(tmp, "up1tr6%sstate %d mt %x unhandled",
@@ -892,11 +884,11 @@ down1tr6(struct PStack *st, int pr, void *arg) proc = arg; } -for (i =0 ; i <DOWNSTL_LEN ; i++) +for (i =0 ; i <ARRAY_SIZE (downstl); i++)if ((pr == downstl[i].primitive) && ((1 << proc->state) & downstl[i].state))break ; -if (i ==DOWNSTL_LEN ) { +if (i ==ARRAY_SIZE (downstl)) {if (st->l3.debug &L3_DEB_STATE ) {sprintf (tmp,"down1tr6 state %d prim %d unhandled" , proc->state, pr);
@@ -922,11 +914,11 @@ man1tr6(struct PStack *st, int pr, void *arg)printk (KERN_ERR "HiSax man1tr6 without proc pr=%04x\n" , pr);return ; } -for (i =0 ; i <MANSLLEN ; i++) +for (i =0 ; i <ARRAY_SIZE (manstatelist); i++)if ((pr == manstatelist[i].primitive) && ((1 << proc->state) & manstatelist[i].state))break ; -if (i ==MANSLLEN ) { +if (i ==ARRAY_SIZE (manstatelist)) {if (st->l3.debug &L3_DEB_STATE ) {l3_debug (st,"cr %d man1tr6 state %d prim %d unhandled" , proc->callref &0x7f , proc->state, pr);
drivers/isdn/hisax/l3dss1.c +8 -18
@@ -2820,9 +2820,6 @@ static struct stateentry downstatelist[] = CC_T309, l3dss1_dl_release}, }; -#define DOWNSLLEN \ - (sizeof(downstatelist) / sizeof(struct stateentry)) -static struct stateentry datastatelist[] = { {ALL_STATES ,
@@ -2875,9 +2872,6 @@ static struct stateentry datastatelist[] = MT_RESUME_REJECT, l3dss1_resume_rej}, }; -#define DATASLLEN \ - (sizeof(datastatelist) / sizeof(struct stateentry)) -static struct stateentry globalmes_list[] = { {ALL_STATES ,
@@ -2888,8 +2882,6 @@ static struct stateentry globalmes_list[] =MT_RESTART_ACKNOWLEDGE, l3dss1_restart_ack}, */ }; -#define GLOBALM_LEN \ - (sizeof(globalmes_list) / sizeof(struct stateentry))static struct stateentry manstatelist[] = {
@@ -2903,8 +2895,6 @@ static struct stateentry manstatelist[] = DL_RELEASE | INDICATION, l3dss1_dl_release}, }; -#define MANSLLEN \ - (sizeof(manstatelist) / sizeof(struct stateentry))/* *INDENT-ON* */
@@ -2918,11 +2908,11 @@ global_handler(struct PStack *st, int mt, struct sk_buff *skb)struct l3_process *proc = st->l3.global; proc->callref = skb->data[2 ];/* cr flag */ -for (i =0 ; i <GLOBALM_LEN ; i++) +for (i =0 ; i <ARRAY_SIZE (globalmes_list); i++)if ((mt == globalmes_list[i].primitive) && ((1 << proc->state) & globalmes_list[i].state))break ; -if (i ==GLOBALM_LEN ) { +if (i ==ARRAY_SIZE (globalmes_list)) {if (st->l3.debug &L3_DEB_STATE ) {l3_debug (st,"dss1 global state %d mt %x unhandled" , proc->state, mt);
@@ -3097,11 +3087,11 @@ dss1up(struct PStack *st, int pr, void *arg) }if ((p =findie (skb->data, skb->len,IE_DISPLAY ,0 )) !=NULL )l3dss1_deliver_display (proc, pr, p);/* Display IE included */ -for (i =0 ; i <DATASLLEN ; i++) +for (i =0 ; i <ARRAY_SIZE (datastatelist); i++)if ((mt == datastatelist[i].primitive) && ((1 << proc->state) & datastatelist[i].state))break ; -if (i ==DATASLLEN ) { +if (i ==ARRAY_SIZE (datastatelist)) {if (st->l3.debug &L3_DEB_STATE ) { l3_debug(st, "dss1up%sstate %d mt %#x unhandled", (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ",
@@ -3156,11 +3146,11 @@ dss1down(struct PStack *st, int pr, void *arg)return ; } -for (i =0 ; i <DOWNSLLEN ; i++) +for (i =0 ; i <ARRAY_SIZE (downstatelist); i++)if ((pr == downstatelist[i].primitive) && ((1 << proc->state) & downstatelist[i].state))break ; -if (i ==DOWNSLLEN ) { +if (i ==ARRAY_SIZE (downstatelist)) {if (st->l3.debug &L3_DEB_STATE ) {l3_debug (st,"dss1down state %d prim %#x unhandled" , proc->state, pr);
@@ -3184,11 +3174,11 @@ dss1man(struct PStack *st, int pr, void *arg)printk (KERN_ERR "HiSax dss1man without proc pr=%04x\n" , pr);return ; } -for (i =0 ; i <MANSLLEN ; i++) +for (i =0 ; i <ARRAY_SIZE (manstatelist); i++)if ((pr == manstatelist[i].primitive) && ((1 << proc->state) & manstatelist[i].state))break ; -if (i ==MANSLLEN ) { +if (i ==ARRAY_SIZE (manstatelist)) {if (st->l3.debug &L3_DEB_STATE ) {l3_debug (st,"cr %d dss1man state %d prim %#x unhandled" , proc->callref &0x7f , proc->state, pr);
drivers/isdn/hisax/l3ni1.c +8 -18
@@ -2755,9 +2755,6 @@ static struct stateentry downstatelist[] = CC_TSPID, l3ni1_spid_tout }, }; -#define DOWNSLLEN \ - (sizeof(downstatelist) / sizeof(struct stateentry)) -static struct stateentry datastatelist[] = { {ALL_STATES ,
@@ -2810,9 +2807,6 @@ static struct stateentry datastatelist[] = MT_RESUME_REJECT, l3ni1_resume_rej}, }; -#define DATASLLEN \ - (sizeof(datastatelist) / sizeof(struct stateentry)) -static struct stateentry globalmes_list[] = { {ALL_STATES ,
@@ -2825,8 +2819,6 @@ static struct stateentry globalmes_list[] = { SBIT( 0 ), MT_DL_ESTABLISHED, l3ni1_spid_send }, { SBIT( 20 ) | SBIT( 21 ) | SBIT( 22 ), MT_INFORMATION, l3ni1_spid_epid }, }; -#define GLOBALM_LEN \ - (sizeof(globalmes_list) / sizeof(struct stateentry))static struct stateentry manstatelist[] = {
@@ -2840,8 +2832,6 @@ static struct stateentry manstatelist[] = DL_RELEASE | INDICATION, l3ni1_dl_release}, }; -#define MANSLLEN \ - (sizeof(manstatelist) / sizeof(struct stateentry))/* *INDENT-ON* */
@@ -2858,11 +2848,11 @@ global_handler(struct PStack *st, int mt, struct sk_buff *skb) proc->callref = skb->data[2 ];/* cr flag */ else proc->callref = 0; -for (i =0 ; i <GLOBALM_LEN ; i++) +for (i =0 ; i <ARRAY_SIZE (globalmes_list); i++)if ((mt == globalmes_list[i].primitive) && ((1 << proc->state) & globalmes_list[i].state))break ; -if (i ==GLOBALM_LEN ) { +if (i ==ARRAY_SIZE (globalmes_list)) {if (st->l3.debug &L3_DEB_STATE ) {l3_debug (st,"ni1 global state %d mt %x unhandled" , proc->state, mt);
@@ -3049,11 +3039,11 @@ ni1up(struct PStack *st, int pr, void *arg) }if ((p =findie (skb->data, skb->len,IE_DISPLAY ,0 )) !=NULL )l3ni1_deliver_display (proc, pr, p);/* Display IE included */ -for (i =0 ; i <DATASLLEN ; i++) +for (i =0 ; i <ARRAY_SIZE (datastatelist); i++)if ((mt == datastatelist[i].primitive) && ((1 << proc->state) & datastatelist[i].state))break ; -if (i ==DATASLLEN ) { +if (i ==ARRAY_SIZE (datastatelist)) {if (st->l3.debug &L3_DEB_STATE ) { l3_debug(st, "ni1up%sstate %d mt %#x unhandled", (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ",
@@ -3108,11 +3098,11 @@ ni1down(struct PStack *st, int pr, void *arg)return ; } -for (i =0 ; i <DOWNSLLEN ; i++) +for (i =0 ; i <ARRAY_SIZE (downstatelist); i++)if ((pr == downstatelist[i].primitive) && ((1 << proc->state) & downstatelist[i].state))break ; -if (i ==DOWNSLLEN ) { +if (i ==ARRAY_SIZE (downstatelist)) {if (st->l3.debug &L3_DEB_STATE ) {l3_debug (st,"ni1down state %d prim %#x unhandled" , proc->state, pr);
@@ -3136,11 +3126,11 @@ ni1man(struct PStack *st, int pr, void *arg)printk (KERN_ERR "HiSax ni1man without proc pr=%04x\n" , pr);return ; } -for (i =0 ; i <MANSLLEN ; i++) +for (i =0 ; i <ARRAY_SIZE (manstatelist); i++)if ((pr == manstatelist[i].primitive) && ((1 << proc->state) & manstatelist[i].state))break ; -if (i ==MANSLLEN ) { +if (i ==ARRAY_SIZE (manstatelist)) {if (st->l3.debug &L3_DEB_STATE ) {l3_debug (st,"cr %d ni1man state %d prim %#x unhandled" , proc->callref &0x7f , proc->state, pr);
drivers/isdn/hisax/q931.c +12 -12
@@ -140,7 +140,7 @@ struct MessageType { } }; -#define MTSIZE sizeof(mtlist)/sizeof(struct MessageType) +#define MTSIZE ARRAY_SIZE(mtlist)static struct MessageType mt_n0[] =
@@ -157,7 +157,7 @@ struct MessageType mt_n0[] = {MT_N0_CLO_ACK, "CLOse ACKnowledge"} }; -#define MT_N0_LEN (sizeof(mt_n0) / sizeof(struct MessageType)) +#define MT_N0_LEN ARRAY_SIZE(mt_n0)static struct MessageType mt_n1[] =
@@ -194,7 +194,7 @@ struct MessageType mt_n1[] = {MT_N1_STAT, "STATus"} }; -#define MT_N1_LEN (sizeof(mt_n1) / sizeof(struct MessageType)) +#define MT_N1_LEN ARRAY_SIZE(mt_n1) static int
@@ -438,7 +438,7 @@ struct CauseValue { }, }; -#define CVSIZE sizeof(cvlist)/sizeof(struct CauseValue) +#define CVSIZE ARRAY_SIZE(cvlist)static int
@@ -516,7 +516,7 @@ struct MessageType cause_1tr6[] = {CAUSE_UserInfoDiscarded, "User Info Discarded"} }; -static int cause_1tr6_len = (sizeof (cause_1tr6) /sizeof (struct MessageType )); +static int cause_1tr6_len =ARRAY_SIZE (cause_1tr6);static int prcause_1tr6 (char *dest,u_char * p)
@@ -865,7 +865,7 @@ struct DTag { /* Display tags */ { 0x96, "Redirection name" }, { 0x9e, "Text" }, }; -#define DTAGSIZE sizeof(dtaglist)/sizeof(struct DTag) +#define DTAGSIZE ARRAY_SIZE(dtaglist)static int disptext_ni1 (char *dest,u_char * p)
@@ -1074,7 +1074,7 @@ struct InformationElement { }; -#define IESIZE sizeof(ielist)/sizeof(struct InformationElement) +#define IESIZE ARRAY_SIZE(ielist)static struct InformationElement ielist_ni1[] = {
@@ -1102,7 +1102,7 @@ struct InformationElement ielist_ni1[] = { }; -#define IESIZE_NI1 sizeof(ielist_ni1)/sizeof(struct InformationElement) +#define IESIZE_NI1 ARRAY_SIZE(ielist_ni1)static struct InformationElement ielist_ni1_cs5[] = {
@@ -1110,14 +1110,14 @@ struct InformationElement ielist_ni1_cs5[] = { { 0x2a, "Display text", disptext_ni1 }, }; -#define IESIZE_NI1_CS5 sizeof(ielist_ni1_cs5)/sizeof(struct InformationElement) +#define IESIZE_NI1_CS5 ARRAY_SIZE(ielist_ni1_cs5)static struct InformationElement ielist_ni1_cs6[] = { {0x7b ,"Call appearance" , general_ni1 }, }; -#define IESIZE_NI1_CS6 sizeof(ielist_ni1_cs6)/sizeof(struct InformationElement) +#define IESIZE_NI1_CS6 ARRAY_SIZE(ielist_ni1_cs6)static struct InformationElement we_0[] = {
@@ -1133,7 +1133,7 @@ static struct InformationElement we_0[] = {WE0_userInfo, "User Info", general} }; -#define WE_0_LEN (sizeof(we_0) / sizeof(struct InformationElement)) +#define WE_0_LEN ARRAY_SIZE(we_0)static struct InformationElement we_6[] = {
@@ -1145,7 +1145,7 @@ static struct InformationElement we_6[] = {WE6_statusCalled, "Status Called", general}, {WE6_addTransAttr, "Additional Transmission Attributes", general} }; -#define WE_6_LEN (sizeof(we_6) / sizeof(struct InformationElement)) +#define WE_6_LEN ARRAY_SIZE(we_6)int QuickHex (char *txt,u_char * p,int cnt)
drivers/isdn/hisax/tei.c +1 -3
@@ -447,8 +447,6 @@ static struct FsmNode TeiFnList[] __initdata = {ST_TEI_IDVERIFY, EV_CHKREQ, tei_id_chk_req}, }; -#define TEI_FN_COUNT (sizeof(TeiFnList)/sizeof(struct FsmNode)) -int __init TeiNew (void ) {
@@ -456,7 +454,7 @@ TeiNew(void) teifsm.event_count =TEI_EVENT_COUNT ; teifsm.strEvent = strTeiEvent; teifsm.strState = strTeiState; -return FsmNew (&teifsm, TeiFnList,TEI_FN_COUNT ); +return FsmNew (&teifsm, TeiFnList,ARRAY_SIZE (TeiFnList)); }void
drivers/isdn/mISDN/layer2.c +0 -2
@@ -1832,8 +1832,6 @@ static struct FsmNode L2FnList[] = {ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da}, }; -#define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode)) -static int ph_data_indication (struct layer2 *l2,struct mISDNhead *hh,struct sk_buff *skb) {
Signature · 1 line
1.6.0.2
PATCH 13/13 mISDN: hfcmulti display real PCI ids for not supported cards
In reply to Karsten KeilIn the PCI probe function struct pci_device_id points to the matched entry of the ID table, but for devices which are matched with PCI_ANY_ID sub IDs we want display the IDs of the device itself.
--- drivers/isdn/hardware/mISDN/hfcmulti.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/isdn/hardware/mISDN/hfcmulti.c +4 -3
@@ -5370,9 +5370,10 @@ hfcmulti_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ent->device == PCI_DEVICE_ID_CCD_HFC8S || ent->device == PCI_DEVICE_ID_CCD_HFCE1)) {printk (KERN_ERR -"Unknown HFC multiport controller (vendor:%x device:%x " -"subvendor:%x subdevice:%x)\n" , ent->vendor, ent->device, - ent->subvendor, ent->subdevice); +"Unknown HFC multiport controller (vendor:%04x device:%04x " +"subvendor:%04x subdevice:%04x)\n" , pdev->vendor, + pdev->device, pdev->subsystem_vendor, + pdev->subsystem_device);printk (KERN_ERR "Please contact the driver maintainer for support.\n" );return -ENODEV ;
Signature · 1 line
1.6.0.2
David Miller
maintainerFrom: Karsten Keil <[email protected]>
Date: Sat, 25 Jul 2009 20:34:56 +0200
Quoted 3 lines
This is the collection of ISDN patches for net-next, you can pull them from
git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6-net-nextfor_david
Pulled, thanks a lot Karsten!