lkml.org 
[lkml]   [2005]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[2.6 patch] drivers/usb/media/pwc/: make code static
    This patch makes needlessly global code static.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>

    ---

    drivers/usb/media/pwc/pwc-ctrl.c | 76 +++++++++++++++----------------
    drivers/usb/media/pwc/pwc-if.c | 2
    drivers/usb/media/pwc/pwc.h | 6 --
    3 files changed, 40 insertions(+), 44 deletions(-)

    --- linux-2.6.12-rc2-mm3-full/drivers/usb/media/pwc/pwc.h.old 2005-04-18 03:11:14.000000000 +0200
    +++ linux-2.6.12-rc2-mm3-full/drivers/usb/media/pwc/pwc.h 2005-04-18 03:13:28.000000000 +0200
    @@ -226,9 +226,8 @@
    extern "C" {
    #endif

    -/* Global variables */
    +/* Global variable */
    extern int pwc_trace;
    -extern int pwc_preferred_compression;

    /** 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);
    @@ -243,8 +242,6 @@
    /** Functions in pwc-ctrl.c */
    /* 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);
    -/* 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 */
    extern int pwc_get_brightness(struct pwc_device *pdev);
    @@ -256,7 +253,6 @@
    extern int pwc_get_saturation(struct pwc_device *pdev);
    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_get_leds(struct pwc_device *pdev, int *on_value, int *off_value);
    extern int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor);

    /* Power down or up the camera; not supported by all models */
    --- linux-2.6.12-rc2-mm3-full/drivers/usb/media/pwc/pwc-ctrl.c.old 2005-04-18 03:11:29.000000000 +0200
    +++ linux-2.6.12-rc2-mm3-full/drivers/usb/media/pwc/pwc-ctrl.c 2005-04-18 03:24:41.000000000 +0200
    @@ -418,6 +418,44 @@



    +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
    @width: viewport width
    @@ -475,44 +513,6 @@
    }


    -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 */

    int pwc_get_brightness(struct pwc_device *pdev)
    --- linux-2.6.12-rc2-mm3-full/drivers/usb/media/pwc/pwc-if.c.old 2005-04-18 03:13:37.000000000 +0200
    +++ linux-2.6.12-rc2-mm3-full/drivers/usb/media/pwc/pwc-if.c 2005-04-18 03:13:53.000000000 +0200
    @@ -129,7 +129,7 @@
    int pwc_trace = TRACE_MODULE | TRACE_FLOW | TRACE_PWCX;
    static int power_save = 0;
    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 {
    int type;
    char serial_number[30];
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-04-18 04:09    [W:0.030 / U:58.996 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site