Skip to content

L
linux
Commit 98680557 authored by Tomas Winkler's avatar Tomas Winkler Committed by Mauro Carvalho Chehab
Browse files
Options

[media] easycap: cleanup function usage 

1. Remove declarations of none global functions from easycap.h
and make them static in the c-files.
2. Reorder static functions to reduce number of forward declarations.
3. Remove unused functions.
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c7855ee5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 215 additions and 452 deletions
drivers/staging/media/easycap/easycap.h
View file @ 98680557
...@@ -473,20 +473,16 @@ long easycap_unlocked_ioctl(struct file *, unsigned int, unsigned long); ...@@ -473,20 +473,16 @@ long easycap_unlocked_ioctl(struct file *, unsigned int, unsigned long);
int easycap_dqbuf(struct easycap *, int); int easycap_dqbuf(struct easycap *, int);
int submit_video_urbs(struct easycap *); int submit_video_urbs(struct easycap *);
int kill_video_urbs(struct easycap *); int kill_video_urbs(struct easycap *);
int field2frame(struct easycap *);
int redaub(struct easycap *, void *, void *,
int, int, u8, u8, bool);
void easycap_testcard(struct easycap *, int); void easycap_testcard(struct easycap *, int);
int fillin_formats(void); int fillin_formats(void);
int newinput(struct easycap *, int); int newinput(struct easycap *, int);
int adjust_standard(struct easycap *, v4l2_std_id); int adjust_standard(struct easycap *, v4l2_std_id);
int adjust_format(struct easycap *, u32, u32, u32, int adjust_format(struct easycap *, u32, u32, u32, int, bool);
int, bool);
int adjust_brightness(struct easycap *, int); int adjust_brightness(struct easycap *, int);
int adjust_contrast(struct easycap *, int); int adjust_contrast(struct easycap *, int);
int adjust_saturation(struct easycap *, int); int adjust_saturation(struct easycap *, int);
int adjust_hue(struct easycap *, int); int adjust_hue(struct easycap *, int);
int adjust_volume(struct easycap *, int);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* AUDIO FUNCTION PROTOTYPES * AUDIO FUNCTION PROTOTYPES
...@@ -494,46 +490,28 @@ int adjust_volume(struct easycap *, int); ...@@ -494,46 +490,28 @@ int adjust_volume(struct easycap *, int);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int easycap_alsa_probe(struct easycap *); int easycap_alsa_probe(struct easycap *);
void easycap_alsa_complete(struct urb *); void easycap_alsa_complete(struct urb *);
int easycap_sound_setup(struct easycap *);
int submit_audio_urbs(struct easycap *);
int kill_audio_urbs(struct easycap *);
void easyoss_testtone(struct easycap *, int);
int audio_setup(struct easycap *); int audio_setup(struct easycap *);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* LOW-LEVEL FUNCTION PROTOTYPES * LOW-LEVEL FUNCTION PROTOTYPES
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int audio_gainget(struct usb_device *);
int audio_gainset(struct usb_device *, s8); int audio_gainset(struct usb_device *, s8);
int set_interface(struct usb_device *, u16);
int wakeup_device(struct usb_device *); int wakeup_device(struct usb_device *);
int confirm_resolution(struct usb_device *);
int confirm_stream(struct usb_device *);
int setup_stk(struct usb_device *, bool); int setup_stk(struct usb_device *, bool);
int setup_saa(struct usb_device *, bool); int setup_saa(struct usb_device *, bool);
int setup_vt(struct usb_device *);
int check_stk(struct usb_device *, bool);
int check_saa(struct usb_device *, bool);
int ready_saa(struct usb_device *); int ready_saa(struct usb_device *);
int merit_saa(struct usb_device *); int merit_saa(struct usb_device *);
int check_vt(struct usb_device *); int check_vt(struct usb_device *);
int select_input(struct usb_device *, int, int); int select_input(struct usb_device *, int, int);
int set_resolution(struct usb_device *, int set_resolution(struct usb_device *, u16, u16, u16, u16);
u16, u16, u16, u16);
int read_saa(struct usb_device *, u16); int read_saa(struct usb_device *, u16);
int read_stk(struct usb_device *, u32);
int write_saa(struct usb_device *, u16, u16); int write_saa(struct usb_device *, u16, u16);
int write_000(struct usb_device *, u16, u16);
int start_100(struct usb_device *); int start_100(struct usb_device *);
int stop_100(struct usb_device *); int stop_100(struct usb_device *);
int write_300(struct usb_device *);
int read_vt(struct usb_device *, u16);
int write_vt(struct usb_device *, u16, u16);
int isdongle(struct easycap *); int isdongle(struct easycap *);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
......
drivers/staging/media/easycap/easycap_ioctl.c
View file @ 98680557
...@@ -854,7 +854,7 @@ int adjust_hue(struct easycap *peasycap, int value) ...@@ -854,7 +854,7 @@ int adjust_hue(struct easycap *peasycap, int value)
return -ENOENT; return -ENOENT;
} }
/*****************************************************************************/ /*****************************************************************************/
int adjust_volume(struct easycap *peasycap, int value) static int adjust_volume(struct easycap *peasycap, int value)
{ {
s8 mood; s8 mood;
int i1; int i1;
......
drivers/staging/media/easycap/easycap_low.c
View file @ 98680557
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "easycap.h" #include "easycap.h"
#define GET(X, Y, Z) do { \ #define GET(X, Y, Z) do { \
int __rc; \ int __rc; \
*(Z) = (u16)0; \ *(Z) = (u16)0; \
...@@ -354,101 +355,6 @@ static int wait_i2c(struct usb_device *p) ...@@ -354,101 +355,6 @@ static int wait_i2c(struct usb_device *p)
return -1; return -1;
} }
/****************************************************************************/
int confirm_resolution(struct usb_device *p)
{
u8 get0, get1, get2, get3, get4, get5, get6, get7;
if (!p)
return -ENODEV;
GET(p, 0x0110, &get0);
GET(p, 0x0111, &get1);
GET(p, 0x0112, &get2);
GET(p, 0x0113, &get3);
GET(p, 0x0114, &get4);
GET(p, 0x0115, &get5);
GET(p, 0x0116, &get6);
GET(p, 0x0117, &get7);
JOT(8, "0x%03X, 0x%03X, "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X\n",
get0, get1, get2, get3, get4, get5, get6, get7);
JOT(8, "....cf PAL_720x526: "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X\n",
0x000, 0x000, 0x001, 0x000, 0x5A0, 0x005, 0x121, 0x001);
JOT(8, "....cf PAL_704x526: "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X\n",
0x004, 0x000, 0x001, 0x000, 0x584, 0x005, 0x121, 0x001);
JOT(8, "....cf VGA_640x480: "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X, "
"0x%03X, 0x%03X\n",
0x008, 0x000, 0x020, 0x000, 0x508, 0x005, 0x110, 0x001);
return 0;
}
/****************************************************************************/
int confirm_stream(struct usb_device *p)
{
u16 get2;
u8 igot;
if (!p)
return -ENODEV;
GET(p, 0x0100, &igot); get2 = 0x80 & igot;
if (0x80 == get2)
JOT(8, "confirm_stream: OK\n");
else
JOT(8, "confirm_stream: STUCK\n");
return 0;
}
/****************************************************************************/
int setup_stk(struct usb_device *p, bool ntsc)
{
int i;
const struct stk1160config *cfg;
if (!p)
return -ENODEV;
cfg = (ntsc) ? stk1160configNTSC : stk1160configPAL;
for (i = 0; cfg[i].reg != 0xFFF; i++)
SET(p, cfg[i].reg, cfg[i].set);
write_300(p);
return 0;
}
/****************************************************************************/
int setup_saa(struct usb_device *p, bool ntsc)
{
int i, ir;
const struct saa7113config *cfg;
if (!p)
return -ENODEV;
cfg = (ntsc) ? saa7113configNTSC : saa7113configPAL;
for (i = 0; cfg[i].reg != 0xFF; i++)
ir = write_saa(p, cfg[i].reg, cfg[i].set);
return 0;
}
/****************************************************************************/
int write_000(struct usb_device *p, u16 set2, u16 set0)
{
u8 igot0, igot2;
if (!p)
return -ENODEV;
GET(p, 0x0002, &igot2);
GET(p, 0x0000, &igot0);
SET(p, 0x0002, set2);
SET(p, 0x0000, set0);
return 0;
}
/****************************************************************************/ /****************************************************************************/
int write_saa(struct usb_device *p, u16 reg0, u16 set0) int write_saa(struct usb_device *p, u16 reg0, u16 set0)
{ {
...@@ -470,8 +376,7 @@ int write_saa(struct usb_device *p, u16 reg0, u16 set0) ...@@ -470,8 +376,7 @@ int write_saa(struct usb_device *p, u16 reg0, u16 set0)
* REGISTER 504: TARGET ADDRESS ON VT1612A * REGISTER 504: TARGET ADDRESS ON VT1612A
*/ */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
int static int write_vt(struct usb_device *p, u16 reg0, u16 set0)
write_vt(struct usb_device *p, u16 reg0, u16 set0)
{ {
u8 igot; u8 igot;
u16 got502, got503; u16 got502, got503;
...@@ -508,7 +413,7 @@ write_vt(struct usb_device *p, u16 reg0, u16 set0) ...@@ -508,7 +413,7 @@ write_vt(struct usb_device *p, u16 reg0, u16 set0)
* REGISTER 504: TARGET ADDRESS ON VT1612A * REGISTER 504: TARGET ADDRESS ON VT1612A
*/ */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
int read_vt(struct usb_device *p, u16 reg0) static int read_vt(struct usb_device *p, u16 reg0)
{ {
u8 igot; u8 igot;
u16 got502, got503; u16 got502, got503;
...@@ -532,7 +437,7 @@ int read_vt(struct usb_device *p, u16 reg0) ...@@ -532,7 +437,7 @@ int read_vt(struct usb_device *p, u16 reg0)
* THESE APPEAR TO HAVE NO EFFECT ON EITHER VIDEO OR AUDIO. * THESE APPEAR TO HAVE NO EFFECT ON EITHER VIDEO OR AUDIO.
*/ */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
int write_300(struct usb_device *p) static int write_300(struct usb_device *p)
{ {
if (!p) if (!p)
return -ENODEV; return -ENODEV;
...@@ -545,32 +450,32 @@ int write_300(struct usb_device *p) ...@@ -545,32 +450,32 @@ int write_300(struct usb_device *p)
return 0; return 0;
} }
/****************************************************************************/ /****************************************************************************/
/*--------------------------------------------------------------------------*/ /****************************************************************************/
/* int setup_stk(struct usb_device *p, bool ntsc)
* NOTE: THE FOLLOWING IS NOT CHECKED:
* REGISTER 0x0F, WHICH IS INVOLVED IN CHROMINANCE AUTOMATIC GAIN CONTROL.
*/
/*--------------------------------------------------------------------------*/
int check_saa(struct usb_device *p, bool ntsc)
{ {
int i, ir, rc = 0; int i;
struct saa7113config const *cfg; const struct stk1160config *cfg;
if (!p) if (!p)
return -ENODEV; return -ENODEV;
cfg = (ntsc) ? stk1160configNTSC : stk1160configPAL;
for (i = 0; cfg[i].reg != 0xFFF; i++)
SET(p, cfg[i].reg, cfg[i].set);
cfg = (ntsc) ? saa7113configNTSC : saa7113configPAL; write_300(p);
for (i = 0; cfg[i].reg != 0xFF; i++) {
if (0x0F == cfg[i].reg)
continue;
ir = read_saa(p, cfg[i].reg);
if (ir != cfg[i].set) {
SAY("SAA register 0x%02X has 0x%02X, expected 0x%02X\n",
cfg[i].reg, ir, cfg[i].set);
rc--;
}
}
return (rc < -8) ? rc : 0; return 0;
}
/****************************************************************************/
int setup_saa(struct usb_device *p, bool ntsc)
{
int i, ir;
const struct saa7113config *cfg;
if (!p)
return -ENODEV;
cfg = (ntsc) ? saa7113configNTSC : saa7113configPAL;
for (i = 0; cfg[i].reg != 0xFF; i++)
ir = write_saa(p, cfg[i].reg, cfg[i].set);
return 0;
} }
/****************************************************************************/ /****************************************************************************/
int merit_saa(struct usb_device *p) int merit_saa(struct usb_device *p)
...@@ -629,44 +534,6 @@ int ready_saa(struct usb_device *p) ...@@ -629,44 +534,6 @@ int ready_saa(struct usb_device *p)
return 0; return 0;
} }
/****************************************************************************/ /****************************************************************************/
/*--------------------------------------------------------------------------*/
/*
* NOTE: THE FOLLOWING ARE NOT CHECKED:
* REGISTERS 0x000, 0x002: FUNCTIONALITY IS NOT KNOWN
* REGISTER 0x100: ACCEPT ALSO (0x80 | stk1160config....[.].set)
*/
/*--------------------------------------------------------------------------*/
int check_stk(struct usb_device *p, bool ntsc)
{
int i, ir;
const struct stk1160config *cfg;
if (!p)
return -ENODEV;
cfg = (ntsc) ? stk1160configNTSC : stk1160configPAL;
for (i = 0; 0xFFF != cfg[i].reg; i++) {
if (0x000 == cfg[i].reg || 0x002 == cfg[i].reg)
continue;
ir = read_stk(p, cfg[i].reg);
if (0x100 == cfg[i].reg) {
if ((ir != (0xFF & cfg[i].set)) &&
(ir != (0x80 | (0xFF & cfg[i].set))) &&
(0xFFFF != cfg[i].set)) {
SAY("STK reg[0x%03X]=0x%02X expected 0x%02X\n",
cfg[i].reg, ir, cfg[i].set);
}
continue;
}
if ((ir != (0xFF & cfg[i].set)) && (0xFFFF != cfg[i].set))
SAY("STK register 0x%03X has 0x%02X,expected 0x%02X\n",
cfg[i].reg, ir, cfg[i].set);
}
return 0;
}
/****************************************************************************/
int read_saa(struct usb_device *p, u16 reg0) int read_saa(struct usb_device *p, u16 reg0)
{ {
u8 igot; u8 igot;
...@@ -682,7 +549,7 @@ int read_saa(struct usb_device *p, u16 reg0) ...@@ -682,7 +549,7 @@ int read_saa(struct usb_device *p, u16 reg0)
return igot; return igot;
} }
/****************************************************************************/ /****************************************************************************/
int read_stk(struct usb_device *p, u32 reg0) static int read_stk(struct usb_device *p, u32 reg0)
{ {
u8 igot; u8 igot;
...@@ -692,27 +559,7 @@ int read_stk(struct usb_device *p, u32 reg0) ...@@ -692,27 +559,7 @@ int read_stk(struct usb_device *p, u32 reg0)
GET(p, reg0, &igot); GET(p, reg0, &igot);
return igot; return igot;
} }
/****************************************************************************/ int select_input(struct usb_device *p, int input, int mode)
/*--------------------------------------------------------------------------*/
/*
* HARDWARE USERSPACE INPUT NUMBER PHYSICAL INPUT DRIVER input VALUE
*
* CVBS+S-VIDEO 0 or 1 CVBS 1
* FOUR-CVBS 0 or 1 CVBS1 1
* FOUR-CVBS 2 CVBS2 2
* FOUR-CVBS 3 CVBS3 3
* FOUR-CVBS 4 CVBS4 4
* CVBS+S-VIDEO 5 S-VIDEO 5
*
* WHEN 5==input THE ARGUMENT mode MUST ALSO BE SUPPLIED:
*
* mode 7 => GAIN TO BE SET EXPLICITLY USING REGISTER 0x05 (UNTESTED)
* mode 9 => USE AUTOMATIC GAIN CONTROL (DEFAULT)
*
*/
/*---------------------------------------------------------------------------*/
int
select_input(struct usb_device *p, int input, int mode)
{ {
int ir; int ir;
...@@ -1115,15 +962,3 @@ int audio_gainset(struct usb_device *pusb_device, s8 loud) ...@@ -1115,15 +962,3 @@ int audio_gainset(struct usb_device *pusb_device, s8 loud)
return 0; return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
int audio_gainget(struct usb_device *pusb_device)
{
int igot;
if (!pusb_device)
return -ENODEV;
igot = read_vt(pusb_device, 0x001C);
if (0 > igot)
SAY("ERROR: failed to read VT1612A register 0x1C\n");
return igot;
}
/*****************************************************************************/
drivers/staging/media/easycap/easycap_main.c
View file @ 98680557
...@@ -66,6 +66,10 @@ struct easycap_dongle easycapdc60_dongle[DONGLE_MANY]; ...@@ -66,6 +66,10 @@ struct easycap_dongle easycapdc60_dongle[DONGLE_MANY];
static struct mutex mutex_dongle; static struct mutex mutex_dongle;
static void easycap_complete(struct urb *purb); static void easycap_complete(struct urb *purb);
static int reset(struct easycap *peasycap); static int reset(struct easycap *peasycap);
static int field2frame(struct easycap *peasycap);
static int redaub(struct easycap *peasycap,
void *pad, void *pex, int much, int more,
u8 mask, u8 margin, bool isuy);
const char *strerror(int err) const char *strerror(int err)
{ {
...@@ -1211,8 +1215,7 @@ int easycap_dqbuf(struct easycap *peasycap, int mode) ...@@ -1211,8 +1215,7 @@ int easycap_dqbuf(struct easycap *peasycap, int mode)
* CHOOSES THE OPTION V4L2_FIELD_INTERLACED. * CHOOSES THE OPTION V4L2_FIELD_INTERLACED.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int static int field2frame(struct easycap *peasycap)
field2frame(struct easycap *peasycap)
{ {
void *pex, *pad; void *pex, *pad;
...@@ -1601,8 +1604,8 @@ field2frame(struct easycap *peasycap) ...@@ -1601,8 +1604,8 @@ field2frame(struct easycap *peasycap)
* REDUCE CODE LENGTH WILL GENERALLY IMPAIR RUNTIME PERFORMANCE. BEWARE. * REDUCE CODE LENGTH WILL GENERALLY IMPAIR RUNTIME PERFORMANCE. BEWARE.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int static int redaub(struct easycap *peasycap,
redaub(struct easycap *peasycap, void *pad, void *pex, int much, int more, void *pad, void *pex, int much, int more,
u8 mask, u8 margin, bool isuy) u8 mask, u8 margin, bool isuy)
{ {
static s32 ay[256], bu[256], rv[256], gu[256], gv[256]; static s32 ay[256], bu[256], rv[256], gu[256], gv[256];
......
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