[PATCH] : ir245_vlsi_mir.diff

Jean Tourrilhes (jt@bougret.hpl.hp.com)
Fri, 30 Nov 2001 12:55:04 -0800


ir245_vlsi_mir.diff :
-------------------
<Patch from Martin Diehl>
o [CORRECT] When MIR is requested, enable MIR on the chip, not FIR

diff -u -p linux/drivers/net/irda/vlsi_ir.d3.c linux/drivers/net/irda/vlsi_ir.c
--- linux/drivers/net/irda/vlsi_ir.d3.c Wed Nov 28 10:13:52 2001
+++ linux/drivers/net/irda/vlsi_ir.c Wed Nov 28 10:14:03 2001
@@ -2,7 +2,7 @@
*
* vlsi_ir.c: VLSI82C147 PCI IrDA controller driver for Linux
*
- * Version: 0.3, Sep 30, 2001
+ * Version: 0.3a, Nov 10, 2001
*
* Copyright (c) 2001 Martin Diehl
*
@@ -490,7 +490,7 @@ static int vlsi_set_baud(struct net_devi
if (mode == IFF_FIR)
config ^= IRENABLE_FIR_ON;
else if (mode == IFF_MIR)
- config ^= (IRENABLE_FIR_ON|IRENABLE_CRC16_ON);
+ config ^= (IRENABLE_MIR_ON|IRENABLE_CRC16_ON);
else
config ^= IRENABLE_SIR_ON;

@@ -877,6 +877,7 @@ static int vlsi_open(struct net_device *
idev->irlap = irlap_open(ndev,&idev->qos,hwname);

netif_start_queue(ndev);
+ outw(0, ndev->base_addr+VLSI_PIO_PROMPT); /* kick hw state machine */

printk(KERN_INFO "%s: device %s operational using (%d,%d) tx,rx-ring\n",
__FUNCTION__, ndev->name, ringsize[0], ringsize[1]);
@@ -1200,7 +1201,6 @@ vlsi_irda_probe(struct pci_dev *pdev, co
int alloc_size;


- vlsi_reg_debug(0x3000, "vlsi initial state");
if (pci_enable_device(pdev))
goto out;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/