Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 273603
b: refs/heads/master
c: e2e02ca
h: refs/heads/master
i:
  273601: 14ebb50
  273599: 8d34f39
v: v3
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Nov 3, 2011
1 parent c94ba1e commit eff32e3
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 133 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: c7a6c00194c05a30fecc84e101d4b9c8d44cffc9
refs/heads/master: e2e02ca48878e78393f09a47918501a3a4b374b4
262 changes: 130 additions & 132 deletions trunk/drivers/staging/media/as102/as10x_cmd_cfg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
\file as10x_cmd_cfg.c
\version $Id$
\author: S. Martinelli
----------------------------------------------------------------------------\n
Expand All @@ -22,7 +20,8 @@
#include <linux/kernel.h>
#include "as102_drv.h"
#elif defined(WIN32)
#if defined(__BUILDMACHINE__) && (__BUILDMACHINE__ == WinDDK) /* win32 ddk implementation */
#if defined(__BUILDMACHINE__) && (__BUILDMACHINE__ == WinDDK)
/* win32 ddk implementation */
#include "wdm.h"
#include "Device.h"
#include "endian_mgmt.h" /* FIXME */
Expand Down Expand Up @@ -59,52 +58,52 @@
int as10x_cmd_get_context(as10x_handle_t *phandle, uint16_t tag,
uint32_t *pvalue)
{
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.context.req));

/* fill command */
pcmd->body.context.req.proc_id = cpu_to_le16(CONTROL_PROC_CONTEXT);
pcmd->body.context.req.tag = cpu_to_le16(tag);
pcmd->body.context.req.type = cpu_to_le16(GET_CONTEXT_DATA);

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

if(error < 0) {
goto out;
}

/* parse response: context command do not follow the common response */
/* structure -> specific handling response parse required */
error = as10x_context_rsp_parse(prsp, CONTROL_PROC_CONTEXT_RSP);

if(error == 0) {
/* Response OK -> get response data */
*pvalue = le32_to_cpu(prsp->body.context.rsp.reg_val.u.value32);
/* value returned is always a 32-bit value */
}
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.context.req));

/* fill command */
pcmd->body.context.req.proc_id = cpu_to_le16(CONTROL_PROC_CONTEXT);
pcmd->body.context.req.tag = cpu_to_le16(tag);
pcmd->body.context.req.type = cpu_to_le16(GET_CONTEXT_DATA);

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

if (error < 0)
goto out;

/* parse response: context command do not follow the common response */
/* structure -> specific handling response parse required */
error = as10x_context_rsp_parse(prsp, CONTROL_PROC_CONTEXT_RSP);

if (error == 0) {
/* Response OK -> get response data */
*pvalue = le32_to_cpu(prsp->body.context.rsp.reg_val.u.value32);
/* value returned is always a 32-bit value */
}

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

/**
Expand All @@ -118,47 +117,48 @@ int as10x_cmd_get_context(as10x_handle_t *phandle, uint16_t tag,
int as10x_cmd_set_context(as10x_handle_t *phandle, uint16_t tag,
uint32_t value)
{
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.context.req));

/* fill command */
pcmd->body.context.req.proc_id = cpu_to_le16(CONTROL_PROC_CONTEXT);
/* pcmd->body.context.req.reg_val.mode initialization is not required */
pcmd->body.context.req.reg_val.u.value32 = cpu_to_le32(value);
pcmd->body.context.req.tag = cpu_to_le16(tag);
pcmd->body.context.req.type = cpu_to_le16(SET_CONTEXT_DATA);

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

if(error < 0) {
goto out;
}

/* parse response: context command do not follow the common response */
/* structure -> specific handling response parse required */
error = as10x_context_rsp_parse(prsp, CONTROL_PROC_CONTEXT_RSP);
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.context.req));

/* fill command */
pcmd->body.context.req.proc_id = cpu_to_le16(CONTROL_PROC_CONTEXT);
/* pcmd->body.context.req.reg_val.mode initialization is not required */
pcmd->body.context.req.reg_val.u.value32 = cpu_to_le32(value);
pcmd->body.context.req.tag = cpu_to_le16(tag);
pcmd->body.context.req.type = cpu_to_le16(SET_CONTEXT_DATA);

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

if (error < 0)
goto out;

/* parse response: context command do not follow the common response */
/* structure -> specific handling response parse required */
error = as10x_context_rsp_parse(prsp, CONTROL_PROC_CONTEXT_RSP);

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

/**
Expand All @@ -175,45 +175,43 @@ int as10x_cmd_set_context(as10x_handle_t *phandle, uint16_t tag,
*/
int as10x_cmd_eLNA_change_mode(as10x_handle_t *phandle, uint8_t mode)
{
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.cfg_change_mode.req));

/* fill command */
pcmd->body.cfg_change_mode.req.proc_id =
cpu_to_le16(CONTROL_PROC_ELNA_CHANGE_MODE);
pcmd->body.cfg_change_mode.req.mode = mode;

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

if(error < 0) {
goto out;
}

/* parse response */
error = as10x_rsp_parse(prsp, CONTROL_PROC_ELNA_CHANGE_MODE_RSP);
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.cfg_change_mode.req));

/* fill command */
pcmd->body.cfg_change_mode.req.proc_id =
cpu_to_le16(CONTROL_PROC_ELNA_CHANGE_MODE);
pcmd->body.cfg_change_mode.req.mode = mode;

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

if (error < 0)
goto out;

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

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

/**
Expand All @@ -225,15 +223,15 @@ int as10x_cmd_eLNA_change_mode(as10x_handle_t *phandle, uint8_t mode)
ABILIS_RC_NOK
\callgraph
*/
int as10x_context_rsp_parse(struct as10x_cmd_t *prsp, uint16_t proc_id) {

int err;
int as10x_context_rsp_parse(struct as10x_cmd_t *prsp, uint16_t proc_id)
{
int err;

err = prsp->body.context.rsp.error;
err = prsp->body.context.rsp.error;

if((err == 0) &&
(le16_to_cpu(prsp->body.context.rsp.proc_id) == proc_id)) {
return 0;
}
return AS10X_CMD_ERROR;
if ((err == 0) &&
(le16_to_cpu(prsp->body.context.rsp.proc_id) == proc_id)) {
return 0;
}
return AS10X_CMD_ERROR;
}

0 comments on commit eff32e3

Please sign in to comment.