Parallel port detection via ACPI

ok, here's an adaptation of the same crude patch to 2.4.26; I did not give it a try, but it does compile. let me know if it works properly.

@@ -53,6 +53,9 @@

#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/sysctl.h>
+#include <linux/acpi.h>
+
+#include <acpi/acpi_bus.h>

#include <asm/io.h>
#include <asm/dma.h>
@@ -2916,6 +2919,91 @@
static int __init parport_pc_init_superio(int autoirq, int autodma) {return 0;} #endif /* CONFIG_PCI */

+struct parport_pc_resources
+{

+       int     io_lo;
+       int     io_hi;
+       int     irq;
+       int     dma;

+};
+
+
+
+/* Callback to process all the assigned resources to the parallel port device */ +static acpi_status acpi_parport_pc_resource(struct acpi_resource *res, void *data) +{
+ struct parport_pc_resources *pcres = (struct parport_pc_resources *) data;
+ acpi_status status;
+
+
+ if (res->id == ACPI_RSTYPE_IO)
+ {

+               struct acpi_resource_io *io = (struct acpi_resource_io *) &res->data.io;
+               if (pcres->io_lo==0) pcres->io_lo = io->min_base_address;
+               else pcres->io_hi = io->min_base_address;
+       }
+       else if (res->id == ACPI_RSTYPE_IRQ)
+       {
+               struct acpi_resource_irq *irq = (struct acpi_resource_irq *) &res->data.irq;
+               pcres->irq = irq->interrupts[0];
+       }
+       else if (res->id == ACPI_RSTYPE_DMA)
+       {

+ struct acpi_resource_dma *dma = (struct acpi_resource_dma *) &res->data.dma;
+ pcres->dma = dma->channels[0];
+ }
+
+ return AE_OK;
+}
+
+
+static int acpi_parport_pc_add(struct acpi_device *device) +{

+       acpi_status status;
+       struct parport_pc_resources pcres;
+       struct parport *pdata;
+
+
+       pcres.io_lo = 0;
+       pcres.io_hi = 0;
+       pcres.irq = PARPORT_IRQ_NONE;
+       pcres.dma = PARPORT_DMA_NONE;

+
+ status = acpi_walk_resources(device->handle, METHOD_NAME__CRS,
+ acpi_parport_pc_resource, &pcres);
+ if (ACPI_FAILURE(status))
+ return -ENODEV;
+

+       printk("ACPI parport device with low IO 0x%X, high IO 0x%X, IRQ %d, DMA %d\n", pcres.io_lo, pcres.io_hi, pcres.irq, pcres.dma);
+       if (!(pdata = parport_pc_probe_port (pcres.io_lo, pcres.io_hi, pcres.irq, pcres.dma, NULL)))
+       {

+ printk("probe of ACPI parport device failed\n");
+ return -ENODEV;
+ }
+
+ acpi_driver_data(device) = pdata;
+ return 0;
+}
+
+static int acpi_parport_pc_remove(struct acpi_device *device, int type) +{

+       struct parport *pdata = (struct parport *)acpi_driver_data(device);
+       parport_pc_unregister_port(pdata);
+       return 0;

+}
+
+
+static struct acpi_driver parport_pc_acpi_driver = {

+       .name =         "parport_pc",
+       .class =        "",
+       .ids =          "PNP0400, PNP0401",
+       .ops =  {
+               .add =          acpi_parport_pc_add,
+               .remove =       acpi_parport_pc_remove,

+ },
+};
+
+
/* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */ static int __init __attribute__((unused)) parport_pc_find_isa_ports (int autoirq, int autodma)
@@ -2952,10 +3040,14 @@
#endif

       /* Onboard SuperIO chipsets that show themselves on the PCI bus. */
+       /*
       count += parport_pc_init_superio (autoirq, autodma);

+ */

       /* ISA ports and whatever (see asm/parport.h). */
+       /*
       count += parport_pc_find_nonpci_ports (autoirq, autodma);

+ */

       r = pci_register_driver (&parport_pc_pci_driver);
       if (r >= 0) {
@@ -2963,6 +3055,13 @@
               count += r;
       }

+       r = acpi_bus_register_driver (&parport_pc_acpi_driver);
+       if (ACPI_SUCCESS(r))
+       {

+ registered_parport = 1;
+ /* should we increase count? */
+ }
+

       return count;
}

@@ -3060,10 +3159,15 @@

       }

       ret = !parport_pc_init (io, io_hi, irqval, dmaval);
+       /*
       if (ret && registered_parport)
               pci_unregister_driver (&parport_pc_pci_driver);

       return ret;

+ */
+
+ /* Do not fail if no port is found (perhaps one might be available through a docking station?) */
+ return 0;
}

void cleanup_module(void)
@@ -3072,7 +3176,10 @@

       struct parport *p = parport_enumerate(), *tmp;

       if (!user_specified)
+       {
               pci_unregister_driver (&parport_pc_pci_driver);

+ acpi_bus_unregister_driver(&parport_pc_acpi_driver);
+ }

       while (p) {
               tmp = p->next;

_________________________________________________________________
MSN Messenger: instale gr�tis e converse com seus amigos. http://messenger.msn.com.br

Hi Dino :)

* Dino Klein <[email protected]> dixit:

Thanks a lot, I'll give it a try as soon as possible :)

Raúl Núñez de Arenas Coronado

Linux Registered User 88736
http://www.pleyades.net & http://raul.pleyades.net/