lkml.org 
[lkml]   [2001]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] 2.4.10-ac8 parport_pc fix
From
Date
Here is a patch for the 2.4.10-ac8 parport_pc driver.

Now that the PnP BIOS driver tells the difference between a
device's not using a resource type, its use of that resource
type being disabled, and its use of that resource with number
zero, we can modify the parport_pc driver to interpret and
report that information correctly.

This patch is independent of the PnP BIOS driver patches
I just submitted.

// Thomas

The patch:
--- linux-2.4.10-ac8/drivers/parport/parport_pc.c Sun Oct 7 14:38:44 2001
+++ linux-2.4.10-ac8-fix/drivers/parport/parport_pc.c Sun Oct 7 15:37:44 2001
@@ -2799,22 +2799,62 @@

#if defined (CONFIG_PNPBIOS) || defined (CONFIG_PNPBIOS_MODULE)

+#define UNSET(res) ((res).flags & IORESOURCE_UNSET)
+
int init_pnp040x(struct pci_dev *dev)
-{ int io,iohi,irq,dma;
+{
+ int io,iohi,irq,dma;
+
+ printk(KERN_INFO
+ "parport: PnP BIOS reports device %s %s (node number 0x%x) is ",
+ dev->name, dev->slot_name, dev->devfn
+ );
+
+ if ( UNSET(dev->resource[0]) ) {
+ printk("not configured.\n");
+ return 0;
+ }
+ io = dev->resource[0].start;
+ printk("configured to use io 0x%04x",io);
+ if ( UNSET(dev->resource[1]) ) {
+ iohi = 0;
+ } else {
+ iohi = dev->resource[1].start;
+ printk(", io 0x%04x",iohi);
+ }

- io=dev->resource[0].start;
- iohi=dev->resource[1].start;
- irq=dev->irq_resource[0].start;
- dma=dev->dma_resource[0].start;
+ if ( UNSET(dev->irq_resource[0]) ) {
+ irq = PARPORT_IRQ_NONE;
+ } else {
+ if ( dev->irq_resource[0].start == -1 ) {
+ irq = PARPORT_IRQ_NONE;
+ printk(", irq disabled");
+ } else {
+ irq = dev->irq_resource[0].start;
+ printk(", irq %d",irq);
+ }
+ }

- if(dma==0) dma=-1;
+ if ( UNSET(dev->dma_resource[0]) ) {
+ dma = PARPORT_DMA_NONE;
+ } else {
+ if ( dev->dma_resource[0].start == -1 ) {
+ dma = PARPORT_DMA_NONE;
+ printk(", dma disabled");
+ } else {
+ dma = dev->dma_resource[0].start;
+ printk(", dma %d",irq);
+ }
+ }
+
+ printk("\n");

- printk(KERN_INFO "PnPBIOS: Parport found %s %s at io=%04x,%04x irq=%d dma=%d\n",
- dev->name,dev->slot_name,io,iohi,irq,dma);
if (parport_pc_probe_port(io,iohi,irq,dma,NULL))
return 1;
+
return 0;
}
+#undef UNSET

#endif

-
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/

\
 
 \ /
  Last update: 2005-03-22 13:04    [W:0.058 / U:2.896 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site