summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-01-07 08:55:49 -0500
committerChris Michael <cpmichael@osg.samsung.com>2016-01-07 09:00:32 -0500
commitf836aba678b4ed251875a4d43db27b2a3fce8494 (patch)
tree7bc6909973c5f36667a0239f155b681173d40332 /src/lib/ecore_drm
parent999dd527d860fe84933105afa6a514d55a0fce6d (diff)
ecore-drm: Fix formatting
NB: No functional changes Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
Diffstat (limited to 'src/lib/ecore_drm')
-rw-r--r--src/lib/ecore_drm/ecore_drm_device.c4
-rw-r--r--src/lib/ecore_drm/ecore_drm_private.h5
-rw-r--r--src/lib/ecore_drm/ecore_drm_tty.c9
3 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_device.c b/src/lib/ecore_drm/ecore_drm_device.c
index d3eb91f..5376dbd 100644
--- a/src/lib/ecore_drm/ecore_drm_device.c
+++ b/src/lib/ecore_drm/ecore_drm_device.c
@@ -117,9 +117,7 @@ _ecore_drm_device_cached_context_get(enum xkb_context_flags flags)
117} 117}
118 118
119struct xkb_keymap * 119struct xkb_keymap *
120_ecore_drm_device_cached_keymap_get(struct xkb_context *ctx, 120_ecore_drm_device_cached_keymap_get(struct xkb_context *ctx, const struct xkb_rule_names *names, enum xkb_keymap_compile_flags flags)
121 const struct xkb_rule_names *names,
122 enum xkb_keymap_compile_flags flags)
123{ 121{
124 EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, NULL); 122 EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, NULL);
125 123
diff --git a/src/lib/ecore_drm/ecore_drm_private.h b/src/lib/ecore_drm/ecore_drm_private.h
index c3ba84c..bb959e9 100644
--- a/src/lib/ecore_drm/ecore_drm_private.h
+++ b/src/lib/ecore_drm/ecore_drm_private.h
@@ -297,7 +297,6 @@ void _ecore_drm_inputs_init(void);
297void _ecore_drm_inputs_shutdown(void); 297void _ecore_drm_inputs_shutdown(void);
298 298
299struct xkb_context *_ecore_drm_device_cached_context_get(enum xkb_context_flags flags); 299struct xkb_context *_ecore_drm_device_cached_context_get(enum xkb_context_flags flags);
300struct xkb_keymap *_ecore_drm_device_cached_keymap_get(struct xkb_context *ctx, 300struct xkb_keymap *_ecore_drm_device_cached_keymap_get(struct xkb_context *ctx, const struct xkb_rule_names *names, enum xkb_keymap_compile_flags flags);
301 const struct xkb_rule_names *names, 301
302 enum xkb_keymap_compile_flags flags);
303#endif 302#endif
diff --git a/src/lib/ecore_drm/ecore_drm_tty.c b/src/lib/ecore_drm/ecore_drm_tty.c
index bf05786..fdc2bcd 100644
--- a/src/lib/ecore_drm/ecore_drm_tty.c
+++ b/src/lib/ecore_drm/ecore_drm_tty.c
@@ -242,7 +242,8 @@ EAPI Eina_Bool
242ecore_drm_tty_release(Ecore_Drm_Device *dev) 242ecore_drm_tty_release(Ecore_Drm_Device *dev)
243{ 243{
244 /* check for valid device */ 244 /* check for valid device */
245 EINA_SAFETY_ON_TRUE_RETURN_VAL((!dev) || (!dev->drm.name) || (dev->tty.fd < 0), EINA_FALSE); 245 EINA_SAFETY_ON_TRUE_RETURN_VAL((!dev) || (!dev->drm.name) ||
246 (dev->tty.fd < 0), EINA_FALSE);
246 247
247 /* send ioctl for vt release */ 248 /* send ioctl for vt release */
248 if (ioctl(dev->tty.fd, VT_RELDISP, 1) < 0) 249 if (ioctl(dev->tty.fd, VT_RELDISP, 1) < 0)
@@ -258,7 +259,8 @@ EAPI Eina_Bool
258ecore_drm_tty_acquire(Ecore_Drm_Device *dev) 259ecore_drm_tty_acquire(Ecore_Drm_Device *dev)
259{ 260{
260 /* check for valid device */ 261 /* check for valid device */
261 EINA_SAFETY_ON_TRUE_RETURN_VAL((!dev) || (!dev->drm.name) || (dev->tty.fd < 0), EINA_FALSE); 262 EINA_SAFETY_ON_TRUE_RETURN_VAL((!dev) || (!dev->drm.name) ||
263 (dev->tty.fd < 0), EINA_FALSE);
262 264
263 /* send ioctl for vt acquire */ 265 /* send ioctl for vt acquire */
264 if (ioctl(dev->tty.fd, VT_RELDISP, VT_ACKACQ) < 0) 266 if (ioctl(dev->tty.fd, VT_RELDISP, VT_ACKACQ) < 0)
@@ -274,7 +276,8 @@ EAPI int
274ecore_drm_tty_get(Ecore_Drm_Device *dev) 276ecore_drm_tty_get(Ecore_Drm_Device *dev)
275{ 277{
276 /* check for valid device */ 278 /* check for valid device */
277 EINA_SAFETY_ON_TRUE_RETURN_VAL((!dev) || (!dev->drm.name) || (dev->tty.fd < 0), -1); 279 EINA_SAFETY_ON_TRUE_RETURN_VAL((!dev) || (!dev->drm.name) ||
280 (dev->tty.fd < 0), -1);
278 281
279 return dev->tty.fd; 282 return dev->tty.fd;
280} 283}