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

Commit 2093586d authored by Dirk Brandewie's avatar Dirk Brandewie Committed by Inaky Perez-Gonzalez
Browse files

wimax/i2400m: USB driver uses a configurable endpoint map 



Newer generations of the i2400m USB WiMAX device use a different
endpoint map; in order to make it easy to support it, we make the
endpoint-to-function mapeable instead of static.

Signed-off-by: default avatarDirk Brandewie <dirk.j.brandewie@intel.com>
Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
parent 8bec9a5e

drivers/net/wimax/i2400m/i2400m-usb.h

+8 −6
Original line number Diff line number Diff line
@@ -88,6 +88,13 @@ struct edc { 
	u16 errorcount;

};



struct i2400m_endpoint_cfg {

	unsigned char bulk_out;

	unsigned char notification;

	unsigned char reset_cold;

	unsigned char bulk_in;

};



static inline void edc_init(struct edc *edc)

{

	edc->timestart = jiffies;
@@ -141,12 +148,6 @@ enum { 
	I2400MU_MAX_NOTIFICATION_LEN = 256,

	I2400MU_BLK_SIZE = 16,

	I2400MU_PL_SIZE_MAX = 0x3EFF,



	/* Endpoints */

	I2400MU_EP_BULK_OUT = 0,

	I2400MU_EP_NOTIFICATION,

	I2400MU_EP_RESET_COLD,

	I2400MU_EP_BULK_IN,

};
@@ -216,6 +217,7 @@ struct i2400mu { 
	struct usb_device *usb_dev;

	struct usb_interface *usb_iface;

	struct edc urb_edc;		/* Error density counter */

	struct i2400m_endpoint_cfg endpoint_cfg;



	struct urb *notif_urb;

	struct task_struct *tx_kthread;

drivers/net/wimax/i2400m/usb-fw.c

+3 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ ssize_t i2400mu_tx_bulk_out(struct i2400mu *i2400mu, void *buf, size_t buf_size) 
		dev_err(dev, "BM-CMD: can't get autopm: %d\n", result);

		do_autopm = 0;

	}

	epd = usb_get_epd(i2400mu->usb_iface, I2400MU_EP_BULK_OUT);

	epd = usb_get_epd(i2400mu->usb_iface, i2400mu->endpoint_cfg.bulk_out);

	pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

retry:

	result = usb_bulk_msg(i2400mu->usb_dev, pipe, buf, buf_size, &len, HZ);
@@ -226,7 +226,8 @@ int i2400mu_notif_submit(struct i2400mu *i2400mu, struct urb *urb, 
	struct usb_endpoint_descriptor *epd;

	int pipe;



	epd = usb_get_epd(i2400mu->usb_iface, I2400MU_EP_NOTIFICATION);

	epd = usb_get_epd(i2400mu->usb_iface,

			  i2400mu->endpoint_cfg.notification);

	pipe = usb_rcvintpipe(i2400mu->usb_dev, epd->bEndpointAddress);

	usb_fill_int_urb(urb, i2400mu->usb_dev, pipe,

			 i2400m->bm_ack_buf, I2400M_BM_ACK_BUF_SIZE,

drivers/net/wimax/i2400m/usb-notif.c

+2 −1
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ int i2400mu_notification_setup(struct i2400mu *i2400mu) 
		dev_err(dev, "notification: cannot allocate URB\n");

		goto error_alloc_urb;

	}

	epd = usb_get_epd(i2400mu->usb_iface, I2400MU_EP_NOTIFICATION);

	epd = usb_get_epd(i2400mu->usb_iface,

			  i2400mu->endpoint_cfg.notification);

	usb_pipe = usb_rcvintpipe(i2400mu->usb_dev, epd->bEndpointAddress);

	usb_fill_int_urb(i2400mu->notif_urb, i2400mu->usb_dev, usb_pipe,

			 buf, I2400MU_MAX_NOTIFICATION_LEN,

drivers/net/wimax/i2400m/usb-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ struct sk_buff *i2400mu_rx(struct i2400mu *i2400mu, struct sk_buff *rx_skb) 
		dev_err(dev, "RX: can't get autopm: %d\n", result);

		do_autopm = 0;

	}

	epd = usb_get_epd(i2400mu->usb_iface, I2400MU_EP_BULK_IN);

	epd = usb_get_epd(i2400mu->usb_iface, i2400mu->endpoint_cfg.bulk_in);

	usb_pipe = usb_rcvbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

retry:

	rx_size = skb_end_pointer(rx_skb) - rx_skb->data - rx_skb->len;

drivers/net/wimax/i2400m/usb-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int i2400mu_tx(struct i2400mu *i2400mu, struct i2400m_msg_hdr *tx_msg, 
		dev_err(dev, "TX: can't get autopm: %d\n", result);

		do_autopm = 0;

	}

	epd = usb_get_epd(i2400mu->usb_iface, I2400MU_EP_BULK_OUT);

	epd = usb_get_epd(i2400mu->usb_iface, i2400mu->endpoint_cfg.bulk_out);

	usb_pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

retry:

	result = usb_bulk_msg(i2400mu->usb_dev, usb_pipe,