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

Commit 2f8a467a authored by Li Jun's avatar Li Jun Committed by Greg Kroah-Hartman
Browse files

usb: otg-fsm: move 2 otg fsm timers definition to otg_fsm_timer 



B_DATA_PLS(data-line pulse time) and B_SSEND_SRP(session end to SRP init) are
also from OTG&EH 2.0 Specification and they are not chipidea specific.

Signed-off-by: default avatarLi Jun <jun.li@freescale.com>
Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 01ecd156

drivers/usb/chipidea/otg_fsm.c

+4 −4
Original line number Diff line number Diff line
@@ -206,13 +206,13 @@ static struct attribute_group inputs_attr_group = { 
/*

 * Add timer to active timer list

 */

static void ci_otg_add_timer(struct ci_hdrc *ci, enum ci_otg_fsm_timer_index t)

static void ci_otg_add_timer(struct ci_hdrc *ci, enum otg_fsm_timer t)

{

	struct ci_otg_fsm_timer *tmp_timer;

	struct ci_otg_fsm_timer *timer = ci->fsm_timer->timer_list[t];

	struct list_head *active_timers = &ci->fsm_timer->active_timers;



	if (t >= NUM_CI_OTG_FSM_TIMERS)

	if (t >= NUM_OTG_FSM_TIMERS)

		return;



	/*
@@ -239,14 +239,14 @@ static void ci_otg_add_timer(struct ci_hdrc *ci, enum ci_otg_fsm_timer_index t) 
/*

 * Remove timer from active timer list

 */

static void ci_otg_del_timer(struct ci_hdrc *ci, enum ci_otg_fsm_timer_index t)

static void ci_otg_del_timer(struct ci_hdrc *ci, enum otg_fsm_timer t)

{

	struct ci_otg_fsm_timer *tmp_timer, *del_tmp;

	struct ci_otg_fsm_timer *timer = ci->fsm_timer->timer_list[t];

	struct list_head *active_timers = &ci->fsm_timer->active_timers;

	int flag = 0;



	if (t >= NUM_CI_OTG_FSM_TIMERS)

	if (t >= NUM_OTG_FSM_TIMERS)

		return;



	list_for_each_entry_safe(tmp_timer, del_tmp, active_timers, list)

drivers/usb/chipidea/otg_fsm.h

+1 −12
Original line number Diff line number Diff line
@@ -62,17 +62,6 @@ 
/* SSEND time before SRP */

#define TB_SSEND_SRP         (1500)	/* minimum 1.5 sec, section:5.1.2 */



enum ci_otg_fsm_timer_index {

	/*

	 * CI specific timers, start from the end

	 * of standard and auxiliary OTG timers

	 */

	B_DATA_PLS = NUM_OTG_FSM_TIMERS,

	B_SSEND_SRP,



	NUM_CI_OTG_FSM_TIMERS,

};



struct ci_otg_fsm_timer {

	unsigned long expires;  /* Number of count increase to timeout */

	unsigned long count;    /* Tick counter */
@@ -82,7 +71,7 @@ struct ci_otg_fsm_timer { 
};



struct ci_otg_fsm_timer_list {

	struct ci_otg_fsm_timer *timer_list[NUM_CI_OTG_FSM_TIMERS];

	struct ci_otg_fsm_timer *timer_list[NUM_OTG_FSM_TIMERS];

	struct list_head active_timers;

};

include/linux/usb/otg-fsm.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ enum otg_fsm_timer { 
	B_SE0_SRP,

	B_SRP_FAIL,

	A_WAIT_ENUM,

	B_DATA_PLS,

	B_SSEND_SRP,



	NUM_OTG_FSM_TIMERS,

};