commit c518ef4b88826be437b85538b65d6959860612e7
parent dbead1dae62d18cd9269eb05157ae83bf0c7132a
Author: Michael Forney <mforney@mforney.org>
Date: Wed, 19 Feb 2014 15:40:59 -0800
framebuffer_plane: Drop swc_ prefix for non-public structures/functions
Diffstat:
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libswc/framebuffer_plane.c b/libswc/framebuffer_plane.c
@@ -78,14 +78,14 @@ static bool update(struct swc_view * view)
static void send_frame(void * data)
{
- struct swc_framebuffer_plane * plane = data;
+ struct framebuffer_plane * plane = data;
swc_view_frame(&plane->view, swc_time());
}
static bool attach(struct swc_view * view, struct wld_buffer * buffer)
{
- struct swc_framebuffer_plane * plane
+ struct framebuffer_plane * plane
= CONTAINER_OF(view, typeof(*plane), view);
union wld_object object;
@@ -161,16 +161,16 @@ const static struct swc_view_impl view_impl = {
static void handle_page_flip(struct swc_drm_handler * handler, uint32_t time)
{
- struct swc_framebuffer_plane * plane
+ struct framebuffer_plane * plane
= CONTAINER_OF(handler, typeof(*plane), drm_handler);
swc_view_frame(&plane->view, time);
}
-bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
- uint32_t crtc, struct swc_mode * mode,
- uint32_t * connectors,
- uint32_t num_connectors)
+bool framebuffer_plane_initialize(struct framebuffer_plane * plane,
+ uint32_t crtc, struct swc_mode * mode,
+ uint32_t * connectors,
+ uint32_t num_connectors)
{
uint32_t * plane_connectors;
@@ -218,7 +218,7 @@ bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
return false;
}
-void swc_framebuffer_plane_finalize(struct swc_framebuffer_plane * plane)
+void framebuffer_plane_finalize(struct framebuffer_plane * plane)
{
wl_array_release(&plane->connectors);
drmModeCrtcPtr crtc = plane->original_crtc_state;
diff --git a/libswc/framebuffer_plane.h b/libswc/framebuffer_plane.h
@@ -29,7 +29,7 @@
#include "surface.h"
#include "view.h"
-struct swc_framebuffer_plane
+struct framebuffer_plane
{
uint32_t crtc;
drmModeCrtcPtr original_crtc_state;
@@ -40,12 +40,12 @@ struct swc_framebuffer_plane
struct swc_drm_handler drm_handler;
};
-bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
- uint32_t crtc, struct swc_mode * mode,
- uint32_t * connectors,
- uint32_t num_connectors);
+bool framebuffer_plane_initialize(struct framebuffer_plane * plane,
+ uint32_t crtc, struct swc_mode * mode,
+ uint32_t * connectors,
+ uint32_t num_connectors);
-void swc_framebuffer_plane_finalize(struct swc_framebuffer_plane * plane);
+void framebuffer_plane_finalize(struct framebuffer_plane * plane);
#endif
diff --git a/libswc/screen.c b/libswc/screen.c
@@ -96,7 +96,7 @@ struct screen * screen_new(uint32_t crtc, struct swc_output * output)
return screen;
error2:
- swc_framebuffer_plane_finalize(&screen->planes.framebuffer);
+ framebuffer_plane_finalize(&screen->planes.framebuffer);
error1:
free(screen);
error0:
@@ -109,7 +109,7 @@ void screen_destroy(struct screen * screen)
wl_list_for_each_safe(output, next, &screen->outputs, link)
swc_output_destroy(output);
- swc_framebuffer_plane_finalize(&screen->planes.framebuffer);
+ framebuffer_plane_finalize(&screen->planes.framebuffer);
swc_cursor_plane_finalize(&screen->planes.cursor);
free(screen);
}