staging: gpib: Add init response codes for new ni-usb-hs+
PATCH 1/1 staging: gpib: Add init response codes for new ni-usb-hs+
A new version of a bona fide genuine NI-USB-HS+ adaptor sends new response codes to the initialization sequence.
Add the checking for these response codes to suppress console warning messages.
Signed-off-by Dave Penkler <[email protected]>
--- drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/gpib/ni_usb/ni_usb_gpib.c +7 -7
@@ -2079,10 +2079,10 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv) }if (buffer[++j] !=0x0 ) {// [6] ready =1 ; -// NI-USB-HS+ sends 0xf here +// NI-USB-HS+ sends 0xf or 0x19 here if (buffer[j] !=0x2 && buffer[j] !=0xe && buffer[j] !=0xf && - buffer[j] !=0x16 ) { -dev_err (&usb_dev->dev,"unexpected data: buffer[%i]=0x%x, expected 0x2, 0xe, 0xf or 0x16\n" , + buffer[j] !=0x16 && buffer[j] !=0x19 ) { +dev_err (&usb_dev->dev,"unexpected data: buffer[%i]=0x%x, expected 0x2, 0xe, 0xf, 0x16 or 0x19\n" , j, (int )buffer[j]); unexpected =1 ; }
@@ -2110,11 +2110,11 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv) j, (int)buffer[j]); unexpected =1 ; } -if (buffer[++j] !=0x0 ) { +if (buffer[++j] !=0x0 ) {// [10] MC usb-488 sends 0x7 here, new HS+ sends 0x59 ready =1 ; -if (buffer[j] !=0x96 && buffer[j] !=0x7 && buffer[j] !=0x6e ) { -// [10] MC usb-488 sends 0x7 here -dev_err (&usb_dev->dev,"unexpected data: buffer[%i]=0x%x, expected 0x96, 0x07 or 0x6e\n" , +if (buffer[j] !=0x96 && buffer[j] !=0x7 && buffer[j] !=0x6e && + buffer[j] !=0x59 ) { +dev_err (&usb_dev->dev,"unexpected data: buffer[%i]=0x%x, expected 0x96, 0x07, 0x6e or 0x59\n" , j, (int )buffer[j]); unexpected =1 ; }
Signature · 1 line
2.50.1