scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-01 12:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

pd: vdm: remove replicated VDM code.

Browse Source 
Signed-off-by: Todd Broch <tbroch@chromium.org>

BRANCH=samus
BUG=chrome-os-partner:30645
TEST=manual,
Still see alternate mode entry and can use flash VDMS

Change-Id: Id7371960a20e7d26a15b3a40ca40aa03b6595956
Reviewed-on: https://chromium-review.googlesource.com/235681
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Commit-Queue: Todd Broch <tbroch@chromium.org>
Tested-by: Todd Broch <tbroch@chromium.org>
This commit is contained in:
Todd Broch
2014-12-13 15:02:39 -08:00
committed by chrome-internal-fetch
parent 89559b0d67
commit 97730b5be1
11 changed files with 34 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
board/dingdong/usb_pd_policy.c
View File

@@ -230,8 +230,8 @@ const struct svdm_response svdm_rsp = {
.exit_mode = &svdm_exit_mode,
};
static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
{
int rsize;
@@ -249,11 +249,3 @@ static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
return rsize;
}
int pd_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
{
if (PD_VDO_SVDM(payload[0]))
return pd_svdm(port, cnt, payload, rpayload);
else
return pd_custom_vdm(port, cnt, payload, rpayload);
}

6
board/firefly/usb_pd_policy.c
View File

@@ -128,3 +128,9 @@ void pd_new_contract(int port, int pr_role, int dr_role,
int partner_pr_swap, int partner_dr_swap)
{
}
int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
{
return 0;
}

12
board/fruitpie/usb_pd_policy.c
View File

@@ -122,8 +122,8 @@ const struct svdm_response svdm_rsp = {
.modes = NULL,
};
static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
{
int cmd = PD_VDO_CMD(payload[0]);
uint16_t dev_id = 0;
@@ -160,14 +160,6 @@ static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
return 0;
}
int pd_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
{
if (PD_VDO_SVDM(payload[0]))
return pd_svdm(port, cnt, payload, rpayload);
else
return pd_custom_vdm(port, cnt, payload, rpayload);
}
static int svdm_enter_dp_mode(int port, uint32_t mode_caps)
{
/* Only enter mode if device is DFP_D capable */

12
board/hoho/usb_pd_policy.c
View File

@@ -229,8 +229,8 @@ const struct svdm_response svdm_rsp = {
.exit_mode = &svdm_exit_mode,
};
static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
{
int rsize;
@@ -248,11 +248,3 @@ static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
return rsize;
}
int pd_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
{
if (PD_VDO_SVDM(payload[0]))
return pd_svdm(port, cnt, payload, rpayload);
else
return pd_custom_vdm(port, cnt, payload, rpayload);
}

5
board/plankton/usb_pd_policy.c
View File

@@ -141,3 +141,8 @@ void pd_new_contract(int port, int pr_role, int dr_role,
int partner_pr_swap, int partner_dr_swap)
{
}
int pd_custom_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
{
return 0;
}

6
board/ryu/usb_pd_policy.c
View File

@@ -113,3 +113,9 @@ void pd_execute_data_swap(int port, int data_role)
{
/* TODO: what do we need to do to change host controller data role? */
}
int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
{
return 0;
}

10
board/ryu_p1/usb_pd_policy.c
View File

@@ -116,7 +116,7 @@ void pd_execute_data_swap(int port, int data_role)
}
/* ----------------- Vendor Defined Messages ------------------ */
static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
{
int cmd = PD_VDO_CMD(payload[0]);
@@ -160,11 +160,3 @@ static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
return 0;
}
int pd_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
{
if (PD_VDO_SVDM(payload[0]))
return pd_svdm(port, cnt, payload, rpayload);
else
return pd_custom_vdm(port, cnt, payload, rpayload);
}

12
board/samus_pd/usb_pd_policy.c
View File

@@ -153,8 +153,8 @@ const struct svdm_response svdm_rsp = {
.modes = NULL,
};
static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
{
int cmd = PD_VDO_CMD(payload[0]);
uint16_t dev_id = 0;
@@ -204,14 +204,6 @@ static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
return 0;
}
int pd_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
{
if (PD_VDO_SVDM(payload[0]))
return pd_svdm(port, cnt, payload, rpayload);
else
return pd_custom_vdm(port, cnt, payload, rpayload);
}
static void svdm_safe_dp_mode(int port)
{
/* make DP interface safe until configure */

12
board/zinger/usb_pd_policy.c
View File

@@ -491,8 +491,8 @@ const struct svdm_response svdm_rsp = {
.exit_mode = &svdm_exit_mode,
};
static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
int pd_custom_vdm(int port, int cnt, uint32_t *payload,
uint32_t **rpayload)
{
int cmd = PD_VDO_CMD(payload[0]);
int rsize;
@@ -527,11 +527,3 @@ static int pd_custom_vdm(int port, int cnt, uint32_t *payload,
return rsize;
}
int pd_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload)
{
if (PD_VDO_SVDM(payload[0]))
return pd_svdm(port, cnt, payload, rpayload);
else
return pd_custom_vdm(port, cnt, payload, rpayload);
}

6
common/usb_pd_protocol.c
View File

@@ -715,7 +715,11 @@ static void handle_vdm_request(int port, int cnt, uint32_t *payload)
CPRINTF("\n");
}
rlen = pd_vdm(port, cnt, payload, &rdata);
if (PD_VDO_SVDM(payload[0]))
rlen = pd_svdm(port, cnt, payload, &rdata);
else
rlen = pd_custom_vdm(port, cnt, payload, &rdata);
if (rlen > 0) {
queue_vdm(port, rdata, &rdata[1], rlen - 1);
return;

2
include/usb_pd.h
View File

@@ -842,7 +842,7 @@ void pd_get_info(uint32_t *info_data);
* @param rpayload pointer to the data to send back.
* @return if >0, number of VDOs to send back.
*/
int pd_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload);
int pd_custom_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload);
/**
* Handle Structured Vendor Defined Messages