Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 273600
b: refs/heads/master
c: 79848e9
h: refs/heads/master
v: v3
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Nov 3, 2011
1 parent 8d34f39 commit 0144ca8
Show file tree
Hide file tree
Showing 2 changed files with 137 additions and 145 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9cc08121f177e9618fe9108b0f5e2fb690d4df33
refs/heads/master: 79848e9afbdb47a230d55d29af1a6fada718427c
280 changes: 136 additions & 144 deletions trunk/drivers/staging/media/as102/as10x_cmd_stream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
\file as10x_cmd_stream.c
\version $Id$
\author: S. Martinelli
----------------------------------------------------------------------------\n
Expand Down Expand Up @@ -53,57 +51,57 @@
\return 0 when no error, < 0 in case of error.
\callgraph
*/
int as10x_cmd_add_PID_filter(as10x_handle_t* phandle,
struct as10x_ts_filter *filter) {
int error;
struct as10x_cmd_t *pcmd, *prsp;

ENTER();

pcmd = phandle->cmd;
prsp = phandle->rsp;

/* prepare command */
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);
pcmd->body.add_pid_filter.req.pid = cpu_to_le16(filter->pid);
pcmd->body.add_pid_filter.req.stream_type = filter->type;

if(filter->idx < 16)
pcmd->body.add_pid_filter.req.idx = filter->idx;
else
pcmd->body.add_pid_filter.req.idx = 0xFF;

/* send command */
if(phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle,
(uint8_t *) pcmd,
sizeof(pcmd->body.add_pid_filter.req) + HEADER_SIZE,
(uint8_t *) prsp,
sizeof(prsp->body.add_pid_filter.rsp) + HEADER_SIZE);
}
else{
error = AS10X_CMD_ERROR;
}

if(error < 0) {
goto out;
}

/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_SETFILTER_RSP);

if(error == 0) {
/* Response OK -> get response data */
filter->idx = prsp->body.add_pid_filter.rsp.filter_id;
}
int as10x_cmd_add_PID_filter(as10x_handle_t *phandle,
struct as10x_ts_filter *filter)
{
int error;
struct as10x_cmd_t *pcmd, *prsp;

ENTER();

pcmd = phandle->cmd;
prsp = phandle->rsp;

/* prepare command */
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);
pcmd->body.add_pid_filter.req.pid = cpu_to_le16(filter->pid);
pcmd->body.add_pid_filter.req.stream_type = filter->type;

if (filter->idx < 16)
pcmd->body.add_pid_filter.req.idx = filter->idx;
else
pcmd->body.add_pid_filter.req.idx = 0xFF;

/* send command */
if (phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
sizeof(pcmd->body.add_pid_filter.req)
+ HEADER_SIZE, (uint8_t *) prsp,
sizeof(prsp->body.add_pid_filter.rsp)
+ HEADER_SIZE);
} else {
error = AS10X_CMD_ERROR;
}

if (error < 0)
goto out;

/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_SETFILTER_RSP);

if (error == 0) {
/* Response OK -> get response data */
filter->idx = prsp->body.add_pid_filter.rsp.filter_id;
}

out:
LEAVE();
return(error);
LEAVE();
return error;
}

/**
Expand All @@ -113,144 +111,138 @@ int as10x_cmd_add_PID_filter(as10x_handle_t* phandle,
\return 0 when no error, < 0 in case of error.
\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)
{
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),
sizeof(pcmd->body.del_pid_filter.req));
/* prepare command */
as10x_cmd_build(pcmd, (++phandle->cmd_xid),
sizeof(pcmd->body.del_pid_filter.req));

/* fill command */
pcmd->body.del_pid_filter.req.proc_id = cpu_to_le16(CONTROL_PROC_REMOVEFILTER);
pcmd->body.del_pid_filter.req.pid = cpu_to_le16(pid_value);
/* fill command */
pcmd->body.del_pid_filter.req.proc_id =
cpu_to_le16(CONTROL_PROC_REMOVEFILTER);
pcmd->body.del_pid_filter.req.pid = cpu_to_le16(pid_value);

/* send command */
if(phandle->ops->xfer_cmd){
error = phandle->ops->xfer_cmd(phandle,
(uint8_t *) pcmd,
sizeof(pcmd->body.del_pid_filter.req) + HEADER_SIZE,
(uint8_t *) prsp,
sizeof(prsp->body.del_pid_filter.rsp) + HEADER_SIZE);
}
else{
error = AS10X_CMD_ERROR;
}
/* send command */
if (phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
sizeof(pcmd->body.del_pid_filter.req)
+ HEADER_SIZE, (uint8_t *) prsp,
sizeof(prsp->body.del_pid_filter.rsp)
+ HEADER_SIZE);
} else {
error = AS10X_CMD_ERROR;
}

if(error < 0) {
goto out;
}
if (error < 0)
goto out;

/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_REMOVEFILTER_RSP);
/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_REMOVEFILTER_RSP);

out:
LEAVE();
return(error);
LEAVE();
return error;
}

/**
\brief Send start streaming command to AS10x
\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
*/
int as10x_cmd_start_streaming(as10x_handle_t* phandle)
int as10x_cmd_start_streaming(as10x_handle_t *phandle)
{
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),
sizeof(pcmd->body.start_streaming.req));
/* prepare command */
as10x_cmd_build(pcmd, (++phandle->cmd_xid),
sizeof(pcmd->body.start_streaming.req));

/* fill command */
pcmd->body.start_streaming.req.proc_id =
cpu_to_le16(CONTROL_PROC_START_STREAMING);
/* fill command */
pcmd->body.start_streaming.req.proc_id =
cpu_to_le16(CONTROL_PROC_START_STREAMING);

/* send command */
if(phandle->ops->xfer_cmd){
error = phandle->ops->xfer_cmd(phandle,
(uint8_t *) pcmd,
sizeof(pcmd->body.start_streaming.req) + HEADER_SIZE,
(uint8_t *) prsp,
sizeof(prsp->body.start_streaming.rsp) + HEADER_SIZE);
}
else{
error = AS10X_CMD_ERROR;
}
/* send command */
if (phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
sizeof(pcmd->body.start_streaming.req)
+ HEADER_SIZE, (uint8_t *) prsp,
sizeof(prsp->body.start_streaming.rsp)
+ HEADER_SIZE);
} else {
error = AS10X_CMD_ERROR;
}

if(error < 0) {
goto out;
}
if (error < 0)
goto out;

/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_START_STREAMING_RSP);
/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_START_STREAMING_RSP);

out:
LEAVE();
return(error);
LEAVE();
return error;
}

/**
\brief Send stop streaming command to AS10x
\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
*/
int as10x_cmd_stop_streaming(as10x_handle_t* phandle)
int as10x_cmd_stop_streaming(as10x_handle_t *phandle)
{
int8_t error;
struct as10x_cmd_t *pcmd, *prsp;
int8_t 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),
sizeof(pcmd->body.stop_streaming.req));
/* prepare command */
as10x_cmd_build(pcmd, (++phandle->cmd_xid),
sizeof(pcmd->body.stop_streaming.req));

/* fill command */
pcmd->body.stop_streaming.req.proc_id =
cpu_to_le16(CONTROL_PROC_STOP_STREAMING);
/* fill command */
pcmd->body.stop_streaming.req.proc_id =
cpu_to_le16(CONTROL_PROC_STOP_STREAMING);

/* send command */
if(phandle->ops->xfer_cmd){
error = phandle->ops->xfer_cmd(phandle,
(uint8_t *) pcmd,
sizeof(pcmd->body.stop_streaming.req) + HEADER_SIZE,
(uint8_t *) prsp,
sizeof(prsp->body.stop_streaming.rsp) + HEADER_SIZE);
}
else{
error = AS10X_CMD_ERROR;
}
/* send command */
if (phandle->ops->xfer_cmd) {
error = phandle->ops->xfer_cmd(phandle, (uint8_t *) pcmd,
sizeof(pcmd->body.stop_streaming.req)
+ HEADER_SIZE, (uint8_t *) prsp,
sizeof(prsp->body.stop_streaming.rsp)
+ HEADER_SIZE);
} else {
error = AS10X_CMD_ERROR;
}

if(error < 0) {
goto out;
}
if (error < 0)
goto out;

/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_STOP_STREAMING_RSP);
/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_STOP_STREAMING_RSP);

out:
LEAVE();
return(error);
LEAVE();
return error;
}


0 comments on commit 0144ca8

Please sign in to comment.