Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6c59c13 authored by Martin Bachem's avatar Martin Bachem Committed by Linus Torvalds
Browse files

hisax: update hfc_usb driver 



This fixes handling of USB ISO completion error -EXDEV and includes
several other changes to current CVS version at isdn4linux.de (changes
in debug flags, style of code remarks, etc)

Signed-off-by: default avatarMartin Bachem <info@colognechip.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 36ce1514

drivers/isdn/hisax/hfc_usb.c

+233 −370

File changed.

Preview size limit exceeded, changes collapsed.

drivers/isdn/hisax/hfc_usb.h

+55 −75
Original line number Diff line number Diff line 
/*

 * hfc_usb.h

 *

* $Id: hfc_usb.h,v 4.2 2005/04/07 15:27:17 martinb1 Exp $

 * $Id: hfc_usb.h,v 1.1.2.5 2007/08/20 14:36:03 mbachem Exp $

 */



#ifndef __HFC_USB_H__
@@ -10,12 +10,7 @@ 
#define DRIVER_AUTHOR   "Peter Sprenger (sprenger@moving-byters.de)"

#define DRIVER_DESC     "HFC-S USB based HiSAX ISDN driver"



#define VERBOSE_USB_DEBUG





/***********/

/* defines */

/***********/

#define HFC_CTRL_TIMEOUT	20	/* 5ms timeout writing/reading regs */

#define HFC_TIMER_T3		8000	/* timeout for l1 activation timer */

#define HFC_TIMER_T4		500	/* time for state change interval */
@@ -52,9 +47,8 @@ 


#define HFCUSB_CHIPID		0x40	/* ID value of HFC-S USB */



/******************/



/* fifo registers */

/******************/

#define HFCUSB_NUM_FIFOS	8	/* maximum number of fifos */

#define HFCUSB_B1_TX		0	/* index for B1 transmit bulk/int */

#define HFCUSB_B1_RX		1	/* index for B1 receive bulk/int */
@@ -77,49 +71,36 @@ 
#define ISOC_PACKETS_B	8

#define ISO_BUFFER_SIZE	128



// ISO send definitions

/* Fifo flow Control for TX ISO */

#define SINK_MAX	68

#define SINK_MIN	48

#define SINK_DMIN	12

#define SINK_DMAX	18

#define BITLINE_INF	(-64*8)





/**********/

/* macros */

/**********/

/* HFC-S USB register access by Control-URSs */

#define write_usb(a,b,c)usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),NULL,0,HFC_CTRL_TIMEOUT)

#define read_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_in_pipe,1,0xC0,0,(b),(c),1,HFC_CTRL_TIMEOUT)





/*******************/

/* Debugging Flags */

/*******************/

#define USB_DBG   1

#define ISDN_DBG  2





/* *********************/

/* USB related defines */

/***********************/

#define HFC_CTRL_BUFSIZE 32







/*************************************************/

/* entry and size of output/input control buffer */

/*************************************************/

typedef struct {

	__u8 hfc_reg;		/* register number */

	__u8 reg_val;		/* value to be written (or read) */

	int action;		/* data for action handler */

} ctrl_buft;



/* Debugging Flags */

#define HFCUSB_DBG_INIT		0x0001

#define HFCUSB_DBG_STATES	0x0002

#define HFCUSB_DBG_DCHANNEL	0x0080

#define HFCUSB_DBG_FIFO_ERR	0x4000

#define HFCUSB_DBG_VERBOSE_USB	0x8000



/********************/

/* URB error codes: */

/********************/

/* Used to represent a list of values and their respective symbolic names */

/*

 * URB error codes:

 * Used to represent a list of values and their respective symbolic names

 */

struct hfcusb_symbolic_list {

	const int num;

	const char *name;
@@ -134,20 +115,20 @@ static struct hfcusb_symbolic_list urb_errlist[] = { 
	{-ENXIO, "URB already queued"},

	{-EFBIG, "Too much ISO frames requested"},

	{-ENOSR, "Buffer error (overrun)"},

	{-EPIPE, "Specified endpoint is stalled"},

	{-EPIPE, "Specified endpoint is stalled (device not responding)"},

	{-EOVERFLOW, "Babble (bad cable?)"},

	{-EPROTO, "Bit-stuff error (bad cable?)"},

	{-EILSEQ, "CRC or missing token"},

	{-ETIME, "Device did not respond"},

	{-EILSEQ, "CRC/Timeout"},

	{-ETIMEDOUT, "NAK (device does not respond)"},

	{-ESHUTDOWN, "Device unplugged"},

	{-1, NULL}

};





/*****************************************************/

/* device dependant information to support different */

/* ISDN Ta's using the HFC-S USB chip                */

/*****************************************************/

/*

 * device dependant information to support different

 * ISDN Ta's using the HFC-S USB chip

 */



/* USB descriptor need to contain one of the following EndPoint combination: */

#define CNF_4INT3ISO	1	// 4 INT IN, 3 ISO OUT
@@ -161,9 +142,12 @@ static struct hfcusb_symbolic_list urb_errlist[] = { 
#define EP_BLK	4	// Bulk endpoint mandatory at this position

#define EP_INT	5	// Interrupt endpoint mandatory at this position



/* this array represents all endpoints possible in the HCF-USB the last

* 3 entries are the configuration number, the minimum interval for

* Interrupt endpoints & boolean if E-channel logging possible

/*

 * List of all supported endpoint configuration sets, used to find the

 * best matching endpoint configuration within a devices' USB descriptor.

 * We need at least 3 RX endpoints, and 3 TX endpoints, either

 * INT-in and ISO-out, or ISO-in and ISO-out)

 * with 4 RX endpoints even E-Channel logging is possible

 */

static int validconf[][19] = {

	// INT in, ISO out config
@@ -193,7 +177,6 @@ static char *conf_str[] = { 
};

#endif





typedef struct {

	int vendor;		// vendor id

	int prod_id;		// product id
@@ -220,8 +203,5 @@ typedef struct { 
#define LED_NORMAL   	0	// LEDs are normal

#define LED_INVERTED 	1	// LEDs are inverted



/* time in ms to perform a Flashing LED when B-Channel has traffic */

#define LED_TIME      250





#endif	// __HFC_USB_H__