mirror of
https://github.com/torvalds/linux.git
synced 2024-10-31 17:21:49 +00:00
[PATCH] USB: drivers/usb/media/pwc/: make code static
This patch makes needlessly global code static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
7107627b04
commit
2c47e7f378
@ -418,6 +418,44 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static void pwc_set_image_buffer_size(struct pwc_device *pdev)
|
||||||
|
{
|
||||||
|
int i, factor = 0, filler = 0;
|
||||||
|
|
||||||
|
/* for PALETTE_YUV420P */
|
||||||
|
switch(pdev->vpalette)
|
||||||
|
{
|
||||||
|
case VIDEO_PALETTE_YUV420P:
|
||||||
|
factor = 6;
|
||||||
|
filler = 128;
|
||||||
|
break;
|
||||||
|
case VIDEO_PALETTE_RAW:
|
||||||
|
factor = 6; /* can be uncompressed YUV420P */
|
||||||
|
filler = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Set sizes in bytes */
|
||||||
|
pdev->image.size = pdev->image.x * pdev->image.y * factor / 4;
|
||||||
|
pdev->view.size = pdev->view.x * pdev->view.y * factor / 4;
|
||||||
|
|
||||||
|
/* Align offset, or you'll get some very weird results in
|
||||||
|
YUV420 mode... x must be multiple of 4 (to get the Y's in
|
||||||
|
place), and y even (or you'll mixup U & V). This is less of a
|
||||||
|
problem for YUV420P.
|
||||||
|
*/
|
||||||
|
pdev->offset.x = ((pdev->view.x - pdev->image.x) / 2) & 0xFFFC;
|
||||||
|
pdev->offset.y = ((pdev->view.y - pdev->image.y) / 2) & 0xFFFE;
|
||||||
|
|
||||||
|
/* Fill buffers with gray or black */
|
||||||
|
for (i = 0; i < MAX_IMAGES; i++) {
|
||||||
|
if (pdev->image_ptr[i] != NULL)
|
||||||
|
memset(pdev->image_ptr[i], filler, pdev->view.size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@pdev: device structure
|
@pdev: device structure
|
||||||
@width: viewport width
|
@width: viewport width
|
||||||
@ -475,44 +513,6 @@ int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frame
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void pwc_set_image_buffer_size(struct pwc_device *pdev)
|
|
||||||
{
|
|
||||||
int i, factor = 0, filler = 0;
|
|
||||||
|
|
||||||
/* for PALETTE_YUV420P */
|
|
||||||
switch(pdev->vpalette)
|
|
||||||
{
|
|
||||||
case VIDEO_PALETTE_YUV420P:
|
|
||||||
factor = 6;
|
|
||||||
filler = 128;
|
|
||||||
break;
|
|
||||||
case VIDEO_PALETTE_RAW:
|
|
||||||
factor = 6; /* can be uncompressed YUV420P */
|
|
||||||
filler = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Set sizes in bytes */
|
|
||||||
pdev->image.size = pdev->image.x * pdev->image.y * factor / 4;
|
|
||||||
pdev->view.size = pdev->view.x * pdev->view.y * factor / 4;
|
|
||||||
|
|
||||||
/* Align offset, or you'll get some very weird results in
|
|
||||||
YUV420 mode... x must be multiple of 4 (to get the Y's in
|
|
||||||
place), and y even (or you'll mixup U & V). This is less of a
|
|
||||||
problem for YUV420P.
|
|
||||||
*/
|
|
||||||
pdev->offset.x = ((pdev->view.x - pdev->image.x) / 2) & 0xFFFC;
|
|
||||||
pdev->offset.y = ((pdev->view.y - pdev->image.y) / 2) & 0xFFFE;
|
|
||||||
|
|
||||||
/* Fill buffers with gray or black */
|
|
||||||
for (i = 0; i < MAX_IMAGES; i++) {
|
|
||||||
if (pdev->image_ptr[i] != NULL)
|
|
||||||
memset(pdev->image_ptr[i], filler, pdev->view.size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* BRIGHTNESS */
|
/* BRIGHTNESS */
|
||||||
|
|
||||||
int pwc_get_brightness(struct pwc_device *pdev)
|
int pwc_get_brightness(struct pwc_device *pdev)
|
||||||
@ -949,7 +949,7 @@ int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)
|
|||||||
return SendControlMsg(SET_STATUS_CTL, LED_FORMATTER, 2);
|
return SendControlMsg(SET_STATUS_CTL, LED_FORMATTER, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
|
static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
|
||||||
{
|
{
|
||||||
unsigned char buf[2];
|
unsigned char buf[2];
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -129,7 +129,7 @@ static int default_mbufs = 2; /* Default number of mmap() buffers */
|
|||||||
int pwc_trace = TRACE_MODULE | TRACE_FLOW | TRACE_PWCX;
|
int pwc_trace = TRACE_MODULE | TRACE_FLOW | TRACE_PWCX;
|
||||||
static int power_save = 0;
|
static int power_save = 0;
|
||||||
static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */
|
static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */
|
||||||
int pwc_preferred_compression = 2; /* 0..3 = uncompressed..high */
|
static int pwc_preferred_compression = 2; /* 0..3 = uncompressed..high */
|
||||||
static struct {
|
static struct {
|
||||||
int type;
|
int type;
|
||||||
char serial_number[30];
|
char serial_number[30];
|
||||||
|
@ -226,9 +226,8 @@ struct pwc_device
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Global variables */
|
/* Global variable */
|
||||||
extern int pwc_trace;
|
extern int pwc_trace;
|
||||||
extern int pwc_preferred_compression;
|
|
||||||
|
|
||||||
/** functions in pwc-if.c */
|
/** functions in pwc-if.c */
|
||||||
int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_fps, int new_compression, int new_snapshot);
|
int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_fps, int new_compression, int new_snapshot);
|
||||||
@ -243,8 +242,6 @@ void pwc_construct(struct pwc_device *pdev);
|
|||||||
/** Functions in pwc-ctrl.c */
|
/** Functions in pwc-ctrl.c */
|
||||||
/* Request a certain video mode. Returns < 0 if not possible */
|
/* Request a certain video mode. Returns < 0 if not possible */
|
||||||
extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot);
|
extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot);
|
||||||
/* Calculate the number of bytes per image (not frame) */
|
|
||||||
extern void pwc_set_image_buffer_size(struct pwc_device *pdev);
|
|
||||||
|
|
||||||
/* Various controls; should be obvious. Value 0..65535, or < 0 on error */
|
/* Various controls; should be obvious. Value 0..65535, or < 0 on error */
|
||||||
extern int pwc_get_brightness(struct pwc_device *pdev);
|
extern int pwc_get_brightness(struct pwc_device *pdev);
|
||||||
@ -256,7 +253,6 @@ extern int pwc_set_gamma(struct pwc_device *pdev, int value);
|
|||||||
extern int pwc_get_saturation(struct pwc_device *pdev);
|
extern int pwc_get_saturation(struct pwc_device *pdev);
|
||||||
extern int pwc_set_saturation(struct pwc_device *pdev, int value);
|
extern int pwc_set_saturation(struct pwc_device *pdev, int value);
|
||||||
extern int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value);
|
extern int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value);
|
||||||
extern int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value);
|
|
||||||
extern int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor);
|
extern int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor);
|
||||||
|
|
||||||
/* Power down or up the camera; not supported by all models */
|
/* Power down or up the camera; not supported by all models */
|
||||||
|
Loading…
Reference in New Issue
Block a user