Fix ST 5481 USB driver
PATCH 1/2 Fix ST 5481 USB driver
Subject: [PATCH 1/2] Fix ST 5481 USB driver
The old driver was not fully adapted to new USB ABI and does not work.
Signed-off-by Karsten Keil <[email protected]>
---
drivers/isdn/hisax/st5481.h | 4 +- drivers/isdn/hisax/st5481_b.c | 22 ++++++++---- drivers/isdn/hisax/st5481_d.c | 26 ++++++++------ drivers/isdn/hisax/st5481_init.c | 4 +- drivers/isdn/hisax/st5481_usb.c | 70 +++++++++++++++++++++++--------------- 5 files changed, 76 insertions(+), 50 deletions(-)
0677b284b827fbac20961037982f2a6459a827a8
drivers/isdn/hisax/st5481.h +2 -2
@@ -466,10 +466,10 @@ void st5481_stop(struct st5481_adapter *#define __debug_variable st5481_debug#include "hisax_debug.h" -#ifdef CONFIG_HISAX_DEBUG -extern int st5481_debug; +#ifdef CONFIG_HISAX_DEBUG +#define DBG_ISO_PACKET (level,urb) \ if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb)
drivers/isdn/hisax/st5481_b.c +14 -8
@@ -172,14 +172,18 @@ static void usb_b_out_complete(struct urtest_and_clear_bit (buf_nr, &b_out->busy);if (unlikely (urb->status <0 )) { -if (urb->status != -ENOENT && urb->status != -ESHUTDOWN ) { -WARN ("urb status %d" ,urb->status); -if (b_out->busy ==0 ) { -st5481_usb_pipe_reset (adapter, (bcs->channel+1 )*2 |USB_DIR_OUT ,NULL ,NULL ); - } - }else { -DBG (1 ,"urb killed" ); -return ;// Give up +switch (urb->status) { +case -ENOENT : +case -ESHUTDOWN : +case -ECONNRESET : +DBG (4 ,"urb killed status %d" , urb->status); +return ;// Give up +default : +WARN ("urb status %d" ,urb->status); +if (b_out->busy ==0 ) { +st5481_usb_pipe_reset (adapter, (bcs->channel+1 )*2 |USB_DIR_OUT ,NULL ,NULL ); + } +break ; } }
@@ -205,7 +209,9 @@ static void st5481B_mode(struct st5481_b bcs->mode = mode;// Cancel all USB transfers on this B channel + b_out->urb[0 ]->transfer_flags |=URB_ASYNC_UNLINK ;usb_unlink_urb (b_out->urb[0 ]); + b_out->urb[1 ]->transfer_flags |=URB_ASYNC_UNLINK ;usb_unlink_urb (b_out->urb[1 ]); b_out->busy =0 ;
drivers/isdn/hisax/st5481_d.c +15 -11
@@ -382,16 +382,20 @@ static void usb_d_out_complete(struct urtest_and_clear_bit (buf_nr, &d_out->busy);if (unlikely (urb->status <0 )) { -if (urb->status != -ENOENT && urb->status != -ESHUTDOWN ) { -WARN ("urb status %d" ,urb->status); -if (d_out->busy ==0 ) { -st5481_usb_pipe_reset (adapter,EP_D_OUT |USB_DIR_OUT , fifo_reseted, adapter); - } -return ; - }else { -DBG (1 ,"urb killed" ); -return ;// Give up +switch (urb->status) { +case -ENOENT : +case -ESHUTDOWN : +case -ECONNRESET : +DBG (1 ,"urb killed status %d" , urb->status); +break ; +default : +WARN ("urb status %d" ,urb->status); +if (d_out->busy ==0 ) { +st5481_usb_pipe_reset (adapter,EP_D_OUT |USB_DIR_OUT , fifo_reseted, adapter); + } +break ; } +return ;// Give up }FsmEvent (&adapter->d_out.fsm,EV_DOUT_COMPLETE , (void *) buf_nr);
@@ -709,14 +713,14 @@ int st5481_setup_d(struct st5481_adapter adapter->l1m.fsm = &l1fsm; adapter->l1m.state =ST_L1_F3 ; - adapter->l1m.debug =1 ; + adapter->l1m.debug = st5481_debug &0x100 ; adapter->l1m.userdata = adapter; adapter->l1m.printdebug = l1m_debug;FsmInitTimer (&adapter->l1m, &adapter->timer); adapter->d_out.fsm.fsm = &dout_fsm; adapter->d_out.fsm.state =ST_DOUT_NONE ; - adapter->d_out.fsm.debug =1 ; + adapter->d_out.fsm.debug = st5481_debug &0x100 ; adapter->d_out.fsm.userdata = adapter; adapter->d_out.fsm.printdebug = dout_debug;
drivers/isdn/hisax/st5481_init.c +2 -2
@@ -43,10 +43,10 @@ static int number_of_leds = 2; /*module_param (number_of_leds, int,0 );#ifdef CONFIG_HISAX_DEBUG -static int debug =0x1 ; +static int debug =0 ;module_param (debug, int,0 ); -int st5481_debug;#endif +int st5481_debug;static LIST_HEAD (adapter_list);
drivers/isdn/hisax/st5481_usb.c +43 -27
139 lines not on this page · raw message
Signature · 3 lines
Karsten Keil SuSE Labs ISDN development