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>
This commit is contained in:
Finn Thain
Geert Uytterhoeven
parent
41fb11ca90
commit
53aac0ad7c
1 changed files with 97 additions and 111 deletions
|
|
@ -49,7 +49,6 @@
|
|||
#define SWIM_IO_SIZE 0x2000 /* SWIM IO resource size */
|
||||
|
||||
/* Mac bootinfo struct */
|
||||
|
||||
struct mac_booter_data mac_bi_data;
|
||||
|
||||
/* The phys. video addr. - might be bogus on some machines */
|
||||
|
|
@ -70,8 +69,6 @@ extern void baboon_init(void);
|
|||
|
||||
extern void mac_mksound(unsigned int, unsigned int);
|
||||
|
||||
extern void nubus_sweep_video(void);
|
||||
|
||||
static void mac_get_model(char *str);
|
||||
static void mac_identify(void);
|
||||
static void mac_report_hardware(void);
|
||||
|
|
@ -167,12 +164,6 @@ void __init config_mac(void)
|
|||
mach_max_dma_address = 0xffffffff;
|
||||
#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
|
||||
mach_beep = mac_mksound;
|
||||
#endif
|
||||
#ifdef CONFIG_HEARTBEAT
|
||||
#if 0
|
||||
mach_heartbeat = mac_heartbeat;
|
||||
mach_heartbeat_irq = IRQ_MAC_TIMER;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -191,27 +182,19 @@ void __init config_mac(void)
|
|||
if (macintosh_config->ident == MAC_MODEL_IICI
|
||||
|| macintosh_config->ident == MAC_MODEL_IIFX)
|
||||
mach_l2_flush = mac_cache_card_flush;
|
||||
|
||||
/*
|
||||
* Check for machine specific fixups.
|
||||
*/
|
||||
|
||||
#ifdef OLD_NUBUS_CODE
|
||||
nubus_sweep_video();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Macintosh Table: hardcoded model configuration data.
|
||||
* Macintosh Table: hardcoded model configuration data.
|
||||
*
|
||||
* Much of this was defined by Alan, based on who knows what docs.
|
||||
* I've added a lot more, and some of that was pure guesswork based
|
||||
* on hardware pages present on the Mac web site. Possibly wildly
|
||||
* inaccurate, so look here if a new Mac model won't run. Example: if
|
||||
* a Mac crashes immediately after the VIA1 registers have been dumped
|
||||
* to the screen, it probably died attempting to read DirB on a RBV.
|
||||
* Meaning it should have MAC_VIA_IIci here :-)
|
||||
* Much of this was defined by Alan, based on who knows what docs.
|
||||
* I've added a lot more, and some of that was pure guesswork based
|
||||
* on hardware pages present on the Mac web site. Possibly wildly
|
||||
* inaccurate, so look here if a new Mac model won't run. Example: if
|
||||
* a Mac crashes immediately after the VIA1 registers have been dumped
|
||||
* to the screen, it probably died attempting to read DirB on a RBV.
|
||||
* Meaning it should have MAC_VIA_IIci here :-)
|
||||
*/
|
||||
|
||||
struct mac_model *macintosh_config;
|
||||
|
|
@ -219,7 +202,7 @@ EXPORT_SYMBOL(macintosh_config);
|
|||
|
||||
static struct mac_model mac_data_table[] = {
|
||||
/*
|
||||
* We'll pretend to be a Macintosh II, that's pretty safe.
|
||||
* We'll pretend to be a Macintosh II, that's pretty safe.
|
||||
*/
|
||||
|
||||
{
|
||||
|
|
@ -230,12 +213,11 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_IWM
|
||||
.floppy_type = MAC_FLOPPY_IWM,
|
||||
},
|
||||
|
||||
/*
|
||||
* Original MacII hardware
|
||||
*
|
||||
* Original Mac II hardware
|
||||
*/
|
||||
|
||||
{
|
||||
|
|
@ -246,7 +228,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_IWM
|
||||
.floppy_type = MAC_FLOPPY_IWM,
|
||||
}, {
|
||||
.ident = MAC_MODEL_IIX,
|
||||
.name = "IIx",
|
||||
|
|
@ -255,7 +237,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_IICX,
|
||||
.name = "IIcx",
|
||||
|
|
@ -264,7 +246,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_SE30,
|
||||
.name = "SE/30",
|
||||
|
|
@ -273,13 +255,13 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
},
|
||||
|
||||
/*
|
||||
* Weirdified MacII hardware - all subtly different. Gee thanks
|
||||
* Apple. All these boxes seem to have VIA2 in a different place to
|
||||
* the MacII (+1A000 rather than +4000)
|
||||
* Weirdified Mac II hardware - all subtly different. Gee thanks
|
||||
* Apple. All these boxes seem to have VIA2 in a different place to
|
||||
* the Mac II (+1A000 rather than +4000)
|
||||
* CSA: see http://developer.apple.com/technotes/hw/hw_09.html
|
||||
*/
|
||||
|
||||
|
|
@ -291,7 +273,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_IIFX,
|
||||
.name = "IIfx",
|
||||
|
|
@ -300,7 +282,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_IOP,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_IOP
|
||||
.floppy_type = MAC_FLOPPY_SWIM_IOP,
|
||||
}, {
|
||||
.ident = MAC_MODEL_IISI,
|
||||
.name = "IIsi",
|
||||
|
|
@ -309,7 +291,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_IIVI,
|
||||
.name = "IIvi",
|
||||
|
|
@ -318,7 +300,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_IIVX,
|
||||
.name = "IIvx",
|
||||
|
|
@ -327,11 +309,11 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
},
|
||||
|
||||
/*
|
||||
* Classic models (guessing: similar to SE/30 ?? Nope, similar to LC ...)
|
||||
* Classic models (guessing: similar to SE/30? Nope, similar to LC...)
|
||||
*/
|
||||
|
||||
{
|
||||
|
|
@ -342,7 +324,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_CCL,
|
||||
.name = "Color Classic",
|
||||
|
|
@ -351,11 +333,11 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
},
|
||||
|
||||
/*
|
||||
* Some Mac LC machines. Basically the same as the IIci, ADB like IIsi
|
||||
* Some Mac LC machines. Basically the same as the IIci, ADB like IIsi
|
||||
*/
|
||||
|
||||
{
|
||||
|
|
@ -366,7 +348,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_LCII,
|
||||
.name = "LC II",
|
||||
|
|
@ -375,7 +357,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_LCIII,
|
||||
.name = "LC III",
|
||||
|
|
@ -384,17 +366,17 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
},
|
||||
|
||||
/*
|
||||
* Quadra. Video is at 0xF9000000, via is like a MacII. We label it differently
|
||||
* as some of the stuff connected to VIA2 seems different. Better SCSI chip and
|
||||
* onboard ethernet using a NatSemi SONIC except the 660AV and 840AV which use an
|
||||
* AMD 79C940 (MACE).
|
||||
* The 700, 900 and 950 have some I/O chips in the wrong place to
|
||||
* confuse us. The 840AV has a SCSI location of its own (same as
|
||||
* the 660AV).
|
||||
* Quadra. Video is at 0xF9000000, via is like a MacII. We label it
|
||||
* differently as some of the stuff connected to VIA2 seems different.
|
||||
* Better SCSI chip and onboard ethernet using a NatSemi SONIC except
|
||||
* the 660AV and 840AV which use an AMD 79C940 (MACE).
|
||||
* The 700, 900 and 950 have some I/O chips in the wrong place to
|
||||
* confuse us. The 840AV has a SCSI location of its own (same as
|
||||
* the 660AV).
|
||||
*/
|
||||
|
||||
{
|
||||
|
|
@ -405,7 +387,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_QUADRA,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_Q605_ACC,
|
||||
.name = "Quadra 605",
|
||||
|
|
@ -414,7 +396,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_QUADRA,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_Q610,
|
||||
.name = "Quadra 610",
|
||||
|
|
@ -424,7 +406,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_QUADRA,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_Q630,
|
||||
.name = "Quadra 630",
|
||||
|
|
@ -435,7 +417,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_QUADRA,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_Q650,
|
||||
.name = "Quadra 650",
|
||||
|
|
@ -445,9 +427,9 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_QUADRA,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
},
|
||||
/* The Q700 does have a NS Sonic */
|
||||
/* The Q700 does have a NS Sonic */
|
||||
{
|
||||
.ident = MAC_MODEL_Q700,
|
||||
.name = "Quadra 700",
|
||||
|
|
@ -457,7 +439,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_QUADRA,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_Q800,
|
||||
.name = "Quadra 800",
|
||||
|
|
@ -467,7 +449,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_QUADRA,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_Q840,
|
||||
.name = "Quadra 840AV",
|
||||
|
|
@ -477,7 +459,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_PSC,
|
||||
.ether_type = MAC_ETHER_MACE,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_AV
|
||||
.floppy_type = MAC_FLOPPY_AV,
|
||||
}, {
|
||||
.ident = MAC_MODEL_Q900,
|
||||
.name = "Quadra 900",
|
||||
|
|
@ -487,7 +469,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_IOP,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_IOP
|
||||
.floppy_type = MAC_FLOPPY_SWIM_IOP,
|
||||
}, {
|
||||
.ident = MAC_MODEL_Q950,
|
||||
.name = "Quadra 950",
|
||||
|
|
@ -497,60 +479,60 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_IOP,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_IOP
|
||||
.floppy_type = MAC_FLOPPY_SWIM_IOP,
|
||||
},
|
||||
|
||||
/*
|
||||
* Performa - more LC type machines
|
||||
* Performa - more LC type machines
|
||||
*/
|
||||
|
||||
{
|
||||
.ident = MAC_MODEL_P460,
|
||||
.name = "Performa 460",
|
||||
.name = "Performa 460",
|
||||
.adb_type = MAC_ADB_IISI,
|
||||
.via_type = MAC_VIA_IIci,
|
||||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_P475,
|
||||
.name = "Performa 475",
|
||||
.name = "Performa 475",
|
||||
.adb_type = MAC_ADB_CUDA,
|
||||
.via_type = MAC_VIA_QUADRA,
|
||||
.scsi_type = MAC_SCSI_QUADRA,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_P475F,
|
||||
.name = "Performa 475",
|
||||
.name = "Performa 475",
|
||||
.adb_type = MAC_ADB_CUDA,
|
||||
.via_type = MAC_VIA_QUADRA,
|
||||
.scsi_type = MAC_SCSI_QUADRA,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_P520,
|
||||
.name = "Performa 520",
|
||||
.name = "Performa 520",
|
||||
.adb_type = MAC_ADB_CUDA,
|
||||
.via_type = MAC_VIA_IIci,
|
||||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_P550,
|
||||
.name = "Performa 550",
|
||||
.name = "Performa 550",
|
||||
.adb_type = MAC_ADB_CUDA,
|
||||
.via_type = MAC_VIA_IIci,
|
||||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
},
|
||||
/* These have the comm slot, and therefore the possibility of SONIC ethernet */
|
||||
/* These have the comm slot, and therefore possibly SONIC ethernet */
|
||||
{
|
||||
.ident = MAC_MODEL_P575,
|
||||
.name = "Performa 575",
|
||||
|
|
@ -560,7 +542,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_II,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_P588,
|
||||
.name = "Performa 588",
|
||||
|
|
@ -571,7 +553,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_II,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_TV,
|
||||
.name = "TV",
|
||||
|
|
@ -580,7 +562,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_P600,
|
||||
.name = "Performa 600",
|
||||
|
|
@ -589,14 +571,14 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_II,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
},
|
||||
|
||||
/*
|
||||
* Centris - just guessing again; maybe like Quadra
|
||||
* Centris - just guessing again; maybe like Quadra.
|
||||
* The C610 may or may not have SONIC. We probe to make sure.
|
||||
*/
|
||||
|
||||
/* The C610 may or may not have SONIC. We probe to make sure */
|
||||
{
|
||||
.ident = MAC_MODEL_C610,
|
||||
.name = "Centris 610",
|
||||
|
|
@ -606,7 +588,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_QUADRA,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_C650,
|
||||
.name = "Centris 650",
|
||||
|
|
@ -616,7 +598,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_QUADRA,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR1,
|
||||
}, {
|
||||
.ident = MAC_MODEL_C660,
|
||||
.name = "Centris 660AV",
|
||||
|
|
@ -626,7 +608,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_PSC,
|
||||
.ether_type = MAC_ETHER_MACE,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_AV
|
||||
.floppy_type = MAC_FLOPPY_AV,
|
||||
},
|
||||
|
||||
/*
|
||||
|
|
@ -643,7 +625,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB145,
|
||||
.name = "PowerBook 145",
|
||||
|
|
@ -652,7 +634,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB150,
|
||||
.name = "PowerBook 150",
|
||||
|
|
@ -662,7 +644,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.ide_type = MAC_IDE_PB,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB160,
|
||||
.name = "PowerBook 160",
|
||||
|
|
@ -671,7 +653,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB165,
|
||||
.name = "PowerBook 165",
|
||||
|
|
@ -680,7 +662,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB165C,
|
||||
.name = "PowerBook 165c",
|
||||
|
|
@ -689,7 +671,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB170,
|
||||
.name = "PowerBook 170",
|
||||
|
|
@ -698,7 +680,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB180,
|
||||
.name = "PowerBook 180",
|
||||
|
|
@ -707,7 +689,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB180C,
|
||||
.name = "PowerBook 180c",
|
||||
|
|
@ -716,7 +698,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB190,
|
||||
.name = "PowerBook 190",
|
||||
|
|
@ -726,7 +708,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.ide_type = MAC_IDE_BABOON,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB520,
|
||||
.name = "PowerBook 520",
|
||||
|
|
@ -736,7 +718,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scc_type = MAC_SCC_QUADRA,
|
||||
.ether_type = MAC_ETHER_SONIC,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
},
|
||||
|
||||
/*
|
||||
|
|
@ -757,7 +739,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB230,
|
||||
.name = "PowerBook Duo 230",
|
||||
|
|
@ -766,7 +748,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB250,
|
||||
.name = "PowerBook Duo 250",
|
||||
|
|
@ -775,7 +757,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB270C,
|
||||
.name = "PowerBook Duo 270c",
|
||||
|
|
@ -784,7 +766,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB280,
|
||||
.name = "PowerBook Duo 280",
|
||||
|
|
@ -793,7 +775,7 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
}, {
|
||||
.ident = MAC_MODEL_PB280C,
|
||||
.name = "PowerBook Duo 280c",
|
||||
|
|
@ -802,12 +784,13 @@ static struct mac_model mac_data_table[] = {
|
|||
.scsi_type = MAC_SCSI_OLD,
|
||||
.scc_type = MAC_SCC_QUADRA,
|
||||
.nubus_type = MAC_NUBUS,
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2
|
||||
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
|
||||
},
|
||||
|
||||
/*
|
||||
* Other stuff ??
|
||||
* Other stuff?
|
||||
*/
|
||||
|
||||
{
|
||||
.ident = -1
|
||||
}
|
||||
|
|
@ -823,7 +806,8 @@ static void __init mac_identify(void)
|
|||
/* no bootinfo model id -> NetBSD booter was used! */
|
||||
/* XXX FIXME: breaks for model > 31 */
|
||||
model = (mac_bi_data.cpuid >> 2) & 63;
|
||||
printk(KERN_WARNING "No bootinfo model ID, using cpuid instead (hey, use Penguin!)\n");
|
||||
printk(KERN_WARNING "No bootinfo model ID, using cpuid instead "
|
||||
"(obsolete bootloader?)\n");
|
||||
}
|
||||
|
||||
macintosh_config = mac_data_table;
|
||||
|
|
@ -834,10 +818,11 @@ static void __init mac_identify(void)
|
|||
}
|
||||
}
|
||||
|
||||
/* We need to pre-init the IOPs, if any. Otherwise */
|
||||
/* the serial console won't work if the user had */
|
||||
/* the serial ports set to "Faster" mode in MacOS. */
|
||||
|
||||
/*
|
||||
* We need to pre-init the IOPs, if any. Otherwise
|
||||
* the serial console won't work if the user had
|
||||
* the serial ports set to "Faster" mode in MacOS.
|
||||
*/
|
||||
iop_preinit();
|
||||
|
||||
printk(KERN_INFO "Detected Macintosh model: %d \n", model);
|
||||
|
|
@ -846,7 +831,8 @@ static void __init mac_identify(void)
|
|||
* Report booter data:
|
||||
*/
|
||||
printk(KERN_DEBUG " Penguin bootinfo data:\n");
|
||||
printk(KERN_DEBUG " Video: addr 0x%lx row 0x%lx depth %lx dimensions %ld x %ld\n",
|
||||
printk(KERN_DEBUG " Video: addr 0x%lx "
|
||||
"row 0x%lx depth %lx dimensions %ld x %ld\n",
|
||||
mac_bi_data.videoaddr, mac_bi_data.videorow,
|
||||
mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF,
|
||||
mac_bi_data.dimensions >> 16);
|
||||
|
|
|
|||
Loading…
Reference in a new issue