From: Ian Abbott Date: Mon, 16 May 2011 11:05:54 +0000 (+0100) Subject: staging: comedi: adv_pci_dio: Add a counter subdevice to PCI-1751 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cfe3cffd8e44c0b69c9c50a1659acbd32ac19b70;p=linux-beck.git staging: comedi: adv_pci_dio: Add a counter subdevice to PCI-1751 The Advantech PCI-1751 has a 8254 counter chip on board. Add it to the device as a counter subdevice. Apparently the counter can generate interrupts although the driver does not currently use this capability. Original patch by Ivan Russkih (Иван Русских) . Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c index 9102667ab40e..d23799be7ce2 100644 --- a/drivers/staging/comedi/drivers/adv_pci_dio.c +++ b/drivers/staging/comedi/drivers/adv_pci_dio.c @@ -117,6 +117,7 @@ enum hw_io_access { /* Advantech PCI-1751/3/3E */ #define PCI1751_DIO 0 /* R/W: begin of 8255 registers block */ +#define PCI1751_CNT 24 /* R/W: begin of 8254 registers block */ #define PCI1751_ICR 32 /* W: Interrupt control register */ #define PCI1751_ISR 32 /* R: Interrupt status register */ #define PCI1753_DIO 0 /* R/W: begin of 8255 registers block */ @@ -329,7 +330,7 @@ static const struct dio_boardtype boardtypes[] = { { {0, 0, 0, 0}, {0, 0, 0, 0} }, { {48, PCI1751_DIO, 2, 0}, {0, 0, 0, 0} }, {0, 0, 0, 0}, - { {0, 0, 0, 0} }, + { {3, PCI1751_CNT, 1, 0} }, IO_8b}, {"pci1752", PCI_VENDOR_ID_ADVANTECH, 0x1752, PCIDIO_MAINREG, TYPE_PCI1752,