Skip to content

L
linux
Commit 79848e9a authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files
Options

[media] staging: as102: Fix CodingStyle errors in file as10x_cmd_stream.c 

Fix Linux kernel coding style (whitespace and indentation) errors
in file as10x_cmd_stream.c. No functional changes.
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarPiotr Chmura <chmooreck@poczta.onet.pl>
Signed-off-by: default avatarSylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9cc08121
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 144 deletions
drivers/staging/media/as102/as10x_cmd_stream.c
View file @ 79848e9a
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
\file as10x_cmd_stream.c \file as10x_cmd_stream.c
\version $Id$
\author: S. Martinelli \author: S. Martinelli
----------------------------------------------------------------------------\n ----------------------------------------------------------------------------\n
...@@ -53,57 +51,57 @@ ...@@ -53,57 +51,57 @@
\return 0 when no error, < 0 in case of error. \return 0 when no error, < 0 in case of error.
\callgraph \callgraph
*/ */
int as10x_cmd_add_PID_filter(as10x_handle_t* phandle, int as10x_cmd_add_PID_filter(as10x_handle_t *phandle,
struct as10x_ts_filter *filter) { struct as10x_ts_filter *filter)
int error; {
struct as10x_cmd_t *pcmd, *prsp; int error;
struct as10x_cmd_t *pcmd, *prsp;
ENTER();
ENTER();
pcmd = phandle->cmd;
prsp = phandle->rsp; pcmd = phandle->cmd;
prsp = phandle->rsp;
/* prepare command */
as10x_cmd_build(pcmd, (++phandle->cmd_xid), /* prepare command */
sizeof(pcmd->body.add_pid_filter.req)); as10x_cmd_build(pcmd, (++phandle->cmd_xid),
sizeof(pcmd->body.add_pid_filter.req));
/* fill command */
pcmd->body.add_pid_filter.req.proc_id = cpu_to_le16(CONTROL_PROC_SETFILTER); /* fill command */
pcmd->body.add_pid_filter.req.pid = cpu_to_le16(filter->pid); pcmd->body.add_pid_filter.req.proc_id =
pcmd->body.add_pid_filter.req.stream_type = filter->type; cpu_to_le16(CONTROL_PROC_SETFILTER);
pcmd->body.add_pid_filter.req.pid = cpu_to_le16(filter->pid);
if(filter->idx < 16) pcmd->body.add_pid_filter.req.stream_type = filter->type;
pcmd->body.add_pid_filter.req.idx = filter->idx;
else if (filter->idx < 16)
pcmd->body.add_pid_filter.req.idx = 0xFF; pcmd->body.add_pid_filter.req.idx = filter->idx;
else
/* send command */ pcmd->body.add_pid_filter.req.idx = 0xFF;
if(phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle, /* send command */
(uint8_t *) pcmd, if (phandle->ops->xfer_cmd) {
sizeof(pcmd->body.add_pid_filter.req) + HEADER_SIZE, error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
(uint8_t *) prsp, sizeof(pcmd->body.add_pid_filter.req)
sizeof(prsp->body.add_pid_filter.rsp) + HEADER_SIZE); + HEADER_SIZE, (uint8_t *) prsp,
} sizeof(prsp->body.add_pid_filter.rsp)
else{ + HEADER_SIZE);
error = AS10X_CMD_ERROR; } else {
} error = AS10X_CMD_ERROR;
}
if(error < 0) {
goto out; if (error < 0)
} goto out;
/* parse response */ /* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_SETFILTER_RSP); error = as10x_rsp_parse(prsp, CONTROL_PROC_SETFILTER_RSP);
if(error == 0) { if (error == 0) {
/* Response OK -> get response data */ /* Response OK -> get response data */
filter->idx = prsp->body.add_pid_filter.rsp.filter_id; filter->idx = prsp->body.add_pid_filter.rsp.filter_id;
} }
out: out:
LEAVE(); LEAVE();
return(error); return error;
} }
/** /**
...@@ -113,144 +111,138 @@ int as10x_cmd_add_PID_filter(as10x_handle_t* phandle, ...@@ -113,144 +111,138 @@ int as10x_cmd_add_PID_filter(as10x_handle_t* phandle,
\return 0 when no error, < 0 in case of error. \return 0 when no error, < 0 in case of error.
\callgraph \callgraph
*/ */
int as10x_cmd_del_PID_filter(as10x_handle_t* phandle, int as10x_cmd_del_PID_filter(as10x_handle_t *phandle,
uint16_t pid_value) uint16_t pid_value)
{ {
int error;
struct as10x_cmd_t *pcmd, *prsp;
int error; ENTER();
struct as10x_cmd_t *pcmd, *prsp;
ENTER();
pcmd = phandle->cmd; pcmd = phandle->cmd;
prsp = phandle->rsp; prsp = phandle->rsp;
/* prepare command */ /* prepare command */
as10x_cmd_build(pcmd, (++phandle->cmd_xid), as10x_cmd_build(pcmd, (++phandle->cmd_xid),
sizeof(pcmd->body.del_pid_filter.req)); sizeof(pcmd->body.del_pid_filter.req));
/* fill command */ /* fill command */
pcmd->body.del_pid_filter.req.proc_id = cpu_to_le16(CONTROL_PROC_REMOVEFILTER); pcmd->body.del_pid_filter.req.proc_id =
pcmd->body.del_pid_filter.req.pid = cpu_to_le16(pid_value); cpu_to_le16(CONTROL_PROC_REMOVEFILTER);
pcmd->body.del_pid_filter.req.pid = cpu_to_le16(pid_value);
/* send command */ /* send command */
if(phandle->ops->xfer_cmd){ if (phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle, error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
(uint8_t *) pcmd, sizeof(pcmd->body.del_pid_filter.req)
sizeof(pcmd->body.del_pid_filter.req) + HEADER_SIZE, + HEADER_SIZE, (uint8_t *) prsp,
(uint8_t *) prsp, sizeof(prsp->body.del_pid_filter.rsp)
sizeof(prsp->body.del_pid_filter.rsp) + HEADER_SIZE); + HEADER_SIZE);
} } else {
else{ error = AS10X_CMD_ERROR;
error = AS10X_CMD_ERROR; }
}
if(error < 0) { if (error < 0)
goto out; goto out;
}
/* parse response */ /* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_REMOVEFILTER_RSP); error = as10x_rsp_parse(prsp, CONTROL_PROC_REMOVEFILTER_RSP);
out: out:
LEAVE(); LEAVE();
return(error); return error;
} }
/** /**
\brief Send start streaming command to AS10x \brief Send start streaming command to AS10x
\param phandle: pointer to AS10x handle \param phandle: pointer to AS10x handle
\return 0 when no error, < 0 in case of error.  \return 0 when no error, < 0 in case of error.
\callgraph \callgraph
*/ */
int as10x_cmd_start_streaming(as10x_handle_t* phandle) int as10x_cmd_start_streaming(as10x_handle_t *phandle)
{ {
int error; int error;
struct as10x_cmd_t *pcmd, *prsp; struct as10x_cmd_t *pcmd, *prsp;
ENTER(); ENTER();
pcmd = phandle->cmd; pcmd = phandle->cmd;
prsp = phandle->rsp; prsp = phandle->rsp;
/* prepare command */ /* prepare command */
as10x_cmd_build(pcmd, (++phandle->cmd_xid), as10x_cmd_build(pcmd, (++phandle->cmd_xid),
sizeof(pcmd->body.start_streaming.req)); sizeof(pcmd->body.start_streaming.req));
/* fill command */ /* fill command */
pcmd->body.start_streaming.req.proc_id = pcmd->body.start_streaming.req.proc_id =
cpu_to_le16(CONTROL_PROC_START_STREAMING); cpu_to_le16(CONTROL_PROC_START_STREAMING);
/* send command */ /* send command */
if(phandle->ops->xfer_cmd){ if (phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle, error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
(uint8_t *) pcmd, sizeof(pcmd->body.start_streaming.req)
sizeof(pcmd->body.start_streaming.req) + HEADER_SIZE, + HEADER_SIZE, (uint8_t *) prsp,
(uint8_t *) prsp, sizeof(prsp->body.start_streaming.rsp)
sizeof(prsp->body.start_streaming.rsp) + HEADER_SIZE); + HEADER_SIZE);
} } else {
else{ error = AS10X_CMD_ERROR;
error = AS10X_CMD_ERROR; }
}
if(error < 0) { if (error < 0)
goto out; goto out;
}
/* parse response */ /* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_START_STREAMING_RSP); error = as10x_rsp_parse(prsp, CONTROL_PROC_START_STREAMING_RSP);
out: out:
LEAVE(); LEAVE();
return(error); return error;
} }
/** /**
\brief Send stop streaming command to AS10x \brief Send stop streaming command to AS10x
\param phandle: pointer to AS10x handle \param phandle: pointer to AS10x handle
\return 0 when no error, < 0 in case of error.  \return 0 when no error, < 0 in case of error.
\callgraph \callgraph
*/ */
int as10x_cmd_stop_streaming(as10x_handle_t* phandle) int as10x_cmd_stop_streaming(as10x_handle_t *phandle)
{ {
int8_t error; int8_t error;
struct as10x_cmd_t *pcmd, *prsp; struct as10x_cmd_t *pcmd, *prsp;
ENTER(); ENTER();
pcmd = phandle->cmd; pcmd = phandle->cmd;
prsp = phandle->rsp; prsp = phandle->rsp;
/* prepare command */ /* prepare command */
as10x_cmd_build(pcmd, (++phandle->cmd_xid), as10x_cmd_build(pcmd, (++phandle->cmd_xid),
sizeof(pcmd->body.stop_streaming.req)); sizeof(pcmd->body.stop_streaming.req));
/* fill command */ /* fill command */
pcmd->body.stop_streaming.req.proc_id = pcmd->body.stop_streaming.req.proc_id =
cpu_to_le16(CONTROL_PROC_STOP_STREAMING); cpu_to_le16(CONTROL_PROC_STOP_STREAMING);
/* send command */ /* send command */
if(phandle->ops->xfer_cmd){ if (phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle, error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
(uint8_t *) pcmd, sizeof(pcmd->body.stop_streaming.req)
sizeof(pcmd->body.stop_streaming.req) + HEADER_SIZE, + HEADER_SIZE, (uint8_t *) prsp,
(uint8_t *) prsp, sizeof(prsp->body.stop_streaming.rsp)
sizeof(prsp->body.stop_streaming.rsp) + HEADER_SIZE); + HEADER_SIZE);
} } else {
else{ error = AS10X_CMD_ERROR;
error = AS10X_CMD_ERROR; }
}
if(error < 0) { if (error < 0)
goto out; goto out;
}
/* parse response */ /* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_STOP_STREAMING_RSP); error = as10x_rsp_parse(prsp, CONTROL_PROC_STOP_STREAMING_RSP);
out: out:
LEAVE(); LEAVE();
return(error); return error;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7