diff options
author | 2011-06-29 11:43:19 +0300 | |
---|---|---|
committer | 2011-06-29 11:43:19 +0300 | |
commit | 48891debe232da0de062ac248a36c8257c1633ac (patch) | |
tree | ab989eca596b0d9a8cd64e7984b4dcaf3fb3505f | |
parent | a77e5f07ed513233314c18f3e45490fdfa11f6ba (diff) |
cleanup: mark some vo_directfb2.c and vo_s3fb.c functions static
-rw-r--r-- | libvo/vo_directfb2.c | 14 | ||||
-rw-r--r-- | libvo/vo_s3fb.c | 20 |
2 files changed, 22 insertions, 12 deletions
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index ae15918b53..d21c9e37c6 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -122,7 +122,8 @@ static int field_parity = -1; * implementation * ******************************/ -void unlock(void) { +static void unlock(void) +{ if (frame && framelocked) frame->Unlock(frame); if (primary && primarylocked) primary->Unlock(primary); } @@ -288,7 +289,7 @@ static int preinit(const char *arg) } -DFBSurfacePixelFormat convformat(uint32_t format) +static DFBSurfacePixelFormat convformat(uint32_t format) { // add more formats !!! switch (format) { @@ -325,9 +326,9 @@ unsigned int height; int setsize; } enum1_t; -DFBEnumerationResult test_format_callback( unsigned int id, - DFBDisplayLayerDescription desc, - void *data) +static DFBEnumerationResult test_format_callback(unsigned int id, + DFBDisplayLayerDescription desc, + void *data) { enum1_t *params =(enum1_t *)data; IDirectFBDisplayLayer *layer; @@ -423,7 +424,8 @@ int bpp; } videomode_t; -DFBEnumerationResult video_modes_callback( int width,int height,int bpp, void *data) +static DFBEnumerationResult video_modes_callback(int width, int height, + int bpp, void *data) { videomode_t *params =(videomode_t *)data; diff --git a/libvo/vo_s3fb.c b/libvo/vo_s3fb.c index a0d54e0ca9..bd04ea29a7 100644 --- a/libvo/vo_s3fb.c +++ b/libvo/vo_s3fb.c @@ -105,18 +105,21 @@ static void clear_screen(void); #define OUTREG(mmreg, value) *(unsigned int *)(&v->mmio[mmreg]) = value -int readcrtc(int reg) { +static int readcrtc(int reg) +{ outb(reg, 0x3d4); return inb(0x3d5); } -void writecrtc(int reg, int value) { +static void writecrtc(int reg, int value) +{ outb(reg, 0x3d4); outb(value, 0x3d5); } // enable S3 registers -int enable(void) { +static int enable(void) +{ int fd; if (v) @@ -148,7 +151,8 @@ int enable(void) { return 0; } -void disable(void) { +static void disable(void) +{ if (v) { writecrtc(0x53, v->cr53); writecrtc(0x39, v->cr39); @@ -160,7 +164,10 @@ void disable(void) { } } -int yuv_on(int format, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int crop, int xres, int yres, int line_length, int offset) { +static int yuv_on(int format, int src_w, int src_h, int dst_x, int dst_y, + int dst_w, int dst_h, int crop, int xres, int yres, + int line_length, int offset) +{ int tmp, pitch, start, src_wc, src_hc, bpp; if (format == 0 || format == 7) @@ -227,7 +234,8 @@ int yuv_on(int format, int src_w, int src_h, int dst_x, int dst_y, int dst_w, in return offset; } -void yuv_off(void) { +static void yuv_off(void) +{ writecrtc(0x67, readcrtc(0x67) & ~0xc); memset(v->mmio + 0x8180, 0, 0x80); OUTREG(0x81b8, 0x900); |