SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2025-01-10 01:40:29 +00:00
parent 4b49aefbb1
commit 1fd36b57f8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
945 changed files with 81965 additions and 59988 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xserver/hw/xfree86/common/xf86sbusBus.c
View file

@ -244,7 +244,7 @@ xf86SbusProbe(void)
* in the correct format for a SBUS bus id.
*/
Bool
static Bool
xf86ParseSbusBusString(const char *busID, int *fbNum)
{
/*
@ -316,7 +316,7 @@ xf86ParseSbusBusString(const char *busID, int *fbNum)
* Compare a BUS ID string with a SBUS bus id. Return TRUE if they match.
*/
Bool
static Bool
xf86CompareSbusBusString(const char *busID, int fbNum)
{
int iFbNum;
@ -333,7 +333,7 @@ xf86CompareSbusBusString(const char *busID, int fbNum)
* Check if the slot requested is free. If it is already in use, return FALSE.
*/
Bool
static Bool
xf86CheckSbusSlot(int fbNum)
{
int i;
@ -354,7 +354,7 @@ xf86CheckSbusSlot(int fbNum)
* Otherwise, claim the slot for the screen requesting it.
*/
int
static int
xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp, GDevPtr dev, Bool active)
{
EntityPtr p = NULL;
@ -740,6 +740,7 @@ void
xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec * GDev)
{
char *promPath = NULL;
char *tmp;
sBus = (sbusDevicePtr) busData;
GDev->identifier = sBus->descr;
@ -748,10 +749,11 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec * GDev)
sparcPromClose();
}
if (promPath) {
XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
XNFasprintf(&tmp, "SBUS:%s", promPath);
free(promPath);
}
else {
XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
XNFasprintf(&tmp, "SBUS:fb%d", sBus->fbNum);
}
GDev->busID = tmp;
}