mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Refactor connector name into new function

Browse Source 
Refactor the code constructing the connector name into a new function.
This makes create_output_for_connector() slightly easier to read.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Pekka Paalanen
2014-06-04 16:29:49 +03:00
committed by Daniel Stone
parent 7b36b420c1
commit 3ce6362a33
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+18 -10
View File
@@ -1678,7 +1678,7 @@ drm_set_dpms(struct weston_output *output_base, enum dpms_enum level)
output->dpms_prop->prop_id, level); output->dpms_prop->prop_id, level);
} }
static const char *connector_type_names[] = { static const char * const connector_type_names[] = {
"None", "None",
"VGA", "VGA",
"DVI", "DVI",
@@ -1696,6 +1696,21 @@ static const char *connector_type_names[] = {
"eDP", "eDP",
}; };
static char *
make_connector_name(const drmModeConnector *con)
{
char name[32];
const char *type_name;
if (con->connector_type < ARRAY_LENGTH(connector_type_names))
type_name = connector_type_names[con->connector_type];
else
type_name = "UNKNOWN";
snprintf(name, sizeof name, "%s%d", type_name, con->connector_type_id);
return strdup(name);
}
static int static int
find_crtc_for_connector(struct drm_backend *b, find_crtc_for_connector(struct drm_backend *b,
drmModeRes *resources, drmModeConnector *connector) drmModeRes *resources, drmModeConnector *connector)
@@ -2171,8 +2186,7 @@ create_output_for_connector(struct drm_backend *b,
drmModeModeInfo crtc_mode, modeline; drmModeModeInfo crtc_mode, modeline;
drmModeCrtc *crtc; drmModeCrtc *crtc;
int i, width, height, scale; int i, width, height, scale;
char name[32], *s; char *s;
const char *type_name;
enum output_config config; enum output_config config;
uint32_t transform; uint32_t transform;
@@ -2187,18 +2201,12 @@ create_output_for_connector(struct drm_backend *b,
return -1; return -1;
output->base.subpixel = drm_subpixel_to_wayland(connector->subpixel); output->base.subpixel = drm_subpixel_to_wayland(connector->subpixel);
output->base.name = make_connector_name(connector);
output->base.make = "unknown"; output->base.make = "unknown";
output->base.model = "unknown"; output->base.model = "unknown";
output->base.serial_number = "unknown"; output->base.serial_number = "unknown";
wl_list_init(&output->base.mode_list); wl_list_init(&output->base.mode_list);
if (connector->connector_type < ARRAY_LENGTH(connector_type_names))
type_name = connector_type_names[connector->connector_type];
else
type_name = "UNKNOWN";
snprintf(name, 32, "%s%d", type_name, connector->connector_type_id);
output->base.name = strdup(name);
section = weston_config_get_section(b->compositor->config, "output", "name", section = weston_config_get_section(b->compositor->config, "output", "name",
output->base.name); output->base.name);
weston_config_section_get_string(section, "mode", &s, "preferred"); weston_config_section_get_string(section, "mode", &s, "preferred");