From: David Schleef <ds@schleef.org>
Date: Tue, 15 Jan 2002 11:42:38 +0000 (+0000)
Subject: Update for new 8255 interface
X-Git-Tag: r0_7_62~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f51eacb26c1db0b079e253d6a9da540cab14cd8;p=comedi.git

Update for new 8255 interface
---

diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index 3bf15e78..df5e46d1 100644
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -219,7 +219,7 @@ static unsigned int labpc_inb(unsigned int address);
 static void labpc_outb(unsigned int byte, unsigned int address);
 static unsigned int labpc_readb(unsigned int address);
 static void labpc_writeb(unsigned int byte, unsigned int address);
-static int labpc_dio_mem_callback(int dir, int port, int data, void *arg);
+static int labpc_dio_mem_callback(int dir, int port, int data, unsigned long arg);
 static void labpc_load_ai_calibration(comedi_device *dev, unsigned int range);
 static void labpc_load_ao_calibration(comedi_device *dev, unsigned int channel, unsigned int range);
 static void labpc_serial_out(comedi_device *dev, unsigned int value, unsigned int num_bits);
@@ -699,7 +699,7 @@ static int labpc_attach(comedi_device *dev, comedi_devconfig *it)
 	if(thisboard->write_byte == labpc_writeb)
 		subdev_8255_init(dev, s, labpc_dio_mem_callback, (unsigned long)(dev->iobase + DIO_BASE_REG));
 	else
-		subdev_8255_init(dev, s, NULL, (void*)(dev->iobase + DIO_BASE_REG));
+		subdev_8255_init(dev, s, NULL, dev->iobase + DIO_BASE_REG);
 
 	// calibration subdevices for boards that have one
 	s = dev->subdevices + 3;