Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 286399
b: refs/heads/master
c: 24be689
h: refs/heads/master
i:
  286397: 9a77b70
  286395: 5e3d553
  286391: dadd675
  286383: fbbe0c9
  286367: 7687846
  286335: cb4ee3b
v: v3
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Jan 16, 2012
1 parent 42e6cd6 commit d1e2e79
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 119 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: 1c852201a28601b1379857f615e99071211294c6
refs/heads/master: 24be689bfbbcd6c047d7918784ff810e97648006
154 changes: 55 additions & 99 deletions trunk/drivers/media/video/pwc/pwc-ctrl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,74 +104,55 @@ static struct Nala_table_entry Nala_table[PSZ_MAX][PWC_FPS_MAX_NALA] =

/****************************************************************************/

static int _send_control_msg(struct pwc_device *pdev,
u8 request, u16 value, int index, void *buf, int buflen)
{
int rc;
void *kbuf = NULL;

if (buflen) {
kbuf = kmemdup(buf, buflen, GFP_KERNEL); /* not allowed on stack */
if (kbuf == NULL)
return -ENOMEM;
}

rc = usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),
request,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value,
index,
kbuf, buflen, USB_CTRL_SET_TIMEOUT);

kfree(kbuf);
return rc;
}

static int recv_control_msg(struct pwc_device *pdev,
u8 request, u16 value, void *buf, int buflen)
u8 request, u16 value, int recv_count)
{
int rc;
void *kbuf = kmalloc(buflen, GFP_KERNEL); /* not allowed on stack */

if (kbuf == NULL)
return -ENOMEM;

rc = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
request,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value,
pdev->vcinterface,
kbuf, buflen, USB_CTRL_GET_TIMEOUT);
memcpy(buf, kbuf, buflen);
kfree(kbuf);

value, pdev->vcinterface,
pdev->ctrl_buf, recv_count, USB_CTRL_GET_TIMEOUT);
if (rc < 0)
PWC_ERROR("recv_control_msg error %d req %02x val %04x\n",
rc, request, value);
return rc;
}

static inline int send_video_command(struct pwc_device *pdev,
int index, void *buf, int buflen)
int index, const unsigned char *buf, int buflen)
{
return _send_control_msg(pdev,
SET_EP_STREAM_CTL,
VIDEO_OUTPUT_CONTROL_FORMATTER,
index,
buf, buflen);
int rc;

memcpy(pdev->ctrl_buf, buf, buflen);

rc = usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),
SET_EP_STREAM_CTL,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
VIDEO_OUTPUT_CONTROL_FORMATTER, index,
pdev->ctrl_buf, buflen, USB_CTRL_SET_TIMEOUT);
if (rc >= 0)
memcpy(pdev->cmd_buf, buf, buflen);
else
PWC_ERROR("send_video_command error %d\n", rc);

return rc;
}

int send_control_msg(struct pwc_device *pdev,
u8 request, u16 value, void *buf, int buflen)
{
return _send_control_msg(pdev,
request, value, pdev->vcinterface, buf, buflen);
return usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),
request,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value, pdev->vcinterface,
buf, buflen, USB_CTRL_SET_TIMEOUT);
}

static int set_video_mode_Nala(struct pwc_device *pdev, int size, int pixfmt,
int frames, int *compression, int send_to_cam)
{
unsigned char buf[3];
int fps, ret = 0;
struct Nala_table_entry *pEntry;
int frames2frames[31] =
Expand Down Expand Up @@ -206,18 +187,14 @@ static int set_video_mode_Nala(struct pwc_device *pdev, int size, int pixfmt,
if (pEntry->alternate == 0)
return -EINVAL;

memcpy(buf, pEntry->mode, 3);
if (send_to_cam)
ret = send_video_command(pdev, pdev->vendpoint, buf, 3);
if (ret < 0) {
PWC_DEBUG_MODULE("Failed to send video command... %d\n", ret);
ret = send_video_command(pdev, pdev->vendpoint,
pEntry->mode, 3);
if (ret < 0)
return ret;
}
if (pEntry->compressed && pixfmt == V4L2_PIX_FMT_YUV420)
pwc_dec1_init(pdev, buf);

pdev->cmd_len = 3;
memcpy(pdev->cmd_buf, buf, 3);
if (pEntry->compressed && pixfmt == V4L2_PIX_FMT_YUV420)
pwc_dec1_init(pdev, pEntry->mode);

/* Set various parameters */
pdev->pixfmt = pixfmt;
Expand Down Expand Up @@ -249,7 +226,6 @@ static int set_video_mode_Nala(struct pwc_device *pdev, int size, int pixfmt,
static int set_video_mode_Timon(struct pwc_device *pdev, int size, int pixfmt,
int frames, int *compression, int send_to_cam)
{
unsigned char buf[13];
const struct Timon_table_entry *pChoose;
int fps, ret = 0;

Expand All @@ -274,17 +250,14 @@ static int set_video_mode_Timon(struct pwc_device *pdev, int size, int pixfmt,
if (pChoose == NULL || pChoose->alternate == 0)
return -ENOENT; /* Not supported. */

memcpy(buf, pChoose->mode, 13);
if (send_to_cam)
ret = send_video_command(pdev, pdev->vendpoint, buf, 13);
ret = send_video_command(pdev, pdev->vendpoint,
pChoose->mode, 13);
if (ret < 0)
return ret;

if (pChoose->bandlength > 0 && pixfmt == V4L2_PIX_FMT_YUV420)
pwc_dec23_init(pdev, buf);

pdev->cmd_len = 13;
memcpy(pdev->cmd_buf, buf, 13);
pwc_dec23_init(pdev, pChoose->mode);

/* Set various parameters */
pdev->pixfmt = pixfmt;
Expand All @@ -306,7 +279,6 @@ static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int pixfmt,
{
const struct Kiara_table_entry *pChoose = NULL;
int fps, ret = 0;
unsigned char buf[12];

if (size >= PSZ_MAX || *compression < 0 || *compression > 3)
return -EINVAL;
Expand All @@ -328,22 +300,15 @@ static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int pixfmt,
if (pChoose == NULL || pChoose->alternate == 0)
return -ENOENT; /* Not supported. */

PWC_TRACE("Using alternate setting %d.\n", pChoose->alternate);

/* usb_control_msg won't take staticly allocated arrays as argument?? */
memcpy(buf, pChoose->mode, 12);

/* Firmware bug: video endpoint is 5, but commands are sent to endpoint 4 */
if (send_to_cam)
ret = send_video_command(pdev, 4, buf, 12);
ret = send_video_command(pdev, 4, pChoose->mode, 12);
if (ret < 0)
return ret;

if (pChoose->bandlength > 0 && pixfmt == V4L2_PIX_FMT_YUV420)
pwc_dec23_init(pdev, buf);
pwc_dec23_init(pdev, pChoose->mode);

pdev->cmd_len = 12;
memcpy(pdev->cmd_buf, buf, 12);
/* All set and go */
pdev->pixfmt = pixfmt;
pdev->vframes = (fps + 1) * 5;
Expand Down Expand Up @@ -445,21 +410,21 @@ unsigned int pwc_get_fps(struct pwc_device *pdev, unsigned int index, unsigned i
int pwc_get_u8_ctrl(struct pwc_device *pdev, u8 request, u16 value, int *data)
{
int ret;
u8 buf;

ret = recv_control_msg(pdev, request, value, &buf, sizeof(buf));
ret = recv_control_msg(pdev, request, value, 1);
if (ret < 0)
return ret;

*data = buf;
*data = pdev->ctrl_buf[0];
return 0;
}

int pwc_set_u8_ctrl(struct pwc_device *pdev, u8 request, u16 value, u8 data)
{
int ret;

ret = send_control_msg(pdev, request, value, &data, sizeof(data));
pdev->ctrl_buf[0] = data;
ret = send_control_msg(pdev, request, value, pdev->ctrl_buf, 1);
if (ret < 0)
return ret;

Expand All @@ -469,37 +434,34 @@ int pwc_set_u8_ctrl(struct pwc_device *pdev, u8 request, u16 value, u8 data)
int pwc_get_s8_ctrl(struct pwc_device *pdev, u8 request, u16 value, int *data)
{
int ret;
s8 buf;

ret = recv_control_msg(pdev, request, value, &buf, sizeof(buf));
ret = recv_control_msg(pdev, request, value, 1);
if (ret < 0)
return ret;

*data = buf;
*data = ((s8 *)pdev->ctrl_buf)[0];
return 0;
}

int pwc_get_u16_ctrl(struct pwc_device *pdev, u8 request, u16 value, int *data)
{
int ret;
u8 buf[2];

ret = recv_control_msg(pdev, request, value, buf, sizeof(buf));
ret = recv_control_msg(pdev, request, value, 2);
if (ret < 0)
return ret;

*data = (buf[1] << 8) | buf[0];
*data = (pdev->ctrl_buf[1] << 8) | pdev->ctrl_buf[0];
return 0;
}

int pwc_set_u16_ctrl(struct pwc_device *pdev, u8 request, u16 value, u16 data)
{
int ret;
u8 buf[2];

buf[0] = data & 0xff;
buf[1] = data >> 8;
ret = send_control_msg(pdev, request, value, buf, sizeof(buf));
pdev->ctrl_buf[0] = data & 0xff;
pdev->ctrl_buf[1] = data >> 8;
ret = send_control_msg(pdev, request, value, pdev->ctrl_buf, 2);
if (ret < 0)
return ret;

Expand All @@ -520,7 +482,6 @@ int pwc_button_ctrl(struct pwc_device *pdev, u16 value)
/* POWER */
void pwc_camera_power(struct pwc_device *pdev, int power)
{
char buf;
int r;

if (!pdev->power_save)
Expand All @@ -530,21 +491,18 @@ void pwc_camera_power(struct pwc_device *pdev, int power)
return; /* Not supported by Nala or Timon < release 6 */

if (power)
buf = 0x00; /* active */
pdev->ctrl_buf[0] = 0x00; /* active */
else
buf = 0xFF; /* power save */
r = send_control_msg(pdev,
SET_STATUS_CTL, SET_POWER_SAVE_MODE_FORMATTER,
&buf, sizeof(buf));

pdev->ctrl_buf[0] = 0xFF; /* power save */
r = send_control_msg(pdev, SET_STATUS_CTL,
SET_POWER_SAVE_MODE_FORMATTER, pdev->ctrl_buf, 1);
if (r < 0)
PWC_ERROR("Failed to power %s camera (%d)\n",
power ? "on" : "off", r);
}

int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)
{
unsigned char buf[2];
int r;

if (pdev->type < 730)
Expand All @@ -560,11 +518,11 @@ int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)
if (off_value > 0xff)
off_value = 0xff;

buf[0] = on_value;
buf[1] = off_value;
pdev->ctrl_buf[0] = on_value;
pdev->ctrl_buf[1] = off_value;

r = send_control_msg(pdev,
SET_STATUS_CTL, LED_FORMATTER, &buf, sizeof(buf));
SET_STATUS_CTL, LED_FORMATTER, pdev->ctrl_buf, 2);
if (r < 0)
PWC_ERROR("Failed to set LED on/off time (%d)\n", r);

Expand All @@ -574,7 +532,6 @@ int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)
#ifdef CONFIG_USB_PWC_DEBUG
int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)
{
unsigned char buf;
int ret = -1, request;

if (pdev->type < 675)
Expand All @@ -584,14 +541,13 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)
else
request = SENSOR_TYPE_FORMATTER2;

ret = recv_control_msg(pdev,
GET_STATUS_CTL, request, &buf, sizeof(buf));
ret = recv_control_msg(pdev, GET_STATUS_CTL, request, 1);
if (ret < 0)
return ret;
if (pdev->type < 675)
*sensor = buf | 0x100;
*sensor = pdev->ctrl_buf[0] | 0x100;
else
*sensor = buf;
*sensor = pdev->ctrl_buf[0];
return 0;
}
#endif
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/pwc/pwc-dec1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
#include "pwc.h"

void pwc_dec1_init(struct pwc_device *pdev, void *buffer)
void pwc_dec1_init(struct pwc_device *pdev, const unsigned char *cmd)
{
struct pwc_dec1_private *pdec = &pdev->dec1;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/pwc/pwc-dec1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ struct pwc_dec1_private
int version;
};

void pwc_dec1_init(struct pwc_device *pdev, void *buffer);
void pwc_dec1_init(struct pwc_device *pdev, const unsigned char *cmd);

#endif
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/pwc/pwc-dec23.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ static unsigned char pwc_crop_table[256 + 2*MAX_OUTER_CROP_VALUE];


/* If the type or the command change, we rebuild the lookup table */
void pwc_dec23_init(struct pwc_device *pdev, unsigned char *cmd)
void pwc_dec23_init(struct pwc_device *pdev, const unsigned char *cmd)
{
int flags, version, shift, i;
struct pwc_dec23_private *pdec = &pdev->dec23;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/pwc/pwc-dec23.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct pwc_dec23_private

};

void pwc_dec23_init(struct pwc_device *pdev, unsigned char *cmd);
void pwc_dec23_init(struct pwc_device *pdev, const unsigned char *cmd);
void pwc_dec23_decompress(struct pwc_device *pdev,
const void *src,
void *dst);
Expand Down
Loading

0 comments on commit d1e2e79

Please sign in to comment.