1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
$NetBSD: patch-hw_xfree86_os-support_bus_Sbus.c,v 1.1 2015/09/20 16:39:18 tnn Exp $
Merge most of netbsdSbus.c from xsrc.
--- hw/xfree86/os-support/bus/Sbus.c.orig 2012-08-19 15:45:54.000000000 +0000
+++ hw/xfree86/os-support/bus/Sbus.c
@@ -34,6 +34,9 @@
#ifdef sun
#include <sys/utsname.h>
#endif
+#if defined(__NetBSD__) && defined(__sparc__)
+#include <dev/ofw/openfirmio.h>
+#endif
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
@@ -50,7 +53,6 @@ static int promP1275 = -1;
#define MAX_PROP 128
#define MAX_VAL (4096-128-4)
-static struct openpromio *promOpio;
sbusDevicePtr *xf86SbusInfo = NULL;
@@ -68,68 +70,75 @@ struct sbus_devtable sbusDeviceTable[] =
{SBUS_DEVICE_GT, FBTYPE_SUNGT, "gt", NULL, "Sun Graphics Tower"},
{SBUS_DEVICE_MGX, -1, "mgx", NULL, "Quantum 3D MGXplus"},
{SBUS_DEVICE_LEO, FBTYPE_SUNLEO, "leo", "sunleo", "Sun ZX or Turbo ZX"},
- {SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX"},
+ {SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX or S24"},
{SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB"},
{SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D"},
+ {SBUS_DEVICE_P9100, FBTYPE_P9100, "pnozz", "pnozz", "Weitek P9100"},
+ {SBUS_DEVICE_AG10E, FBTYPE_AG10E, "ag10e", "ag10e", "Fujitsu AG-10e"},
{0, 0, NULL}
};
+static struct ofiocdesc ofio;
+static char of_buf[256];
+
int
promGetSibling(int node)
{
- promOpio->oprom_size = sizeof(int);
if (node == -1)
return 0;
- *(int *) promOpio->oprom_array = node;
- if (ioctl(promFd, OPROMNEXT, promOpio) < 0)
+ if (ioctl(promFd, OFIOCGETNEXT, &node) < 0)
return 0;
- promCurrentNode = *(int *) promOpio->oprom_array;
- return *(int *) promOpio->oprom_array;
+ promCurrentNode = node;
+ return node;
}
int
promGetChild(int node)
{
- promOpio->oprom_size = sizeof(int);
if (!node || node == -1)
return 0;
- *(int *) promOpio->oprom_array = node;
- if (ioctl(promFd, OPROMCHILD, promOpio) < 0)
+ if (ioctl(promFd, OFIOCGETCHILD, &node) < 0)
return 0;
- promCurrentNode = *(int *) promOpio->oprom_array;
- return *(int *) promOpio->oprom_array;
+ promCurrentNode = node;
+ return node;
}
char *
promGetProperty(const char *prop, int *lenp)
{
- promOpio->oprom_size = MAX_VAL;
- strcpy(promOpio->oprom_array, prop);
- if (ioctl(promFd, OPROMGETPROP, promOpio) < 0)
+ ofio.of_nodeid = promCurrentNode;
+ ofio.of_name = (char *)prop;
+ ofio.of_namelen = strlen(prop);
+ ofio.of_buf = of_buf;
+ ofio.of_buflen = sizeof(of_buf);
+
+ if (ioctl(promFd, OFIOCGET, &ofio) < 0)
return 0;
+
+ of_buf[ofio.of_buflen] = '\0';
+
if (lenp)
- *lenp = promOpio->oprom_size;
- return promOpio->oprom_array;
+ *lenp = ofio.of_buflen;
+ return of_buf;
}
int
promGetBool(const char *prop)
{
- promOpio->oprom_size = 0;
+ ofio.of_nodeid = promCurrentNode;
+ ofio.of_name = (char *)prop;
+ ofio.of_namelen = strlen(prop);
+ ofio.of_buf = of_buf;
+ ofio.of_buflen = sizeof(of_buf);
- *(int *) promOpio->oprom_array = 0;
- for (;;) {
- promOpio->oprom_size = MAX_PROP;
- if (ioctl(promFd, OPROMNXTPROP, promOpio) < 0)
- return 0;
- if (!promOpio->oprom_size)
- return 0;
- if (!strcmp(promOpio->oprom_array, prop))
- return 1;
- }
+ if (ioctl(promFd, OFIOCGET, &ofio) < 0)
+ return 0;
+ if (ofio.of_buflen < 0)
+ return 0;
+ return 1;
}
#define PROM_NODE_SIBLING 0x01
@@ -180,8 +189,8 @@ promIsP1275(void)
promP1275 = TRUE;
else
promP1275 = FALSE;
-#elif defined(__FreeBSD__)
- promP1275 = TRUE;
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ promP1275 = TRUE;
#else
#error Missing promIsP1275() function for this OS
#endif
@@ -198,8 +207,6 @@ sparcPromClose(void)
close(promFd);
promFd = -1;
}
- free(promOpio);
- promOpio = NULL;
promOpenCount = 0;
}
@@ -213,11 +220,6 @@ sparcPromInit(void)
promFd = open("/dev/openprom", O_RDONLY, 0);
if (promFd == -1)
return -1;
- promOpio = (struct openpromio *) malloc(4096);
- if (!promOpio) {
- sparcPromClose();
- return -1;
- }
promRootNode = promGetSibling(0);
if (!promRootNode) {
sparcPromClose();
@@ -399,9 +401,9 @@ sparcPromAssignNodes(void)
* were the types of the cards missed. */
char buffer[64];
int fbNum, devId;
- static struct {
- int devId;
- char *prefix;
+ static const struct {
+ const int devId;
+ const char *prefix;
} procFbPrefixes[] = {
{SBUS_DEVICE_BW2, "BWtwo"},
{SBUS_DEVICE_CG14, "CGfourteen"},
|
