Skip to content

L
linux
Commit 50e1fbdc authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files
Options

staging/easycap: add first level indentation to easycap_ioctl.c 

Add the first level indentation to easycap_testcard.c with astyle -t8.
About 100 of 80 columns warnings were left out for further fix

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent abb46c8c
Show whitespace changes
Inline Side-by-side
Showing with 1995 additions and 1978 deletions
drivers/staging/easycap/easycap_ioctl.c
View file @ 50e1fbdc
...@@ -42,101 +42,105 @@ ...@@ -42,101 +42,105 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int adjust_standard(struct easycap *peasycap, v4l2_std_id std_id) int adjust_standard(struct easycap *peasycap, v4l2_std_id std_id)
{ {
struct easycap_standard const *peasycap_standard; struct easycap_standard const *peasycap_standard;
u16 reg, set; u16 reg, set;
int ir, rc, need, k; int ir, rc, need, k;
unsigned int itwas, isnow; unsigned int itwas, isnow;
bool resubmit; bool resubmit;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
peasycap_standard = &easycap_standard[0]; peasycap_standard = &easycap_standard[0];
while (0xFFFF != peasycap_standard->mask) { while (0xFFFF != peasycap_standard->mask) {
if (std_id == peasycap_standard->v4l2_standard.id) if (std_id == peasycap_standard->v4l2_standard.id)
break; break;
peasycap_standard++; peasycap_standard++;
} }
if (0xFFFF == peasycap_standard->mask) { if (0xFFFF == peasycap_standard->mask) {
peasycap_standard = &easycap_standard[0]; peasycap_standard = &easycap_standard[0];
while (0xFFFF != peasycap_standard->mask) { while (0xFFFF != peasycap_standard->mask) {
if (std_id & peasycap_standard->v4l2_standard.id) if (std_id & peasycap_standard->v4l2_standard.id)
break; break;
peasycap_standard++; peasycap_standard++;
} }
} }
if (0xFFFF == peasycap_standard->mask) { if (0xFFFF == peasycap_standard->mask) {
SAM("ERROR: 0x%08X=std_id: standard not found\n", SAM("ERROR: 0x%08X=std_id: standard not found\n",
(unsigned int)std_id); (unsigned int)std_id);
return -EINVAL; return -EINVAL;
} }
SAM("selected standard: %s\n", SAM("selected standard: %s\n",
&(peasycap_standard->v4l2_standard.name[0])); &(peasycap_standard->v4l2_standard.name[0]));
if (peasycap->standard_offset == if (peasycap->standard_offset == peasycap_standard - easycap_standard) {
(int)(peasycap_standard - &easycap_standard[0])) {
SAM("requested standard already in effect\n"); SAM("requested standard already in effect\n");
return 0; return 0;
} }
peasycap->standard_offset = (int)(peasycap_standard - &easycap_standard[0]); peasycap->standard_offset = peasycap_standard - easycap_standard;
for (k = 0; k < INPUT_MANY; k++) { for (k = 0; k < INPUT_MANY; k++) {
if (!peasycap->inputset[k].standard_offset_ok) { if (!peasycap->inputset[k].standard_offset_ok) {
peasycap->inputset[k].standard_offset = peasycap->inputset[k].standard_offset =
peasycap->standard_offset; peasycap->standard_offset;
} }
} }
if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) { if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
peasycap->inputset[peasycap->input].standard_offset = peasycap->inputset[peasycap->input].standard_offset =
peasycap->standard_offset; peasycap->standard_offset;
peasycap->inputset[peasycap->input].standard_offset_ok = 1; peasycap->inputset[peasycap->input].standard_offset_ok = 1;
} else } else
JOM(8, "%i=peasycap->input\n", peasycap->input); JOM(8, "%i=peasycap->input\n", peasycap->input);
peasycap->fps = peasycap_standard->v4l2_standard.frameperiod.denominator /
peasycap->fps = peasycap_standard->v4l2_standard.frameperiod.denominator /
peasycap_standard->v4l2_standard.frameperiod.numerator; peasycap_standard->v4l2_standard.frameperiod.numerator;
switch (peasycap->fps) { switch (peasycap->fps) {
case 6: case 6:
case 30: { case 30: {
peasycap->ntsc = true; peasycap->ntsc = true;
break; break;
} }
case 5: case 5:
case 25: { case 25: {
peasycap->ntsc = false; peasycap->ntsc = false;
break; break;
} }
default: { default: {
SAM("MISTAKE: %i=frames-per-second\n", peasycap->fps); SAM("MISTAKE: %i=frames-per-second\n", peasycap->fps);
return -ENOENT; return -ENOENT;
} }
} }
JOM(8, "%i frames-per-second\n", peasycap->fps); JOM(8, "%i frames-per-second\n", peasycap->fps);
if (0x8000 & peasycap_standard->mask) { if (0x8000 & peasycap_standard->mask) {
peasycap->skip = 5; peasycap->skip = 5;
peasycap->usec = 1000000 / (2 * (5 * peasycap->fps)); peasycap->usec = 1000000 / (2 * (5 * peasycap->fps));
peasycap->tolerate = 1000 * (25 / (5 * peasycap->fps)); peasycap->tolerate = 1000 * (25 / (5 * peasycap->fps));
} else { } else {
peasycap->skip = 0; peasycap->skip = 0;
peasycap->usec = 1000000 / (2 * peasycap->fps); peasycap->usec = 1000000 / (2 * peasycap->fps);
peasycap->tolerate = 1000 * (25 / peasycap->fps); peasycap->tolerate = 1000 * (25 / peasycap->fps);
} }
if (peasycap->video_isoc_streaming) { if (peasycap->video_isoc_streaming) {
resubmit = true; resubmit = true;
kill_video_urbs(peasycap); kill_video_urbs(peasycap);
} else } else
resubmit = false; resubmit = false;
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* /*
* SAA7113H DATASHEET PAGE 44, TABLE 42 * SAA7113H DATASHEET PAGE 44, TABLE 42
*/ */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
need = 0; itwas = 0; reg = 0x00; set = 0x00; need = 0;
switch (peasycap_standard->mask & 0x000F) { itwas = 0;
case NTSC_M_JP: { reg = 0x00;
reg = 0x0A; set = 0x95; set = 0x00;
switch (peasycap_standard->mask & 0x000F) {
case NTSC_M_JP: {
reg = 0x0A;
set = 0x95;
ir = read_saa(peasycap->pusb_device, reg); ir = read_saa(peasycap->pusb_device, reg);
if (0 > ir) if (0 > ir)
SAM("ERROR: cannot read SAA register 0x%02X\n", reg); SAM("ERROR: cannot read SAA register 0x%02X\n", reg);
...@@ -156,7 +160,8 @@ case NTSC_M_JP: { ...@@ -156,7 +160,8 @@ case NTSC_M_JP: {
"from 0x%02X to 0x%02X\n", reg, itwas, isnow); "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
} }
reg = 0x0B; set = 0x48; reg = 0x0B;
set = 0x48;
ir = read_saa(peasycap->pusb_device, reg); ir = read_saa(peasycap->pusb_device, reg);
if (0 > ir) if (0 > ir)
SAM("ERROR: cannot read SAA register 0x%02X\n", reg); SAM("ERROR: cannot read SAA register 0x%02X\n", reg);
...@@ -180,31 +185,46 @@ case NTSC_M_JP: { ...@@ -180,31 +185,46 @@ case NTSC_M_JP: {
* NOTE: NO break HERE: RUN ON TO NEXT CASE * NOTE: NO break HERE: RUN ON TO NEXT CASE
*/ */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
} }
case NTSC_M: case NTSC_M:
case PAL_BGHIN: { case PAL_BGHIN: {
reg = 0x0E; set = 0x01; need = 1; break; reg = 0x0E;
} set = 0x01;
case NTSC_N_443: need = 1;
case PAL_60: {
reg = 0x0E; set = 0x11; need = 1; break;
}
case NTSC_443:
case PAL_Nc: {
reg = 0x0E; set = 0x21; need = 1; break;
}
case NTSC_N:
case PAL_M: {
reg = 0x0E; set = 0x31; need = 1; break;
}
case SECAM: {
reg = 0x0E; set = 0x51; need = 1; break;
}
default:
break; break;
} }
case NTSC_N_443:
case PAL_60: {
reg = 0x0E;
set = 0x11;
need = 1;
break;
}
case NTSC_443:
case PAL_Nc: {
reg = 0x0E;
set = 0x21;
need = 1;
break;
}
case NTSC_N:
case PAL_M: {
reg = 0x0E;
set = 0x31;
need = 1;
break;
}
case SECAM: {
reg = 0x0E;
set = 0x51;
need = 1;
break;
}
default:
break;
}
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
if (need) { if (need) {
ir = read_saa(peasycap->pusb_device, reg); ir = read_saa(peasycap->pusb_device, reg);
if (0 > ir) if (0 > ir)
SAM("ERROR: failed to read SAA register 0x%02X\n", reg); SAM("ERROR: failed to read SAA register 0x%02X\n", reg);
...@@ -223,18 +243,18 @@ if (need) { ...@@ -223,18 +243,18 @@ if (need) {
JOM(8, "SAA register 0x%02X changed " JOM(8, "SAA register 0x%02X changed "
"from 0x%02X to 0x%02X\n", reg, itwas, isnow); "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
} }
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* /*
* SAA7113H DATASHEET PAGE 41 * SAA7113H DATASHEET PAGE 41
*/ */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
reg = 0x08; reg = 0x08;
ir = read_saa(peasycap->pusb_device, reg); ir = read_saa(peasycap->pusb_device, reg);
if (0 > ir) if (0 > ir)
SAM("ERROR: failed to read SAA register 0x%02X " SAM("ERROR: failed to read SAA register 0x%02X "
"so cannot reset\n", reg); "so cannot reset\n", reg);
else { else {
itwas = (unsigned int)ir; itwas = (unsigned int)ir;
if (peasycap_standard->mask & 0x0001) if (peasycap_standard->mask & 0x0001)
set = itwas | 0x40 ; set = itwas | 0x40 ;
...@@ -253,18 +273,18 @@ else { ...@@ -253,18 +273,18 @@ else {
JOM(8, "SAA register 0x%02X changed " JOM(8, "SAA register 0x%02X changed "
"from 0x%02X to 0x%02X\n", reg, itwas, isnow); "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
} }
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* /*
* SAA7113H DATASHEET PAGE 51, TABLE 57 * SAA7113H DATASHEET PAGE 51, TABLE 57
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
reg = 0x40; reg = 0x40;
ir = read_saa(peasycap->pusb_device, reg); ir = read_saa(peasycap->pusb_device, reg);
if (0 > ir) if (0 > ir)
SAM("ERROR: failed to read SAA register 0x%02X " SAM("ERROR: failed to read SAA register 0x%02X "
"so cannot reset\n", reg); "so cannot reset\n", reg);
else { else {
itwas = (unsigned int)ir; itwas = (unsigned int)ir;
if (peasycap_standard->mask & 0x0001) if (peasycap_standard->mask & 0x0001)
set = itwas | 0x80 ; set = itwas | 0x80 ;
...@@ -283,15 +303,15 @@ else { ...@@ -283,15 +303,15 @@ else {
JOM(8, "SAA register 0x%02X changed " JOM(8, "SAA register 0x%02X changed "
"from 0x%02X to 0x%02X\n", reg, itwas, isnow); "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
} }
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* /*
* SAA7113H DATASHEET PAGE 53, TABLE 66 * SAA7113H DATASHEET PAGE 53, TABLE 66
*/ */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
reg = 0x5A; reg = 0x5A;
ir = read_saa(peasycap->pusb_device, reg); ir = read_saa(peasycap->pusb_device, reg);
if (0 > ir) if (0 > ir)
SAM("ERROR: failed to read SAA register 0x%02X but continuing\n", reg); SAM("ERROR: failed to read SAA register 0x%02X but continuing\n", reg);
itwas = (unsigned int)ir; itwas = (unsigned int)ir;
if (peasycap_standard->mask & 0x0001) if (peasycap_standard->mask & 0x0001)
...@@ -310,9 +330,9 @@ if (0 > ir) ...@@ -310,9 +330,9 @@ if (0 > ir)
JOM(8, "SAA register 0x%02X changed " JOM(8, "SAA register 0x%02X changed "
"from 0x%02X to 0x%02X\n", reg, itwas, isnow); "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
} }
if (true == resubmit) if (true == resubmit)
submit_video_urbs(peasycap); submit_video_urbs(peasycap);
return 0; return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
...@@ -342,88 +362,88 @@ return 0; ...@@ -342,88 +362,88 @@ return 0;
int adjust_format(struct easycap *peasycap, int adjust_format(struct easycap *peasycap,
u32 width, u32 height, u32 pixelformat, int field, bool try) u32 width, u32 height, u32 pixelformat, int field, bool try)
{ {
struct easycap_format *peasycap_format, *peasycap_best_format; struct easycap_format *peasycap_format, *peasycap_best_format;
u16 mask; u16 mask;
struct usb_device *p; struct usb_device *p;
int miss, multiplier, best, k; int miss, multiplier, best, k;
char bf[5], fo[32], *pc; char bf[5], fo[32], *pc;
u32 uc; u32 uc;
bool resubmit; bool resubmit;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (0 > peasycap->standard_offset) { if (0 > peasycap->standard_offset) {
JOM(8, "%i=peasycap->standard_offset\n", peasycap->standard_offset); JOM(8, "%i=peasycap->standard_offset\n", peasycap->standard_offset);
return -EBUSY; return -EBUSY;
} }
p = peasycap->pusb_device; p = peasycap->pusb_device;
if (NULL == p) { if (NULL == p) {
SAM("ERROR: peaycap->pusb_device is NULL\n"); SAM("ERROR: peaycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
pc = &bf[0]; pc = &bf[0];
uc = pixelformat; uc = pixelformat;
memcpy((void *)pc, (void *)(&uc), 4); memcpy((void *)pc, (void *)(&uc), 4);
bf[4] = 0; bf[4] = 0;
mask = 0xFF & easycap_standard[peasycap->standard_offset].mask; mask = 0xFF & easycap_standard[peasycap->standard_offset].mask;
SAM("sought: %ix%i,%s(0x%08X),%i=field,0x%02X=std mask\n", SAM("sought: %ix%i,%s(0x%08X),%i=field,0x%02X=std mask\n",
width, height, pc, pixelformat, field, mask); width, height, pc, pixelformat, field, mask);
switch (field) { switch (field) {
case V4L2_FIELD_ANY: { case V4L2_FIELD_ANY: {
strcpy(&fo[0], "V4L2_FIELD_ANY "); strcpy(&fo[0], "V4L2_FIELD_ANY ");
break; break;
} }
case V4L2_FIELD_NONE: { case V4L2_FIELD_NONE: {
strcpy(&fo[0], "V4L2_FIELD_NONE"); strcpy(&fo[0], "V4L2_FIELD_NONE");
break; break;
} }
case V4L2_FIELD_TOP: { case V4L2_FIELD_TOP: {
strcpy(&fo[0], "V4L2_FIELD_TOP"); strcpy(&fo[0], "V4L2_FIELD_TOP");
break; break;
} }
case V4L2_FIELD_BOTTOM: { case V4L2_FIELD_BOTTOM: {
strcpy(&fo[0], "V4L2_FIELD_BOTTOM"); strcpy(&fo[0], "V4L2_FIELD_BOTTOM");
break; break;
} }
case V4L2_FIELD_INTERLACED: { case V4L2_FIELD_INTERLACED: {
strcpy(&fo[0], "V4L2_FIELD_INTERLACED"); strcpy(&fo[0], "V4L2_FIELD_INTERLACED");
break; break;
} }
case V4L2_FIELD_SEQ_TB: { case V4L2_FIELD_SEQ_TB: {
strcpy(&fo[0], "V4L2_FIELD_SEQ_TB"); strcpy(&fo[0], "V4L2_FIELD_SEQ_TB");
break; break;
} }
case V4L2_FIELD_SEQ_BT: { case V4L2_FIELD_SEQ_BT: {
strcpy(&fo[0], "V4L2_FIELD_SEQ_BT"); strcpy(&fo[0], "V4L2_FIELD_SEQ_BT");
break; break;
} }
case V4L2_FIELD_ALTERNATE: { case V4L2_FIELD_ALTERNATE: {
strcpy(&fo[0], "V4L2_FIELD_ALTERNATE"); strcpy(&fo[0], "V4L2_FIELD_ALTERNATE");
break; break;
} }
case V4L2_FIELD_INTERLACED_TB: { case V4L2_FIELD_INTERLACED_TB: {
strcpy(&fo[0], "V4L2_FIELD_INTERLACED_TB"); strcpy(&fo[0], "V4L2_FIELD_INTERLACED_TB");
break; break;
} }
case V4L2_FIELD_INTERLACED_BT: { case V4L2_FIELD_INTERLACED_BT: {
strcpy(&fo[0], "V4L2_FIELD_INTERLACED_BT"); strcpy(&fo[0], "V4L2_FIELD_INTERLACED_BT");
break; break;
} }
default: { default: {
strcpy(&fo[0], "V4L2_FIELD_... UNKNOWN "); strcpy(&fo[0], "V4L2_FIELD_... UNKNOWN ");
break; break;
} }
} }
SAM("sought: %s\n", &fo[0]); SAM("sought: %s\n", &fo[0]);
if (V4L2_FIELD_ANY == field) { if (V4L2_FIELD_ANY == field) {
field = V4L2_FIELD_NONE; field = V4L2_FIELD_NONE;
SAM("prefer: V4L2_FIELD_NONE=field, was V4L2_FIELD_ANY\n"); SAM("prefer: V4L2_FIELD_NONE=field, was V4L2_FIELD_ANY\n");
} }
peasycap_best_format = NULL; peasycap_best_format = NULL;
peasycap_format = &easycap_format[0]; peasycap_format = &easycap_format[0];
while (0 != peasycap_format->v4l2_format.fmt.pix.width) { while (0 != peasycap_format->v4l2_format.fmt.pix.width) {
JOM(16, ".> %i %i 0x%08X %ix%i\n", JOM(16, ".> %i %i 0x%08X %ix%i\n",
peasycap_format->mask & 0x01, peasycap_format->mask & 0x01,
peasycap_format->v4l2_format.fmt.pix.field, peasycap_format->v4l2_format.fmt.pix.field,
...@@ -433,27 +453,26 @@ while (0 != peasycap_format->v4l2_format.fmt.pix.width) { ...@@ -433,27 +453,26 @@ while (0 != peasycap_format->v4l2_format.fmt.pix.width) {
if (((peasycap_format->mask & 0x1F) == (mask & 0x1F)) && if (((peasycap_format->mask & 0x1F) == (mask & 0x1F)) &&
(peasycap_format->v4l2_format.fmt.pix.field == field) && (peasycap_format->v4l2_format.fmt.pix.field == field) &&
(peasycap_format->v4l2_format.fmt.pix.pixelformat == (peasycap_format->v4l2_format.fmt.pix.pixelformat == pixelformat) &&
pixelformat) &&
(peasycap_format->v4l2_format.fmt.pix.width == width) && (peasycap_format->v4l2_format.fmt.pix.width == width) &&
(peasycap_format->v4l2_format.fmt.pix.height == height)) { (peasycap_format->v4l2_format.fmt.pix.height == height)) {
peasycap_best_format = peasycap_format; peasycap_best_format = peasycap_format;
break; break;
} }
peasycap_format++; peasycap_format++;
} }
if (0 == peasycap_format->v4l2_format.fmt.pix.width) { if (0 == peasycap_format->v4l2_format.fmt.pix.width) {
SAM("cannot do: %ix%i with standard mask 0x%02X\n", SAM("cannot do: %ix%i with standard mask 0x%02X\n",
width, height, mask); width, height, mask);
peasycap_format = &easycap_format[0]; best = -1; peasycap_format = &easycap_format[0];
best = -1;
while (0 != peasycap_format->v4l2_format.fmt.pix.width) { while (0 != peasycap_format->v4l2_format.fmt.pix.width) {
if (((peasycap_format->mask & 0x1F) == (mask & 0x1F)) && if (((peasycap_format->mask & 0x1F) == (mask & 0x1F)) &&
(peasycap_format->v4l2_format.fmt.pix (peasycap_format->v4l2_format.fmt.pix.field == field) &&
.field == field) && (peasycap_format->v4l2_format.fmt.pix.pixelformat == pixelformat)) {
(peasycap_format->v4l2_format.fmt.pix
.pixelformat == pixelformat)) { miss = abs(peasycap_format->v4l2_format.fmt.pix.width - width);
miss = abs(peasycap_format->
v4l2_format.fmt.pix.width - width);
if ((best > miss) || (best < 0)) { if ((best > miss) || (best < 0)) {
best = miss; best = miss;
peasycap_best_format = peasycap_format; peasycap_best_format = peasycap_format;
...@@ -471,108 +490,102 @@ if (0 == peasycap_format->v4l2_format.fmt.pix.width) { ...@@ -471,108 +490,102 @@ if (0 == peasycap_format->v4l2_format.fmt.pix.width) {
SAM(" %ix%i unmatched\n", width, height); SAM(" %ix%i unmatched\n", width, height);
return peasycap->format_offset; return peasycap->format_offset;
} }
} }
if (NULL == peasycap_best_format) { if (NULL == peasycap_best_format) {
SAM("MISTAKE: peasycap_best_format is NULL"); SAM("MISTAKE: peasycap_best_format is NULL");
return -EINVAL; return -EINVAL;
} }
peasycap_format = peasycap_best_format; peasycap_format = peasycap_best_format;
/*...........................................................................*/ /*...........................................................................*/
if (true == try) if (try)
return (int)(peasycap_best_format - &easycap_format[0]); return peasycap_best_format - easycap_format;
/*...........................................................................*/ /*...........................................................................*/
if (false != try) { if (false != try) {
SAM("MISTAKE: true==try where is should be false\n"); SAM("MISTAKE: true==try where is should be false\n");
return -EINVAL; return -EINVAL;
} }
SAM("actioning: %ix%i %s\n", SAM("actioning: %ix%i %s\n",
peasycap_format->v4l2_format.fmt.pix.width, peasycap_format->v4l2_format.fmt.pix.width,
peasycap_format->v4l2_format.fmt.pix.height, peasycap_format->v4l2_format.fmt.pix.height,
&peasycap_format->name[0]); &peasycap_format->name[0]);
peasycap->height = peasycap_format->v4l2_format.fmt.pix.height; peasycap->height = peasycap_format->v4l2_format.fmt.pix.height;
peasycap->width = peasycap_format->v4l2_format.fmt.pix.width; peasycap->width = peasycap_format->v4l2_format.fmt.pix.width;
peasycap->pixelformat = peasycap_format->v4l2_format.fmt.pix.pixelformat; peasycap->pixelformat = peasycap_format->v4l2_format.fmt.pix.pixelformat;
peasycap->format_offset = (int)(peasycap_format - &easycap_format[0]); peasycap->format_offset = peasycap_format - easycap_format;
for (k = 0; k < INPUT_MANY; k++) { for (k = 0; k < INPUT_MANY; k++) {
if (!peasycap->inputset[k].format_offset_ok) { if (!peasycap->inputset[k].format_offset_ok) {
peasycap->inputset[k].format_offset = peasycap->inputset[k].format_offset =
peasycap->format_offset; peasycap->format_offset;
} }
} }
if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) { if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
peasycap->inputset[peasycap->input].format_offset = peasycap->inputset[peasycap->input].format_offset =
peasycap->format_offset; peasycap->format_offset;
peasycap->inputset[peasycap->input].format_offset_ok = 1; peasycap->inputset[peasycap->input].format_offset_ok = 1;
} else } else
JOM(8, "%i=peasycap->input\n", peasycap->input); JOM(8, "%i=peasycap->input\n", peasycap->input);
peasycap->bytesperpixel = (0x00E0 & peasycap_format->mask) >> 5 ; peasycap->bytesperpixel = (0x00E0 & peasycap_format->mask) >> 5 ;
if (0x0100 & peasycap_format->mask) if (0x0100 & peasycap_format->mask)
peasycap->byteswaporder = true; peasycap->byteswaporder = true;
else else
peasycap->byteswaporder = false; peasycap->byteswaporder = false;
if (0x0200 & peasycap_format->mask) if (0x0200 & peasycap_format->mask)
peasycap->skip = 5; peasycap->skip = 5;
else else
peasycap->skip = 0; peasycap->skip = 0;
if (0x0800 & peasycap_format->mask) if (0x0800 & peasycap_format->mask)
peasycap->decimatepixel = true; peasycap->decimatepixel = true;
else else
peasycap->decimatepixel = false; peasycap->decimatepixel = false;
if (0x1000 & peasycap_format->mask) if (0x1000 & peasycap_format->mask)
peasycap->offerfields = true; peasycap->offerfields = true;
else else
peasycap->offerfields = false; peasycap->offerfields = false;
if (true == peasycap->decimatepixel) if (true == peasycap->decimatepixel)
multiplier = 2; multiplier = 2;
else else
multiplier = 1; multiplier = 1;
peasycap->videofieldamount = multiplier * peasycap->width * peasycap->videofieldamount =
multiplier * peasycap->height; multiplier * peasycap->width * multiplier * peasycap->height;
peasycap->frame_buffer_used = peasycap->bytesperpixel * peasycap->frame_buffer_used =
peasycap->width * peasycap->height; peasycap->bytesperpixel * peasycap->width * peasycap->height;
if (peasycap->video_isoc_streaming) { if (peasycap->video_isoc_streaming) {
resubmit = true; resubmit = true;
kill_video_urbs(peasycap); kill_video_urbs(peasycap);
} else } else
resubmit = false; resubmit = false;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* PAL * PAL
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
if (0 == (0x01 & peasycap_format->mask)) { if (0 == (0x01 & peasycap_format->mask)) {
if (((720 == peasycap_format->v4l2_format.fmt.pix.width) && if (((720 == peasycap_format->v4l2_format.fmt.pix.width) &&
(576 == (576 == peasycap_format->v4l2_format.fmt.pix.height)) ||
peasycap_format->v4l2_format.fmt.pix.height)) || ((360 == peasycap_format->v4l2_format.fmt.pix.width) &&
((360 == (288 == peasycap_format->v4l2_format.fmt.pix.height))) {
peasycap_format->v4l2_format.fmt.pix.width) && if (set_resolution(p, 0x0000, 0x0001, 0x05A0, 0x0121)) {
(288 ==
peasycap_format->v4l2_format.fmt.pix.height))) {
if (0 != set_resolution(p, 0x0000, 0x0001, 0x05A0, 0x0121)) {
SAM("ERROR: set_resolution() failed\n"); SAM("ERROR: set_resolution() failed\n");
return -EINVAL; return -EINVAL;
} }
} else if ((704 == peasycap_format->v4l2_format.fmt.pix.width) && } else if ((704 == peasycap_format->v4l2_format.fmt.pix.width) &&
(576 == peasycap_format->v4l2_format.fmt.pix.height)) { (576 == peasycap_format->v4l2_format.fmt.pix.height)) {
if (0 != set_resolution(p, 0x0004, 0x0001, 0x0584, 0x0121)) { if (set_resolution(p, 0x0004, 0x0001, 0x0584, 0x0121)) {
SAM("ERROR: set_resolution() failed\n"); SAM("ERROR: set_resolution() failed\n");
return -EINVAL; return -EINVAL;
} }
} else if (((640 == peasycap_format->v4l2_format.fmt.pix.width) && } else if (((640 == peasycap_format->v4l2_format.fmt.pix.width) &&
(480 == (480 == peasycap_format->v4l2_format.fmt.pix.height)) ||
peasycap_format->v4l2_format.fmt.pix.height)) || ((320 == peasycap_format->v4l2_format.fmt.pix.width) &&
((320 == (240 == peasycap_format->v4l2_format.fmt.pix.height))) {
peasycap_format->v4l2_format.fmt.pix.width) && if (set_resolution(p, 0x0014, 0x0020, 0x0514, 0x0110)) {
(240 ==
peasycap_format->v4l2_format.fmt.pix.height))) {
if (0 != set_resolution(p, 0x0014, 0x0020, 0x0514, 0x0110)) {
SAM("ERROR: set_resolution() failed\n"); SAM("ERROR: set_resolution() failed\n");
return -EINVAL; return -EINVAL;
} }
...@@ -585,26 +598,20 @@ if (0 == (0x01 & peasycap_format->mask)) { ...@@ -585,26 +598,20 @@ if (0 == (0x01 & peasycap_format->mask)) {
* NTSC * NTSC
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
} else { } else {
if (((720 == peasycap_format->v4l2_format.fmt.pix.width) && if (((720 == peasycap_format->v4l2_format.fmt.pix.width) &&
(480 == (480 == peasycap_format->v4l2_format.fmt.pix.height)) ||
peasycap_format->v4l2_format.fmt.pix.height)) || ((360 == peasycap_format->v4l2_format.fmt.pix.width) &&
((360 == (240 == peasycap_format->v4l2_format.fmt.pix.height))) {
peasycap_format->v4l2_format.fmt.pix.width) && if (set_resolution(p, 0x0000, 0x0003, 0x05A0, 0x00F3)) {
(240 ==
peasycap_format->v4l2_format.fmt.pix.height))) {
if (0 != set_resolution(p, 0x0000, 0x0003, 0x05A0, 0x00F3)) {
SAM("ERROR: set_resolution() failed\n"); SAM("ERROR: set_resolution() failed\n");
return -EINVAL; return -EINVAL;
} }
} else if (((640 == peasycap_format->v4l2_format.fmt.pix.width) && } else if (((640 == peasycap_format->v4l2_format.fmt.pix.width) &&
(480 == (480 == peasycap_format->v4l2_format.fmt.pix.height)) ||
peasycap_format->v4l2_format.fmt.pix.height)) || ((320 == peasycap_format->v4l2_format.fmt.pix.width) &&
((320 == (240 == peasycap_format->v4l2_format.fmt.pix.height))) {
peasycap_format->v4l2_format.fmt.pix.width) && if (set_resolution(p, 0x0014, 0x0003, 0x0514, 0x00F3)) {
(240 ==
peasycap_format->v4l2_format.fmt.pix.height))) {
if (0 != set_resolution(p, 0x0014, 0x0003, 0x0514, 0x00F3)) {
SAM("ERROR: set_resolution() failed\n"); SAM("ERROR: set_resolution() failed\n");
return -EINVAL; return -EINVAL;
} }
...@@ -612,36 +619,36 @@ if (0 == (0x01 & peasycap_format->mask)) { ...@@ -612,36 +619,36 @@ if (0 == (0x01 & peasycap_format->mask)) {
SAM("MISTAKE: bad format, cannot set resolution\n"); SAM("MISTAKE: bad format, cannot set resolution\n");
return -EINVAL; return -EINVAL;
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
if (true == resubmit) if (resubmit)
submit_video_urbs(peasycap); submit_video_urbs(peasycap);
return (int)(peasycap_best_format - &easycap_format[0]);
return peasycap_best_format - easycap_format;
} }
/*****************************************************************************/ /*****************************************************************************/
int adjust_brightness(struct easycap *peasycap, int value) int adjust_brightness(struct easycap *peasycap, int value)
{ {
unsigned int mood; unsigned int mood;
int i1, k; int i1, k;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
i1 = 0; i1 = 0;
while (0xFFFFFFFF != easycap_control[i1].id) { while (0xFFFFFFFF != easycap_control[i1].id) {
if (V4L2_CID_BRIGHTNESS == easycap_control[i1].id) { if (V4L2_CID_BRIGHTNESS == easycap_control[i1].id) {
if ((easycap_control[i1].minimum > value) || if ((easycap_control[i1].minimum > value) ||
(easycap_control[i1].maximum < value)) (easycap_control[i1].maximum < value))
value = easycap_control[i1].default_value; value = easycap_control[i1].default_value;
if ((easycap_control[i1].minimum <= peasycap->brightness) && if ((easycap_control[i1].minimum <= peasycap->brightness) &&
(easycap_control[i1].maximum >= (easycap_control[i1].maximum >= peasycap->brightness)) {
peasycap->brightness)) {
if (peasycap->brightness == value) { if (peasycap->brightness == value) {
SAM("unchanged brightness at 0x%02X\n", SAM("unchanged brightness at 0x%02X\n",
value); value);
...@@ -672,36 +679,34 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -672,36 +679,34 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
break; break;
} }
i1++; i1++;
} }
SAM("WARNING: failed to adjust brightness: control not found\n"); SAM("WARNING: failed to adjust brightness: control not found\n");
return -ENOENT; return -ENOENT;
} }
/*****************************************************************************/ /*****************************************************************************/
int adjust_contrast(struct easycap *peasycap, int value) int adjust_contrast(struct easycap *peasycap, int value)
{ {
unsigned int mood; unsigned int mood;
int i1, k; int i1, k;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
i1 = 0; i1 = 0;
while (0xFFFFFFFF != easycap_control[i1].id) { while (0xFFFFFFFF != easycap_control[i1].id) {
if (V4L2_CID_CONTRAST == easycap_control[i1].id) { if (V4L2_CID_CONTRAST == easycap_control[i1].id) {
if ((easycap_control[i1].minimum > value) || if ((easycap_control[i1].minimum > value) ||
(easycap_control[i1].maximum < value)) (easycap_control[i1].maximum < value))
value = easycap_control[i1].default_value; value = easycap_control[i1].default_value;
if ((easycap_control[i1].minimum <= peasycap->contrast) && if ((easycap_control[i1].minimum <= peasycap->contrast) &&
(easycap_control[i1].maximum >= (easycap_control[i1].maximum >= peasycap->contrast)) {
peasycap->contrast)) {
if (peasycap->contrast == value) { if (peasycap->contrast == value) {
SAM("unchanged contrast at 0x%02X\n", value); SAM("unchanged contrast at 0x%02X\n", value);
return 0; return 0;
...@@ -709,17 +714,17 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -709,17 +714,17 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
} }
peasycap->contrast = value; peasycap->contrast = value;
for (k = 0; k < INPUT_MANY; k++) { for (k = 0; k < INPUT_MANY; k++) {
if (!peasycap->inputset[k].contrast_ok) { if (!peasycap->inputset[k].contrast_ok)
peasycap->inputset[k].contrast = peasycap->inputset[k].contrast = peasycap->contrast;
peasycap->contrast;
}
} }
if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) { if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
peasycap->inputset[peasycap->input].contrast = peasycap->inputset[peasycap->input].contrast =
peasycap->contrast; peasycap->contrast;
peasycap->inputset[peasycap->input].contrast_ok = 1; peasycap->inputset[peasycap->input].contrast_ok = 1;
} else } else
JOM(8, "%i=peasycap->input\n", peasycap->input); JOM(8, "%i=peasycap->input\n", peasycap->input);
mood = 0x00FF & (unsigned int) (peasycap->contrast - 128); mood = 0x00FF & (unsigned int) (peasycap->contrast - 128);
if (!write_saa(peasycap->pusb_device, 0x0B, mood)) { if (!write_saa(peasycap->pusb_device, 0x0B, mood)) {
SAM("adjusting contrast to 0x%02X\n", mood); SAM("adjusting contrast to 0x%02X\n", mood);
...@@ -732,26 +737,26 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -732,26 +737,26 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
break; break;
} }
i1++; i1++;
} }
SAM("WARNING: failed to adjust contrast: control not found\n"); SAM("WARNING: failed to adjust contrast: control not found\n");
return -ENOENT; return -ENOENT;
} }
/*****************************************************************************/ /*****************************************************************************/
int adjust_saturation(struct easycap *peasycap, int value) int adjust_saturation(struct easycap *peasycap, int value)
{ {
unsigned int mood; unsigned int mood;
int i1, k; int i1, k;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
i1 = 0; i1 = 0;
while (0xFFFFFFFF != easycap_control[i1].id) { while (0xFFFFFFFF != easycap_control[i1].id) {
if (V4L2_CID_SATURATION == easycap_control[i1].id) { if (V4L2_CID_SATURATION == easycap_control[i1].id) {
if ((easycap_control[i1].minimum > value) || if ((easycap_control[i1].minimum > value) ||
(easycap_control[i1].maximum < value)) (easycap_control[i1].maximum < value))
...@@ -759,8 +764,7 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -759,8 +764,7 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
if ((easycap_control[i1].minimum <= peasycap->saturation) && if ((easycap_control[i1].minimum <= peasycap->saturation) &&
(easycap_control[i1].maximum >= (easycap_control[i1].maximum >= peasycap->saturation)) {
peasycap->saturation)) {
if (peasycap->saturation == value) { if (peasycap->saturation == value) {
SAM("unchanged saturation at 0x%02X\n", SAM("unchanged saturation at 0x%02X\n",
value); value);
...@@ -769,11 +773,10 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -769,11 +773,10 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
} }
peasycap->saturation = value; peasycap->saturation = value;
for (k = 0; k < INPUT_MANY; k++) { for (k = 0; k < INPUT_MANY; k++) {
if (!peasycap->inputset[k].saturation_ok) { if (!peasycap->inputset[k].saturation_ok)
peasycap->inputset[k].saturation = peasycap->inputset[k].saturation =
peasycap->saturation; peasycap->saturation;
} }
}
if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) { if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) {
peasycap->inputset[peasycap->input].saturation = peasycap->inputset[peasycap->input].saturation =
peasycap->saturation; peasycap->saturation;
...@@ -792,34 +795,33 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -792,34 +795,33 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
break; break;
} }
i1++; i1++;
} }
SAM("WARNING: failed to adjust saturation: control not found\n"); SAM("WARNING: failed to adjust saturation: control not found\n");
return -ENOENT; return -ENOENT;
} }
/*****************************************************************************/ /*****************************************************************************/
int adjust_hue(struct easycap *peasycap, int value) int adjust_hue(struct easycap *peasycap, int value)
{ {
unsigned int mood; unsigned int mood;
int i1, i2, k; int i1, i2, k;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
i1 = 0; i1 = 0;
while (0xFFFFFFFF != easycap_control[i1].id) { while (0xFFFFFFFF != easycap_control[i1].id) {
if (V4L2_CID_HUE == easycap_control[i1].id) { if (V4L2_CID_HUE == easycap_control[i1].id) {
if ((easycap_control[i1].minimum > value) || if ((easycap_control[i1].minimum > value) ||
(easycap_control[i1].maximum < value)) (easycap_control[i1].maximum < value))
value = easycap_control[i1].default_value; value = easycap_control[i1].default_value;
if ((easycap_control[i1].minimum <= peasycap->hue) && if ((easycap_control[i1].minimum <= peasycap->hue) &&
(easycap_control[i1].maximum >= (easycap_control[i1].maximum >= peasycap->hue)) {
peasycap->hue)) {
if (peasycap->hue == value) { if (peasycap->hue == value) {
SAM("unchanged hue at 0x%02X\n", value); SAM("unchanged hue at 0x%02X\n", value);
return 0; return 0;
...@@ -830,9 +832,8 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -830,9 +832,8 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
if (!peasycap->inputset[k].hue_ok) if (!peasycap->inputset[k].hue_ok)
peasycap->inputset[k].hue = peasycap->hue; peasycap->inputset[k].hue = peasycap->hue;
} }
if ((0 <= peasycap->input) && (INPUT_MANY > peasycap->input)) { if (0 <= peasycap->input && INPUT_MANY > peasycap->input) {
peasycap->inputset[peasycap->input].hue = peasycap->inputset[peasycap->input].hue = peasycap->hue;
peasycap->hue;
peasycap->inputset[peasycap->input].hue_ok = 1; peasycap->inputset[peasycap->input].hue_ok = 1;
} else } else
JOM(8, "%i=peasycap->input\n", peasycap->input); JOM(8, "%i=peasycap->input\n", peasycap->input);
...@@ -848,33 +849,33 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -848,33 +849,33 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
break; break;
} }
i1++; i1++;
} }
SAM("WARNING: failed to adjust hue: control not found\n"); SAM("WARNING: failed to adjust hue: control not found\n");
return -ENOENT; return -ENOENT;
} }
/*****************************************************************************/ /*****************************************************************************/
int adjust_volume(struct easycap *peasycap, int value) int adjust_volume(struct easycap *peasycap, int value)
{ {
s8 mood; s8 mood;
int i1; int i1;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
i1 = 0; i1 = 0;
while (0xFFFFFFFF != easycap_control[i1].id) { while (0xFFFFFFFF != easycap_control[i1].id) {
if (V4L2_CID_AUDIO_VOLUME == easycap_control[i1].id) { if (V4L2_CID_AUDIO_VOLUME == easycap_control[i1].id) {
if ((easycap_control[i1].minimum > value) || if ((easycap_control[i1].minimum > value) ||
(easycap_control[i1].maximum < value)) (easycap_control[i1].maximum < value))
value = easycap_control[i1].default_value; value = easycap_control[i1].default_value;
if ((easycap_control[i1].minimum <= peasycap->volume) && if ((easycap_control[i1].minimum <= peasycap->volume) &&
(easycap_control[i1].maximum >= (easycap_control[i1].maximum >= peasycap->volume)) {
peasycap->volume)) {
if (peasycap->volume == value) { if (peasycap->volume == value) {
SAM("unchanged volume at 0x%02X\n", value); SAM("unchanged volume at 0x%02X\n", value);
return 0; return 0;
...@@ -894,10 +895,10 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -894,10 +895,10 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
} }
break; break;
} }
i1++; i1++;
} }
SAM("WARNING: failed to adjust volume: control not found\n"); SAM("WARNING: failed to adjust volume: control not found\n");
return -ENOENT; return -ENOENT;
} }
/*****************************************************************************/ /*****************************************************************************/
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
...@@ -913,18 +914,18 @@ return -ENOENT; ...@@ -913,18 +914,18 @@ return -ENOENT;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int adjust_mute(struct easycap *peasycap, int value) static int adjust_mute(struct easycap *peasycap, int value)
{ {
int i1; int i1;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
i1 = 0; i1 = 0;
while (0xFFFFFFFF != easycap_control[i1].id) { while (0xFFFFFFFF != easycap_control[i1].id) {
if (V4L2_CID_AUDIO_MUTE == easycap_control[i1].id) { if (V4L2_CID_AUDIO_MUTE == easycap_control[i1].id) {
peasycap->mute = value; peasycap->mute = value;
switch (peasycap->mute) { switch (peasycap->mute) {
...@@ -945,38 +946,38 @@ while (0xFFFFFFFF != easycap_control[i1].id) { ...@@ -945,38 +946,38 @@ while (0xFFFFFFFF != easycap_control[i1].id) {
break; break;
} }
i1++; i1++;
} }
SAM("WARNING: failed to adjust mute: control not found\n"); SAM("WARNING: failed to adjust mute: control not found\n");
return -ENOENT; return -ENOENT;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
long easycap_unlocked_ioctl(struct file *file, long easycap_unlocked_ioctl(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct easycap *peasycap; struct easycap *peasycap;
struct usb_device *p; struct usb_device *p;
int kd; int kd;
if (NULL == file) { if (NULL == file) {
SAY("ERROR: file is NULL\n"); SAY("ERROR: file is NULL\n");
return -ERESTARTSYS; return -ERESTARTSYS;
} }
peasycap = file->private_data; peasycap = file->private_data;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return -1; return -1;
} }
if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
SAY("ERROR: bad peasycap\n"); SAY("ERROR: bad peasycap\n");
return -EFAULT; return -EFAULT;
} }
p = peasycap->pusb_device; p = peasycap->pusb_device;
if (NULL == p) { if (NULL == p) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
kd = isdongle(peasycap); kd = isdongle(peasycap);
if (0 <= kd && DONGLE_MANY > kd) { if (0 <= kd && DONGLE_MANY > kd) {
if (mutex_lock_interruptible(&easycapdc60_dongle[kd].mutex_video)) { if (mutex_lock_interruptible(&easycapdc60_dongle[kd].mutex_video)) {
SAY("ERROR: cannot lock " SAY("ERROR: cannot lock "
"easycapdc60_dongle[%i].mutex_video\n", kd); "easycapdc60_dongle[%i].mutex_video\n", kd);
...@@ -988,7 +989,7 @@ if (0 <= kd && DONGLE_MANY > kd) { ...@@ -988,7 +989,7 @@ if (0 <= kd && DONGLE_MANY > kd) {
* MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap, * MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap,
* IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL. * IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.
* IF NECESSARY, BAIL OUT. * IF NECESSARY, BAIL OUT.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
if (kd != isdongle(peasycap)) if (kd != isdongle(peasycap))
return -ERESTARTSYS; return -ERESTARTSYS;
...@@ -1014,18 +1015,18 @@ if (0 <= kd && DONGLE_MANY > kd) { ...@@ -1014,18 +1015,18 @@ if (0 <= kd && DONGLE_MANY > kd) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -ERESTARTSYS; return -ERESTARTSYS;
} }
} else { } else {
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE * IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE
* ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED. BAIL OUT. * ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED. BAIL OUT.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
return -ERESTARTSYS; return -ERESTARTSYS;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
switch (cmd) { switch (cmd) {
case VIDIOC_QUERYCAP: { case VIDIOC_QUERYCAP: {
struct v4l2_capability v4l2_capability; struct v4l2_capability v4l2_capability;
char version[16], *p1, *p2; char version[16], *p1, *p2;
int i, rc, k[3]; int i, rc, k[3];
...@@ -1041,7 +1042,8 @@ case VIDIOC_QUERYCAP: { ...@@ -1041,7 +1042,8 @@ case VIDIOC_QUERYCAP: {
strcpy(&version[0], EASYCAP_DRIVER_VERSION); strcpy(&version[0], EASYCAP_DRIVER_VERSION);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
k[i] = 0; k[i] = 0;
p2 = &version[0]; i = 0; p2 = &version[0];
i = 0;
while (*p2) { while (*p2) {
p1 = p2; p1 = p2;
while (*p2 && ('.' != *p2)) while (*p2 && ('.' != *p2))
...@@ -1053,8 +1055,7 @@ case VIDIOC_QUERYCAP: { ...@@ -1053,8 +1055,7 @@ case VIDIOC_QUERYCAP: {
if (rc) { if (rc) {
SAM("ERROR: %i=strict_strtol(%s,.,,)\n", SAM("ERROR: %i=strict_strtol(%s,.,,)\n",
rc, p1); rc, p1);
mutex_unlock(&easycapdc60_dongle[kd]. mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
mutex_video);
return -EINVAL; return -EINVAL;
} }
k[i] = (int)lng; k[i] = (int)lng;
...@@ -1063,41 +1064,44 @@ case VIDIOC_QUERYCAP: { ...@@ -1063,41 +1064,44 @@ case VIDIOC_QUERYCAP: {
} }
memset(&v4l2_capability, 0, sizeof(struct v4l2_capability)); memset(&v4l2_capability, 0, sizeof(struct v4l2_capability));
strlcpy(&v4l2_capability.driver[0], "easycap", strlcpy(&v4l2_capability.driver[0],
sizeof(v4l2_capability.driver)); "easycap", sizeof(v4l2_capability.driver));
v4l2_capability.capabilities = v4l2_capability.capabilities = V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | V4L2_CAP_STREAMING |
V4L2_CAP_AUDIO | V4L2_CAP_READWRITE; V4L2_CAP_AUDIO |
V4L2_CAP_READWRITE;
v4l2_capability.version = KERNEL_VERSION(k[0], k[1], k[2]); v4l2_capability.version = KERNEL_VERSION(k[0], k[1], k[2]);
JOM(8, "v4l2_capability.version=(%i,%i,%i)\n", k[0], k[1], k[2]); JOM(8, "v4l2_capability.version=(%i,%i,%i)\n", k[0], k[1], k[2]);
strlcpy(&v4l2_capability.card[0], "EasyCAP DC60", strlcpy(&v4l2_capability.card[0],
sizeof(v4l2_capability.card)); "EasyCAP DC60", sizeof(v4l2_capability.card));
if (usb_make_path(peasycap->pusb_device, &v4l2_capability.bus_info[0], if (usb_make_path(peasycap->pusb_device,
&v4l2_capability.bus_info[0],
sizeof(v4l2_capability.bus_info)) < 0) { sizeof(v4l2_capability.bus_info)) < 0) {
strlcpy(&v4l2_capability.bus_info[0], "EasyCAP bus_info", strlcpy(&v4l2_capability.bus_info[0], "EasyCAP bus_info",
sizeof(v4l2_capability.bus_info)); sizeof(v4l2_capability.bus_info));
JOM(8, "%s=v4l2_capability.bus_info\n", JOM(8, "%s=v4l2_capability.bus_info\n",
&v4l2_capability.bus_info[0]); &v4l2_capability.bus_info[0]);
} }
if (0 != copy_to_user((void __user *)arg, &v4l2_capability, if (copy_to_user((void __user *)arg, &v4l2_capability,
sizeof(struct v4l2_capability))) { sizeof(struct v4l2_capability))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_ENUMINPUT: { case VIDIOC_ENUMINPUT: {
struct v4l2_input v4l2_input; struct v4l2_input v4l2_input;
u32 index; u32 index;
JOM(8, "VIDIOC_ENUMINPUT\n"); JOM(8, "VIDIOC_ENUMINPUT\n");
if (0 != copy_from_user(&v4l2_input, (void __user *)arg, if (copy_from_user(&v4l2_input, (void __user *)arg,
sizeof(struct v4l2_input))) { sizeof(struct v4l2_input))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
...@@ -1113,7 +1117,8 @@ case VIDIOC_ENUMINPUT: { ...@@ -1113,7 +1117,8 @@ case VIDIOC_ENUMINPUT: {
v4l2_input.type = V4L2_INPUT_TYPE_CAMERA; v4l2_input.type = V4L2_INPUT_TYPE_CAMERA;
v4l2_input.audioset = 0x01; v4l2_input.audioset = 0x01;
v4l2_input.tuner = 0; v4l2_input.tuner = 0;
v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM | v4l2_input.std = V4L2_STD_PAL |
V4L2_STD_SECAM |
V4L2_STD_NTSC ; V4L2_STD_NTSC ;
v4l2_input.status = 0; v4l2_input.status = 0;
JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]); JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
...@@ -1126,7 +1131,7 @@ case VIDIOC_ENUMINPUT: { ...@@ -1126,7 +1131,7 @@ case VIDIOC_ENUMINPUT: {
v4l2_input.audioset = 0x01; v4l2_input.audioset = 0x01;
v4l2_input.tuner = 0; v4l2_input.tuner = 0;
v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM | v4l2_input.std = V4L2_STD_PAL | V4L2_STD_SECAM |
V4L2_STD_NTSC ; V4L2_STD_NTSC;
v4l2_input.status = 0; v4l2_input.status = 0;
JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]); JOM(8, "%i=index: %s\n", index, &v4l2_input.name[0]);
break; break;
...@@ -1186,28 +1191,28 @@ case VIDIOC_ENUMINPUT: { ...@@ -1186,28 +1191,28 @@ case VIDIOC_ENUMINPUT: {
} }
} }
if (0 != copy_to_user((void __user *)arg, &v4l2_input, if (copy_to_user((void __user *)arg, &v4l2_input,
sizeof(struct v4l2_input))) { sizeof(struct v4l2_input))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_INPUT: { case VIDIOC_G_INPUT: {
u32 index; u32 index;
JOM(8, "VIDIOC_G_INPUT\n"); JOM(8, "VIDIOC_G_INPUT\n");
index = (u32)peasycap->input; index = (u32)peasycap->input;
JOM(8, "user is told: %i\n", index); JOM(8, "user is told: %i\n", index);
if (0 != copy_to_user((void __user *)arg, &index, sizeof(u32))) { if (copy_to_user((void __user *)arg, &index, sizeof(u32))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_S_INPUT: case VIDIOC_S_INPUT:
{ {
u32 index; u32 index;
int rc; int rc;
...@@ -1241,20 +1246,20 @@ case VIDIOC_S_INPUT: ...@@ -1241,20 +1246,20 @@ case VIDIOC_S_INPUT:
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_ENUMAUDIO: { case VIDIOC_ENUMAUDIO: {
JOM(8, "VIDIOC_ENUMAUDIO\n"); JOM(8, "VIDIOC_ENUMAUDIO\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_ENUMAUDOUT: { case VIDIOC_ENUMAUDOUT: {
struct v4l2_audioout v4l2_audioout; struct v4l2_audioout v4l2_audioout;
JOM(8, "VIDIOC_ENUMAUDOUT\n"); JOM(8, "VIDIOC_ENUMAUDOUT\n");
if (0 != copy_from_user(&v4l2_audioout, (void __user *)arg, if (copy_from_user(&v4l2_audioout, (void __user *)arg,
sizeof(struct v4l2_audioout))) { sizeof(struct v4l2_audioout))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
...@@ -1268,15 +1273,15 @@ case VIDIOC_ENUMAUDOUT: { ...@@ -1268,15 +1273,15 @@ case VIDIOC_ENUMAUDOUT: {
v4l2_audioout.index = 0; v4l2_audioout.index = 0;
strcpy(&v4l2_audioout.name[0], "Soundtrack"); strcpy(&v4l2_audioout.name[0], "Soundtrack");
if (0 != copy_to_user((void __user *)arg, &v4l2_audioout, if (copy_to_user((void __user *)arg, &v4l2_audioout,
sizeof(struct v4l2_audioout))) { sizeof(struct v4l2_audioout))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_QUERYCTRL: { case VIDIOC_QUERYCTRL: {
int i1; int i1;
struct v4l2_queryctrl v4l2_queryctrl; struct v4l2_queryctrl v4l2_queryctrl;
...@@ -1304,21 +1309,21 @@ case VIDIOC_QUERYCTRL: { ...@@ -1304,21 +1309,21 @@ case VIDIOC_QUERYCTRL: {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
if (0 != copy_to_user((void __user *)arg, &v4l2_queryctrl, if (copy_to_user((void __user *)arg, &v4l2_queryctrl,
sizeof(struct v4l2_queryctrl))) { sizeof(struct v4l2_queryctrl))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_QUERYMENU: { case VIDIOC_QUERYMENU: {
JOM(8, "VIDIOC_QUERYMENU unsupported\n"); JOM(8, "VIDIOC_QUERYMENU unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_CTRL: { case VIDIOC_G_CTRL: {
struct v4l2_control *pv4l2_control; struct v4l2_control *pv4l2_control;
JOM(8, "VIDIOC_G_CTRL\n"); JOM(8, "VIDIOC_G_CTRL\n");
...@@ -1377,7 +1382,7 @@ case VIDIOC_G_CTRL: { ...@@ -1377,7 +1382,7 @@ case VIDIOC_G_CTRL: {
return -EINVAL; return -EINVAL;
} }
} }
if (0 != copy_to_user((void __user *)arg, pv4l2_control, if (copy_to_user((void __user *)arg, pv4l2_control,
sizeof(struct v4l2_control))) { sizeof(struct v4l2_control))) {
kfree(pv4l2_control); kfree(pv4l2_control);
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
...@@ -1385,9 +1390,9 @@ case VIDIOC_G_CTRL: { ...@@ -1385,9 +1390,9 @@ case VIDIOC_G_CTRL: {
} }
kfree(pv4l2_control); kfree(pv4l2_control);
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_S_CTRL: case VIDIOC_S_CTRL:
{ {
struct v4l2_control v4l2_control; struct v4l2_control v4l2_control;
...@@ -1451,15 +1456,15 @@ case VIDIOC_S_CTRL: ...@@ -1451,15 +1456,15 @@ case VIDIOC_S_CTRL:
} }
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_S_EXT_CTRLS: { case VIDIOC_S_EXT_CTRLS: {
JOM(8, "VIDIOC_S_EXT_CTRLS unsupported\n"); JOM(8, "VIDIOC_S_EXT_CTRLS unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_ENUM_FMT: { case VIDIOC_ENUM_FMT: {
u32 index; u32 index;
struct v4l2_fmtdesc v4l2_fmtdesc; struct v4l2_fmtdesc v4l2_fmtdesc;
...@@ -1526,20 +1531,20 @@ case VIDIOC_ENUM_FMT: { ...@@ -1526,20 +1531,20 @@ case VIDIOC_ENUM_FMT: {
return -EINVAL; return -EINVAL;
} }
} }
if (0 != copy_to_user((void __user *)arg, &v4l2_fmtdesc, if (copy_to_user((void __user *)arg, &v4l2_fmtdesc,
sizeof(struct v4l2_fmtdesc))) { sizeof(struct v4l2_fmtdesc))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
/* /*
* THE RESPONSE TO VIDIOC_ENUM_FRAMESIZES MUST BE CONDITIONED ON THE * THE RESPONSE TO VIDIOC_ENUM_FRAMESIZES MUST BE CONDITIONED ON THE
* THE CURRENT STANDARD, BECAUSE THAT IS WHAT gstreamer EXPECTS. BEWARE. * THE CURRENT STANDARD, BECAUSE THAT IS WHAT gstreamer EXPECTS. BEWARE.
*/ */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_ENUM_FRAMESIZES: { case VIDIOC_ENUM_FRAMESIZES: {
u32 index; u32 index;
struct v4l2_frmsizeenum v4l2_frmsizeenum; struct v4l2_frmsizeenum v4l2_frmsizeenum;
...@@ -1662,20 +1667,20 @@ case VIDIOC_ENUM_FRAMESIZES: { ...@@ -1662,20 +1667,20 @@ case VIDIOC_ENUM_FRAMESIZES: {
} }
} }
} }
if (0 != copy_to_user((void __user *)arg, &v4l2_frmsizeenum, if (copy_to_user((void __user *)arg, &v4l2_frmsizeenum,
sizeof(struct v4l2_frmsizeenum))) { sizeof(struct v4l2_frmsizeenum))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
/* /*
* THE RESPONSE TO VIDIOC_ENUM_FRAMEINTERVALS MUST BE CONDITIONED ON THE * THE RESPONSE TO VIDIOC_ENUM_FRAMEINTERVALS MUST BE CONDITIONED ON THE
* THE CURRENT STANDARD, BECAUSE THAT IS WHAT gstreamer EXPECTS. BEWARE. * THE CURRENT STANDARD, BECAUSE THAT IS WHAT gstreamer EXPECTS. BEWARE.
*/ */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_ENUM_FRAMEINTERVALS: { case VIDIOC_ENUM_FRAMEINTERVALS: {
u32 index; u32 index;
int denominator; int denominator;
struct v4l2_frmivalenum v4l2_frmivalenum; struct v4l2_frmivalenum v4l2_frmivalenum;
...@@ -1724,15 +1729,15 @@ case VIDIOC_ENUM_FRAMEINTERVALS: { ...@@ -1724,15 +1729,15 @@ case VIDIOC_ENUM_FRAMEINTERVALS: {
return -EINVAL; return -EINVAL;
} }
} }
if (0 != copy_to_user((void __user *)arg, &v4l2_frmivalenum, if (copy_to_user((void __user *)arg, &v4l2_frmivalenum,
sizeof(struct v4l2_frmivalenum))) { sizeof(struct v4l2_frmivalenum))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_FMT: { case VIDIOC_G_FMT: {
struct v4l2_format *pv4l2_format; struct v4l2_format *pv4l2_format;
struct v4l2_pix_format *pv4l2_pix_format; struct v4l2_pix_format *pv4l2_pix_format;
...@@ -1773,7 +1778,7 @@ case VIDIOC_G_FMT: { ...@@ -1773,7 +1778,7 @@ case VIDIOC_G_FMT: {
JOM(8, "user is told: %s\n", JOM(8, "user is told: %s\n",
&easycap_format[peasycap->format_offset].name[0]); &easycap_format[peasycap->format_offset].name[0]);
if (0 != copy_to_user((void __user *)arg, pv4l2_format, if (copy_to_user((void __user *)arg, pv4l2_format,
sizeof(struct v4l2_format))) { sizeof(struct v4l2_format))) {
kfree(pv4l2_format); kfree(pv4l2_format);
kfree(pv4l2_pix_format); kfree(pv4l2_pix_format);
...@@ -1783,10 +1788,10 @@ case VIDIOC_G_FMT: { ...@@ -1783,10 +1788,10 @@ case VIDIOC_G_FMT: {
kfree(pv4l2_format); kfree(pv4l2_format);
kfree(pv4l2_pix_format); kfree(pv4l2_pix_format);
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_TRY_FMT: case VIDIOC_TRY_FMT:
case VIDIOC_S_FMT: { case VIDIOC_S_FMT: {
struct v4l2_format v4l2_format; struct v4l2_format v4l2_format;
struct v4l2_pix_format v4l2_pix_format; struct v4l2_pix_format v4l2_pix_format;
bool try; bool try;
...@@ -1825,19 +1830,20 @@ case VIDIOC_S_FMT: { ...@@ -1825,19 +1830,20 @@ case VIDIOC_S_FMT: {
memset(&v4l2_pix_format, 0, sizeof(struct v4l2_pix_format)); memset(&v4l2_pix_format, 0, sizeof(struct v4l2_pix_format));
v4l2_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; v4l2_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
memcpy(&(v4l2_format.fmt.pix), &(easycap_format[best_format] memcpy(&(v4l2_format.fmt.pix),
.v4l2_format.fmt.pix), sizeof(v4l2_pix_format)); &(easycap_format[best_format].v4l2_format.fmt.pix),
sizeof(v4l2_pix_format));
JOM(8, "user is told: %s\n", &easycap_format[best_format].name[0]); JOM(8, "user is told: %s\n", &easycap_format[best_format].name[0]);
if (0 != copy_to_user((void __user *)arg, &v4l2_format, if (copy_to_user((void __user *)arg, &v4l2_format,
sizeof(struct v4l2_format))) { sizeof(struct v4l2_format))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_CROPCAP: { case VIDIOC_CROPCAP: {
struct v4l2_cropcap v4l2_cropcap; struct v4l2_cropcap v4l2_cropcap;
JOM(8, "VIDIOC_CROPCAP\n"); JOM(8, "VIDIOC_CROPCAP\n");
...@@ -1866,37 +1872,37 @@ case VIDIOC_CROPCAP: { ...@@ -1866,37 +1872,37 @@ case VIDIOC_CROPCAP: {
JOM(8, "user is told: %ix%i\n", peasycap->width, peasycap->height); JOM(8, "user is told: %ix%i\n", peasycap->width, peasycap->height);
if (0 != copy_to_user((void __user *)arg, &v4l2_cropcap, if (copy_to_user((void __user *)arg, &v4l2_cropcap,
sizeof(struct v4l2_cropcap))) { sizeof(struct v4l2_cropcap))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_CROP: case VIDIOC_G_CROP:
case VIDIOC_S_CROP: { case VIDIOC_S_CROP: {
JOM(8, "VIDIOC_G_CROP|VIDIOC_S_CROP unsupported\n"); JOM(8, "VIDIOC_G_CROP|VIDIOC_S_CROP unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_QUERYSTD: { case VIDIOC_QUERYSTD: {
JOM(8, "VIDIOC_QUERYSTD: " JOM(8, "VIDIOC_QUERYSTD: "
"EasyCAP is incapable of detecting standard\n"); "EasyCAP is incapable of detecting standard\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /*-------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/ /*
/* * THE MANIPULATIONS INVOLVING last0,last1,last2,last3
* THE MANIPULATIONS INVOLVING last0,last1,last2,last3 CONSTITUTE A WORKAROUND * CONSTITUTE A WORKAROUND * FOR WHAT APPEARS TO BE
* FOR WHAT APPEARS TO BE A BUG IN 64-BIT mplayer. * A BUG IN 64-BIT mplayer.
* NOT NEEDED, BUT HOPEFULLY HARMLESS, FOR 32-BIT mplayer. * NOT NEEDED, BUT HOPEFULLY HARMLESS, FOR 32-BIT mplayer.
*/ */
/*---------------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
case VIDIOC_ENUMSTD: { case VIDIOC_ENUMSTD: {
int last0 = -1, last1 = -1, last2 = -1, last3 = -1; int last0 = -1, last1 = -1, last2 = -1, last3 = -1;
struct v4l2_standard v4l2_standard; struct v4l2_standard v4l2_standard;
u32 index; u32 index;
...@@ -1911,11 +1917,17 @@ case VIDIOC_ENUMSTD: { ...@@ -1911,11 +1917,17 @@ case VIDIOC_ENUMSTD: {
} }
index = v4l2_standard.index; index = v4l2_standard.index;
last3 = last2; last2 = last1; last1 = last0; last0 = index; last3 = last2;
last2 = last1;
last1 = last0;
last0 = index;
if ((index == last3) && (index == last2) && if ((index == last3) && (index == last2) &&
(index == last1) && (index == last0)) { (index == last1) && (index == last0)) {
index++; index++;
last3 = last2; last2 = last1; last1 = last0; last0 = index; last3 = last2;
last2 = last1;
last1 = last0;
last0 = index;
} }
memset(&v4l2_standard, 0, sizeof(struct v4l2_standard)); memset(&v4l2_standard, 0, sizeof(struct v4l2_standard));
...@@ -1938,15 +1950,15 @@ case VIDIOC_ENUMSTD: { ...@@ -1938,15 +1950,15 @@ case VIDIOC_ENUMSTD: {
v4l2_standard.index = index; v4l2_standard.index = index;
if (0 != copy_to_user((void __user *)arg, &v4l2_standard, if (copy_to_user((void __user *)arg, &v4l2_standard,
sizeof(struct v4l2_standard))) { sizeof(struct v4l2_standard))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_STD: { case VIDIOC_G_STD: {
v4l2_std_id std_id; v4l2_std_id std_id;
struct easycap_standard const *peasycap_standard; struct easycap_standard const *peasycap_standard;
...@@ -1971,15 +1983,15 @@ case VIDIOC_G_STD: { ...@@ -1971,15 +1983,15 @@ case VIDIOC_G_STD: {
JOM(8, "user is told: %s\n", JOM(8, "user is told: %s\n",
&peasycap_standard->v4l2_standard.name[0]); &peasycap_standard->v4l2_standard.name[0]);
if (0 != copy_to_user((void __user *)arg, &std_id, if (copy_to_user((void __user *)arg, &std_id,
sizeof(v4l2_std_id))) { sizeof(v4l2_std_id))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_S_STD: { case VIDIOC_S_STD: {
v4l2_std_id std_id; v4l2_std_id std_id;
int rc; int rc;
...@@ -2002,15 +2014,16 @@ case VIDIOC_S_STD: { ...@@ -2002,15 +2014,16 @@ case VIDIOC_S_STD: {
return -ENOENT; return -ENOENT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_REQBUFS: { case VIDIOC_REQBUFS: {
int nbuffers; int nbuffers;
struct v4l2_requestbuffers v4l2_requestbuffers; struct v4l2_requestbuffers v4l2_requestbuffers;
JOM(8, "VIDIOC_REQBUFS\n"); JOM(8, "VIDIOC_REQBUFS\n");
if (0 != copy_from_user(&v4l2_requestbuffers, (void __user *)arg, if (0 != copy_from_user(&v4l2_requestbuffers,
(void __user *)arg,
sizeof(struct v4l2_requestbuffers))) { sizeof(struct v4l2_requestbuffers))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
...@@ -2040,15 +2053,15 @@ case VIDIOC_REQBUFS: { ...@@ -2040,15 +2053,15 @@ case VIDIOC_REQBUFS: {
} }
peasycap->frame_buffer_many = nbuffers; peasycap->frame_buffer_many = nbuffers;
if (0 != copy_to_user((void __user *)arg, &v4l2_requestbuffers, if (copy_to_user((void __user *)arg, &v4l2_requestbuffers,
sizeof(struct v4l2_requestbuffers))) { sizeof(struct v4l2_requestbuffers))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_QUERYBUF: { case VIDIOC_QUERYBUF: {
u32 index; u32 index;
struct v4l2_buffer v4l2_buffer; struct v4l2_buffer v4l2_buffer;
...@@ -2098,15 +2111,15 @@ case VIDIOC_QUERYBUF: { ...@@ -2098,15 +2111,15 @@ case VIDIOC_QUERYBUF: {
JOM(16, " %10i=m.offset\n", v4l2_buffer.m.offset); JOM(16, " %10i=m.offset\n", v4l2_buffer.m.offset);
JOM(16, " %10i=length\n", v4l2_buffer.length); JOM(16, " %10i=length\n", v4l2_buffer.length);
if (0 != copy_to_user((void __user *)arg, &v4l2_buffer, if (copy_to_user((void __user *)arg, &v4l2_buffer,
sizeof(struct v4l2_buffer))) { sizeof(struct v4l2_buffer))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_QBUF: { case VIDIOC_QBUF: {
struct v4l2_buffer v4l2_buffer; struct v4l2_buffer v4l2_buffer;
JOM(8, "VIDIOC_QBUF\n"); JOM(8, "VIDIOC_QBUF\n");
...@@ -2126,7 +2139,7 @@ case VIDIOC_QBUF: { ...@@ -2126,7 +2139,7 @@ case VIDIOC_QBUF: {
return -EINVAL; return -EINVAL;
} }
if (v4l2_buffer.index < 0 || if (v4l2_buffer.index < 0 ||
(v4l2_buffer.index >= peasycap->frame_buffer_many)) { v4l2_buffer.index >= peasycap->frame_buffer_many) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
...@@ -2135,7 +2148,7 @@ case VIDIOC_QBUF: { ...@@ -2135,7 +2148,7 @@ case VIDIOC_QBUF: {
peasycap->done[v4l2_buffer.index] = 0; peasycap->done[v4l2_buffer.index] = 0;
peasycap->queued[v4l2_buffer.index] = V4L2_BUF_FLAG_QUEUED; peasycap->queued[v4l2_buffer.index] = V4L2_BUF_FLAG_QUEUED;
if (0 != copy_to_user((void __user *)arg, &v4l2_buffer, if (copy_to_user((void __user *)arg, &v4l2_buffer,
sizeof(struct v4l2_buffer))) { sizeof(struct v4l2_buffer))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
...@@ -2147,9 +2160,9 @@ case VIDIOC_QBUF: { ...@@ -2147,9 +2160,9 @@ case VIDIOC_QBUF: {
peasycap->frame_lock = 0; peasycap->frame_lock = 0;
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_DQBUF: case VIDIOC_DQBUF:
{ {
struct timeval timeval, timeval2; struct timeval timeval, timeval2;
int i, j; int i, j;
...@@ -2167,7 +2180,7 @@ case VIDIOC_DQBUF: ...@@ -2167,7 +2180,7 @@ case VIDIOC_DQBUF:
return -EIO; return -EIO;
} }
if (0 != copy_from_user(&v4l2_buffer, (void __user *)arg, if (copy_from_user(&v4l2_buffer, (void __user *)arg,
sizeof(struct v4l2_buffer))) { sizeof(struct v4l2_buffer))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
...@@ -2178,13 +2191,13 @@ case VIDIOC_DQBUF: ...@@ -2178,13 +2191,13 @@ case VIDIOC_DQBUF:
return -EINVAL; return -EINVAL;
} }
if (true == peasycap->offerfields) { if (peasycap->offerfields) {
/*-----------------------------------------------------------*/ /*---------------------------------------------------*/
/* /*
* IN ITS 50 "fps" MODE tvtime SEEMS ALWAYS TO REQUEST * IN ITS 50 "fps" MODE tvtime SEEMS ALWAYS TO REQUEST
* V4L2_FIELD_BOTTOM * V4L2_FIELD_BOTTOM
*/ */
/*-----------------------------------------------------------*/ /*---------------------------------------------------*/
if (V4L2_FIELD_TOP == v4l2_buffer.field) if (V4L2_FIELD_TOP == v4l2_buffer.field)
JOM(8, "user wants V4L2_FIELD_TOP\n"); JOM(8, "user wants V4L2_FIELD_TOP\n");
else if (V4L2_FIELD_BOTTOM == v4l2_buffer.field) else if (V4L2_FIELD_BOTTOM == v4l2_buffer.field)
...@@ -2201,13 +2214,15 @@ case VIDIOC_DQBUF: ...@@ -2201,13 +2214,15 @@ case VIDIOC_DQBUF:
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EIO; return -EIO;
} }
/*---------------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
/* /*
* IF THE USER HAS PREVIOUSLY CALLED easycap_poll(), AS DETERMINED BY FINDING * IF THE USER HAS PREVIOUSLY CALLED easycap_poll(),
* THE FLAG peasycap->polled SET, THERE MUST BE NO FURTHER WAIT HERE. IN THIS * AS DETERMINED BY FINDING
* THE FLAG peasycap->polled SET, THERE MUST BE
* NO FURTHER WAIT HERE. IN THIS
* CASE, JUST CHOOSE THE FRAME INDICATED BY peasycap->frame_read * CASE, JUST CHOOSE THE FRAME INDICATED BY peasycap->frame_read
*/ */
/*---------------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
if (!peasycap->polled) { if (!peasycap->polled) {
do { do {
...@@ -2215,8 +2230,7 @@ case VIDIOC_DQBUF: ...@@ -2215,8 +2230,7 @@ case VIDIOC_DQBUF:
if (-EIO == rcdq) { if (-EIO == rcdq) {
JOM(8, "returning -EIO because " JOM(8, "returning -EIO because "
"dqbuf() returned -EIO\n"); "dqbuf() returned -EIO\n");
mutex_unlock(&easycapdc60_dongle[kd]. mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
mutex_video);
return -EIO; return -EIO;
} }
} while (0 != rcdq); } while (0 != rcdq);
...@@ -2242,7 +2256,8 @@ case VIDIOC_DQBUF: ...@@ -2242,7 +2256,8 @@ case VIDIOC_DQBUF:
if (90 < j) { if (90 < j) {
SAM("easycap driver shutting down " SAM("easycap driver shutting down "
"on condition blue\n"); "on condition blue\n");
peasycap->video_eof = 1; peasycap->audio_eof = 1; peasycap->video_eof = 1;
peasycap->audio_eof = 1;
} }
} }
...@@ -2277,7 +2292,7 @@ case VIDIOC_DQBUF: ...@@ -2277,7 +2292,7 @@ case VIDIOC_DQBUF:
JOM(16, " %10i=m.offset\n", v4l2_buffer.m.offset); JOM(16, " %10i=m.offset\n", v4l2_buffer.m.offset);
JOM(16, " %10i=length\n", v4l2_buffer.length); JOM(16, " %10i=length\n", v4l2_buffer.length);
if (0 != copy_to_user((void __user *)arg, &v4l2_buffer, if (copy_to_user((void __user *)arg, &v4l2_buffer,
sizeof(struct v4l2_buffer))) { sizeof(struct v4l2_buffer))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
...@@ -2300,9 +2315,9 @@ case VIDIOC_DQBUF: ...@@ -2300,9 +2315,9 @@ case VIDIOC_DQBUF:
} }
} }
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_STREAMON: { case VIDIOC_STREAMON: {
int i; int i;
JOM(8, "VIDIOC_STREAMON\n"); JOM(8, "VIDIOC_STREAMON\n");
...@@ -2321,9 +2336,9 @@ case VIDIOC_STREAMON: { ...@@ -2321,9 +2336,9 @@ case VIDIOC_STREAMON: {
peasycap->video_eof = 0; peasycap->video_eof = 0;
peasycap->audio_eof = 0; peasycap->audio_eof = 0;
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_STREAMOFF: { case VIDIOC_STREAMOFF: {
JOM(8, "VIDIOC_STREAMOFF\n"); JOM(8, "VIDIOC_STREAMOFF\n");
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
...@@ -2333,7 +2348,8 @@ case VIDIOC_STREAMOFF: { ...@@ -2333,7 +2348,8 @@ case VIDIOC_STREAMOFF: {
} }
peasycap->video_idle = 1; peasycap->video_idle = 1;
peasycap->audio_idle = 1; peasycap->timeval0.tv_sec = 0; peasycap->audio_idle = 1;
peasycap->timeval0.tv_sec = 0;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* IF THE WAIT QUEUES ARE NOT CLEARED IN RESPONSE TO THE STREAMOFF COMMAND * IF THE WAIT QUEUES ARE NOT CLEARED IN RESPONSE TO THE STREAMOFF COMMAND
...@@ -2351,9 +2367,9 @@ case VIDIOC_STREAMOFF: { ...@@ -2351,9 +2367,9 @@ case VIDIOC_STREAMOFF: {
#endif /* CONFIG_EASYCAP_OSS */ #endif /* CONFIG_EASYCAP_OSS */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_PARM: { case VIDIOC_G_PARM: {
struct v4l2_streamparm *pv4l2_streamparm; struct v4l2_streamparm *pv4l2_streamparm;
JOM(8, "VIDIOC_G_PARM\n"); JOM(8, "VIDIOC_G_PARM\n");
...@@ -2363,8 +2379,8 @@ case VIDIOC_G_PARM: { ...@@ -2363,8 +2379,8 @@ case VIDIOC_G_PARM: {
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -ENOMEM; return -ENOMEM;
} }
if (0 != copy_from_user(pv4l2_streamparm, (void __user *)arg, if (copy_from_user(pv4l2_streamparm,
sizeof(struct v4l2_streamparm))) { (void __user *)arg, sizeof(struct v4l2_streamparm))) {
kfree(pv4l2_streamparm); kfree(pv4l2_streamparm);
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EFAULT; return -EFAULT;
...@@ -2395,7 +2411,8 @@ case VIDIOC_G_PARM: { ...@@ -2395,7 +2411,8 @@ case VIDIOC_G_PARM: {
pv4l2_streamparm->parm.capture.readbuffers = pv4l2_streamparm->parm.capture.readbuffers =
peasycap->frame_buffer_many; peasycap->frame_buffer_many;
pv4l2_streamparm->parm.capture.extendedmode = 0; pv4l2_streamparm->parm.capture.extendedmode = 0;
if (0 != copy_to_user((void __user *)arg, pv4l2_streamparm, if (copy_to_user((void __user *)arg,
pv4l2_streamparm,
sizeof(struct v4l2_streamparm))) { sizeof(struct v4l2_streamparm))) {
kfree(pv4l2_streamparm); kfree(pv4l2_streamparm);
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
...@@ -2403,60 +2420,60 @@ case VIDIOC_G_PARM: { ...@@ -2403,60 +2420,60 @@ case VIDIOC_G_PARM: {
} }
kfree(pv4l2_streamparm); kfree(pv4l2_streamparm);
break; break;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_S_PARM: { case VIDIOC_S_PARM: {
JOM(8, "VIDIOC_S_PARM unsupported\n"); JOM(8, "VIDIOC_S_PARM unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_AUDIO: { case VIDIOC_G_AUDIO: {
JOM(8, "VIDIOC_G_AUDIO unsupported\n"); JOM(8, "VIDIOC_G_AUDIO unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_S_AUDIO: { case VIDIOC_S_AUDIO: {
JOM(8, "VIDIOC_S_AUDIO unsupported\n"); JOM(8, "VIDIOC_S_AUDIO unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_S_TUNER: { case VIDIOC_S_TUNER: {
JOM(8, "VIDIOC_S_TUNER unsupported\n"); JOM(8, "VIDIOC_S_TUNER unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_FBUF: case VIDIOC_G_FBUF:
case VIDIOC_S_FBUF: case VIDIOC_S_FBUF:
case VIDIOC_OVERLAY: { case VIDIOC_OVERLAY: {
JOM(8, "VIDIOC_G_FBUF|VIDIOC_S_FBUF|VIDIOC_OVERLAY unsupported\n"); JOM(8, "VIDIOC_G_FBUF|VIDIOC_S_FBUF|VIDIOC_OVERLAY unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_G_TUNER: { case VIDIOC_G_TUNER: {
JOM(8, "VIDIOC_G_TUNER unsupported\n"); JOM(8, "VIDIOC_G_TUNER unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
case VIDIOC_G_FREQUENCY: case VIDIOC_G_FREQUENCY:
case VIDIOC_S_FREQUENCY: { case VIDIOC_S_FREQUENCY: {
JOM(8, "VIDIOC_G_FREQUENCY|VIDIOC_S_FREQUENCY unsupported\n"); JOM(8, "VIDIOC_G_FREQUENCY|VIDIOC_S_FREQUENCY unsupported\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -EINVAL; return -EINVAL;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
default: { default: {
JOM(8, "ERROR: unrecognized V4L2 IOCTL command: 0x%08X\n", cmd); JOM(8, "ERROR: unrecognized V4L2 IOCTL command: 0x%08X\n", cmd);
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
} }
mutex_unlock(&easycapdc60_dongle[kd].mutex_video); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
JOM(4, "unlocked easycapdc60_dongle[%i].mutex_video\n", kd); JOM(4, "unlocked easycapdc60_dongle[%i].mutex_video\n", kd);
return 0; return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
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