ecore-drm: Cleanup ecore_drm private header

Remove support for logging to a file.
Fix ecore_drm_dbus function prototypes

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-07-11 18:26:41 -04:00
parent 5ce304ff84
commit 121be16f3a
1 changed files with 7 additions and 35 deletions

View File

@ -74,39 +74,11 @@ extern int _ecore_drm_log_dom;
/* FIXME: Get slots from evdev device */
#define EVDEV_MAX_SLOTS 32
/* undef this for non-testing builds */
//# define LOG_TO_FILE
# ifdef LOG_TO_FILE
extern FILE *lg;
# define ERR(...) \
EINA_LOG_DOM_ERR(_ecore_drm_log_dom, __VA_ARGS__); \
fflush(lg);
# define DBG(...) \
EINA_LOG_DOM_DBG(_ecore_drm_log_dom, __VA_ARGS__); \
fflush(lg);
# define INF(...) \
EINA_LOG_DOM_INFO(_ecore_drm_log_dom, __VA_ARGS__); \
fflush(lg);
# define WRN(...) \
EINA_LOG_DOM_WARN(_ecore_drm_log_dom, __VA_ARGS__); \
fflush(lg);
# define CRIT(...) \
EINA_LOG_DOM_CRIT(_ecore_drm_log_dom, __VA_ARGS__); \
fflush(lg);
# else
# define ERR(...) EINA_LOG_DOM_ERR(_ecore_drm_log_dom, __VA_ARGS__)
# define DBG(...) EINA_LOG_DOM_DBG(_ecore_drm_log_dom, __VA_ARGS__)
# define INF(...) EINA_LOG_DOM_INFO(_ecore_drm_log_dom, __VA_ARGS__)
# define WRN(...) EINA_LOG_DOM_WARN(_ecore_drm_log_dom, __VA_ARGS__)
# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_drm_log_dom, __VA_ARGS__)
# endif
#define ERR(...) EINA_LOG_DOM_ERR(_ecore_drm_log_dom, __VA_ARGS__)
#define DBG(...) EINA_LOG_DOM_DBG(_ecore_drm_log_dom, __VA_ARGS__)
#define INF(...) EINA_LOG_DOM_INFO(_ecore_drm_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_drm_log_dom, __VA_ARGS__)
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_drm_log_dom, __VA_ARGS__)
extern struct udev *udev;
@ -253,8 +225,8 @@ struct _Ecore_Drm_Sprite
unsigned int formats[];
};
void _ecore_drm_message_send(int opcode, int fd, void *data, size_t bytes);
Eina_Bool _ecore_drm_message_receive(int opcode, int *fd, void **data, size_t bytes);
Eina_Bool _ecore_drm_dbus_init(const char *session);
void _ecore_drm_dbus_shutdown(const char *session);
Ecore_Drm_Evdev *_ecore_drm_evdev_device_create(Ecore_Drm_Seat *seat, const char *path, int fd);
void _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *evdev);