20 # DEALINGS IN THE SOFTWARE. |
20 # DEALINGS IN THE SOFTWARE. |
21 # |
21 # |
22 |
22 |
23 Allow probing for /dev/fb cards other than the traditional sbus devices. |
23 Allow probing for /dev/fb cards other than the traditional sbus devices. |
24 |
24 |
25 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.c hw/xfree86/common/xf86sbusBus.c |
25 diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.c hw/xfree86/common/xf86sbusBus.c |
26 --- hw/xfree86/common/xf86sbusBus.c 2009-08-10 21:00:23.000000000 -0700 |
26 --- hw/xfree86/common/xf86sbusBus.c 2010-06-10 07:07:55.000000000 -0700 |
27 +++ hw/xfree86/common/xf86sbusBus.c 2009-11-03 22:29:01.187852455 -0800 |
27 +++ hw/xfree86/common/xf86sbusBus.c 2010-09-03 16:45:12.667073647 -0700 |
28 @@ -40,6 +40,10 @@ |
28 @@ -40,6 +40,10 @@ |
29 #include "xf86sbusBus.h" |
29 #include "xf86sbusBus.h" |
30 #include "xf86Sbus.h" |
30 #include "xf86Sbus.h" |
31 |
31 |
32 +#ifdef sun |
32 +#ifdef sun |
36 Bool sbusSlotClaimed = FALSE; |
36 Bool sbusSlotClaimed = FALSE; |
37 |
37 |
38 static int xf86nSbusInfo; |
38 static int xf86nSbusInfo; |
39 @@ -212,8 +216,25 @@ xf86SbusProbe(void) |
39 @@ -212,8 +216,25 @@ xf86SbusProbe(void) |
40 xf86ErrorF(" at %s", promPath); |
40 xf86ErrorF(" at %s", promPath); |
41 xfree(promPath); |
41 free(promPath); |
42 } |
42 } |
43 - } else |
43 - } else |
44 + } else { |
44 + } else { |
45 +#ifdef sun |
45 +#ifdef sun |
46 + if (psdp->devId == SBUS_DEVICE_UNK) { |
46 + if (psdp->devId == SBUS_DEVICE_UNK) { |
61 +#endif |
61 +#endif |
62 + } |
62 + } |
63 xf86ErrorF("\n"); |
63 xf86ErrorF("\n"); |
64 } |
64 } |
65 if (useProm) |
65 if (useProm) |
66 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.h hw/xfree86/common/xf86sbusBus.h |
66 diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.h hw/xfree86/common/xf86sbusBus.h |
67 --- hw/xfree86/common/xf86sbusBus.h 2009-08-10 21:00:23.000000000 -0700 |
67 --- hw/xfree86/common/xf86sbusBus.h 2010-06-05 18:16:49.000000000 -0700 |
68 +++ hw/xfree86/common/xf86sbusBus.h 2009-11-03 22:29:01.188001632 -0800 |
68 +++ hw/xfree86/common/xf86sbusBus.h 2010-09-03 16:45:12.667333987 -0700 |
69 @@ -39,6 +39,7 @@ |
69 @@ -39,6 +39,7 @@ |
70 #define SBUS_DEVICE_FFB 0x000b |
70 #define SBUS_DEVICE_FFB 0x000b |
71 #define SBUS_DEVICE_GT 0x000c |
71 #define SBUS_DEVICE_GT 0x000c |
72 #define SBUS_DEVICE_MGX 0x000d |
72 #define SBUS_DEVICE_MGX 0x000d |
73 +#define SBUS_DEVICE_UNK 0x000e |
73 +#define SBUS_DEVICE_UNK 0x000e |
74 |
74 |
75 typedef struct sbus_prom_node { |
75 typedef struct sbus_prom_node { |
76 int node; |
76 int node; |
77 diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/bus/Sbus.c hw/xfree86/os-support/bus/Sbus.c |
77 diff -Nurp -x '*~' -x '*.orig' hw/xfree86/os-support/bus/Sbus.c hw/xfree86/os-support/bus/Sbus.c |
78 --- hw/xfree86/os-support/bus/Sbus.c 2009-08-10 21:00:24.000000000 -0700 |
78 --- hw/xfree86/os-support/bus/Sbus.c 2010-07-14 13:23:17.000000000 -0700 |
79 +++ hw/xfree86/os-support/bus/Sbus.c 2009-11-03 22:29:01.188224955 -0800 |
79 +++ hw/xfree86/os-support/bus/Sbus.c 2010-09-03 16:45:12.667732075 -0700 |
80 @@ -68,6 +68,7 @@ struct sbus_devtable sbusDeviceTable[] = |
80 @@ -68,6 +68,7 @@ struct sbus_devtable sbusDeviceTable[] = |
81 { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX" }, |
81 { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX" }, |
82 { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" }, |
82 { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" }, |
83 { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" }, |
83 { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" }, |
84 + { SBUS_DEVICE_UNK, FBTYPE_LASTPLUSONE + 1, "unknown", "unknown", "Unknown FB" }, |
84 + { SBUS_DEVICE_UNK, FBTYPE_LASTPLUSONE + 1, "unknown", "unknown", "Unknown FB" }, |