patch-2.1.105 linux/drivers/net/hamradio/baycom_par.c

• Lines: 36
• Date: Sun Jun 7 11:13:45 1998
• Orig file: v2.1.104/linux/drivers/net/hamradio/baycom_par.c
• Orig date: Wed Dec 31 11:55:54 1997

diff -u --recursive --new-file v2.1.104/linux/drivers/net/hamradio/baycom_par.c linux/drivers/net/hamradio/baycom_par.c
@@ -329,9 +329,7 @@
 
 static void par96_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-	struct parport *pp = (struct parport *)dev_id;
-	struct pardevice *pd = pp->cad;
-	struct device *dev = (struct device *)pd->private;
+	struct device *dev = (struct device *)dev_id;
 	struct baycom_state *bc = (struct baycom_state *)dev->priv;
 
 	if (!dev || !bc || bc->hdrv.magic != HDLCDRV_MAGIC)
@@ -347,13 +345,14 @@
 		par96_rx(dev, bc);
 		if (--bc->modem.arb_divider <= 0) {
 			bc->modem.arb_divider = 6;
-			sti();
+			__sti();
 			hdlcdrv_arbitrate(dev, &bc->hdrv);
 		}
 	}
-	sti();
+	__sti();
 	hdlcdrv_transmitter(dev, &bc->hdrv);
 	hdlcdrv_receiver(dev, &bc->hdrv);
+        __cli();
 }
 
 /* --------------------------------------------------------------------- */
@@ -409,6 +408,7 @@
 	}
 	dev->irq = pp->irq;
 	/* bc->pdev->port->ops->change_mode(bc->pdev->port, PARPORT_MODE_PCSPP);  not yet implemented */
+        bc->hdrv.par.bitrate = 9600;
 	/* switch off PTT */
 	outb(PAR96_PTT | PAR97_POWER, LPT_DATA(dev));
 	/*bc->pdev->port->ops->enable_irq(bc->pdev->port);  not yet implemented */