diff options
| -rw-r--r-- | mdk-stage1/pcmcia_/probe.c | 94 |
1 files changed, 45 insertions, 49 deletions
diff --git a/mdk-stage1/pcmcia_/probe.c b/mdk-stage1/pcmcia_/probe.c index 9877ad404..7a61d2f62 100644 --- a/mdk-stage1/pcmcia_/probe.c +++ b/mdk-stage1/pcmcia_/probe.c @@ -65,53 +65,53 @@ typedef struct { u_short vendor, device; - char *tag; + char *modname; char *name; } pci_id_t; pci_id_t pci_id[] = { - { 0x1013, 0x1100, "Cirrus Logic CL 6729", "Cirrus PD6729" }, - { 0x1013, 0x1110, "Cirrus Logic PD 6832", "Cirrus PD6832" }, - { 0x10b3, 0xb106, "SMC 34C90", "SMC 34C90" }, - { 0x1180, 0x0465, "Ricoh RL5C465", "Ricoh RL5C465" }, - { 0x1180, 0x0466, "Ricoh RL5C466", "Ricoh RL5C466" }, - { 0x1180, 0x0475, "Ricoh RL5C475", "Ricoh RL5C475" }, - { 0x1180, 0x0476, "Ricoh RL5C476", "Ricoh RL5C476" }, - { 0x1180, 0x0477, "Ricoh RL5c477", "Ricoh RL5c477" }, //mdk-stage1// added from pcitable - { 0x1180, 0x0478, "Ricoh RL5C478", "Ricoh RL5C478" }, - { 0x104c, 0xac12, "Texas Instruments PCI1130", "TI 1130" }, - { 0x104c, 0xac13, "Texas Instruments PCI1031", "TI 1031" }, - { 0x104c, 0xac15, "Texas Instruments PCI1131", "TI 1131" }, - { 0x104c, 0xac1a, "Texas Instruments PCI1210", "TI 1210" }, - { 0x104c, 0xac1e, "Texas Instruments PCI1211", "TI 1211" }, - { 0x104c, 0xac17, "Texas Instruments PCI1220", "TI 1220" }, - { 0x104c, 0xac19, "Texas Instruments PCI1221", "TI 1221" }, - { 0x104c, 0xac1c, "Texas Instruments PCI1225", "TI 1225" }, - { 0x104c, 0xac16, "Texas Instruments PCI1250", "TI 1250A" }, - { 0x104c, 0xac1d, "Texas Instruments PCI1251A", "TI 1251A" }, - { 0x104c, 0xac1f, "Texas Instruments PCI1251B", "TI 1251B" }, - { 0x104c, 0xac50, "Texas Instruments PCI1410", "TI 1410" }, - { 0x104c, 0xac51, "Texas Instruments PCI1420", "TI 1420" }, - { 0x104c, 0xac1b, "Texas Instruments PCI1450", "TI 1450" }, - { 0x104c, 0xac52, "Texas Instruments PCI1451", "TI 1451" }, - { 0x104c, 0xac41, "Texas Instruments PCI4410", "TI 4410" }, - { 0x104c, 0xac40, "Texas Instruments PCI4450", "TI 4450" }, - { 0x104c, 0xac42, "Texas Instruments PCI4451", "TI 4451" }, - { 0x1217, 0x6729, "O2 Micro 6729", "O2Micro OZ6729" }, - { 0x1217, 0x673a, "O2 Micro 6730", "O2Micro OZ6730" }, - { 0x1217, 0x6832, "O2 Micro 6832/6833", "O2Micro OZ6832/OZ6833" }, - { 0x1217, 0x6836, "O2 Micro 6836/6860", "O2Micro OZ6836/OZ6860" }, - { 0x1217, 0x6872, "O2 Micro 6812", "O2Micro OZ6812" }, - { 0x1217, 0x6925, "O2 Micro 6922", "O2Micro OZ6922 CardBus Controller" }, - { 0x1217, 0x6933, "O2 Micro 6933", "O2Micro OZ6933 Cardbus Controller" }, - { 0x1217, 0x6972, "O2 Micro 6912", "O2Micro OZ6912 CardBus Controller" }, - { 0x1179, 0x0603, "Toshiba ToPIC95-A", "Toshiba ToPIC95-A" }, - { 0x1179, 0x060a, "Toshiba ToPIC95-B", "Toshiba ToPIC95-B" }, - { 0x1179, 0x060f, "Toshiba ToPIC97", "Toshiba ToPIC97" }, - { 0x1179, 0x0617, "Toshiba ToPIC100", "Toshiba ToPIC100" }, - { 0x119b, 0x1221, "Omega Micro 82C092G", "Omega Micro 82C092G" }, - { 0x8086, 0x1221, "Intel 82092AA", "Intel 82092AA_0" }, - { 0x8086, 0x1222, "Intel 82092AA", "Intel 82092AA_1" } //mdk-stage1// added from pcitable + { 0x1013, 0x1100, "i82365", "Cirrus Logic CL 6729" }, + { 0x1013, 0x1110, "yenta_socket", "Cirrus Logic PD 6832" }, + { 0x10b3, 0xb106, "yenta_socket", "SMC 34C90" }, + { 0x1180, 0x0465, "yenta_socket", "Ricoh RL5C465" }, + { 0x1180, 0x0466, "yenta_socket", "Ricoh RL5C466" }, + { 0x1180, 0x0475, "yenta_socket", "Ricoh RL5C475" }, + { 0x1180, 0x0476, "yenta_socket", "Ricoh RL5C476" }, + { 0x1180, 0x0477, "yenta_socket", "Ricoh RL5C477" }, + { 0x1180, 0x0478, "yenta_socket", "Ricoh RL5C478" }, + { 0x104c, 0xac12, "yenta_socket", "Texas Instruments PCI1130" }, + { 0x104c, 0xac13, "yenta_socket", "Texas Instruments PCI1031" }, + { 0x104c, 0xac15, "yenta_socket", "Texas Instruments PCI1131" }, + { 0x104c, 0xac1a, "yenta_socket", "Texas Instruments PCI1210" }, + { 0x104c, 0xac1e, "yenta_socket", "Texas Instruments PCI1211" }, + { 0x104c, 0xac17, "yenta_socket", "Texas Instruments PCI1220" }, + { 0x104c, 0xac19, "yenta_socket", "Texas Instruments PCI1221" }, + { 0x104c, 0xac1c, "yenta_socket", "Texas Instruments PCI1225" }, + { 0x104c, 0xac16, "yenta_socket", "Texas Instruments PCI1250" }, + { 0x104c, 0xac1d, "yenta_socket", "Texas Instruments PCI1251A" }, + { 0x104c, 0xac1f, "yenta_socket", "Texas Instruments PCI1251B" }, + { 0x104c, 0xac50, "yenta_socket", "Texas Instruments PCI1410" }, + { 0x104c, 0xac51, "yenta_socket", "Texas Instruments PCI1420" }, + { 0x104c, 0xac1b, "yenta_socket", "Texas Instruments PCI1450" }, + { 0x104c, 0xac52, "yenta_socket", "Texas Instruments PCI1451" }, + { 0x104c, 0xac41, "yenta_socket", "Texas Instruments PCI4410" }, + { 0x104c, 0xac40, "yenta_socket", "Texas Instruments PCI4450" }, + { 0x104c, 0xac42, "yenta_socket", "Texas Instruments PCI4451" }, + { 0x1217, 0x6729, "i82365", "O2 Micro 6729" }, + { 0x1217, 0x673a, "i82365", "O2 Micro 6730" }, + { 0x1217, 0x6832, "yenta_socket", "O2 Micro 6832/6833" }, + { 0x1217, 0x6836, "yenta_socket", "O2 Micro 6836/6860" }, + { 0x1217, 0x6872, "yenta_socket", "O2 Micro 6812" }, + { 0x1217, 0x6925, "yenta_socket", "O2 Micro 6922" }, + { 0x1217, 0x6933, "yenta_socket", "O2 Micro 6933" }, + { 0x1217, 0x6972, "yenta_socket", "O2 Micro 6912" }, + { 0x1179, 0x0603, "i82365", "Toshiba ToPIC95-A" }, + { 0x1179, 0x060a, "yenta_socket", "Toshiba ToPIC95-B" }, + { 0x1179, 0x060f, "yenta_socket", "Toshiba ToPIC97" }, + { 0x1179, 0x0617, "yenta_socket", "Toshiba ToPIC100" }, + { 0x119b, 0x1221, "i82365", "Omega Micro 82C092G" }, + { 0x8086, 0x1221, "i82092", "Intel 82092AA_0" }, + { 0x8086, 0x1222, "i82092", "Intel 82092AA_1" }, }; #define PCI_COUNT (sizeof(pci_id)/sizeof(pci_id_t)) @@ -135,11 +135,7 @@ static int pci_probe(void) (device == pci_id[i].device)) break; if (i < PCI_COUNT) { name = pci_id[i].name; - if (pci_id[i].vendor == 0x1013 && pci_id[i].device == 0x1100) - driver = "i82365"; - else - driver = "yenta_socket"; - break; + driver = pci_id[i].modname; } } } @@ -176,7 +172,7 @@ static int pci_probe(void) //mdk-stage1// if (module) //mdk-stage1// printf("i82365\n"); //mdk-stage1// else - log_message("\t%s found, 2 sockets.", name); + log_message("\t%s found, 2 sockets (driver %s).", name, driver); return 0; } else { //mdk-stage1// if (!module) |