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

xfree86: os-support: move VidMemInfo xf86_os_support.h 

This type is only used inside the os-support layer of xfree86, so it fits
better into xf86_os_support.h, whose purpose is being the primary entry
point into os-support layer.

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-14 13:14:43 +01:00 committed by Marge Bot
parent 533c45e595
commit 5b23578f93
2 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hw/xfree86/os-support/xf86OSpriv.h
View File

@ -1,39 +0,0 @@
/*
* Copyright (c) 1999-2000 by The XFree86 Project, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Except as contained in this notice, the name of the copyright holder(s)
* and author(s) shall not be used in advertising or otherwise to promote
* the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s).
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#ifndef _XF86OSPRIV_H
#define _XF86OSPRIV_H
typedef struct {
Bool initialised;
} VidMemInfo, *VidMemInfoPtr;
#endif /* _XF86OSPRIV_H */

6
hw/xfree86/os-support/xf86_os_support.h
View File

@ -10,8 +10,6 @@
#include <X11/Xdefs.h> #include <X11/Xdefs.h>
#include "xf86OSpriv.h"
typedef void (*PMClose) (void); typedef void (*PMClose) (void);
void xf86OpenConsole(void); void xf86OpenConsole(void);
@ -31,6 +29,10 @@ void xf86OSInputThreadInit(void);
Bool xf86DeallocateGARTMemory(int screenNum, int key); Bool xf86DeallocateGARTMemory(int screenNum, int key);
int xf86RemoveSIGIOHandler(int fd); int xf86RemoveSIGIOHandler(int fd);
typedef struct {
Bool initialised;
} VidMemInfo, *VidMemInfoPtr;
void xf86OSInitVidMem(VidMemInfoPtr); void xf86OSInitVidMem(VidMemInfoPtr);
#endif /* _XSERVER_XF86_OS_SUPPORT */ #endif /* _XSERVER_XF86_OS_SUPPORT */