Skip to content

Commit

Permalink
staging: tidspbridge: overwrite DSP error codes
Browse files Browse the repository at this point in the history
When calling the DSP's remote functions, the DSP returns error
codes different from the ones managed by the kernel, the
function's return value is shared with the MPU using a shared
structure. This patch overwrites those error codes by kernel
specifics and deletes unnecessary code.

Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
  • Loading branch information
Sapiens, Rene authored and Omar Ramirez Luna committed Feb 5, 2011
1 parent 4097c49 commit 98d0ba8
Showing 1 changed file with 8 additions and 36 deletions.
44 changes: 8 additions & 36 deletions drivers/staging/tidspbridge/rmgr/disp.c
Original file line number Diff line number Diff line change
Expand Up @@ -460,17 +460,6 @@ int disp_node_create(struct disp_object *disp_obj,
DBC_ASSERT(ul_bytes < (RMS_COMMANDBUFSIZE * sizeof(rms_word)));
status = send_message(disp_obj, node_get_timeout(hnode),
ul_bytes, node_env);
if (status >= 0) {
/*
* Message successfully received from RMS.
* Return the status of the Node's create function
* on the DSP-side
*/
status = (((rms_word *) (disp_obj->pbuf))[0]);
if (status < 0)
dev_dbg(bridge, "%s: DSP-side failed: 0x%x\n",
__func__, status);
}
}
func_end:
return status;
Expand Down Expand Up @@ -513,18 +502,6 @@ int disp_node_delete(struct disp_object *disp_obj,
status = send_message(disp_obj, node_get_timeout(hnode),
sizeof(struct rms_command),
&dw_arg);
if (status >= 0) {
/*
* Message successfully received from RMS.
* Return the status of the Node's delete
* function on the DSP-side
*/
status = (((rms_word *) (disp_obj->pbuf))[0]);
if (status < 0)
dev_dbg(bridge, "%s: DSP-side failed: "
"0x%x\n", __func__, status);
}

}
}
return status;
Expand Down Expand Up @@ -566,18 +543,6 @@ int disp_node_run(struct disp_object *disp_obj,
status = send_message(disp_obj, node_get_timeout(hnode),
sizeof(struct rms_command),
&dw_arg);
if (status >= 0) {
/*
* Message successfully received from RMS.
* Return the status of the Node's execute
* function on the DSP-side
*/
status = (((rms_word *) (disp_obj->pbuf))[0]);
if (status < 0)
dev_dbg(bridge, "%s: DSP-side failed: "
"0x%x\n", __func__, status);
}

}
}

Expand Down Expand Up @@ -739,7 +704,14 @@ static int send_message(struct disp_object *disp_obj, u32 timeout,
} else {
if (CHNL_IS_IO_COMPLETE(chnl_ioc_obj)) {
DBC_ASSERT(chnl_ioc_obj.pbuf == pbuf);
status = (*((rms_word *) chnl_ioc_obj.pbuf));
if (*((int *)chnl_ioc_obj.pbuf) < 0) {
/* Translate DSP's to kernel error */
status = -EREMOTEIO;
dev_dbg(bridge, "%s: DSP-side failed:"
" DSP errcode = 0x%x, Kernel "
"errcode = %d\n", __func__,
*(int *)pbuf, status);
}
*pdw_arg =
(((rms_word *) (chnl_ioc_obj.pbuf))[1]);
} else {
Expand Down

0 comments on commit 98d0ba8

Please sign in to comment.