| 2dad185a |
1 | 2001-10-11 Tim Waugh <twaugh@redhat.com> |
| 2 | |
| 3 | * include/linux/pci_ids.h: NetMos PCI IDs. |
| 4 | * drivers/parport/parport_pc.c: Support NetMos cards. |
| 5 | * drivers/parport/parport_serial.c: Support NetMos cards. |
| 6 | * drivers/parport/ChangeLog: Updated. |
| 7 | |
| 8 | --- linux/include/linux/pci_ids.h.netmos Fri Mar 1 11:05:36 2002 |
| 9 | +++ linux/include/linux/pci_ids.h Fri Mar 1 11:05:46 2002 |
| 10 | @@ -1743,8 +1743,12 @@ |
| 11 | #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 |
| 12 | |
| 13 | #define PCI_VENDOR_ID_NETMOS 0x9710 |
| 14 | +#define PCI_DEVICE_ID_NETMOS_9705 0x9705 |
| 15 | #define PCI_DEVICE_ID_NETMOS_9735 0x9735 |
| 16 | +#define PCI_DEVICE_ID_NETMOS_9805 0x9805 |
| 17 | +#define PCI_DEVICE_ID_NETMOS_9815 0x9815 |
| 18 | #define PCI_DEVICE_ID_NETMOS_9835 0x9835 |
| 19 | +#define PCI_DEVICE_ID_NETMOS_9855 0x9855 |
| 20 | |
| 21 | #define PCI_SUBVENDOR_ID_EXSYS 0xd84d |
| 22 | #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 |
| 23 | --- linux/drivers/parport/parport_pc.c.netmos Fri Mar 1 11:04:15 2002 |
| 24 | +++ linux/drivers/parport/parport_pc.c Fri Mar 1 11:05:46 2002 |
| 25 | @@ -2706,6 +2706,10 @@ |
| 2dad185a |
26 | oxsemi_840, |
| 27 | aks_0100, |
| eb73265f |
28 | mobility_pp, |
| 2dad185a |
29 | + netmos_9705, |
| 30 | + netmos_9805, |
| 31 | + netmos_9815, |
| 32 | + netmos_9855, |
| 33 | }; |
| 34 | |
| 35 | |
| 36 | @@ -2789,6 +2793,10 @@ |
| 2dad185a |
37 | /* oxsemi_840 */ { 1, { { 0, -1 }, } }, |
| 38 | /* aks_0100 */ { 1, { { 0, 1 }, } }, |
| eb73265f |
39 | /* mobility_pp */ { 1, { { 0, 1 }, } }, |
| 2dad185a |
40 | + /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ |
| 41 | + /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ |
| 42 | + /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ |
| 43 | + /* netmos_9855 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ |
| 44 | }; |
| 45 | |
| 46 | static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = { |
| 47 | @@ -2886,6 +2894,15 @@ |
| 48 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, |
| 49 | { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, |
| 50 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, |
| 51 | + /* NetMos communication controllers */ |
| 52 | + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, |
| 53 | + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, |
| 54 | + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805, |
| 55 | + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, |
| 56 | + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, |
| 57 | + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, |
| 58 | + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, |
| 59 | + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 }, |
| 60 | { 0, } /* terminate list */ |
| 61 | }; |
| 62 | MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); |
| 63 | --- linux/drivers/parport/parport_serial.c.netmos Fri Mar 1 11:05:36 2002 |
| 64 | +++ linux/drivers/parport/parport_serial.c Fri Mar 1 11:05:46 2002 |
| 65 | @@ -32,6 +32,8 @@ |
| 66 | enum parport_pc_pci_cards { |
| 67 | titan_110l = 0, |
| 68 | titan_210l, |
| 69 | + netmos_9735, |
| 70 | + netmos_9835, |
| 71 | avlab_1s1p, |
| 72 | avlab_1s1p_650, |
| 73 | avlab_1s1p_850, |
| 74 | @@ -66,6 +68,8 @@ |
| 75 | } cards[] __devinitdata = { |
| 76 | /* titan_110l */ { 1, { { 3, -1 }, } }, |
| 77 | /* titan_210l */ { 1, { { 3, -1 }, } }, |
| 78 | + /* netmos_9735 (not tested) */ { 1, { { 2, -1 }, } }, |
| 79 | + /* netmos_9835 (not tested) */ { 1, { { 2, -1 }, } }, |
| 80 | /* avlab_1s1p */ { 1, { { 1, 2}, } }, |
| 81 | /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, |
| 82 | /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, |
| 83 | @@ -84,6 +88,10 @@ |
| 84 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, |
| 85 | { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, |
| 86 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, |
| 87 | + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735, |
| 88 | + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 }, |
| 89 | + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, |
| 90 | + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 }, |
| 91 | /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ |
| 92 | { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, |
| 93 | { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, |
| 94 | @@ -124,6 +132,8 @@ |
| 95 | |
| 96 | /* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, |
| 97 | /* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, |
| 98 | +/* netmos_9735 (n/t)*/ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, |
| 99 | +/* netmos_9835 (n/t)*/ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, |
| 100 | /* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, |
| 101 | /* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, |
| 102 | /* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, |
| 103 | --- linux/drivers/parport/ChangeLog.netmos Fri Mar 1 11:05:40 2002 |
| 104 | +++ linux/drivers/parport/ChangeLog Fri Mar 1 11:05:46 2002 |
| 105 | @@ -0,0 +1,5 @@ |
| 106 | +2001-10-11 Tim Waugh <twaugh@redhat.com> |
| 107 | + |
| 108 | + * parport_pc.c, parport_serial.c: Support for NetMos cards. |
| 109 | + Patch originally from Michael Reinelt <reinelt@eunet.at>. |
| 110 | + |
projects / packages / kernel.git / blame