Skip to contentSkip to conversation

New: kernel support for netmos 9835/9735 crippled since 2.6.9

Bugme-new Thomas Richter 2 participants 2 messages Mar 14, 2005 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi Andrew,

Quoted 1 line

I'm inclined to simply revert that change.

In case the mentioned lines do cause problems, please do not hesitate to remove them. As the comments indicate, the patch was completely untested as I haven't had the cards available. However, please ensure that the parallel port remains available for the 9835/9735 in case they are removed from the parport module. Their references should be removed *only* from parport_pc, not from the PCI name database.

So long,
Thomas

#2 lore raw
Quoted 4 lines · Thomas Richter

Hi Andrew,

Quoted 9 lines
Quoted 1 line

I'm inclined to simply revert that change.

In case the mentioned lines do cause problems, please do not hesitate to remove them. As the comments indicate, the patch was completely untested as I haven't had the cards available. However, please ensure that the parallel port remains available for the 9835/9735 in case they are removed from the parport module. Their references should be removed *only* from parport_pc, not from the PCI name database.

OK. Like this?

Steven, do you agree?

drivers/parport/parport_pc.c renamed from drivers/parport/parport_pc.c~parport_pc-revert-netmos-patch +2 -10
diff -puN drivers/parport/parport_pc.c~parport_pc-revert-netmos-patch drivers/parport/parport_pc.c
@@ -2738,8 +2738,6 @@ enum parport_pc_pci_cards {
 	netmos_9855,
 	netmos_9735,
 	netmos_9835,
-	netmos_9755,
-	netmos_9715
 };
 
 
@@ -2813,10 +2811,8 @@ static struct parport_pc_pci {
 	/* netmos_9805 */               { 1, { { 0, -1 }, } }, /* untested */
 	/* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
 	/* netmos_9855 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
-	/* netmos_9735 */               { 1, { { 2, 3 }, } },  /* untested */
-	/* netmos_9835 */               { 1, { { 2, 3 }, } },  /* untested */
-        /* netmos_9755 */               { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */
-        /* netmos_9715 */               { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */
+	/* netmos_9735 */		{ 1, { { 2, 3 }, } },
+	/* netmos_9835 */		{ 1, { { 2, 3 }, } },
 };
 
 static struct pci_device_id parport_pc_pci_tbl[] = {
@@ -2899,10 +2895,6 @@ static struct pci_device_id parport_pc_p
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 },
 	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 },
-	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9755,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9755 },
-	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9715,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9715 },
 	{ 0, } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl);
include/linux/pci_ids.h renamed from include/linux/pci_ids.h~parport_pc-revert-netmos-patch +0 -2
diff -puN include/linux/pci_ids.h~parport_pc-revert-netmos-patch include/linux/pci_ids.h
@@ -2530,8 +2530,6 @@
 #define PCI_DEVICE_ID_NETMOS_9815	0x9815
 #define PCI_DEVICE_ID_NETMOS_9835	0x9835
 #define PCI_DEVICE_ID_NETMOS_9855	0x9855
-#define PCI_DEVICE_ID_NETMOS_9755	0x9755
-#define PCI_DEVICE_ID_NETMOS_9715	0x9715
 
 #define PCI_SUBVENDOR_ID_EXSYS		0xd84d
 #define PCI_SUBDEVICE_ID_EXSYS_4014	0x4014

_