aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2009-11-03 08:39:09 -0500
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-02-27 12:27:15 -0500
commit53aac0ad7cb32af5c25d432454f936b57bf8c11f (patch)
treea55596392f63bee19e2a07312812fbdfb73a3882 /arch/m68k
parent41fb11ca90fe5a115b663340290311c7f5aab0f6 (diff)
mac68k: cleanup
Cleanup whitespace and comments. Remove some dead code. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/mac/config.c208
1 files changed, 97 insertions, 111 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index be017984a456..cad55bc087df 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -49,7 +49,6 @@
49#define SWIM_IO_SIZE 0x2000 /* SWIM IO resource size */ 49#define SWIM_IO_SIZE 0x2000 /* SWIM IO resource size */
50 50
51/* Mac bootinfo struct */ 51/* Mac bootinfo struct */
52
53struct mac_booter_data mac_bi_data; 52struct mac_booter_data mac_bi_data;
54 53
55/* The phys. video addr. - might be bogus on some machines */ 54/* The phys. video addr. - might be bogus on some machines */
@@ -70,8 +69,6 @@ extern void baboon_init(void);
70 69
71extern void mac_mksound(unsigned int, unsigned int); 70extern void mac_mksound(unsigned int, unsigned int);
72 71
73extern void nubus_sweep_video(void);
74
75static void mac_get_model(char *str); 72static void mac_get_model(char *str);
76static void mac_identify(void); 73static void mac_identify(void);
77static void mac_report_hardware(void); 74static void mac_report_hardware(void);
@@ -168,12 +165,6 @@ void __init config_mac(void)
168#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) 165#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
169 mach_beep = mac_mksound; 166 mach_beep = mac_mksound;
170#endif 167#endif
171#ifdef CONFIG_HEARTBEAT
172#if 0
173 mach_heartbeat = mac_heartbeat;
174 mach_heartbeat_irq = IRQ_MAC_TIMER;
175#endif
176#endif
177 168
178 /* 169 /*
179 * Determine hardware present 170 * Determine hardware present
@@ -191,27 +182,19 @@ void __init config_mac(void)
191 if (macintosh_config->ident == MAC_MODEL_IICI 182 if (macintosh_config->ident == MAC_MODEL_IICI
192 || macintosh_config->ident == MAC_MODEL_IIFX) 183 || macintosh_config->ident == MAC_MODEL_IIFX)
193 mach_l2_flush = mac_cache_card_flush; 184 mach_l2_flush = mac_cache_card_flush;
194
195 /*
196 * Check for machine specific fixups.
197 */
198
199#ifdef OLD_NUBUS_CODE
200 nubus_sweep_video();
201#endif
202} 185}
203 186
204 187
205/* 188/*
206 * Macintosh Table: hardcoded model configuration data. 189 * Macintosh Table: hardcoded model configuration data.
207 * 190 *
208 * Much of this was defined by Alan, based on who knows what docs. 191 * Much of this was defined by Alan, based on who knows what docs.
209 * I've added a lot more, and some of that was pure guesswork based 192 * I've added a lot more, and some of that was pure guesswork based
210 * on hardware pages present on the Mac web site. Possibly wildly 193 * on hardware pages present on the Mac web site. Possibly wildly
211 * inaccurate, so look here if a new Mac model won't run. Example: if 194 * inaccurate, so look here if a new Mac model won't run. Example: if
212 * a Mac crashes immediately after the VIA1 registers have been dumped 195 * a Mac crashes immediately after the VIA1 registers have been dumped
213 * to the screen, it probably died attempting to read DirB on a RBV. 196 * to the screen, it probably died attempting to read DirB on a RBV.
214 * Meaning it should have MAC_VIA_IIci here :-) 197 * Meaning it should have MAC_VIA_IIci here :-)
215 */ 198 */
216 199
217struct mac_model *macintosh_config; 200struct mac_model *macintosh_config;
@@ -219,7 +202,7 @@ EXPORT_SYMBOL(macintosh_config);
219 202
220static struct mac_model mac_data_table[] = { 203static struct mac_model mac_data_table[] = {
221 /* 204 /*
222 * We'll pretend to be a Macintosh II, that's pretty safe. 205 * We'll pretend to be a Macintosh II, that's pretty safe.
223 */ 206 */
224 207
225 { 208 {
@@ -230,12 +213,11 @@ static struct mac_model mac_data_table[] = {
230 .scsi_type = MAC_SCSI_OLD, 213 .scsi_type = MAC_SCSI_OLD,
231 .scc_type = MAC_SCC_II, 214 .scc_type = MAC_SCC_II,
232 .nubus_type = MAC_NUBUS, 215 .nubus_type = MAC_NUBUS,
233 .floppy_type = MAC_FLOPPY_IWM 216 .floppy_type = MAC_FLOPPY_IWM,
234 }, 217 },
235 218
236 /* 219 /*
237 * Original MacII hardware 220 * Original Mac II hardware
238 *
239 */ 221 */
240 222
241 { 223 {
@@ -246,7 +228,7 @@ static struct mac_model mac_data_table[] = {
246 .scsi_type = MAC_SCSI_OLD, 228 .scsi_type = MAC_SCSI_OLD,
247 .scc_type = MAC_SCC_II, 229 .scc_type = MAC_SCC_II,
248 .nubus_type = MAC_NUBUS, 230 .nubus_type = MAC_NUBUS,
249 .floppy_type = MAC_FLOPPY_IWM 231 .floppy_type = MAC_FLOPPY_IWM,
250 }, { 232 }, {
251 .ident = MAC_MODEL_IIX, 233 .ident = MAC_MODEL_IIX,
252 .name = "IIx", 234 .name = "IIx",
@@ -255,7 +237,7 @@ static struct mac_model mac_data_table[] = {
255 .scsi_type = MAC_SCSI_OLD, 237 .scsi_type = MAC_SCSI_OLD,
256 .scc_type = MAC_SCC_II, 238 .scc_type = MAC_SCC_II,
257 .nubus_type = MAC_NUBUS, 239 .nubus_type = MAC_NUBUS,
258 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 240 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
259 }, { 241 }, {
260 .ident = MAC_MODEL_IICX, 242 .ident = MAC_MODEL_IICX,
261 .name = "IIcx", 243 .name = "IIcx",
@@ -264,7 +246,7 @@ static struct mac_model mac_data_table[] = {
264 .scsi_type = MAC_SCSI_OLD, 246 .scsi_type = MAC_SCSI_OLD,
265 .scc_type = MAC_SCC_II, 247 .scc_type = MAC_SCC_II,
266 .nubus_type = MAC_NUBUS, 248 .nubus_type = MAC_NUBUS,
267 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 249 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
268 }, { 250 }, {
269 .ident = MAC_MODEL_SE30, 251 .ident = MAC_MODEL_SE30,
270 .name = "SE/30", 252 .name = "SE/30",
@@ -273,13 +255,13 @@ static struct mac_model mac_data_table[] = {
273 .scsi_type = MAC_SCSI_OLD, 255 .scsi_type = MAC_SCSI_OLD,
274 .scc_type = MAC_SCC_II, 256 .scc_type = MAC_SCC_II,
275 .nubus_type = MAC_NUBUS, 257 .nubus_type = MAC_NUBUS,
276 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 258 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
277 }, 259 },
278 260
279 /* 261 /*
280 * Weirdified MacII hardware - all subtly different. Gee thanks 262 * Weirdified Mac II hardware - all subtly different. Gee thanks
281 * Apple. All these boxes seem to have VIA2 in a different place to 263 * Apple. All these boxes seem to have VIA2 in a different place to
282 * the MacII (+1A000 rather than +4000) 264 * the Mac II (+1A000 rather than +4000)
283 * CSA: see http://developer.apple.com/technotes/hw/hw_09.html 265 * CSA: see http://developer.apple.com/technotes/hw/hw_09.html
284 */ 266 */
285 267
@@ -291,7 +273,7 @@ static struct mac_model mac_data_table[] = {
291 .scsi_type = MAC_SCSI_OLD, 273 .scsi_type = MAC_SCSI_OLD,
292 .scc_type = MAC_SCC_II, 274 .scc_type = MAC_SCC_II,
293 .nubus_type = MAC_NUBUS, 275 .nubus_type = MAC_NUBUS,
294 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 276 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
295 }, { 277 }, {
296 .ident = MAC_MODEL_IIFX, 278 .ident = MAC_MODEL_IIFX,
297 .name = "IIfx", 279 .name = "IIfx",
@@ -300,7 +282,7 @@ static struct mac_model mac_data_table[] = {
300 .scsi_type = MAC_SCSI_OLD, 282 .scsi_type = MAC_SCSI_OLD,
301 .scc_type = MAC_SCC_IOP, 283 .scc_type = MAC_SCC_IOP,
302 .nubus_type = MAC_NUBUS, 284 .nubus_type = MAC_NUBUS,
303 .floppy_type = MAC_FLOPPY_SWIM_IOP 285 .floppy_type = MAC_FLOPPY_SWIM_IOP,
304 }, { 286 }, {
305 .ident = MAC_MODEL_IISI, 287 .ident = MAC_MODEL_IISI,
306 .name = "IIsi", 288 .name = "IIsi",
@@ -309,7 +291,7 @@ static struct mac_model mac_data_table[] = {
309 .scsi_type = MAC_SCSI_OLD, 291 .scsi_type = MAC_SCSI_OLD,
310 .scc_type = MAC_SCC_II, 292 .scc_type = MAC_SCC_II,
311 .nubus_type = MAC_NUBUS, 293 .nubus_type = MAC_NUBUS,
312 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 294 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
313 }, { 295 }, {
314 .ident = MAC_MODEL_IIVI, 296 .ident = MAC_MODEL_IIVI,
315 .name = "IIvi", 297 .name = "IIvi",
@@ -318,7 +300,7 @@ static struct mac_model mac_data_table[] = {
318 .scsi_type = MAC_SCSI_OLD, 300 .scsi_type = MAC_SCSI_OLD,
319 .scc_type = MAC_SCC_II, 301 .scc_type = MAC_SCC_II,
320 .nubus_type = MAC_NUBUS, 302 .nubus_type = MAC_NUBUS,
321 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 303 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
322 }, { 304 }, {
323 .ident = MAC_MODEL_IIVX, 305 .ident = MAC_MODEL_IIVX,
324 .name = "IIvx", 306 .name = "IIvx",
@@ -327,11 +309,11 @@ static struct mac_model mac_data_table[] = {
327 .scsi_type = MAC_SCSI_OLD, 309 .scsi_type = MAC_SCSI_OLD,
328 .scc_type = MAC_SCC_II, 310 .scc_type = MAC_SCC_II,
329 .nubus_type = MAC_NUBUS, 311 .nubus_type = MAC_NUBUS,
330 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 312 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
331 }, 313 },
332 314
333 /* 315 /*
334 * Classic models (guessing: similar to SE/30 ?? Nope, similar to LC ...) 316 * Classic models (guessing: similar to SE/30? Nope, similar to LC...)
335 */ 317 */
336 318
337 { 319 {
@@ -342,7 +324,7 @@ static struct mac_model mac_data_table[] = {
342 .scsi_type = MAC_SCSI_OLD, 324 .scsi_type = MAC_SCSI_OLD,
343 .scc_type = MAC_SCC_II, 325 .scc_type = MAC_SCC_II,
344 .nubus_type = MAC_NUBUS, 326 .nubus_type = MAC_NUBUS,
345 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 327 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
346 }, { 328 }, {
347 .ident = MAC_MODEL_CCL, 329 .ident = MAC_MODEL_CCL,
348 .name = "Color Classic", 330 .name = "Color Classic",
@@ -351,11 +333,11 @@ static struct mac_model mac_data_table[] = {
351 .scsi_type = MAC_SCSI_OLD, 333 .scsi_type = MAC_SCSI_OLD,
352 .scc_type = MAC_SCC_II, 334 .scc_type = MAC_SCC_II,
353 .nubus_type = MAC_NUBUS, 335 .nubus_type = MAC_NUBUS,
354 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 336 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
355 }, 337 },
356 338
357 /* 339 /*
358 * Some Mac LC machines. Basically the same as the IIci, ADB like IIsi 340 * Some Mac LC machines. Basically the same as the IIci, ADB like IIsi
359 */ 341 */
360 342
361 { 343 {
@@ -366,7 +348,7 @@ static struct mac_model mac_data_table[] = {
366 .scsi_type = MAC_SCSI_OLD, 348 .scsi_type = MAC_SCSI_OLD,
367 .scc_type = MAC_SCC_II, 349 .scc_type = MAC_SCC_II,
368 .nubus_type = MAC_NUBUS, 350 .nubus_type = MAC_NUBUS,
369 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 351 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
370 }, { 352 }, {
371 .ident = MAC_MODEL_LCII, 353 .ident = MAC_MODEL_LCII,
372 .name = "LC II", 354 .name = "LC II",
@@ -375,7 +357,7 @@ static struct mac_model mac_data_table[] = {
375 .scsi_type = MAC_SCSI_OLD, 357 .scsi_type = MAC_SCSI_OLD,
376 .scc_type = MAC_SCC_II, 358 .scc_type = MAC_SCC_II,
377 .nubus_type = MAC_NUBUS, 359 .nubus_type = MAC_NUBUS,
378 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 360 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
379 }, { 361 }, {
380 .ident = MAC_MODEL_LCIII, 362 .ident = MAC_MODEL_LCIII,
381 .name = "LC III", 363 .name = "LC III",
@@ -384,17 +366,17 @@ static struct mac_model mac_data_table[] = {
384 .scsi_type = MAC_SCSI_OLD, 366 .scsi_type = MAC_SCSI_OLD,
385 .scc_type = MAC_SCC_II, 367 .scc_type = MAC_SCC_II,
386 .nubus_type = MAC_NUBUS, 368 .nubus_type = MAC_NUBUS,
387 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 369 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
388 }, 370 },
389 371
390 /* 372 /*
391 * Quadra. Video is at 0xF9000000, via is like a MacII. We label it differently 373 * Quadra. Video is at 0xF9000000, via is like a MacII. We label it
392 * as some of the stuff connected to VIA2 seems different. Better SCSI chip and 374 * differently as some of the stuff connected to VIA2 seems different.
393 * onboard ethernet using a NatSemi SONIC except the 660AV and 840AV which use an 375 * Better SCSI chip and onboard ethernet using a NatSemi SONIC except
394 * AMD 79C940 (MACE). 376 * the 660AV and 840AV which use an AMD 79C940 (MACE).
395 * The 700, 900 and 950 have some I/O chips in the wrong place to 377 * The 700, 900 and 950 have some I/O chips in the wrong place to
396 * confuse us. The 840AV has a SCSI location of its own (same as 378 * confuse us. The 840AV has a SCSI location of its own (same as
397 * the 660AV). 379 * the 660AV).
398 */ 380 */
399 381
400 { 382 {
@@ -405,7 +387,7 @@ static struct mac_model mac_data_table[] = {
405 .scsi_type = MAC_SCSI_QUADRA, 387 .scsi_type = MAC_SCSI_QUADRA,
406 .scc_type = MAC_SCC_QUADRA, 388 .scc_type = MAC_SCC_QUADRA,
407 .nubus_type = MAC_NUBUS, 389 .nubus_type = MAC_NUBUS,
408 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 390 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
409 }, { 391 }, {
410 .ident = MAC_MODEL_Q605_ACC, 392 .ident = MAC_MODEL_Q605_ACC,
411 .name = "Quadra 605", 393 .name = "Quadra 605",
@@ -414,7 +396,7 @@ static struct mac_model mac_data_table[] = {
414 .scsi_type = MAC_SCSI_QUADRA, 396 .scsi_type = MAC_SCSI_QUADRA,
415 .scc_type = MAC_SCC_QUADRA, 397 .scc_type = MAC_SCC_QUADRA,
416 .nubus_type = MAC_NUBUS, 398 .nubus_type = MAC_NUBUS,
417 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 399 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
418 }, { 400 }, {
419 .ident = MAC_MODEL_Q610, 401 .ident = MAC_MODEL_Q610,
420 .name = "Quadra 610", 402 .name = "Quadra 610",
@@ -424,7 +406,7 @@ static struct mac_model mac_data_table[] = {
424 .scc_type = MAC_SCC_QUADRA, 406 .scc_type = MAC_SCC_QUADRA,
425 .ether_type = MAC_ETHER_SONIC, 407 .ether_type = MAC_ETHER_SONIC,
426 .nubus_type = MAC_NUBUS, 408 .nubus_type = MAC_NUBUS,
427 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 409 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
428 }, { 410 }, {
429 .ident = MAC_MODEL_Q630, 411 .ident = MAC_MODEL_Q630,
430 .name = "Quadra 630", 412 .name = "Quadra 630",
@@ -435,7 +417,7 @@ static struct mac_model mac_data_table[] = {
435 .scc_type = MAC_SCC_QUADRA, 417 .scc_type = MAC_SCC_QUADRA,
436 .ether_type = MAC_ETHER_SONIC, 418 .ether_type = MAC_ETHER_SONIC,
437 .nubus_type = MAC_NUBUS, 419 .nubus_type = MAC_NUBUS,
438 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 420 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
439 }, { 421 }, {
440 .ident = MAC_MODEL_Q650, 422 .ident = MAC_MODEL_Q650,
441 .name = "Quadra 650", 423 .name = "Quadra 650",
@@ -445,9 +427,9 @@ static struct mac_model mac_data_table[] = {
445 .scc_type = MAC_SCC_QUADRA, 427 .scc_type = MAC_SCC_QUADRA,
446 .ether_type = MAC_ETHER_SONIC, 428 .ether_type = MAC_ETHER_SONIC,
447 .nubus_type = MAC_NUBUS, 429 .nubus_type = MAC_NUBUS,
448 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 430 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
449 }, 431 },
450 /* The Q700 does have a NS Sonic */ 432 /* The Q700 does have a NS Sonic */
451 { 433 {
452 .ident = MAC_MODEL_Q700, 434 .ident = MAC_MODEL_Q700,
453 .name = "Quadra 700", 435 .name = "Quadra 700",
@@ -457,7 +439,7 @@ static struct mac_model mac_data_table[] = {
457 .scc_type = MAC_SCC_QUADRA, 439 .scc_type = MAC_SCC_QUADRA,
458 .ether_type = MAC_ETHER_SONIC, 440 .ether_type = MAC_ETHER_SONIC,
459 .nubus_type = MAC_NUBUS, 441 .nubus_type = MAC_NUBUS,
460 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 442 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
461 }, { 443 }, {
462 .ident = MAC_MODEL_Q800, 444 .ident = MAC_MODEL_Q800,
463 .name = "Quadra 800", 445 .name = "Quadra 800",
@@ -467,7 +449,7 @@ static struct mac_model mac_data_table[] = {
467 .scc_type = MAC_SCC_QUADRA, 449 .scc_type = MAC_SCC_QUADRA,
468 .ether_type = MAC_ETHER_SONIC, 450 .ether_type = MAC_ETHER_SONIC,
469 .nubus_type = MAC_NUBUS, 451 .nubus_type = MAC_NUBUS,
470 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 452 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
471 }, { 453 }, {
472 .ident = MAC_MODEL_Q840, 454 .ident = MAC_MODEL_Q840,
473 .name = "Quadra 840AV", 455 .name = "Quadra 840AV",
@@ -477,7 +459,7 @@ static struct mac_model mac_data_table[] = {
477 .scc_type = MAC_SCC_PSC, 459 .scc_type = MAC_SCC_PSC,
478 .ether_type = MAC_ETHER_MACE, 460 .ether_type = MAC_ETHER_MACE,
479 .nubus_type = MAC_NUBUS, 461 .nubus_type = MAC_NUBUS,
480 .floppy_type = MAC_FLOPPY_AV 462 .floppy_type = MAC_FLOPPY_AV,
481 }, { 463 }, {
482 .ident = MAC_MODEL_Q900, 464 .ident = MAC_MODEL_Q900,
483 .name = "Quadra 900", 465 .name = "Quadra 900",
@@ -487,7 +469,7 @@ static struct mac_model mac_data_table[] = {
487 .scc_type = MAC_SCC_IOP, 469 .scc_type = MAC_SCC_IOP,
488 .ether_type = MAC_ETHER_SONIC, 470 .ether_type = MAC_ETHER_SONIC,
489 .nubus_type = MAC_NUBUS, 471 .nubus_type = MAC_NUBUS,
490 .floppy_type = MAC_FLOPPY_SWIM_IOP 472 .floppy_type = MAC_FLOPPY_SWIM_IOP,
491 }, { 473 }, {
492 .ident = MAC_MODEL_Q950, 474 .ident = MAC_MODEL_Q950,
493 .name = "Quadra 950", 475 .name = "Quadra 950",
@@ -497,60 +479,60 @@ static struct mac_model mac_data_table[] = {
497 .scc_type = MAC_SCC_IOP, 479 .scc_type = MAC_SCC_IOP,
498 .ether_type = MAC_ETHER_SONIC, 480 .ether_type = MAC_ETHER_SONIC,
499 .nubus_type = MAC_NUBUS, 481 .nubus_type = MAC_NUBUS,
500 .floppy_type = MAC_FLOPPY_SWIM_IOP 482 .floppy_type = MAC_FLOPPY_SWIM_IOP,
501 }, 483 },
502 484
503 /* 485 /*
504 * Performa - more LC type machines 486 * Performa - more LC type machines
505 */ 487 */
506 488
507 { 489 {
508 .ident = MAC_MODEL_P460, 490 .ident = MAC_MODEL_P460,
509 .name = "Performa 460", 491 .name = "Performa 460",
510 .adb_type = MAC_ADB_IISI, 492 .adb_type = MAC_ADB_IISI,
511 .via_type = MAC_VIA_IIci, 493 .via_type = MAC_VIA_IIci,
512 .scsi_type = MAC_SCSI_OLD, 494 .scsi_type = MAC_SCSI_OLD,
513 .scc_type = MAC_SCC_II, 495 .scc_type = MAC_SCC_II,
514 .nubus_type = MAC_NUBUS, 496 .nubus_type = MAC_NUBUS,
515 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 497 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
516 }, { 498 }, {
517 .ident = MAC_MODEL_P475, 499 .ident = MAC_MODEL_P475,
518 .name = "Performa 475", 500 .name = "Performa 475",
519 .adb_type = MAC_ADB_CUDA, 501 .adb_type = MAC_ADB_CUDA,
520 .via_type = MAC_VIA_QUADRA, 502 .via_type = MAC_VIA_QUADRA,
521 .scsi_type = MAC_SCSI_QUADRA, 503 .scsi_type = MAC_SCSI_QUADRA,
522 .scc_type = MAC_SCC_II, 504 .scc_type = MAC_SCC_II,
523 .nubus_type = MAC_NUBUS, 505 .nubus_type = MAC_NUBUS,
524 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 506 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
525 }, { 507 }, {
526 .ident = MAC_MODEL_P475F, 508 .ident = MAC_MODEL_P475F,
527 .name = "Performa 475", 509 .name = "Performa 475",
528 .adb_type = MAC_ADB_CUDA, 510 .adb_type = MAC_ADB_CUDA,
529 .via_type = MAC_VIA_QUADRA, 511 .via_type = MAC_VIA_QUADRA,
530 .scsi_type = MAC_SCSI_QUADRA, 512 .scsi_type = MAC_SCSI_QUADRA,
531 .scc_type = MAC_SCC_II, 513 .scc_type = MAC_SCC_II,
532 .nubus_type = MAC_NUBUS, 514 .nubus_type = MAC_NUBUS,
533 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 515 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
534 }, { 516 }, {
535 .ident = MAC_MODEL_P520, 517 .ident = MAC_MODEL_P520,
536 .name = "Performa 520", 518 .name = "Performa 520",
537 .adb_type = MAC_ADB_CUDA, 519 .adb_type = MAC_ADB_CUDA,
538 .via_type = MAC_VIA_IIci, 520 .via_type = MAC_VIA_IIci,
539 .scsi_type = MAC_SCSI_OLD, 521 .scsi_type = MAC_SCSI_OLD,
540 .scc_type = MAC_SCC_II, 522 .scc_type = MAC_SCC_II,
541 .nubus_type = MAC_NUBUS, 523 .nubus_type = MAC_NUBUS,
542 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 524 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
543 }, { 525 }, {
544 .ident = MAC_MODEL_P550, 526 .ident = MAC_MODEL_P550,
545 .name = "Performa 550", 527 .name = "Performa 550",
546 .adb_type = MAC_ADB_CUDA, 528 .adb_type = MAC_ADB_CUDA,
547 .via_type = MAC_VIA_IIci, 529 .via_type = MAC_VIA_IIci,
548 .scsi_type = MAC_SCSI_OLD, 530 .scsi_type = MAC_SCSI_OLD,
549 .scc_type = MAC_SCC_II, 531 .scc_type = MAC_SCC_II,
550 .nubus_type = MAC_NUBUS, 532 .nubus_type = MAC_NUBUS,
551 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 533 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
552 }, 534 },
553 /* These have the comm slot, and therefore the possibility of SONIC ethernet */ 535 /* These have the comm slot, and therefore possibly SONIC ethernet */
554 { 536 {
555 .ident = MAC_MODEL_P575, 537 .ident = MAC_MODEL_P575,
556 .name = "Performa 575", 538 .name = "Performa 575",
@@ -560,7 +542,7 @@ static struct mac_model mac_data_table[] = {
560 .scc_type = MAC_SCC_II, 542 .scc_type = MAC_SCC_II,
561 .ether_type = MAC_ETHER_SONIC, 543 .ether_type = MAC_ETHER_SONIC,
562 .nubus_type = MAC_NUBUS, 544 .nubus_type = MAC_NUBUS,
563 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 545 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
564 }, { 546 }, {
565 .ident = MAC_MODEL_P588, 547 .ident = MAC_MODEL_P588,
566 .name = "Performa 588", 548 .name = "Performa 588",
@@ -571,7 +553,7 @@ static struct mac_model mac_data_table[] = {
571 .scc_type = MAC_SCC_II, 553 .scc_type = MAC_SCC_II,
572 .ether_type = MAC_ETHER_SONIC, 554 .ether_type = MAC_ETHER_SONIC,
573 .nubus_type = MAC_NUBUS, 555 .nubus_type = MAC_NUBUS,
574 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 556 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
575 }, { 557 }, {
576 .ident = MAC_MODEL_TV, 558 .ident = MAC_MODEL_TV,
577 .name = "TV", 559 .name = "TV",
@@ -580,7 +562,7 @@ static struct mac_model mac_data_table[] = {
580 .scsi_type = MAC_SCSI_OLD, 562 .scsi_type = MAC_SCSI_OLD,
581 .scc_type = MAC_SCC_II, 563 .scc_type = MAC_SCC_II,
582 .nubus_type = MAC_NUBUS, 564 .nubus_type = MAC_NUBUS,
583 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 565 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
584 }, { 566 }, {
585 .ident = MAC_MODEL_P600, 567 .ident = MAC_MODEL_P600,
586 .name = "Performa 600", 568 .name = "Performa 600",
@@ -589,14 +571,14 @@ static struct mac_model mac_data_table[] = {
589 .scsi_type = MAC_SCSI_OLD, 571 .scsi_type = MAC_SCSI_OLD,
590 .scc_type = MAC_SCC_II, 572 .scc_type = MAC_SCC_II,
591 .nubus_type = MAC_NUBUS, 573 .nubus_type = MAC_NUBUS,
592 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 574 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
593 }, 575 },
594 576
595 /* 577 /*
596 * Centris - just guessing again; maybe like Quadra 578 * Centris - just guessing again; maybe like Quadra.
579 * The C610 may or may not have SONIC. We probe to make sure.
597 */ 580 */
598 581
599 /* The C610 may or may not have SONIC. We probe to make sure */
600 { 582 {
601 .ident = MAC_MODEL_C610, 583 .ident = MAC_MODEL_C610,
602 .name = "Centris 610", 584 .name = "Centris 610",
@@ -606,7 +588,7 @@ static struct mac_model mac_data_table[] = {
606 .scc_type = MAC_SCC_QUADRA, 588 .scc_type = MAC_SCC_QUADRA,
607 .ether_type = MAC_ETHER_SONIC, 589 .ether_type = MAC_ETHER_SONIC,
608 .nubus_type = MAC_NUBUS, 590 .nubus_type = MAC_NUBUS,
609 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 591 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
610 }, { 592 }, {
611 .ident = MAC_MODEL_C650, 593 .ident = MAC_MODEL_C650,
612 .name = "Centris 650", 594 .name = "Centris 650",
@@ -616,7 +598,7 @@ static struct mac_model mac_data_table[] = {
616 .scc_type = MAC_SCC_QUADRA, 598 .scc_type = MAC_SCC_QUADRA,
617 .ether_type = MAC_ETHER_SONIC, 599 .ether_type = MAC_ETHER_SONIC,
618 .nubus_type = MAC_NUBUS, 600 .nubus_type = MAC_NUBUS,
619 .floppy_type = MAC_FLOPPY_SWIM_ADDR1 601 .floppy_type = MAC_FLOPPY_SWIM_ADDR1,
620 }, { 602 }, {
621 .ident = MAC_MODEL_C660, 603 .ident = MAC_MODEL_C660,
622 .name = "Centris 660AV", 604 .name = "Centris 660AV",
@@ -626,7 +608,7 @@ static struct mac_model mac_data_table[] = {
626 .scc_type = MAC_SCC_PSC, 608 .scc_type = MAC_SCC_PSC,
627 .ether_type = MAC_ETHER_MACE, 609 .ether_type = MAC_ETHER_MACE,
628 .nubus_type = MAC_NUBUS, 610 .nubus_type = MAC_NUBUS,
629 .floppy_type = MAC_FLOPPY_AV 611 .floppy_type = MAC_FLOPPY_AV,
630 }, 612 },
631 613
632 /* 614 /*
@@ -643,7 +625,7 @@ static struct mac_model mac_data_table[] = {
643 .scsi_type = MAC_SCSI_OLD, 625 .scsi_type = MAC_SCSI_OLD,
644 .scc_type = MAC_SCC_QUADRA, 626 .scc_type = MAC_SCC_QUADRA,
645 .nubus_type = MAC_NUBUS, 627 .nubus_type = MAC_NUBUS,
646 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 628 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
647 }, { 629 }, {
648 .ident = MAC_MODEL_PB145, 630 .ident = MAC_MODEL_PB145,
649 .name = "PowerBook 145", 631 .name = "PowerBook 145",
@@ -652,7 +634,7 @@ static struct mac_model mac_data_table[] = {
652 .scsi_type = MAC_SCSI_OLD, 634 .scsi_type = MAC_SCSI_OLD,
653 .scc_type = MAC_SCC_QUADRA, 635 .scc_type = MAC_SCC_QUADRA,
654 .nubus_type = MAC_NUBUS, 636 .nubus_type = MAC_NUBUS,
655 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 637 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
656 }, { 638 }, {
657 .ident = MAC_MODEL_PB150, 639 .ident = MAC_MODEL_PB150,
658 .name = "PowerBook 150", 640 .name = "PowerBook 150",
@@ -662,7 +644,7 @@ static struct mac_model mac_data_table[] = {
662 .ide_type = MAC_IDE_PB, 644 .ide_type = MAC_IDE_PB,
663 .scc_type = MAC_SCC_QUADRA, 645 .scc_type = MAC_SCC_QUADRA,
664 .nubus_type = MAC_NUBUS, 646 .nubus_type = MAC_NUBUS,
665 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 647 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
666 }, { 648 }, {
667 .ident = MAC_MODEL_PB160, 649 .ident = MAC_MODEL_PB160,
668 .name = "PowerBook 160", 650 .name = "PowerBook 160",
@@ -671,7 +653,7 @@ static struct mac_model mac_data_table[] = {
671 .scsi_type = MAC_SCSI_OLD, 653 .scsi_type = MAC_SCSI_OLD,
672 .scc_type = MAC_SCC_QUADRA, 654 .scc_type = MAC_SCC_QUADRA,
673 .nubus_type = MAC_NUBUS, 655 .nubus_type = MAC_NUBUS,
674 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 656 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
675 }, { 657 }, {
676 .ident = MAC_MODEL_PB165, 658 .ident = MAC_MODEL_PB165,
677 .name = "PowerBook 165", 659 .name = "PowerBook 165",
@@ -680,7 +662,7 @@ static struct mac_model mac_data_table[] = {
680 .scsi_type = MAC_SCSI_OLD, 662 .scsi_type = MAC_SCSI_OLD,
681 .scc_type = MAC_SCC_QUADRA, 663 .scc_type = MAC_SCC_QUADRA,
682 .nubus_type = MAC_NUBUS, 664 .nubus_type = MAC_NUBUS,
683 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 665 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
684 }, { 666 }, {
685 .ident = MAC_MODEL_PB165C, 667 .ident = MAC_MODEL_PB165C,
686 .name = "PowerBook 165c", 668 .name = "PowerBook 165c",
@@ -689,7 +671,7 @@ static struct mac_model mac_data_table[] = {
689 .scsi_type = MAC_SCSI_OLD, 671 .scsi_type = MAC_SCSI_OLD,
690 .scc_type = MAC_SCC_QUADRA, 672 .scc_type = MAC_SCC_QUADRA,
691 .nubus_type = MAC_NUBUS, 673 .nubus_type = MAC_NUBUS,
692 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 674 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
693 }, { 675 }, {
694 .ident = MAC_MODEL_PB170, 676 .ident = MAC_MODEL_PB170,
695 .name = "PowerBook 170", 677 .name = "PowerBook 170",
@@ -698,7 +680,7 @@ static struct mac_model mac_data_table[] = {
698 .scsi_type = MAC_SCSI_OLD, 680 .scsi_type = MAC_SCSI_OLD,
699 .scc_type = MAC_SCC_QUADRA, 681 .scc_type = MAC_SCC_QUADRA,
700 .nubus_type = MAC_NUBUS, 682 .nubus_type = MAC_NUBUS,
701 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 683 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
702 }, { 684 }, {
703 .ident = MAC_MODEL_PB180, 685 .ident = MAC_MODEL_PB180,
704 .name = "PowerBook 180", 686 .name = "PowerBook 180",
@@ -707,7 +689,7 @@ static struct mac_model mac_data_table[] = {
707 .scsi_type = MAC_SCSI_OLD, 689 .scsi_type = MAC_SCSI_OLD,
708 .scc_type = MAC_SCC_QUADRA, 690 .scc_type = MAC_SCC_QUADRA,
709 .nubus_type = MAC_NUBUS, 691 .nubus_type = MAC_NUBUS,
710 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 692 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
711 }, { 693 }, {
712 .ident = MAC_MODEL_PB180C, 694 .ident = MAC_MODEL_PB180C,
713 .name = "PowerBook 180c", 695 .name = "PowerBook 180c",
@@ -716,7 +698,7 @@ static struct mac_model mac_data_table[] = {
716 .scsi_type = MAC_SCSI_OLD, 698 .scsi_type = MAC_SCSI_OLD,
717 .scc_type = MAC_SCC_QUADRA, 699 .scc_type = MAC_SCC_QUADRA,
718 .nubus_type = MAC_NUBUS, 700 .nubus_type = MAC_NUBUS,
719 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 701 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
720 }, { 702 }, {
721 .ident = MAC_MODEL_PB190, 703 .ident = MAC_MODEL_PB190,
722 .name = "PowerBook 190", 704 .name = "PowerBook 190",
@@ -726,7 +708,7 @@ static struct mac_model mac_data_table[] = {
726 .ide_type = MAC_IDE_BABOON, 708 .ide_type = MAC_IDE_BABOON,
727 .scc_type = MAC_SCC_QUADRA, 709 .scc_type = MAC_SCC_QUADRA,
728 .nubus_type = MAC_NUBUS, 710 .nubus_type = MAC_NUBUS,
729 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 711 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
730 }, { 712 }, {
731 .ident = MAC_MODEL_PB520, 713 .ident = MAC_MODEL_PB520,
732 .name = "PowerBook 520", 714 .name = "PowerBook 520",
@@ -736,7 +718,7 @@ static struct mac_model mac_data_table[] = {
736 .scc_type = MAC_SCC_QUADRA, 718 .scc_type = MAC_SCC_QUADRA,
737 .ether_type = MAC_ETHER_SONIC, 719 .ether_type = MAC_ETHER_SONIC,
738 .nubus_type = MAC_NUBUS, 720 .nubus_type = MAC_NUBUS,
739 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 721 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
740 }, 722 },
741 723
742 /* 724 /*
@@ -757,7 +739,7 @@ static struct mac_model mac_data_table[] = {
757 .scsi_type = MAC_SCSI_OLD, 739 .scsi_type = MAC_SCSI_OLD,
758 .scc_type = MAC_SCC_QUADRA, 740 .scc_type = MAC_SCC_QUADRA,
759 .nubus_type = MAC_NUBUS, 741 .nubus_type = MAC_NUBUS,
760 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 742 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
761 }, { 743 }, {
762 .ident = MAC_MODEL_PB230, 744 .ident = MAC_MODEL_PB230,
763 .name = "PowerBook Duo 230", 745 .name = "PowerBook Duo 230",
@@ -766,7 +748,7 @@ static struct mac_model mac_data_table[] = {
766 .scsi_type = MAC_SCSI_OLD, 748 .scsi_type = MAC_SCSI_OLD,
767 .scc_type = MAC_SCC_QUADRA, 749 .scc_type = MAC_SCC_QUADRA,
768 .nubus_type = MAC_NUBUS, 750 .nubus_type = MAC_NUBUS,
769 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 751 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
770 }, { 752 }, {
771 .ident = MAC_MODEL_PB250, 753 .ident = MAC_MODEL_PB250,
772 .name = "PowerBook Duo 250", 754 .name = "PowerBook Duo 250",
@@ -775,7 +757,7 @@ static struct mac_model mac_data_table[] = {
775 .scsi_type = MAC_SCSI_OLD, 757 .scsi_type = MAC_SCSI_OLD,
776 .scc_type = MAC_SCC_QUADRA, 758 .scc_type = MAC_SCC_QUADRA,
777 .nubus_type = MAC_NUBUS, 759 .nubus_type = MAC_NUBUS,
778 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 760 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
779 }, { 761 }, {
780 .ident = MAC_MODEL_PB270C, 762 .ident = MAC_MODEL_PB270C,
781 .name = "PowerBook Duo 270c", 763 .name = "PowerBook Duo 270c",
@@ -784,7 +766,7 @@ static struct mac_model mac_data_table[] = {
784 .scsi_type = MAC_SCSI_OLD, 766 .scsi_type = MAC_SCSI_OLD,
785 .scc_type = MAC_SCC_QUADRA, 767 .scc_type = MAC_SCC_QUADRA,
786 .nubus_type = MAC_NUBUS, 768 .nubus_type = MAC_NUBUS,
787 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 769 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
788 }, { 770 }, {
789 .ident = MAC_MODEL_PB280, 771 .ident = MAC_MODEL_PB280,
790 .name = "PowerBook Duo 280", 772 .name = "PowerBook Duo 280",
@@ -793,7 +775,7 @@ static struct mac_model mac_data_table[] = {
793 .scsi_type = MAC_SCSI_OLD, 775 .scsi_type = MAC_SCSI_OLD,
794 .scc_type = MAC_SCC_QUADRA, 776 .scc_type = MAC_SCC_QUADRA,
795 .nubus_type = MAC_NUBUS, 777 .nubus_type = MAC_NUBUS,
796 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 778 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
797 }, { 779 }, {
798 .ident = MAC_MODEL_PB280C, 780 .ident = MAC_MODEL_PB280C,
799 .name = "PowerBook Duo 280c", 781 .name = "PowerBook Duo 280c",
@@ -802,12 +784,13 @@ static struct mac_model mac_data_table[] = {
802 .scsi_type = MAC_SCSI_OLD, 784 .scsi_type = MAC_SCSI_OLD,
803 .scc_type = MAC_SCC_QUADRA, 785 .scc_type = MAC_SCC_QUADRA,
804 .nubus_type = MAC_NUBUS, 786 .nubus_type = MAC_NUBUS,
805 .floppy_type = MAC_FLOPPY_SWIM_ADDR2 787 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
806 }, 788 },
807 789
808 /* 790 /*
809 * Other stuff ?? 791 * Other stuff?
810 */ 792 */
793
811 { 794 {
812 .ident = -1 795 .ident = -1
813 } 796 }
@@ -823,7 +806,8 @@ static void __init mac_identify(void)
823 /* no bootinfo model id -> NetBSD booter was used! */ 806 /* no bootinfo model id -> NetBSD booter was used! */
824 /* XXX FIXME: breaks for model > 31 */ 807 /* XXX FIXME: breaks for model > 31 */
825 model = (mac_bi_data.cpuid >> 2) & 63; 808 model = (mac_bi_data.cpuid >> 2) & 63;
826 printk(KERN_WARNING "No bootinfo model ID, using cpuid instead (hey, use Penguin!)\n"); 809 printk(KERN_WARNING "No bootinfo model ID, using cpuid instead "
810 "(obsolete bootloader?)\n");
827 } 811 }
828 812
829 macintosh_config = mac_data_table; 813 macintosh_config = mac_data_table;
@@ -834,10 +818,11 @@ static void __init mac_identify(void)
834 } 818 }
835 } 819 }
836 820
837 /* We need to pre-init the IOPs, if any. Otherwise */ 821 /*
838 /* the serial console won't work if the user had */ 822 * We need to pre-init the IOPs, if any. Otherwise
839 /* the serial ports set to "Faster" mode in MacOS. */ 823 * the serial console won't work if the user had
840 824 * the serial ports set to "Faster" mode in MacOS.
825 */
841 iop_preinit(); 826 iop_preinit();
842 827
843 printk(KERN_INFO "Detected Macintosh model: %d \n", model); 828 printk(KERN_INFO "Detected Macintosh model: %d \n", model);
@@ -846,7 +831,8 @@ static void __init mac_identify(void)
846 * Report booter data: 831 * Report booter data:
847 */ 832 */
848 printk(KERN_DEBUG " Penguin bootinfo data:\n"); 833 printk(KERN_DEBUG " Penguin bootinfo data:\n");
849 printk(KERN_DEBUG " Video: addr 0x%lx row 0x%lx depth %lx dimensions %ld x %ld\n", 834 printk(KERN_DEBUG " Video: addr 0x%lx "
835 "row 0x%lx depth %lx dimensions %ld x %ld\n",
850 mac_bi_data.videoaddr, mac_bi_data.videorow, 836 mac_bi_data.videoaddr, mac_bi_data.videorow,
851 mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF, 837 mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF,
852 mac_bi_data.dimensions >> 16); 838 mac_bi_data.dimensions >> 16);