diff options
author | Laurent Vivier <Laurent@lvivier.info> | 2008-11-06 14:57:41 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-03-26 16:15:27 -0400 |
commit | 7ad93b42bd135641ddc2c298f030132aca7aeca3 (patch) | |
tree | 959a1b043fb33a0b4663218a1608923a928c4efe /arch/m68k/mac | |
parent | 612bfc9e630e3f7a4f3be1325eac28de8b8970af (diff) |
m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
This patch adds a field "floppy_type" which can take the following values:
MAC_FLOPPY_IWM for an IWM based mac
MAC_FLOPPY_SWIM_ADDR1 for a SWIM based mac with controller at VIA1 + 0x1E000
MAC_FLOPPY_SWIM_ADDR2 for a SWIM based mac with controller at VIA1 + 0x16000
MAC_FLOPPY_IOP for an IOP based mac
MAC_FLOPPY_AV for an AV based mac
Signed-off-by: Laurent Vivier <Laurent@lvivier.info>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac')
-rw-r--r-- | arch/m68k/mac/config.c | 163 |
1 files changed, 109 insertions, 54 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 98b6bcfb37bf..3a1c0b2862ed 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
@@ -224,7 +224,8 @@ static struct mac_model mac_data_table[] = { | |||
224 | .via_type = MAC_VIA_II, | 224 | .via_type = MAC_VIA_II, |
225 | .scsi_type = MAC_SCSI_OLD, | 225 | .scsi_type = MAC_SCSI_OLD, |
226 | .scc_type = MAC_SCC_II, | 226 | .scc_type = MAC_SCC_II, |
227 | .nubus_type = MAC_NUBUS | 227 | .nubus_type = MAC_NUBUS, |
228 | .floppy_type = MAC_FLOPPY_IWM | ||
228 | }, | 229 | }, |
229 | 230 | ||
230 | /* | 231 | /* |
@@ -239,7 +240,8 @@ static struct mac_model mac_data_table[] = { | |||
239 | .via_type = MAC_VIA_II, | 240 | .via_type = MAC_VIA_II, |
240 | .scsi_type = MAC_SCSI_OLD, | 241 | .scsi_type = MAC_SCSI_OLD, |
241 | .scc_type = MAC_SCC_II, | 242 | .scc_type = MAC_SCC_II, |
242 | .nubus_type = MAC_NUBUS | 243 | .nubus_type = MAC_NUBUS, |
244 | .floppy_type = MAC_FLOPPY_IWM | ||
243 | }, { | 245 | }, { |
244 | .ident = MAC_MODEL_IIX, | 246 | .ident = MAC_MODEL_IIX, |
245 | .name = "IIx", | 247 | .name = "IIx", |
@@ -247,7 +249,8 @@ static struct mac_model mac_data_table[] = { | |||
247 | .via_type = MAC_VIA_II, | 249 | .via_type = MAC_VIA_II, |
248 | .scsi_type = MAC_SCSI_OLD, | 250 | .scsi_type = MAC_SCSI_OLD, |
249 | .scc_type = MAC_SCC_II, | 251 | .scc_type = MAC_SCC_II, |
250 | .nubus_type = MAC_NUBUS | 252 | .nubus_type = MAC_NUBUS, |
253 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
251 | }, { | 254 | }, { |
252 | .ident = MAC_MODEL_IICX, | 255 | .ident = MAC_MODEL_IICX, |
253 | .name = "IIcx", | 256 | .name = "IIcx", |
@@ -255,7 +258,8 @@ static struct mac_model mac_data_table[] = { | |||
255 | .via_type = MAC_VIA_II, | 258 | .via_type = MAC_VIA_II, |
256 | .scsi_type = MAC_SCSI_OLD, | 259 | .scsi_type = MAC_SCSI_OLD, |
257 | .scc_type = MAC_SCC_II, | 260 | .scc_type = MAC_SCC_II, |
258 | .nubus_type = MAC_NUBUS | 261 | .nubus_type = MAC_NUBUS, |
262 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
259 | }, { | 263 | }, { |
260 | .ident = MAC_MODEL_SE30, | 264 | .ident = MAC_MODEL_SE30, |
261 | .name = "SE/30", | 265 | .name = "SE/30", |
@@ -263,7 +267,8 @@ static struct mac_model mac_data_table[] = { | |||
263 | .via_type = MAC_VIA_II, | 267 | .via_type = MAC_VIA_II, |
264 | .scsi_type = MAC_SCSI_OLD, | 268 | .scsi_type = MAC_SCSI_OLD, |
265 | .scc_type = MAC_SCC_II, | 269 | .scc_type = MAC_SCC_II, |
266 | .nubus_type = MAC_NUBUS | 270 | .nubus_type = MAC_NUBUS, |
271 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
267 | }, | 272 | }, |
268 | 273 | ||
269 | /* | 274 | /* |
@@ -280,7 +285,8 @@ static struct mac_model mac_data_table[] = { | |||
280 | .via_type = MAC_VIA_IIci, | 285 | .via_type = MAC_VIA_IIci, |
281 | .scsi_type = MAC_SCSI_OLD, | 286 | .scsi_type = MAC_SCSI_OLD, |
282 | .scc_type = MAC_SCC_II, | 287 | .scc_type = MAC_SCC_II, |
283 | .nubus_type = MAC_NUBUS | 288 | .nubus_type = MAC_NUBUS, |
289 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
284 | }, { | 290 | }, { |
285 | .ident = MAC_MODEL_IIFX, | 291 | .ident = MAC_MODEL_IIFX, |
286 | .name = "IIfx", | 292 | .name = "IIfx", |
@@ -288,7 +294,8 @@ static struct mac_model mac_data_table[] = { | |||
288 | .via_type = MAC_VIA_IIci, | 294 | .via_type = MAC_VIA_IIci, |
289 | .scsi_type = MAC_SCSI_OLD, | 295 | .scsi_type = MAC_SCSI_OLD, |
290 | .scc_type = MAC_SCC_IOP, | 296 | .scc_type = MAC_SCC_IOP, |
291 | .nubus_type = MAC_NUBUS | 297 | .nubus_type = MAC_NUBUS, |
298 | .floppy_type = MAC_FLOPPY_SWIM_IOP | ||
292 | }, { | 299 | }, { |
293 | .ident = MAC_MODEL_IISI, | 300 | .ident = MAC_MODEL_IISI, |
294 | .name = "IIsi", | 301 | .name = "IIsi", |
@@ -296,7 +303,8 @@ static struct mac_model mac_data_table[] = { | |||
296 | .via_type = MAC_VIA_IIci, | 303 | .via_type = MAC_VIA_IIci, |
297 | .scsi_type = MAC_SCSI_OLD, | 304 | .scsi_type = MAC_SCSI_OLD, |
298 | .scc_type = MAC_SCC_II, | 305 | .scc_type = MAC_SCC_II, |
299 | .nubus_type = MAC_NUBUS | 306 | .nubus_type = MAC_NUBUS, |
307 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
300 | }, { | 308 | }, { |
301 | .ident = MAC_MODEL_IIVI, | 309 | .ident = MAC_MODEL_IIVI, |
302 | .name = "IIvi", | 310 | .name = "IIvi", |
@@ -304,7 +312,8 @@ static struct mac_model mac_data_table[] = { | |||
304 | .via_type = MAC_VIA_IIci, | 312 | .via_type = MAC_VIA_IIci, |
305 | .scsi_type = MAC_SCSI_OLD, | 313 | .scsi_type = MAC_SCSI_OLD, |
306 | .scc_type = MAC_SCC_II, | 314 | .scc_type = MAC_SCC_II, |
307 | .nubus_type = MAC_NUBUS | 315 | .nubus_type = MAC_NUBUS, |
316 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
308 | }, { | 317 | }, { |
309 | .ident = MAC_MODEL_IIVX, | 318 | .ident = MAC_MODEL_IIVX, |
310 | .name = "IIvx", | 319 | .name = "IIvx", |
@@ -312,7 +321,8 @@ static struct mac_model mac_data_table[] = { | |||
312 | .via_type = MAC_VIA_IIci, | 321 | .via_type = MAC_VIA_IIci, |
313 | .scsi_type = MAC_SCSI_OLD, | 322 | .scsi_type = MAC_SCSI_OLD, |
314 | .scc_type = MAC_SCC_II, | 323 | .scc_type = MAC_SCC_II, |
315 | .nubus_type = MAC_NUBUS | 324 | .nubus_type = MAC_NUBUS, |
325 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
316 | }, | 326 | }, |
317 | 327 | ||
318 | /* | 328 | /* |
@@ -326,7 +336,8 @@ static struct mac_model mac_data_table[] = { | |||
326 | .via_type = MAC_VIA_IIci, | 336 | .via_type = MAC_VIA_IIci, |
327 | .scsi_type = MAC_SCSI_OLD, | 337 | .scsi_type = MAC_SCSI_OLD, |
328 | .scc_type = MAC_SCC_II, | 338 | .scc_type = MAC_SCC_II, |
329 | .nubus_type = MAC_NUBUS | 339 | .nubus_type = MAC_NUBUS, |
340 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
330 | }, { | 341 | }, { |
331 | .ident = MAC_MODEL_CCL, | 342 | .ident = MAC_MODEL_CCL, |
332 | .name = "Color Classic", | 343 | .name = "Color Classic", |
@@ -334,7 +345,9 @@ static struct mac_model mac_data_table[] = { | |||
334 | .via_type = MAC_VIA_IIci, | 345 | .via_type = MAC_VIA_IIci, |
335 | .scsi_type = MAC_SCSI_OLD, | 346 | .scsi_type = MAC_SCSI_OLD, |
336 | .scc_type = MAC_SCC_II, | 347 | .scc_type = MAC_SCC_II, |
337 | .nubus_type = MAC_NUBUS}, | 348 | .nubus_type = MAC_NUBUS, |
349 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
350 | }, | ||
338 | 351 | ||
339 | /* | 352 | /* |
340 | * Some Mac LC machines. Basically the same as the IIci, ADB like IIsi | 353 | * Some Mac LC machines. Basically the same as the IIci, ADB like IIsi |
@@ -347,7 +360,8 @@ static struct mac_model mac_data_table[] = { | |||
347 | .via_type = MAC_VIA_IIci, | 360 | .via_type = MAC_VIA_IIci, |
348 | .scsi_type = MAC_SCSI_OLD, | 361 | .scsi_type = MAC_SCSI_OLD, |
349 | .scc_type = MAC_SCC_II, | 362 | .scc_type = MAC_SCC_II, |
350 | .nubus_type = MAC_NUBUS | 363 | .nubus_type = MAC_NUBUS, |
364 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
351 | }, { | 365 | }, { |
352 | .ident = MAC_MODEL_LCII, | 366 | .ident = MAC_MODEL_LCII, |
353 | .name = "LC II", | 367 | .name = "LC II", |
@@ -355,7 +369,8 @@ static struct mac_model mac_data_table[] = { | |||
355 | .via_type = MAC_VIA_IIci, | 369 | .via_type = MAC_VIA_IIci, |
356 | .scsi_type = MAC_SCSI_OLD, | 370 | .scsi_type = MAC_SCSI_OLD, |
357 | .scc_type = MAC_SCC_II, | 371 | .scc_type = MAC_SCC_II, |
358 | .nubus_type = MAC_NUBUS | 372 | .nubus_type = MAC_NUBUS, |
373 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
359 | }, { | 374 | }, { |
360 | .ident = MAC_MODEL_LCIII, | 375 | .ident = MAC_MODEL_LCIII, |
361 | .name = "LC III", | 376 | .name = "LC III", |
@@ -363,7 +378,8 @@ static struct mac_model mac_data_table[] = { | |||
363 | .via_type = MAC_VIA_IIci, | 378 | .via_type = MAC_VIA_IIci, |
364 | .scsi_type = MAC_SCSI_OLD, | 379 | .scsi_type = MAC_SCSI_OLD, |
365 | .scc_type = MAC_SCC_II, | 380 | .scc_type = MAC_SCC_II, |
366 | .nubus_type = MAC_NUBUS | 381 | .nubus_type = MAC_NUBUS, |
382 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
367 | }, | 383 | }, |
368 | 384 | ||
369 | /* | 385 | /* |
@@ -383,7 +399,8 @@ static struct mac_model mac_data_table[] = { | |||
383 | .via_type = MAC_VIA_QUADRA, | 399 | .via_type = MAC_VIA_QUADRA, |
384 | .scsi_type = MAC_SCSI_QUADRA, | 400 | .scsi_type = MAC_SCSI_QUADRA, |
385 | .scc_type = MAC_SCC_QUADRA, | 401 | .scc_type = MAC_SCC_QUADRA, |
386 | .nubus_type = MAC_NUBUS | 402 | .nubus_type = MAC_NUBUS, |
403 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
387 | }, { | 404 | }, { |
388 | .ident = MAC_MODEL_Q605_ACC, | 405 | .ident = MAC_MODEL_Q605_ACC, |
389 | .name = "Quadra 605", | 406 | .name = "Quadra 605", |
@@ -391,7 +408,8 @@ static struct mac_model mac_data_table[] = { | |||
391 | .via_type = MAC_VIA_QUADRA, | 408 | .via_type = MAC_VIA_QUADRA, |
392 | .scsi_type = MAC_SCSI_QUADRA, | 409 | .scsi_type = MAC_SCSI_QUADRA, |
393 | .scc_type = MAC_SCC_QUADRA, | 410 | .scc_type = MAC_SCC_QUADRA, |
394 | .nubus_type = MAC_NUBUS | 411 | .nubus_type = MAC_NUBUS, |
412 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
395 | }, { | 413 | }, { |
396 | .ident = MAC_MODEL_Q610, | 414 | .ident = MAC_MODEL_Q610, |
397 | .name = "Quadra 610", | 415 | .name = "Quadra 610", |
@@ -400,7 +418,8 @@ static struct mac_model mac_data_table[] = { | |||
400 | .scsi_type = MAC_SCSI_QUADRA, | 418 | .scsi_type = MAC_SCSI_QUADRA, |
401 | .scc_type = MAC_SCC_QUADRA, | 419 | .scc_type = MAC_SCC_QUADRA, |
402 | .ether_type = MAC_ETHER_SONIC, | 420 | .ether_type = MAC_ETHER_SONIC, |
403 | .nubus_type = MAC_NUBUS | 421 | .nubus_type = MAC_NUBUS, |
422 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
404 | }, { | 423 | }, { |
405 | .ident = MAC_MODEL_Q630, | 424 | .ident = MAC_MODEL_Q630, |
406 | .name = "Quadra 630", | 425 | .name = "Quadra 630", |
@@ -410,7 +429,8 @@ static struct mac_model mac_data_table[] = { | |||
410 | .ide_type = MAC_IDE_QUADRA, | 429 | .ide_type = MAC_IDE_QUADRA, |
411 | .scc_type = MAC_SCC_QUADRA, | 430 | .scc_type = MAC_SCC_QUADRA, |
412 | .ether_type = MAC_ETHER_SONIC, | 431 | .ether_type = MAC_ETHER_SONIC, |
413 | .nubus_type = MAC_NUBUS | 432 | .nubus_type = MAC_NUBUS, |
433 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
414 | }, { | 434 | }, { |
415 | .ident = MAC_MODEL_Q650, | 435 | .ident = MAC_MODEL_Q650, |
416 | .name = "Quadra 650", | 436 | .name = "Quadra 650", |
@@ -419,7 +439,8 @@ static struct mac_model mac_data_table[] = { | |||
419 | .scsi_type = MAC_SCSI_QUADRA, | 439 | .scsi_type = MAC_SCSI_QUADRA, |
420 | .scc_type = MAC_SCC_QUADRA, | 440 | .scc_type = MAC_SCC_QUADRA, |
421 | .ether_type = MAC_ETHER_SONIC, | 441 | .ether_type = MAC_ETHER_SONIC, |
422 | .nubus_type = MAC_NUBUS | 442 | .nubus_type = MAC_NUBUS, |
443 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
423 | }, | 444 | }, |
424 | /* The Q700 does have a NS Sonic */ | 445 | /* The Q700 does have a NS Sonic */ |
425 | { | 446 | { |
@@ -430,7 +451,8 @@ static struct mac_model mac_data_table[] = { | |||
430 | .scsi_type = MAC_SCSI_QUADRA2, | 451 | .scsi_type = MAC_SCSI_QUADRA2, |
431 | .scc_type = MAC_SCC_QUADRA, | 452 | .scc_type = MAC_SCC_QUADRA, |
432 | .ether_type = MAC_ETHER_SONIC, | 453 | .ether_type = MAC_ETHER_SONIC, |
433 | .nubus_type = MAC_NUBUS | 454 | .nubus_type = MAC_NUBUS, |
455 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
434 | }, { | 456 | }, { |
435 | .ident = MAC_MODEL_Q800, | 457 | .ident = MAC_MODEL_Q800, |
436 | .name = "Quadra 800", | 458 | .name = "Quadra 800", |
@@ -439,7 +461,8 @@ static struct mac_model mac_data_table[] = { | |||
439 | .scsi_type = MAC_SCSI_QUADRA, | 461 | .scsi_type = MAC_SCSI_QUADRA, |
440 | .scc_type = MAC_SCC_QUADRA, | 462 | .scc_type = MAC_SCC_QUADRA, |
441 | .ether_type = MAC_ETHER_SONIC, | 463 | .ether_type = MAC_ETHER_SONIC, |
442 | .nubus_type = MAC_NUBUS | 464 | .nubus_type = MAC_NUBUS, |
465 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
443 | }, { | 466 | }, { |
444 | .ident = MAC_MODEL_Q840, | 467 | .ident = MAC_MODEL_Q840, |
445 | .name = "Quadra 840AV", | 468 | .name = "Quadra 840AV", |
@@ -448,7 +471,8 @@ static struct mac_model mac_data_table[] = { | |||
448 | .scsi_type = MAC_SCSI_QUADRA3, | 471 | .scsi_type = MAC_SCSI_QUADRA3, |
449 | .scc_type = MAC_SCC_PSC, | 472 | .scc_type = MAC_SCC_PSC, |
450 | .ether_type = MAC_ETHER_MACE, | 473 | .ether_type = MAC_ETHER_MACE, |
451 | .nubus_type = MAC_NUBUS | 474 | .nubus_type = MAC_NUBUS, |
475 | .floppy_type = MAC_FLOPPY_AV | ||
452 | }, { | 476 | }, { |
453 | .ident = MAC_MODEL_Q900, | 477 | .ident = MAC_MODEL_Q900, |
454 | .name = "Quadra 900", | 478 | .name = "Quadra 900", |
@@ -457,7 +481,8 @@ static struct mac_model mac_data_table[] = { | |||
457 | .scsi_type = MAC_SCSI_QUADRA2, | 481 | .scsi_type = MAC_SCSI_QUADRA2, |
458 | .scc_type = MAC_SCC_IOP, | 482 | .scc_type = MAC_SCC_IOP, |
459 | .ether_type = MAC_ETHER_SONIC, | 483 | .ether_type = MAC_ETHER_SONIC, |
460 | .nubus_type = MAC_NUBUS | 484 | .nubus_type = MAC_NUBUS, |
485 | .floppy_type = MAC_FLOPPY_SWIM_IOP | ||
461 | }, { | 486 | }, { |
462 | .ident = MAC_MODEL_Q950, | 487 | .ident = MAC_MODEL_Q950, |
463 | .name = "Quadra 950", | 488 | .name = "Quadra 950", |
@@ -466,7 +491,8 @@ static struct mac_model mac_data_table[] = { | |||
466 | .scsi_type = MAC_SCSI_QUADRA2, | 491 | .scsi_type = MAC_SCSI_QUADRA2, |
467 | .scc_type = MAC_SCC_IOP, | 492 | .scc_type = MAC_SCC_IOP, |
468 | .ether_type = MAC_ETHER_SONIC, | 493 | .ether_type = MAC_ETHER_SONIC, |
469 | .nubus_type = MAC_NUBUS | 494 | .nubus_type = MAC_NUBUS, |
495 | .floppy_type = MAC_FLOPPY_SWIM_IOP | ||
470 | }, | 496 | }, |
471 | 497 | ||
472 | /* | 498 | /* |
@@ -480,7 +506,8 @@ static struct mac_model mac_data_table[] = { | |||
480 | .via_type = MAC_VIA_IIci, | 506 | .via_type = MAC_VIA_IIci, |
481 | .scsi_type = MAC_SCSI_OLD, | 507 | .scsi_type = MAC_SCSI_OLD, |
482 | .scc_type = MAC_SCC_II, | 508 | .scc_type = MAC_SCC_II, |
483 | .nubus_type = MAC_NUBUS | 509 | .nubus_type = MAC_NUBUS, |
510 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
484 | }, { | 511 | }, { |
485 | .ident = MAC_MODEL_P475, | 512 | .ident = MAC_MODEL_P475, |
486 | .name = "Performa 475", | 513 | .name = "Performa 475", |
@@ -488,7 +515,8 @@ static struct mac_model mac_data_table[] = { | |||
488 | .via_type = MAC_VIA_QUADRA, | 515 | .via_type = MAC_VIA_QUADRA, |
489 | .scsi_type = MAC_SCSI_QUADRA, | 516 | .scsi_type = MAC_SCSI_QUADRA, |
490 | .scc_type = MAC_SCC_II, | 517 | .scc_type = MAC_SCC_II, |
491 | .nubus_type = MAC_NUBUS | 518 | .nubus_type = MAC_NUBUS, |
519 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
492 | }, { | 520 | }, { |
493 | .ident = MAC_MODEL_P475F, | 521 | .ident = MAC_MODEL_P475F, |
494 | .name = "Performa 475", | 522 | .name = "Performa 475", |
@@ -496,7 +524,8 @@ static struct mac_model mac_data_table[] = { | |||
496 | .via_type = MAC_VIA_QUADRA, | 524 | .via_type = MAC_VIA_QUADRA, |
497 | .scsi_type = MAC_SCSI_QUADRA, | 525 | .scsi_type = MAC_SCSI_QUADRA, |
498 | .scc_type = MAC_SCC_II, | 526 | .scc_type = MAC_SCC_II, |
499 | .nubus_type = MAC_NUBUS | 527 | .nubus_type = MAC_NUBUS, |
528 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
500 | }, { | 529 | }, { |
501 | .ident = MAC_MODEL_P520, | 530 | .ident = MAC_MODEL_P520, |
502 | .name = "Performa 520", | 531 | .name = "Performa 520", |
@@ -504,7 +533,8 @@ static struct mac_model mac_data_table[] = { | |||
504 | .via_type = MAC_VIA_IIci, | 533 | .via_type = MAC_VIA_IIci, |
505 | .scsi_type = MAC_SCSI_OLD, | 534 | .scsi_type = MAC_SCSI_OLD, |
506 | .scc_type = MAC_SCC_II, | 535 | .scc_type = MAC_SCC_II, |
507 | .nubus_type = MAC_NUBUS | 536 | .nubus_type = MAC_NUBUS, |
537 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
508 | }, { | 538 | }, { |
509 | .ident = MAC_MODEL_P550, | 539 | .ident = MAC_MODEL_P550, |
510 | .name = "Performa 550", | 540 | .name = "Performa 550", |
@@ -512,7 +542,8 @@ static struct mac_model mac_data_table[] = { | |||
512 | .via_type = MAC_VIA_IIci, | 542 | .via_type = MAC_VIA_IIci, |
513 | .scsi_type = MAC_SCSI_OLD, | 543 | .scsi_type = MAC_SCSI_OLD, |
514 | .scc_type = MAC_SCC_II, | 544 | .scc_type = MAC_SCC_II, |
515 | .nubus_type = MAC_NUBUS | 545 | .nubus_type = MAC_NUBUS, |
546 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
516 | }, | 547 | }, |
517 | /* These have the comm slot, and therefore the possibility of SONIC ethernet */ | 548 | /* These have the comm slot, and therefore the possibility of SONIC ethernet */ |
518 | { | 549 | { |
@@ -523,7 +554,8 @@ static struct mac_model mac_data_table[] = { | |||
523 | .scsi_type = MAC_SCSI_QUADRA, | 554 | .scsi_type = MAC_SCSI_QUADRA, |
524 | .scc_type = MAC_SCC_II, | 555 | .scc_type = MAC_SCC_II, |
525 | .ether_type = MAC_ETHER_SONIC, | 556 | .ether_type = MAC_ETHER_SONIC, |
526 | .nubus_type = MAC_NUBUS | 557 | .nubus_type = MAC_NUBUS, |
558 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
527 | }, { | 559 | }, { |
528 | .ident = MAC_MODEL_P588, | 560 | .ident = MAC_MODEL_P588, |
529 | .name = "Performa 588", | 561 | .name = "Performa 588", |
@@ -533,7 +565,8 @@ static struct mac_model mac_data_table[] = { | |||
533 | .ide_type = MAC_IDE_QUADRA, | 565 | .ide_type = MAC_IDE_QUADRA, |
534 | .scc_type = MAC_SCC_II, | 566 | .scc_type = MAC_SCC_II, |
535 | .ether_type = MAC_ETHER_SONIC, | 567 | .ether_type = MAC_ETHER_SONIC, |
536 | .nubus_type = MAC_NUBUS | 568 | .nubus_type = MAC_NUBUS, |
569 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
537 | }, { | 570 | }, { |
538 | .ident = MAC_MODEL_TV, | 571 | .ident = MAC_MODEL_TV, |
539 | .name = "TV", | 572 | .name = "TV", |
@@ -541,7 +574,8 @@ static struct mac_model mac_data_table[] = { | |||
541 | .via_type = MAC_VIA_QUADRA, | 574 | .via_type = MAC_VIA_QUADRA, |
542 | .scsi_type = MAC_SCSI_OLD, | 575 | .scsi_type = MAC_SCSI_OLD, |
543 | .scc_type = MAC_SCC_II, | 576 | .scc_type = MAC_SCC_II, |
544 | .nubus_type = MAC_NUBUS | 577 | .nubus_type = MAC_NUBUS, |
578 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
545 | }, { | 579 | }, { |
546 | .ident = MAC_MODEL_P600, | 580 | .ident = MAC_MODEL_P600, |
547 | .name = "Performa 600", | 581 | .name = "Performa 600", |
@@ -549,7 +583,8 @@ static struct mac_model mac_data_table[] = { | |||
549 | .via_type = MAC_VIA_IIci, | 583 | .via_type = MAC_VIA_IIci, |
550 | .scsi_type = MAC_SCSI_OLD, | 584 | .scsi_type = MAC_SCSI_OLD, |
551 | .scc_type = MAC_SCC_II, | 585 | .scc_type = MAC_SCC_II, |
552 | .nubus_type = MAC_NUBUS | 586 | .nubus_type = MAC_NUBUS, |
587 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
553 | }, | 588 | }, |
554 | 589 | ||
555 | /* | 590 | /* |
@@ -565,7 +600,8 @@ static struct mac_model mac_data_table[] = { | |||
565 | .scsi_type = MAC_SCSI_QUADRA, | 600 | .scsi_type = MAC_SCSI_QUADRA, |
566 | .scc_type = MAC_SCC_QUADRA, | 601 | .scc_type = MAC_SCC_QUADRA, |
567 | .ether_type = MAC_ETHER_SONIC, | 602 | .ether_type = MAC_ETHER_SONIC, |
568 | .nubus_type = MAC_NUBUS | 603 | .nubus_type = MAC_NUBUS, |
604 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
569 | }, { | 605 | }, { |
570 | .ident = MAC_MODEL_C650, | 606 | .ident = MAC_MODEL_C650, |
571 | .name = "Centris 650", | 607 | .name = "Centris 650", |
@@ -574,7 +610,8 @@ static struct mac_model mac_data_table[] = { | |||
574 | .scsi_type = MAC_SCSI_QUADRA, | 610 | .scsi_type = MAC_SCSI_QUADRA, |
575 | .scc_type = MAC_SCC_QUADRA, | 611 | .scc_type = MAC_SCC_QUADRA, |
576 | .ether_type = MAC_ETHER_SONIC, | 612 | .ether_type = MAC_ETHER_SONIC, |
577 | .nubus_type = MAC_NUBUS | 613 | .nubus_type = MAC_NUBUS, |
614 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
578 | }, { | 615 | }, { |
579 | .ident = MAC_MODEL_C660, | 616 | .ident = MAC_MODEL_C660, |
580 | .name = "Centris 660AV", | 617 | .name = "Centris 660AV", |
@@ -583,7 +620,8 @@ static struct mac_model mac_data_table[] = { | |||
583 | .scsi_type = MAC_SCSI_QUADRA3, | 620 | .scsi_type = MAC_SCSI_QUADRA3, |
584 | .scc_type = MAC_SCC_PSC, | 621 | .scc_type = MAC_SCC_PSC, |
585 | .ether_type = MAC_ETHER_MACE, | 622 | .ether_type = MAC_ETHER_MACE, |
586 | .nubus_type = MAC_NUBUS | 623 | .nubus_type = MAC_NUBUS, |
624 | .floppy_type = MAC_FLOPPY_AV | ||
587 | }, | 625 | }, |
588 | 626 | ||
589 | /* | 627 | /* |
@@ -599,7 +637,8 @@ static struct mac_model mac_data_table[] = { | |||
599 | .via_type = MAC_VIA_QUADRA, | 637 | .via_type = MAC_VIA_QUADRA, |
600 | .scsi_type = MAC_SCSI_OLD, | 638 | .scsi_type = MAC_SCSI_OLD, |
601 | .scc_type = MAC_SCC_QUADRA, | 639 | .scc_type = MAC_SCC_QUADRA, |
602 | .nubus_type = MAC_NUBUS | 640 | .nubus_type = MAC_NUBUS, |
641 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
603 | }, { | 642 | }, { |
604 | .ident = MAC_MODEL_PB145, | 643 | .ident = MAC_MODEL_PB145, |
605 | .name = "PowerBook 145", | 644 | .name = "PowerBook 145", |
@@ -607,7 +646,8 @@ static struct mac_model mac_data_table[] = { | |||
607 | .via_type = MAC_VIA_QUADRA, | 646 | .via_type = MAC_VIA_QUADRA, |
608 | .scsi_type = MAC_SCSI_OLD, | 647 | .scsi_type = MAC_SCSI_OLD, |
609 | .scc_type = MAC_SCC_QUADRA, | 648 | .scc_type = MAC_SCC_QUADRA, |
610 | .nubus_type = MAC_NUBUS | 649 | .nubus_type = MAC_NUBUS, |
650 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
611 | }, { | 651 | }, { |
612 | .ident = MAC_MODEL_PB150, | 652 | .ident = MAC_MODEL_PB150, |
613 | .name = "PowerBook 150", | 653 | .name = "PowerBook 150", |
@@ -616,7 +656,8 @@ static struct mac_model mac_data_table[] = { | |||
616 | .scsi_type = MAC_SCSI_OLD, | 656 | .scsi_type = MAC_SCSI_OLD, |
617 | .ide_type = MAC_IDE_PB, | 657 | .ide_type = MAC_IDE_PB, |
618 | .scc_type = MAC_SCC_QUADRA, | 658 | .scc_type = MAC_SCC_QUADRA, |
619 | .nubus_type = MAC_NUBUS | 659 | .nubus_type = MAC_NUBUS, |
660 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
620 | }, { | 661 | }, { |
621 | .ident = MAC_MODEL_PB160, | 662 | .ident = MAC_MODEL_PB160, |
622 | .name = "PowerBook 160", | 663 | .name = "PowerBook 160", |
@@ -624,7 +665,8 @@ static struct mac_model mac_data_table[] = { | |||
624 | .via_type = MAC_VIA_QUADRA, | 665 | .via_type = MAC_VIA_QUADRA, |
625 | .scsi_type = MAC_SCSI_OLD, | 666 | .scsi_type = MAC_SCSI_OLD, |
626 | .scc_type = MAC_SCC_QUADRA, | 667 | .scc_type = MAC_SCC_QUADRA, |
627 | .nubus_type = MAC_NUBUS | 668 | .nubus_type = MAC_NUBUS, |
669 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
628 | }, { | 670 | }, { |
629 | .ident = MAC_MODEL_PB165, | 671 | .ident = MAC_MODEL_PB165, |
630 | .name = "PowerBook 165", | 672 | .name = "PowerBook 165", |
@@ -632,7 +674,8 @@ static struct mac_model mac_data_table[] = { | |||
632 | .via_type = MAC_VIA_QUADRA, | 674 | .via_type = MAC_VIA_QUADRA, |
633 | .scsi_type = MAC_SCSI_OLD, | 675 | .scsi_type = MAC_SCSI_OLD, |
634 | .scc_type = MAC_SCC_QUADRA, | 676 | .scc_type = MAC_SCC_QUADRA, |
635 | .nubus_type = MAC_NUBUS | 677 | .nubus_type = MAC_NUBUS, |
678 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
636 | }, { | 679 | }, { |
637 | .ident = MAC_MODEL_PB165C, | 680 | .ident = MAC_MODEL_PB165C, |
638 | .name = "PowerBook 165c", | 681 | .name = "PowerBook 165c", |
@@ -640,7 +683,8 @@ static struct mac_model mac_data_table[] = { | |||
640 | .via_type = MAC_VIA_QUADRA, | 683 | .via_type = MAC_VIA_QUADRA, |
641 | .scsi_type = MAC_SCSI_OLD, | 684 | .scsi_type = MAC_SCSI_OLD, |
642 | .scc_type = MAC_SCC_QUADRA, | 685 | .scc_type = MAC_SCC_QUADRA, |
643 | .nubus_type = MAC_NUBUS | 686 | .nubus_type = MAC_NUBUS, |
687 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
644 | }, { | 688 | }, { |
645 | .ident = MAC_MODEL_PB170, | 689 | .ident = MAC_MODEL_PB170, |
646 | .name = "PowerBook 170", | 690 | .name = "PowerBook 170", |
@@ -648,7 +692,8 @@ static struct mac_model mac_data_table[] = { | |||
648 | .via_type = MAC_VIA_QUADRA, | 692 | .via_type = MAC_VIA_QUADRA, |
649 | .scsi_type = MAC_SCSI_OLD, | 693 | .scsi_type = MAC_SCSI_OLD, |
650 | .scc_type = MAC_SCC_QUADRA, | 694 | .scc_type = MAC_SCC_QUADRA, |
651 | .nubus_type = MAC_NUBUS | 695 | .nubus_type = MAC_NUBUS, |
696 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
652 | }, { | 697 | }, { |
653 | .ident = MAC_MODEL_PB180, | 698 | .ident = MAC_MODEL_PB180, |
654 | .name = "PowerBook 180", | 699 | .name = "PowerBook 180", |
@@ -656,7 +701,8 @@ static struct mac_model mac_data_table[] = { | |||
656 | .via_type = MAC_VIA_QUADRA, | 701 | .via_type = MAC_VIA_QUADRA, |
657 | .scsi_type = MAC_SCSI_OLD, | 702 | .scsi_type = MAC_SCSI_OLD, |
658 | .scc_type = MAC_SCC_QUADRA, | 703 | .scc_type = MAC_SCC_QUADRA, |
659 | .nubus_type = MAC_NUBUS | 704 | .nubus_type = MAC_NUBUS, |
705 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
660 | }, { | 706 | }, { |
661 | .ident = MAC_MODEL_PB180C, | 707 | .ident = MAC_MODEL_PB180C, |
662 | .name = "PowerBook 180c", | 708 | .name = "PowerBook 180c", |
@@ -664,7 +710,8 @@ static struct mac_model mac_data_table[] = { | |||
664 | .via_type = MAC_VIA_QUADRA, | 710 | .via_type = MAC_VIA_QUADRA, |
665 | .scsi_type = MAC_SCSI_OLD, | 711 | .scsi_type = MAC_SCSI_OLD, |
666 | .scc_type = MAC_SCC_QUADRA, | 712 | .scc_type = MAC_SCC_QUADRA, |
667 | .nubus_type = MAC_NUBUS | 713 | .nubus_type = MAC_NUBUS, |
714 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
668 | }, { | 715 | }, { |
669 | .ident = MAC_MODEL_PB190, | 716 | .ident = MAC_MODEL_PB190, |
670 | .name = "PowerBook 190", | 717 | .name = "PowerBook 190", |
@@ -673,7 +720,8 @@ static struct mac_model mac_data_table[] = { | |||
673 | .scsi_type = MAC_SCSI_OLD, | 720 | .scsi_type = MAC_SCSI_OLD, |
674 | .ide_type = MAC_IDE_BABOON, | 721 | .ide_type = MAC_IDE_BABOON, |
675 | .scc_type = MAC_SCC_QUADRA, | 722 | .scc_type = MAC_SCC_QUADRA, |
676 | .nubus_type = MAC_NUBUS | 723 | .nubus_type = MAC_NUBUS, |
724 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
677 | }, { | 725 | }, { |
678 | .ident = MAC_MODEL_PB520, | 726 | .ident = MAC_MODEL_PB520, |
679 | .name = "PowerBook 520", | 727 | .name = "PowerBook 520", |
@@ -682,7 +730,8 @@ static struct mac_model mac_data_table[] = { | |||
682 | .scsi_type = MAC_SCSI_OLD, | 730 | .scsi_type = MAC_SCSI_OLD, |
683 | .scc_type = MAC_SCC_QUADRA, | 731 | .scc_type = MAC_SCC_QUADRA, |
684 | .ether_type = MAC_ETHER_SONIC, | 732 | .ether_type = MAC_ETHER_SONIC, |
685 | .nubus_type = MAC_NUBUS | 733 | .nubus_type = MAC_NUBUS, |
734 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
686 | }, | 735 | }, |
687 | 736 | ||
688 | /* | 737 | /* |
@@ -702,7 +751,8 @@ static struct mac_model mac_data_table[] = { | |||
702 | .via_type = MAC_VIA_IIci, | 751 | .via_type = MAC_VIA_IIci, |
703 | .scsi_type = MAC_SCSI_OLD, | 752 | .scsi_type = MAC_SCSI_OLD, |
704 | .scc_type = MAC_SCC_QUADRA, | 753 | .scc_type = MAC_SCC_QUADRA, |
705 | .nubus_type = MAC_NUBUS | 754 | .nubus_type = MAC_NUBUS, |
755 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
706 | }, { | 756 | }, { |
707 | .ident = MAC_MODEL_PB230, | 757 | .ident = MAC_MODEL_PB230, |
708 | .name = "PowerBook Duo 230", | 758 | .name = "PowerBook Duo 230", |
@@ -710,7 +760,8 @@ static struct mac_model mac_data_table[] = { | |||
710 | .via_type = MAC_VIA_IIci, | 760 | .via_type = MAC_VIA_IIci, |
711 | .scsi_type = MAC_SCSI_OLD, | 761 | .scsi_type = MAC_SCSI_OLD, |
712 | .scc_type = MAC_SCC_QUADRA, | 762 | .scc_type = MAC_SCC_QUADRA, |
713 | .nubus_type = MAC_NUBUS | 763 | .nubus_type = MAC_NUBUS, |
764 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
714 | }, { | 765 | }, { |
715 | .ident = MAC_MODEL_PB250, | 766 | .ident = MAC_MODEL_PB250, |
716 | .name = "PowerBook Duo 250", | 767 | .name = "PowerBook Duo 250", |
@@ -718,7 +769,8 @@ static struct mac_model mac_data_table[] = { | |||
718 | .via_type = MAC_VIA_IIci, | 769 | .via_type = MAC_VIA_IIci, |
719 | .scsi_type = MAC_SCSI_OLD, | 770 | .scsi_type = MAC_SCSI_OLD, |
720 | .scc_type = MAC_SCC_QUADRA, | 771 | .scc_type = MAC_SCC_QUADRA, |
721 | .nubus_type = MAC_NUBUS | 772 | .nubus_type = MAC_NUBUS, |
773 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
722 | }, { | 774 | }, { |
723 | .ident = MAC_MODEL_PB270C, | 775 | .ident = MAC_MODEL_PB270C, |
724 | .name = "PowerBook Duo 270c", | 776 | .name = "PowerBook Duo 270c", |
@@ -726,7 +778,8 @@ static struct mac_model mac_data_table[] = { | |||
726 | .via_type = MAC_VIA_IIci, | 778 | .via_type = MAC_VIA_IIci, |
727 | .scsi_type = MAC_SCSI_OLD, | 779 | .scsi_type = MAC_SCSI_OLD, |
728 | .scc_type = MAC_SCC_QUADRA, | 780 | .scc_type = MAC_SCC_QUADRA, |
729 | .nubus_type = MAC_NUBUS | 781 | .nubus_type = MAC_NUBUS, |
782 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
730 | }, { | 783 | }, { |
731 | .ident = MAC_MODEL_PB280, | 784 | .ident = MAC_MODEL_PB280, |
732 | .name = "PowerBook Duo 280", | 785 | .name = "PowerBook Duo 280", |
@@ -734,7 +787,8 @@ static struct mac_model mac_data_table[] = { | |||
734 | .via_type = MAC_VIA_IIci, | 787 | .via_type = MAC_VIA_IIci, |
735 | .scsi_type = MAC_SCSI_OLD, | 788 | .scsi_type = MAC_SCSI_OLD, |
736 | .scc_type = MAC_SCC_QUADRA, | 789 | .scc_type = MAC_SCC_QUADRA, |
737 | .nubus_type = MAC_NUBUS | 790 | .nubus_type = MAC_NUBUS, |
791 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
738 | }, { | 792 | }, { |
739 | .ident = MAC_MODEL_PB280C, | 793 | .ident = MAC_MODEL_PB280C, |
740 | .name = "PowerBook Duo 280c", | 794 | .name = "PowerBook Duo 280c", |
@@ -742,7 +796,8 @@ static struct mac_model mac_data_table[] = { | |||
742 | .via_type = MAC_VIA_IIci, | 796 | .via_type = MAC_VIA_IIci, |
743 | .scsi_type = MAC_SCSI_OLD, | 797 | .scsi_type = MAC_SCSI_OLD, |
744 | .scc_type = MAC_SCC_QUADRA, | 798 | .scc_type = MAC_SCC_QUADRA, |
745 | .nubus_type = MAC_NUBUS | 799 | .nubus_type = MAC_NUBUS, |
800 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
746 | }, | 801 | }, |
747 | 802 | ||
748 | /* | 803 | /* |