patch-2.3.20 linux/drivers/parport/share.c

• Lines: 32
• Date: Thu Oct 7 14:10:06 1999
• Orig file: v2.3.19/linux/drivers/parport/share.c
• Orig date: Fri Sep 10 23:57:30 1999

diff -u --recursive --new-file v2.3.19/linux/drivers/parport/share.c linux/drivers/parport/share.c
@@ -633,7 +633,7 @@
 }
 
 static int parport_parse_params (int nports, const char *str[], int val[],
-				 int automatic, int none)
+				 int automatic, int none, int nofifo)
 {
 	unsigned int i;
 	for (i = 0; i < nports && str[i]; i++) {
@@ -641,6 +641,8 @@
 			val[i] = automatic;
 		else if (!strncmp(str[i], "none", 4))
 			val[i] = none;
+		else if (nofifo && !strncmp(str[i], "nofifo", 4))
+			val[i] = nofifo;
 		else {
 			char *ep;
 			unsigned long r = simple_strtoul(str[i], &ep, 0);
@@ -659,11 +661,11 @@
 int parport_parse_irqs(int nports, const char *irqstr[], int irqval[])
 {
 	return parport_parse_params (nports, irqstr, irqval, PARPORT_IRQ_AUTO,
-				     PARPORT_IRQ_NONE);
+				     PARPORT_IRQ_NONE, 0);
 }
 
 int parport_parse_dmas(int nports, const char *dmastr[], int dmaval[])
 {
 	return parport_parse_params (nports, dmastr, dmaval, PARPORT_DMA_AUTO,
-				     PARPORT_DMA_NONE);
+				     PARPORT_DMA_NONE, PARPORT_DMA_NOFIFO);
 }