943N/A# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.

98N/A#

98N/A# Permission is hereby granted, free of charge, to any person obtaining a

919N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

919N/A# and/or sell copies of the Software, and to permit persons to whom the

919N/A# Software is furnished to do so, subject to the following conditions:

98N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

98N/A#

919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

98N/A#

98N/A

98N/AAllow probing for /dev/fb cards other than the traditional sbus devices.

98N/A

1124N/Adiff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c

1124N/Aindex 181c6ab..e9328b3 100644

1124N/A--- a/hw/xfree86/common/xf86sbusBus.c

1124N/A+++ b/hw/xfree86/common/xf86sbusBus.c

851N/A@@ -40,6 +40,10 @@

98N/A #include "xf86sbusBus.h"

98N/A #include "xf86Sbus.h"

98N/A

98N/A+#ifdef sun

98N/A+# include <sys/visual_io.h>

98N/A+#endif

98N/A+

98N/A Bool sbusSlotClaimed = FALSE;

98N/A

98N/A static int xf86nSbusInfo;

851N/A@@ -212,8 +216,25 @@ xf86SbusProbe(void)

98N/A xf86ErrorF(" at %s", promPath);

1088N/A free(promPath);

98N/A }

98N/A- } else

98N/A+ } else {

98N/A+#ifdef sun

98N/A+ if (psdp->devId == SBUS_DEVICE_UNK) {

98N/A+ int fbfd;

98N/A+

98N/A+ fbfd = open(psdp->device, O_RDONLY, 0);

98N/A+ if (fbfd >= 0) {

98N/A+ struct vis_identifier visid;

98N/A+ if (ioctl(fbfd, VIS_GETIDENTIFIER, &visid) >= 0) {

98N/A+ psdp->descr = strdup(visid.name);

98N/A+ }

98N/A+ close(fbfd);

98N/A+ }

98N/A+ }

98N/A+ xf86Msg(X_PROBED, "%s: %s", psdp->device, psdp->descr);

98N/A+#else

98N/A xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);

98N/A+#endif

98N/A+ }

98N/A xf86ErrorF("\n");

98N/A }

98N/A if (useProm)

1124N/Adiff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h

1124N/Aindex 66a96e3..e27b0e6 100644

1124N/A--- a/hw/xfree86/common/xf86sbusBus.h

1124N/A+++ b/hw/xfree86/common/xf86sbusBus.h

98N/A@@ -39,6 +39,7 @@

98N/A #define SBUS_DEVICE_FFB 0x000b

98N/A #define SBUS_DEVICE_GT 0x000c

98N/A #define SBUS_DEVICE_MGX 0x000d

98N/A+#define SBUS_DEVICE_UNK 0x000e

98N/A

98N/A typedef struct sbus_prom_node {

98N/A int node;

1124N/Adiff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c

1124N/Aindex 7829d80..86c74d6 100644

1124N/A--- a/hw/xfree86/os-support/bus/Sbus.c

1124N/A+++ b/hw/xfree86/os-support/bus/Sbus.c

1124N/A@@ -68,6 +68,7 @@ struct sbus_devtable sbusDeviceTable[] = {

705N/A { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX" },

705N/A { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" },

705N/A { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" },

705N/A+ { SBUS_DEVICE_UNK, FBTYPE_LASTPLUSONE + 1, "unknown", "unknown", "Unknown FB" },

98N/A { 0, 0, NULL }

98N/A };

98N/A