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

Commit ef8bedb9 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Felipe Balbi
Browse files

usb: gadget: renesas_usbhs: move usbhs_usbreq_get/set_val() to common.c 



usbhs_usbreq_get/set_val() functions were in pipe.c file,
but it is irrelevant to pipe.
this patch move it to common.c

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 356db7ed

drivers/usb/renesas_usbhs/common.c

+26 −0
Original line number Diff line number Diff line
@@ -146,6 +146,32 @@ int usbhs_frame_get_num(struct usbhs_priv *priv) 
	return usbhs_read(priv, FRMNUM) & FRNM_MASK;

}



/*

 *		usb request functions

 */

void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req)

{

	u16 val;



	val = usbhs_read(priv, USBREQ);

	req->bRequest		= (val >> 8) & 0xFF;

	req->bRequestType	= (val >> 0) & 0xFF;



	req->wValue	= usbhs_read(priv, USBVAL);

	req->wIndex	= usbhs_read(priv, USBINDX);

	req->wLength	= usbhs_read(priv, USBLENG);

}



void usbhs_usbreq_set_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req)

{

	usbhs_write(priv, USBREQ,  (req->bRequest << 8) | req->bRequestType);

	usbhs_write(priv, USBVAL,  req->wValue);

	usbhs_write(priv, USBINDX, req->wIndex);

	usbhs_write(priv, USBLENG, req->wLength);



	usbhs_bset(priv, DCPCTR, SUREQ, SUREQ);

}



/*

 *		bus/vbus functions

 */

drivers/usb/renesas_usbhs/common.h

+7 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ struct usbhs_priv; 
/* PIPEnCTR */

/* DCPCTR */

#define BSTS		(1 << 15)	/* Buffer Status */

#define SUREQ		(1 << 14)	/* Sending SETUP Token */

#define CSSTS		(1 << 12)	/* CSSTS Status */

#define SQCLR		(1 << 8)	/* Toggle Bit Clear */

#define	ACLRM		(1 << 9)	/* Buffer Auto-Clear Mode */
@@ -259,6 +260,12 @@ void usbhs_sys_usb_ctrl(struct usbhs_priv *priv, int enable); 
void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable);

void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable);



/*

 * usb request

 */

void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req);

void usbhs_usbreq_set_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req);



/*

 * bus

 */

drivers/usb/renesas_usbhs/pipe.c

+0 −24
Original line number Diff line number Diff line
@@ -39,30 +39,6 @@ static char *usbhsp_pipe_name[] = { 
	[USB_ENDPOINT_XFER_ISOC]	= "ISO",

};



/*

 *		usb request functions

 */

void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req)

{

	u16 val;



	val = usbhs_read(priv, USBREQ);

	req->bRequest		= (val >> 8) & 0xFF;

	req->bRequestType	= (val >> 0) & 0xFF;



	req->wValue	= usbhs_read(priv, USBVAL);

	req->wIndex	= usbhs_read(priv, USBINDX);

	req->wLength	= usbhs_read(priv, USBLENG);

}



void usbhs_usbreq_set_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req)

{

	usbhs_write(priv, USBREQ,  (req->bRequest << 8) | req->bRequestType);

	usbhs_write(priv, USBVAL,  req->wValue);

	usbhs_write(priv, USBINDX, req->wIndex);

	usbhs_write(priv, USBLENG, req->wLength);

}



/*

 *		DCPCTR/PIPEnCTR functions

 */

drivers/usb/renesas_usbhs/pipe.h

+0 −6
Original line number Diff line number Diff line
@@ -70,12 +70,6 @@ struct usbhs_pipe_info { 
 */

#define usbhs_priv_to_pipeinfo(pr)	(&(pr)->pipe_info)



/*

 * usb request

 */

void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req);

void usbhs_usbreq_set_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req);



/*

 * pipe control

 */