XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: untwist config backend prototypes

Browse Source 
* split the prototypes of individual backends into separate headers
* always define the functions (possibly empty) to cut down ifdef wood

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-09 17:21:59 +02:00
committed by Enrico Weigelt
parent 61aa2ede91
commit 1b25c9efef
8 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/config-backends.h
View File

@@ -34,17 +34,4 @@
void remove_devices(const char *backend, const char *config_info);
BOOL device_is_duplicate(const char *config_info);
#ifdef CONFIG_UDEV
int config_udev_pre_init(void);
int config_udev_init(void);
void config_udev_fini(void);
void config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback);
#elif defined(CONFIG_HAL)
int config_hal_init(void);
void config_hal_fini(void);
#elif defined(CONFIG_WSCONS)
int config_wscons_init(void);
void config_wscons_fini(void);
#endif
#endif /* XSERVER_CONFIG_BACKENDS_H */

16
config/config-hal.h Normal file
View File

@@ -0,0 +1,16 @@
#ifndef _XSERVER_CONFIG_HAL_H
#define _XSERVER_CONFIG_HAL_H
#ifdef CONFIG_HAL
int config_hal_init(void);
void config_hal_fini(void);
#else
static inline int config_hal_init(void) { return 1; }
static inline void config_hal_fini(void) {}
#endif
#endif /* _XSERVER_CONFIG_HAL_H */

21
config/config-udev.h Normal file
View File

@@ -0,0 +1,21 @@
#ifndef _XSERVER_CONFIG_UDEV_H
#define _XSERVER_CONFIG_UDEV_H
#ifdef CONFIG_UDEV
#include "config/hotplug_priv.h"
int config_udev_init(void);
void config_udev_fini(void);
int config_udev_pre_init(void);
void config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback);
#else
static inline int config_udev_init(void) { return 1; }
static inline void config_udev_fini(void) {}
static inline int config_udev_pre_init(void) { return 1; }
#endif
#endif /* _XSERVER_CONFIG_UDEV_H */

16
config/config-wscons.h Normal file
View File

@@ -0,0 +1,16 @@
#ifndef _XSERVER_CONFIG_WSCONS_H
#define _XSERVER_CONFIG_WSCONS_H
#ifdef CONFIG_WSCONS
int config_wscons_init(void);
void config_wscons_fini(void);
#else
static inline int config_wscons_init(void) { return 1; }
static inline void config_wscons_fini(void) {}
#endif
#endif /* _XSERVER_CONFIG_WSCONS_H */

13
config/config.c
View File

@@ -27,6 +27,9 @@
#include <unistd.h>
#include "config/config-hal.h"
#include "config/config-udev.h"
#include "config/config-wscons.h"
#include "config/hotplug_priv.h"
#include "os.h"
@@ -38,37 +41,27 @@
void
config_pre_init(void)
{
#ifdef CONFIG_UDEV
if (!config_udev_pre_init())
ErrorF("[config] failed to pre-init udev\n");
#endif
}
void
config_init(void)
{
#ifdef CONFIG_UDEV
if (!config_udev_init())
ErrorF("[config] failed to initialise udev\n");
#elif defined(CONFIG_HAL)
if (!config_hal_init())
ErrorF("[config] failed to initialise HAL\n");
#elif defined(CONFIG_WSCONS)
if (!config_wscons_init())
ErrorF("[config] failed to initialise wscons\n");
#endif
}
void
config_fini(void)
{
#if defined(CONFIG_UDEV)
config_udev_fini();
#elif defined(CONFIG_HAL)
config_hal_fini();
#elif defined(CONFIG_WSCONS)
config_wscons_fini();
#endif
}
void

1
config/hal.c
View File

@@ -31,6 +31,7 @@
#include <dbus/dbus.h>
#include <hal/libhal.h>
#include "config/config-hal.h"
#include "config/hotplug_priv.h"
#include "config/dbus-core.h"
#include "os/fmt.h"

1
config/udev.c
View File

@@ -29,6 +29,7 @@
#include <ctype.h>
#include <unistd.h>
#include "config/config-udev.h"
#include "config/hotplug_priv.h"
#include "os/fmt.h"

3
config/wscons.c
View File

@@ -36,7 +36,8 @@
#include "input.h"
#include "inputstr.h"
#include "os.h"
#include "config-backends.h"
#include "config/config-wscons.h"
#define WSCONS_KBD_DEVICE "/dev/wskbd"
#define WSCONS_MOUSE_PREFIX "/dev/wsmouse"