* You can probably find more information at http://www.gespac.com
*/
-#include <linux/autoconf.h>
-
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
+#include "../include/can.h"
+#include "../include/can_sysdep.h"
#include "../include/main.h"
#include "../include/pcccan.h"
#include "../include/i82527.h"
* %RESET_ADDR represents the io-address of the hardware reset register.
* %NR_82527 represents the number of intel 82527 chips on the board.
* %NR_SJA1000 represents the number of philips sja1000 chips on the board.
- * The flags entry can currently only be %PROGRAMMABLE_IRQ to indicate that
+ * The flags entry can currently only be %CANDEV_PROGRAMMABLE_IRQ to indicate that
* the hardware uses programmable interrupts.
* Return Value: The function always returns zero
* File: src/pcccan.c
candev->nr_82527_chips=NR_82527;
candev->nr_sja1000_chips=NR_SJA1000;
candev->nr_all_chips=NR_82527+NR_SJA1000;
- candev->flags &= ~PROGRAMMABLE_IRQ;
+ candev->flags &= ~CANDEV_PROGRAMMABLE_IRQ;
return 0;
}
int pcccan_init_obj_data(struct chip_t *chip, int objnr)
{
chip->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;
- chip->msgobj[objnr]->flags=0;
return 0;
}
*
* The function pcccan_program_irq() is used for hardware that uses
* programmable interrupts. If your hardware doesn't use programmable interrupts
- * you should not set the @candevices_t->flags entry to %PROGRAMMABLE_IRQ and
+ * you should not set the @candevices_t->flags entry to %CANDEV_PROGRAMMABLE_IRQ and
* leave this function unedited. Again this function is hardware specific so
* there's no example code.
* Return value: The function returns zero on success or %-ENODEV on failure
*/
void pcccan_write_register(unsigned char data, unsigned long address)
{
- disable_irq(pcccan_irq);
+ can_disable_irq(pcccan_irq);
outb(address - pcccan_base, pcccan_base+1);
outb(data, pcccan_base+6);
- enable_irq(pcccan_irq);
+ can_enable_irq(pcccan_irq);
}
/**
unsigned pcccan_read_register(unsigned long address)
{
unsigned ret;
- disable_irq(pcccan_irq);
+ can_disable_irq(pcccan_irq);
outb(address - pcccan_base, pcccan_base+1);
ret=inb(pcccan_base+2);
- enable_irq(pcccan_irq);
+ can_enable_irq(pcccan_irq);
return ret;
}