sparc-probe.patch revision 705
98N/A# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
98N/A#
98N/A# Permission is hereby granted, free of charge, to any person obtaining a
98N/A# copy of this software and associated documentation files (the
98N/A# "Software"), to deal in the Software without restriction, including
98N/A# without limitation the rights to use, copy, modify, merge, publish,
98N/A# distribute, and/or sell copies of the Software, and to permit persons
98N/A# to whom the Software is furnished to do so, provided that the above
98N/A# copyright notice(s) and this permission notice appear in all copies of
98N/A# the Software and that both the above copyright notice(s) and this
98N/A# permission notice appear in supporting documentation.
98N/A#
98N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
98N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
98N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
98N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
98N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
98N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
98N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
98N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
98N/A#
98N/A# Except as contained in this notice, the name of a copyright holder
98N/A# shall not be used in advertising or otherwise to promote the sale, use
98N/A# or other dealings in this Software without prior written authorization
98N/A# of the copyright holder.
98N/A#
98N/A
98N/AAllow probing for /dev/fb cards other than the traditional sbus devices.
98N/A
705N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.c hw/xfree86/common/xf86sbusBus.c
705N/A--- hw/xfree86/common/xf86sbusBus.c 2009-01-09 09:47:04.000000000 -0800
705N/A+++ hw/xfree86/common/xf86sbusBus.c 2009-01-22 20:34:49.343790000 -0800
98N/A@@ -41,6 +41,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;
98N/A@@ -213,8 +217,25 @@ xf86SbusProbe(void)
98N/A xf86ErrorF(" at %s", promPath);
98N/A xfree(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)
705N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.h hw/xfree86/common/xf86sbusBus.h
705N/A--- hw/xfree86/common/xf86sbusBus.h 2009-01-09 09:47:04.000000000 -0800
705N/A+++ hw/xfree86/common/xf86sbusBus.h 2009-01-22 20:34:49.344526000 -0800
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;
705N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/bus/Sbus.c hw/xfree86/os-support/bus/Sbus.c
705N/A--- hw/xfree86/os-support/bus/Sbus.c 2009-01-09 09:47:04.000000000 -0800
705N/A+++ hw/xfree86/os-support/bus/Sbus.c 2009-01-22 20:34:49.345181000 -0800
98N/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