ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/name_registry.cpp

Comparing SheepShaver/src/name_registry.cpp (file contents):
Revision 1.2 by gbeauche, 2003-09-07T14:33:51Z vs.
Revision 1.18 by gbeauche, 2005-03-19T04:31:59Z

#	Line 1 | Line 1
1		/*
2		*  name_registry.cpp - Name Registry handling
3		*
4	<	*  SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig
4	>	*  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 26 | Line 26
26		#include "macos_util.h"
27		#include "user_strings.h"
28		#include "emul_op.h"
29	+	#include "thunks.h"
30
31		#define DEBUG 0
32		#include "debug.h"
#	Line 34 | Line 35
35		// Function pointers
36		typedef int16 (*rcec_ptr)(const RegEntryID *, const char *, RegEntryID *);
37		static uint32 rcec_tvect = 0;
38	<	static inline int16 RegistryCStrEntryCreate(const RegEntryID *arg1, const char *arg2, RegEntryID *arg3)
38	>	static inline int16 RegistryCStrEntryCreate(uintptr arg1, const char *arg2, uint32 arg3)
39		{
40	<	return (int16)CallMacOS3(rcec_ptr, rcec_tvect, arg1, arg2, arg3);
40	>	SheepString arg2str(arg2);
41	>	return (int16)CallMacOS3(rcec_ptr, rcec_tvect, (const RegEntryID *)arg1, arg2str.addr(), arg3);
42		}
43		typedef int16 (*rpc_ptr)(const RegEntryID *, const char *, const void *, uint32);
44		static uint32 rpc_tvect = 0;
45	<	static inline int16 RegistryPropertyCreate(const RegEntryID *arg1, const char *arg2, const void *arg3, uint32 arg4)
45	>	static inline int16 RegistryPropertyCreate(uintptr arg1, const char *arg2, uintptr arg3, uint32 arg4)
46		{
47	<	return (int16)CallMacOS4(rpc_ptr, rpc_tvect, arg1, arg2, arg3, arg4);
47	>	SheepString arg2str(arg2);
48	>	return (int16)CallMacOS4(rpc_ptr, rpc_tvect, (const RegEntryID *)arg1, arg2str.addr(), (const void *)arg3, arg4);
49	>	}
50	>	static inline int16 RegistryPropertyCreateStr(uintptr arg1, const char *arg2, const char *arg3)
51	>	{
52	>	SheepString arg3str(arg3);
53	>	return RegistryPropertyCreate(arg1, arg2, arg3str.addr(), strlen(arg3) + 1);
54		}
47	–	#define RegistryPropertyCreateStr(e,n,s) RegistryPropertyCreate(e,n,s,strlen(s)+1)
55
56		// Video driver stub
57		static const uint8 video_driver[] = {
#	Line 56 | Line 63 | static const uint8 ethernet_driver[] = {
63		#include "EthernetDriverStub.i"
64		};
65
66	+	// Helper for RegEntryID
67	+	typedef SheepArray<sizeof(RegEntryID)> SheepRegEntryID;
68	+
69	+	// Helper for a <uint32, uint32> pair
70	+	struct SheepPair : public SheepArray<8> {
71	+	SheepPair(uint32 base, uint32 size) : SheepArray<8>()
72	+	{ WriteMacInt32(addr(), base); WriteMacInt32(addr() + 4, size); }
73	+	};
74	+
75
76		/*
77		*  Patch Name Registry during startup
#	Line 63 | Line 79 | static const uint8 ethernet_driver[] = {
79
80		void DoPatchNameRegistry(void)
81		{
82	<	uint32 u32;
82	>	SheepVar32 u32;
83		D(bug("Patching Name Registry..."));
84
85		// Create "device-tree"
86	<	RegEntryID device_tree;
87	<	if (!RegistryCStrEntryCreate(NULL, "Devices:device-tree", &device_tree)) {
88	<	u32 = BusClockSpeed;
89	<	RegistryPropertyCreate(&device_tree, "clock-frequency", &u32, 4);
90	<	RegistryPropertyCreateStr(&device_tree, "model", "Power Macintosh");
86	>	SheepRegEntryID device_tree;
87	>	if (!RegistryCStrEntryCreate(0, "Devices:device-tree", device_tree.addr())) {
88	>	u32.set_value(BusClockSpeed);
89	>	RegistryPropertyCreate(device_tree.addr(), "clock-frequency", u32.addr(), 4);
90	>	RegistryPropertyCreateStr(device_tree.addr(), "model", "Power Macintosh");
91
92		// Create "AAPL,ROM"
93	<	RegEntryID aapl_rom;
94	<	if (!RegistryCStrEntryCreate(&device_tree, "AAPL,ROM", &aapl_rom)) {
95	<	RegistryPropertyCreateStr(&aapl_rom, "device_type", "rom");
96	<	uint32 reg[2] = {ROM_BASE, ROM_SIZE};
97	<	RegistryPropertyCreate(&aapl_rom, "reg", &reg, 8);
93	>	SheepRegEntryID aapl_rom;
94	>	if (!RegistryCStrEntryCreate(device_tree.addr(), "AAPL,ROM", aapl_rom.addr())) {
95	>	RegistryPropertyCreateStr(aapl_rom.addr(), "device_type", "rom");
96	>	SheepPair reg(ROM_BASE, ROM_SIZE);
97	>	RegistryPropertyCreate(aapl_rom.addr(), "reg", reg.addr(), 8);
98		}
99
100		// Create "PowerPC,60x"
101	<	RegEntryID power_pc;
101	>	SheepRegEntryID power_pc;
102		char *str;
103		switch (PVR >> 16) {
104		case 1:         // 601
#	Line 115 | Line 131 | void DoPatchNameRegistry(void)
131		case 80:        // 860
132		str = "PowerPC,860";
133		break;
134	+	case 12:        // 7400, 7410, 7450, 7455, 7457
135	+	case 0x800c:
136	+	case 0x8000:
137	+	case 0x8001:
138	+	case 0x8002:
139	+	str = "PowerPC,G4";
140	+	break;
141		default:
142		str = "PowerPC,???";
143		break;
144		}
145	<	if (!RegistryCStrEntryCreate(&device_tree, str, &power_pc)) {
146	<	u32 = CPUClockSpeed;
147	<	RegistryPropertyCreate(&power_pc, "clock-frequency", &u32, 4);
148	<	RegistryPropertyCreate(&power_pc, "cpu-version", &PVR, 4);
149	<	RegistryPropertyCreateStr(&power_pc, "device_type", "cpu");
145	>	if (!RegistryCStrEntryCreate(device_tree.addr(), str, power_pc.addr())) {
146	>	u32.set_value(CPUClockSpeed);
147	>	RegistryPropertyCreate(power_pc.addr(), "clock-frequency", u32.addr(), 4);
148	>	u32.set_value(BusClockSpeed);
149	>	RegistryPropertyCreate(power_pc.addr(), "bus-frequency", u32.addr(), 4);
150	>	u32.set_value(TimebaseSpeed);
151	>	RegistryPropertyCreate(power_pc.addr(), "timebase-frequency", u32.addr(), 4);
152	>	u32.set_value(PVR);
153	>	RegistryPropertyCreate(power_pc.addr(), "cpu-version", u32.addr(), 4);
154	>	RegistryPropertyCreateStr(power_pc.addr(), "device_type", "cpu");
155		switch (PVR >> 16) {
156		case 1:         // 601
157	<	u32 = 64;
158	<	RegistryPropertyCreate(&power_pc, "d-cache-block-size", &u32, 4);
159	<	u32 = 128;
160	<	RegistryPropertyCreate(&power_pc, "d-cache-sets", &u32, 4);
161	<	u32 = 0x8000;
162	<	RegistryPropertyCreate(&power_pc, "d-cache-size", &u32, 4);
163	<	u32 = 64;
164	<	RegistryPropertyCreate(&power_pc, "i-cache-block-size", &u32, 4);
165	<	u32 = 128;
166	<	RegistryPropertyCreate(&power_pc, "i-cache-sets", &u32, 4);
167	<	u32 = 0x8000;
168	<	RegistryPropertyCreate(&power_pc, "i-cache-size", &u32, 4);
169	<	u32 = 128;
170	<	RegistryPropertyCreate(&power_pc, "tlb-sets", &u32, 4);
171	<	u32 = 256;
172	<	RegistryPropertyCreate(&power_pc, "tlb-size", &u32, 4);
157	>	u32.set_value(64);
158	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-block-size", u32.addr(), 4);
159	>	u32.set_value(128);
160	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-sets", u32.addr(), 4);
161	>	u32.set_value(0x8000);
162	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-size", u32.addr(), 4);
163	>	u32.set_value(64);
164	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-block-size", u32.addr(), 4);
165	>	u32.set_value(128);
166	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-sets", u32.addr(), 4);
167	>	u32.set_value(0x8000);
168	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-size", u32.addr(), 4);
169	>	u32.set_value(128);
170	>	RegistryPropertyCreate(power_pc.addr(), "tlb-sets", u32.addr(), 4);
171	>	u32.set_value(256);
172	>	RegistryPropertyCreate(power_pc.addr(), "tlb-size", u32.addr(), 4);
173		break;
174		case 3:         // 603
175	<	u32 = 32;
176	<	RegistryPropertyCreate(&power_pc, "d-cache-block-size", &u32, 4);
177	<	u32 = 64;
178	<	RegistryPropertyCreate(&power_pc, "d-cache-sets", &u32, 4);
179	<	u32 = 0x2000;
180	<	RegistryPropertyCreate(&power_pc, "d-cache-size", &u32, 4);
181	<	u32 = 32;
182	<	RegistryPropertyCreate(&power_pc, "i-cache-block-size", &u32, 4);
183	<	u32 = 64;
184	<	RegistryPropertyCreate(&power_pc, "i-cache-sets", &u32, 4);
185	<	u32 = 0x2000;
186	<	RegistryPropertyCreate(&power_pc, "i-cache-size", &u32, 4);
187	<	u32 = 32;
188	<	RegistryPropertyCreate(&power_pc, "tlb-sets", &u32, 4);
189	<	u32 = 64;
190	<	RegistryPropertyCreate(&power_pc, "tlb-size", &u32, 4);
175	>	u32.set_value(32);
176	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-block-size", u32.addr(), 4);
177	>	u32.set_value(64);
178	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-sets", u32.addr(), 4);
179	>	u32.set_value(0x2000);
180	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-size", u32.addr(), 4);
181	>	u32.set_value(32);
182	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-block-size", u32.addr(), 4);
183	>	u32.set_value(64);
184	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-sets", u32.addr(), 4);
185	>	u32.set_value(0x2000);
186	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-size", u32.addr(), 4);
187	>	u32.set_value(32);
188	>	RegistryPropertyCreate(power_pc.addr(), "tlb-sets", u32.addr(), 4);
189	>	u32.set_value(64);
190	>	RegistryPropertyCreate(power_pc.addr(), "tlb-size", u32.addr(), 4);
191		break;
192		case 4:         // 604
193	<	u32 = 32;
194	<	RegistryPropertyCreate(&power_pc, "d-cache-block-size", &u32, 4);
195	<	u32 = 128;
196	<	RegistryPropertyCreate(&power_pc, "d-cache-sets", &u32, 4);
197	<	u32 = 0x4000;
198	<	RegistryPropertyCreate(&power_pc, "d-cache-size", &u32, 4);
199	<	u32 = 32;
200	<	RegistryPropertyCreate(&power_pc, "i-cache-block-size", &u32, 4);
201	<	u32 = 128;
202	<	RegistryPropertyCreate(&power_pc, "i-cache-sets", &u32, 4);
203	<	u32 = 0x4000;
204	<	RegistryPropertyCreate(&power_pc, "i-cache-size", &u32, 4);
205	<	u32 = 64;
206	<	RegistryPropertyCreate(&power_pc, "tlb-sets", &u32, 4);
207	<	u32 = 128;
208	<	RegistryPropertyCreate(&power_pc, "tlb-size", &u32, 4);
193	>	u32.set_value(32);
194	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-block-size", u32.addr(), 4);
195	>	u32.set_value(128);
196	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-sets", u32.addr(), 4);
197	>	u32.set_value(0x4000);
198	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-size", u32.addr(), 4);
199	>	u32.set_value(32);
200	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-block-size", u32.addr(), 4);
201	>	u32.set_value(128);
202	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-sets", u32.addr(), 4);
203	>	u32.set_value(0x4000);
204	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-size", u32.addr(), 4);
205	>	u32.set_value(64);
206	>	RegistryPropertyCreate(power_pc.addr(), "tlb-sets", u32.addr(), 4);
207	>	u32.set_value(128);
208	>	RegistryPropertyCreate(power_pc.addr(), "tlb-size", u32.addr(), 4);
209		break;
210		case 6:         // 603e
211		case 7:         // 603ev
212	<	u32 = 32;
213	<	RegistryPropertyCreate(&power_pc, "d-cache-block-size", &u32, 4);
214	<	u32 = 128;
215	<	RegistryPropertyCreate(&power_pc, "d-cache-sets", &u32, 4);
216	<	u32 = 0x4000;
217	<	RegistryPropertyCreate(&power_pc, "d-cache-size", &u32, 4);
218	<	u32 = 32;
219	<	RegistryPropertyCreate(&power_pc, "i-cache-block-size", &u32, 4);
220	<	u32 = 128;
221	<	RegistryPropertyCreate(&power_pc, "i-cache-sets", &u32, 4);
222	<	u32 = 0x4000;
223	<	RegistryPropertyCreate(&power_pc, "i-cache-size", &u32, 4);
224	<	u32 = 32;
225	<	RegistryPropertyCreate(&power_pc, "tlb-sets", &u32, 4);
226	<	u32 = 64;
227	<	RegistryPropertyCreate(&power_pc, "tlb-size", &u32, 4);
212	>	u32.set_value(32);
213	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-block-size", u32.addr(), 4);
214	>	u32.set_value(128);
215	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-sets", u32.addr(), 4);
216	>	u32.set_value(0x4000);
217	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-size", u32.addr(), 4);
218	>	u32.set_value(32);
219	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-block-size", u32.addr(), 4);
220	>	u32.set_value(128);
221	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-sets", u32.addr(), 4);
222	>	u32.set_value(0x4000);
223	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-size", u32.addr(), 4);
224	>	u32.set_value(32);
225	>	RegistryPropertyCreate(power_pc.addr(), "tlb-sets", u32.addr(), 4);
226	>	u32.set_value(64);
227	>	RegistryPropertyCreate(power_pc.addr(), "tlb-size", u32.addr(), 4);
228		break;
229	<	case 8:         // 750
230	<	u32 = 32;
231	<	RegistryPropertyCreate(&power_pc, "d-cache-block-size", &u32, 4);
232	<	u32 = 256;
233	<	RegistryPropertyCreate(&power_pc, "d-cache-sets", &u32, 4);
234	<	u32 = 0x8000;
235	<	RegistryPropertyCreate(&power_pc, "d-cache-size", &u32, 4);
236	<	u32 = 32;
237	<	RegistryPropertyCreate(&power_pc, "i-cache-block-size", &u32, 4);
238	<	u32 = 256;
239	<	RegistryPropertyCreate(&power_pc, "i-cache-sets", &u32, 4);
240	<	u32 = 0x8000;
241	<	RegistryPropertyCreate(&power_pc, "i-cache-size", &u32, 4);
242	<	u32 = 64;
243	<	RegistryPropertyCreate(&power_pc, "tlb-sets", &u32, 4);
244	<	u32 = 128;
245	<	RegistryPropertyCreate(&power_pc, "tlb-size", &u32, 4);
229	>	case 8:         // 750, 750FX
230	>	case 0x7000:
231	>	u32.set_value(32);
232	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-block-size", u32.addr(), 4);
233	>	u32.set_value(256);
234	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-sets", u32.addr(), 4);
235	>	u32.set_value(0x8000);
236	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-size", u32.addr(), 4);
237	>	u32.set_value(32);
238	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-block-size", u32.addr(), 4);
239	>	u32.set_value(256);
240	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-sets", u32.addr(), 4);
241	>	u32.set_value(0x8000);
242	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-size", u32.addr(), 4);
243	>	u32.set_value(64);
244	>	RegistryPropertyCreate(power_pc.addr(), "tlb-sets", u32.addr(), 4);
245	>	u32.set_value(128);
246	>	RegistryPropertyCreate(power_pc.addr(), "tlb-size", u32.addr(), 4);
247		break;
248		case 9:         // 604e
249		case 10:        // 604ev5
250	<	u32 = 32;
251	<	RegistryPropertyCreate(&power_pc, "d-cache-block-size", &u32, 4);
252	<	u32 = 256;
253	<	RegistryPropertyCreate(&power_pc, "d-cache-sets", &u32, 4);
254	<	u32 = 0x8000;
255	<	RegistryPropertyCreate(&power_pc, "d-cache-size", &u32, 4);
256	<	u32 = 32;
257	<	RegistryPropertyCreate(&power_pc, "i-cache-block-size", &u32, 4);
258	<	u32 = 256;
259	<	RegistryPropertyCreate(&power_pc, "i-cache-sets", &u32, 4);
260	<	u32 = 0x8000;
261	<	RegistryPropertyCreate(&power_pc, "i-cache-size", &u32, 4);
262	<	u32 = 64;
263	<	RegistryPropertyCreate(&power_pc, "tlb-sets", &u32, 4);
264	<	u32 = 128;
265	<	RegistryPropertyCreate(&power_pc, "tlb-size", &u32, 4);
250	>	u32.set_value(32);
251	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-block-size", u32.addr(), 4);
252	>	u32.set_value(256);
253	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-sets", u32.addr(), 4);
254	>	u32.set_value(0x8000);
255	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-size", u32.addr(), 4);
256	>	u32.set_value(32);
257	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-block-size", u32.addr(), 4);
258	>	u32.set_value(256);
259	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-sets", u32.addr(), 4);
260	>	u32.set_value(0x8000);
261	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-size", u32.addr(), 4);
262	>	u32.set_value(64);
263	>	RegistryPropertyCreate(power_pc.addr(), "tlb-sets", u32.addr(), 4);
264	>	u32.set_value(128);
265	>	RegistryPropertyCreate(power_pc.addr(), "tlb-size", u32.addr(), 4);
266	>	break;
267	>	case 12:        // 7400, 7410, 7450, 7455, 7457
268	>	case 0x800c:
269	>	case 0x8000:
270	>	case 0x8001:
271	>	case 0x8002:
272	>	u32.set_value(32);
273	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-block-size", u32.addr(), 4);
274	>	u32.set_value(128);
275	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-sets", u32.addr(), 4);
276	>	u32.set_value(0x8000);
277	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-size", u32.addr(), 4);
278	>	u32.set_value(32);
279	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-block-size", u32.addr(), 4);
280	>	u32.set_value(128);
281	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-sets", u32.addr(), 4);
282	>	u32.set_value(0x8000);
283	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-size", u32.addr(), 4);
284	>	u32.set_value(64);
285	>	RegistryPropertyCreate(power_pc.addr(), "tlb-sets", u32.addr(), 4);
286	>	u32.set_value(128);
287	>	RegistryPropertyCreate(power_pc.addr(), "tlb-size", u32.addr(), 4);
288	>	break;
289	>	case 0x39:      // 970
290	>	u32.set_value(128);
291	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-block-size", u32.addr(), 4);
292	>	u32.set_value(128);
293	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-sets", u32.addr(), 4);
294	>	u32.set_value(0x8000);
295	>	RegistryPropertyCreate(power_pc.addr(), "d-cache-size", u32.addr(), 4);
296	>	u32.set_value(128);
297	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-block-size", u32.addr(), 4);
298	>	u32.set_value(512);
299	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-sets", u32.addr(), 4);
300	>	u32.set_value(0x10000);
301	>	RegistryPropertyCreate(power_pc.addr(), "i-cache-size", u32.addr(), 4);
302	>	u32.set_value(256);
303	>	RegistryPropertyCreate(power_pc.addr(), "tlb-sets", u32.addr(), 4);
304	>	u32.set_value(0x1000);
305	>	RegistryPropertyCreate(power_pc.addr(), "tlb-size", u32.addr(), 4);
306		break;
307		default:
308		break;
309		}
310	<	u32 = 32;
311	<	RegistryPropertyCreate(&power_pc, "reservation-granularity", &u32, 4);
312	<	uint32 reg[2] = {0, 0};
313	<	RegistryPropertyCreate(&power_pc, "reg", &reg, 8);
310	>	u32.set_value(32);
311	>	RegistryPropertyCreate(power_pc.addr(), "reservation-granularity", u32.addr(), 4);
312	>	SheepPair reg(0, 0);
313	>	RegistryPropertyCreate(power_pc.addr(), "reg", reg.addr(), 8);
314		}
315
316		// Create "memory"
317	<	RegEntryID memory;
318	<	if (!RegistryCStrEntryCreate(&device_tree, "memory", &memory)) {
319	<	uint32 reg[2] = {RAMBase, RAMSize};
320	<	RegistryPropertyCreateStr(&memory, "device_type", "memory");
321	<	RegistryPropertyCreate(&memory, "reg", &reg, 8);
317	>	SheepRegEntryID memory;
318	>	if (!RegistryCStrEntryCreate(device_tree.addr(), "memory", memory.addr())) {
319	>	SheepPair reg(RAMBase, RAMSize);
320	>	RegistryPropertyCreateStr(memory.addr(), "device_type", "memory");
321	>	RegistryPropertyCreate(memory.addr(), "reg", reg.addr(), 8);
322		}
323
324		// Create "video"
325	<	RegEntryID video;
326	<	if (!RegistryCStrEntryCreate(&device_tree, "video", &video)) {
327	<	RegistryPropertyCreateStr(&video, "AAPL,connector", "monitor");
328	<	RegistryPropertyCreateStr(&video, "device_type", "display");
329	<	RegistryPropertyCreate(&video, "driver,AAPL,MacOS,PowerPC", &video_driver, sizeof(video_driver));
330	<	RegistryPropertyCreateStr(&video, "model", "SheepShaver Video");
325	>	SheepRegEntryID video;
326	>	if (!RegistryCStrEntryCreate(device_tree.addr(), "video", video.addr())) {
327	>	RegistryPropertyCreateStr(video.addr(), "AAPL,connector", "monitor");
328	>	RegistryPropertyCreateStr(video.addr(), "device_type", "display");
329	>	SheepArray<sizeof(video_driver)> the_video_driver;
330	>	Host2Mac_memcpy(the_video_driver.addr(), video_driver, sizeof(video_driver));
331	>	RegistryPropertyCreate(video.addr(), "driver,AAPL,MacOS,PowerPC", the_video_driver.addr(), sizeof(video_driver));
332	>	RegistryPropertyCreateStr(video.addr(), "model", "SheepShaver Video");
333		}
334
335		// Create "ethernet"
336	<	RegEntryID ethernet;
337	<	if (!RegistryCStrEntryCreate(&device_tree, "ethernet", &ethernet)) {
338	<	RegistryPropertyCreateStr(&ethernet, "AAPL,connector", "ethernet");
339	<	RegistryPropertyCreateStr(&ethernet, "device_type", "network");
340	<	RegistryPropertyCreate(&ethernet, "driver,AAPL,MacOS,PowerPC", &ethernet_driver, sizeof(ethernet_driver));
336	>	// XXX the current ethernet driver is not direct addressing clean
337	>	#if REAL_ADDRESSING
338	>	SheepRegEntryID ethernet;
339	>	if (!RegistryCStrEntryCreate(device_tree.addr(), "ethernet", ethernet.addr())) {
340	>	RegistryPropertyCreateStr(ethernet.addr(), "AAPL,connector", "ethernet");
341	>	RegistryPropertyCreateStr(ethernet.addr(), "device_type", "network");
342	>	SheepArray<sizeof(ethernet_driver)> the_ethernet_driver;
343	>	Host2Mac_memcpy(the_ethernet_driver.addr(), ethernet_driver, sizeof(ethernet_driver));
344	>	RegistryPropertyCreate(ethernet.addr(), "driver,AAPL,MacOS,PowerPC", the_ethernet_driver.addr(), sizeof(ethernet_driver));
345		// local-mac-address
346		// max-frame-size 2048
347		}
348	+	#endif
349		}
350		D(bug("done.\n"));
351		}
#	Line 277 | Line 353 | void DoPatchNameRegistry(void)
353		void PatchNameRegistry(void)
354		{
355		// Find RegistryCStrEntryCreate() and RegistryPropertyCreate() TVECTs
356	<	rcec_tvect = (uint32)FindLibSymbol("\017NameRegistryLib", "\027RegistryCStrEntryCreate");
356	>	rcec_tvect = FindLibSymbol("\017NameRegistryLib", "\027RegistryCStrEntryCreate");
357		D(bug("RegistryCStrEntryCreate TVECT at %08x\n", rcec_tvect));
358	<	rpc_tvect = (uint32)FindLibSymbol("\017NameRegistryLib", "\026RegistryPropertyCreate");
358	>	rpc_tvect = FindLibSymbol("\017NameRegistryLib", "\026RegistryPropertyCreate");
359		D(bug("RegistryPropertyCreate TVECT at %08x\n", rpc_tvect));
360		if (rcec_tvect == 0 || rpc_tvect == 0) {
361		ErrorAlert(GetString(STR_NO_NAME_REGISTRY_ERR));
#	Line 287 | Line 363 | void PatchNameRegistry(void)
363		}
364
365		// Main routine must be executed in PPC mode
290	–	#if EMULATED_PPC
366		ExecuteNative(NATIVE_PATCH_NAME_REGISTRY);
292	–	#else
293	–	ExecutePPC(DoPatchNameRegistry);
294	–	#endif
367		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines