frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: unexport os-support functions 

These aren't called by drivers/modules, so no need to export them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1456>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-13 14:24:49 +01:00 committed by Marge Bot
parent e2fa0d2ae0
commit 7aa3fa54d4
24 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/common/xf86Bus.c
View File

@ -45,7 +45,6 @@
#include "xf86Bus.h"
#define XF86_OS_PRIVS
#include "xf86_OSproc.h"
#ifdef XSERVER_LIBPCIACCESS
#include "xf86VGAarbiter.h"

2
hw/xfree86/common/xf86Events.c
View File

@ -61,7 +61,7 @@
#include "misc.h"
#include "xf86.h"
#include "xf86Priv.h"
#define XF86_OS_PRIVS
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#include <X11/keysym.h>

2
hw/xfree86/common/xf86Init.c
View File

@ -62,10 +62,10 @@
#include "systemd-logind.h"
#include "loaderProcs.h"
#define XF86_OS_PRIVS
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86Config.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#include "xf86cmap.h"
#include "xorgVersion.h"

2
hw/xfree86/common/xf86fbBus.c
View File

@ -42,8 +42,6 @@
#include "xf86Priv.h"
#include "xf86Bus.h"
#define XF86_OS_PRIVS
#include "xf86_OSproc.h"
Bool fbSlotClaimed = FALSE;

2
hw/xfree86/common/xf86noBus.c
View File

@ -42,8 +42,6 @@
#include "xf86Priv.h"
#include "xf86Bus.h"
#define XF86_OS_PRIVS
#include "xf86_OSproc.h"
int

1
hw/xfree86/common/xf86pciBus.c
View File

@ -46,7 +46,6 @@
/* Bus-specific headers */
#include "xf86Bus.h"
#define XF86_OS_PRIVS
#include "xf86_OSproc.h"
#define PCI_VENDOR_GENERIC 0x00FF

1
hw/xfree86/os-support/bsd/bsd_VTsw.c
View File

@ -30,6 +30,7 @@
#include <X11/X.h>
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
/*

1
hw/xfree86/os-support/bsd/bsd_init.c
View File

@ -35,6 +35,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#include <sys/utsname.h>

2
hw/xfree86/os-support/bus/bsd_pci.c
View File

@ -40,9 +40,11 @@
#endif
#include <stdio.h>
#include "compiler.h"
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#include "Pci.h"

1
hw/xfree86/os-support/hurd/hurd_init.c
View File

@ -34,6 +34,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#include <stdio.h>

11
hw/xfree86/os-support/linux/lnx_acpi.c
View File

@ -2,11 +2,6 @@
#include "xorg-config.h"
#endif
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
#define XF86_OS_PRIVS
#include "xf86_OSproc.h"
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/socket.h>
@ -15,6 +10,12 @@
#include <fcntl.h>
#include <errno.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSproc.h"
#define ACPI_SOCKET "/var/run/acpid.socket"
#define ACPI_VIDEO_NOTIFY_SWITCH 0x80

2
hw/xfree86/os-support/linux/lnx_apm.c
View File

@ -7,7 +7,7 @@
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
#define XF86_OS_PRIVS
#include "xf86_os_support.h"
#include "xf86_OSproc.h"
#ifdef HAVE_ACPI

1
hw/xfree86/os-support/linux/lnx_init.c
View File

@ -38,6 +38,7 @@
#include "linux.h"
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#include <sys/stat.h>

1
hw/xfree86/os-support/shared/VTsw_noop.c
View File

@ -29,6 +29,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
/*

1
hw/xfree86/os-support/shared/VTsw_usl.c
View File

@ -31,6 +31,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
/*

3
hw/xfree86/os-support/shared/pm_noop.c
View File

@ -32,10 +32,11 @@
#endif
#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
#define XF86_OS_PRIVS
#include "xf86_os_support.h"
#include "xf86_OSproc.h"
PMClose

1
hw/xfree86/os-support/shared/vidmem.c
View File

@ -35,6 +35,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#include "xf86OSpriv.h"

1
hw/xfree86/os-support/solaris/sun_VTsw.c
View File

@ -29,6 +29,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#include <door.h>

2
hw/xfree86/os-support/solaris/sun_apm.c
View File

@ -59,7 +59,7 @@
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
#define XF86_OS_PRIVS
#include "xf86_os_support.h"
#include "xf86_OSproc.h"
#include "xf86_OSlib.h"

1
hw/xfree86/os-support/solaris/sun_init.c
View File

@ -33,6 +33,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
#ifdef HAVE_SYS_KD_H
#include <sys/kd.h>

1
hw/xfree86/os-support/stub/stub_init.c
View File

@ -2,6 +2,7 @@
#include <xorg-config.h>
#endif
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
void

1
hw/xfree86/os-support/xf86_OSlib.h
View File

@ -302,7 +302,6 @@ struct pcvtid {
#define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
#define XF86_OS_PRIVS
#include "xf86_OSproc.h"
#endif /* _XF86_OSLIB_H */

17
hw/xfree86/os-support/xf86_OSproc.h
View File

@ -167,23 +167,6 @@ extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f) (int, void *),
void *);
extern _X_EXPORT int xf86RemoveSIGIOHandler(int fd);
#ifdef XF86_OS_PRIVS
typedef void (*PMClose) (void);
extern _X_EXPORT void xf86OpenConsole(void);
extern _X_EXPORT void xf86CloseConsole(void);
extern _X_HIDDEN Bool xf86VTActivate(int vtno);
extern _X_EXPORT Bool xf86VTSwitchPending(void);
extern _X_EXPORT Bool xf86VTSwitchAway(void);
extern _X_EXPORT Bool xf86VTSwitchTo(void);
extern _X_EXPORT void xf86VTRequest(int sig);
extern _X_EXPORT int xf86ProcessArgument(int, char **, int);
extern _X_EXPORT void xf86UseMsg(void);
extern _X_EXPORT PMClose xf86OSPMOpen(void);
extern _X_EXPORT void xf86InitVidMem(void);
#endif /* XF86_OS_PRIVS */
#ifdef XSERVER_PLATFORM_BUS
#include "hotplug.h"
void

27
hw/xfree86/os-support/xf86_os_support.h Normal file
View File

@ -0,0 +1,27 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
/* prototypes for the os-support layer of xfree86 DDX */
#ifndef _XSERVER_XF86_OS_SUPPORT
#define _XSERVER_XF86_OS_SUPPORT
#include <X11/Xdefs.h>
typedef void (*PMClose) (void);
void xf86OpenConsole(void);
void xf86CloseConsole(void);
Bool xf86VTActivate(int vtno);
Bool xf86VTSwitchPending(void);
Bool xf86VTSwitchAway(void);
Bool xf86VTSwitchTo(void);
void xf86VTRequest(int sig);
int xf86ProcessArgument(int argc, char **argv, int i);
void xf86UseMsg(void);
PMClose xf86OSPMOpen(void);
void xf86InitVidMem(void);
#endif /* _XSERVER_XF86_OS_SUPPORT */