X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/ce9505f94bf87d40caeed0b0452e39f95ed521b1..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/include/main.h diff --git a/lincan/include/main.h b/lincan/include/main.h index be2534b..f360dcf 100644 --- a/lincan/include/main.h +++ b/lincan/include/main.h @@ -13,13 +13,13 @@ #include "./can_queue.h" #ifdef CAN_DEBUG - #define DEBUGMSG(fmt,args...) can_printk(KERN_ERR "can.o (debug): " fmt,\ + #define DEBUGMSG(fmt,args...) can_printk(KERN_ERR "lincan (debug): " fmt,\ ##args) #else #define DEBUGMSG(fmt,args...) #endif -#define CANMSG(fmt,args...) can_printk(KERN_ERR "can.o: " fmt,##args) +#define CANMSG(fmt,args...) can_printk(KERN_ERR "lincan: " fmt,##args) extern can_spinlock_t canuser_manipulation_lock; @@ -48,7 +48,7 @@ struct canhardware_t { * @flags: board flags: %PROGRAMMABLE_IRQ .. interrupt number * can be programmed into board * @nr_all_chips: number of chips present on the board - * @nr_82527_chips: number of Intel 8257 chips + * @nr_82527_chips: number of Intel 8257 chips * @nr_sja1000_chips: number of Philips SJA100 chips * @chip: array of pointers to the chip structures * @hwspecops: pointer to board specific operations @@ -74,18 +74,20 @@ struct candevice_t { char *hwname; /* text board type */ int candev_idx; /* board index in canhardware_t.candevice[] */ unsigned long io_addr; /* IO/physical MEM address */ - unsigned long res_addr; /* optional seset register port */ - unsigned long dev_base_addr; /* CPU translated IO/virtual MEM address */ + unsigned long res_addr; /* optional reset register port */ + can_ioptr_t dev_base_addr; /* CPU translated IO/virtual MEM address */ + can_ioptr_t aux_base_addr; /* CPU translated IO/virtual MEM address */ unsigned int flags; int nr_all_chips; int nr_82527_chips; int nr_sja1000_chips; + can_spinlock_t device_lock; struct canchip_t *chip[MAX_HW_CHIPS]; struct hwspecops_t *hwspecops; struct canhardware_t *hosthardware_p; - + union { void *anydev; #ifdef CAN_ENABLE_PCI_SUPPORT @@ -138,14 +140,14 @@ struct candevice_t { * @worker_thread: chip worker thread ID (RT-Linux specific field) * @pend_flags: holds information about pending interrupt and tx_wake() operations * (RT-Linux specific field). Masks values: - * %MSGOBJ_TX_REQUEST .. some of the message objects requires tx_wake() call, + * %MSGOBJ_TX_REQUEST .. some of the message objects requires tx_wake() call, * %MSGOBJ_IRQ_REQUEST .. chip interrupt processing required * %MSGOBJ_WORKER_WAKE .. marks, that worker thread should be waked * for some of above reasons * * The fields @write_register and @read_register are copied from * corresponding fields from @hwspecops structure - * (chip->hostdevice->hwspecops->write_register and + * (chip->hostdevice->hwspecops->write_register and * chip->hostdevice->hwspecops->read_register) * to speedup can_write_reg() and can_read_reg() functions. */ @@ -153,16 +155,16 @@ struct canchip_t { char *chip_type; int chip_idx; /* chip index in candevice_t.chip[] */ int chip_irq; - unsigned long chip_base_addr; + can_ioptr_t chip_base_addr; unsigned int flags; long clock; /* Chip clock in Hz */ long baudrate; - void (*write_register)(unsigned data,unsigned long address); - unsigned (*read_register)(unsigned long address); - + void (*write_register)(unsigned data, can_ioptr_t address); + unsigned (*read_register)(can_ioptr_t address); + void *chip_data; - + unsigned short sja_cdr_reg; /* sja1000 only! */ unsigned short sja_ocr_reg; /* sja1000 only! */ unsigned short int_cpu_reg; /* intel 82527 only! */ @@ -174,7 +176,7 @@ struct canchip_t { struct chipspecops_t *chipspecops; struct candevice_t *hostdevice; - + int max_objects; /* 1 for sja1000, 15 for i82527 */ can_spinlock_t chip_lock; @@ -187,7 +189,7 @@ struct canchip_t { /** * struct msgobj_t - structure holding communication object state - * @obj_base_addr: + * @obj_base_addr: * @minor: associated device minor number * @object: object number in canchip_t structure +1 * @flags: message object flags @@ -207,16 +209,16 @@ struct canchip_t { * @obj_users: list of user structures of type &canuser_t. * @obj_flags: message object specific flags. Masks values: * %MSGOBJ_TX_REQUEST .. the message object requests TX activation - * %MSGOBJ_TX_LOCK .. some IRQ routine or callback on some CPU + * %MSGOBJ_TX_LOCK .. some IRQ routine or callback on some CPU * is running inside TX activation processing code * @rx_preconfig_id: place to store RX message identifier for some chip types * that reuse same object for TX */ struct msgobj_t { - unsigned long obj_base_addr; + can_ioptr_t obj_base_addr; unsigned int minor; /* associated device minor number */ unsigned int object; /* object number in canchip_t +1 for debug printk */ - unsigned long obj_flags; + unsigned long obj_flags; int ret; struct canque_ends_t *qends; @@ -225,11 +227,11 @@ struct msgobj_t { struct canque_slot_t *tx_slot; int tx_retry_cnt; struct timer_list tx_timeout; - + struct canmsg_t rx_msg; struct canchip_t *hostchip; - + unsigned long rx_preconfig_id; atomic_t obj_used; @@ -275,7 +277,7 @@ struct canuser_t { * @request_io: reserve io or memory range for can board * @release_io: free reserved io memory range * @reset: hardware reset routine - * @init_hw_data: called to initialize &candevice_t structure, mainly + * @init_hw_data: called to initialize &candevice_t structure, mainly * @res_add, @nr_all_chips, @nr_82527_chips, @nr_sja1000_chips * and @flags fields * @init_chip_data: called initialize each &canchip_t structure, mainly @@ -285,7 +287,7 @@ struct canuser_t { * @init_obj_data: called initialize each &msgobj_t structure, * mainly @obj_base_addr field. * @program_irq: program interrupt generation hardware of the board - * if flag %PROGRAMMABLE_IRQ is present for specified device/board + * if flag %PROGRAMMABLE_IRQ is present for specified device/board * @write_register: low level write register routine * @read_register: low level read register routine */ @@ -297,8 +299,8 @@ struct hwspecops_t { int (*init_chip_data)(struct candevice_t *candev, int chipnr); int (*init_obj_data)(struct canchip_t *chip, int objnr); int (*program_irq)(struct candevice_t *candev); - void (*write_register)(unsigned data,unsigned long address); - unsigned (*read_register)(unsigned long address); + void (*write_register)(unsigned data, can_ioptr_t address); + unsigned (*read_register)(can_ioptr_t address); }; /** @@ -320,6 +322,8 @@ struct hwspecops_t { * @enable_configuration: enable chip configuration mode * @disable_configuration: disable chip configuration mode * @set_btregs: configures bitrate registers + * @attach_to_chip: attaches to the chip, setups registers and possibly state informations + * @release_chip: called before chip structure removal if %CHIP_ATTACHED is set * @start_chip: starts chip message processing * @stop_chip: stops chip message processing * @irq_handler: interrupt service routine @@ -329,11 +333,11 @@ struct chipspecops_t { int (*chip_config)(struct canchip_t *chip); int (*baud_rate)(struct canchip_t *chip, int rate, int clock, int sjw, int sampl_pt, int flags); - int (*standard_mask)(struct canchip_t *chip, unsigned short code, + int (*standard_mask)(struct canchip_t *chip, unsigned short code, unsigned short mask); - int (*extended_mask)(struct canchip_t *chip, unsigned long code, + int (*extended_mask)(struct canchip_t *chip, unsigned long code, unsigned long mask); - int (*message15_mask)(struct canchip_t *chip, unsigned long code, + int (*message15_mask)(struct canchip_t *chip, unsigned long code, unsigned long mask); int (*clear_objects)(struct canchip_t *chip); int (*config_irqs)(struct canchip_t *chip, short irqs); @@ -348,8 +352,10 @@ struct chipspecops_t { int (*filtch_rq)(struct canchip_t *chip, struct msgobj_t *obj); int (*enable_configuration)(struct canchip_t *chip); int (*disable_configuration)(struct canchip_t *chip); - int (*set_btregs)(struct canchip_t *chip, unsigned short btr0, + int (*set_btregs)(struct canchip_t *chip, unsigned short btr0, unsigned short btr1); + int (*attach_to_chip)(struct canchip_t *chip); + int (*release_chip)(struct canchip_t *chip); int (*start_chip)(struct canchip_t *chip); int (*stop_chip)(struct canchip_t *chip); int (*irq_handler)(int irq, struct canchip_t *chip); @@ -374,9 +380,10 @@ extern int major; extern int minor[MAX_TOT_CHIPS]; extern int extended; extern int baudrate[MAX_TOT_CHIPS]; -extern char *hw[MAX_HW_CARDS]; extern int irq[MAX_IRQ]; +extern char *hw[MAX_HW_CARDS]; extern unsigned long io[MAX_HW_CARDS]; +extern long clockfreq[MAX_HW_CARDS]; extern int processlocal; extern struct canhardware_t *hardware_p; @@ -387,43 +394,43 @@ extern struct mem_addr *mem_head; #if defined(CONFIG_OC_LINCAN_PORTIO_ONLY) -extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned address) +extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned reg_offs) { - outb(data, chip->chip_base_addr+address); + can_outb(data, chip->chip_base_addr+reg_offs); } -extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned address) +extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_offs) { - return inb(chip->chip_base_addr+address); + return can_inb(chip->chip_base_addr+reg_offs); } extern inline void canobj_write_reg(const struct canchip_t *chip, const struct msgobj_t *obj, - unsigned char data, unsigned address) + unsigned char data, unsigned reg_offs) { - outb(data, obj->obj_base_addr+address); + can_outb(data, obj->obj_base_addr+reg_offs); } extern inline unsigned canobj_read_reg(const struct canchip_t *chip, const struct msgobj_t *obj, - unsigned address) + unsigned reg_offs) { - return inb(obj->obj_base_addr+address); + return can_inb(obj->obj_base_addr+reg_offs); } #elif defined(CONFIG_OC_LINCAN_MEMIO_ONLY) -extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned address) +extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned reg_offs) { - writeb(data, chip->chip_base_addr+address); + can_writeb(data, chip->chip_base_addr+reg_offs); } -extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned address) +extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_offs) { - return readb(chip->chip_base_addr+address); + return can_readb(chip->chip_base_addr+reg_offs); } extern inline void canobj_write_reg(const struct canchip_t *chip, const struct msgobj_t *obj, - unsigned char data, unsigned address) + unsigned char data, unsigned reg_offs) { - writeb(data, obj->obj_base_addr+address); + can_writeb(data, obj->obj_base_addr+reg_offs); } extern inline unsigned canobj_read_reg(const struct canchip_t *chip, const struct msgobj_t *obj, - unsigned address) + unsigned reg_offs) { - return readb(obj->obj_base_addr+address); + return can_readb(obj->obj_base_addr+reg_offs); } #else /*CONFIG_OC_LINCAN_DYNAMICIO*/ @@ -431,42 +438,42 @@ extern inline unsigned canobj_read_reg(const struct canchip_t *chip, const struc #define CONFIG_OC_LINCAN_DYNAMICIO #endif -/* Inline function to write to the hardware registers. The argument address is - * relative to the memory map of the chip and not the absolute memory address. +/* Inline function to write to the hardware registers. The argument reg_offs is + * relative to the memory map of the chip and not the absolute memory reg_offs. */ -extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned address) +extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned reg_offs) { - unsigned long address_to_write; - address_to_write = chip->chip_base_addr+address; + can_ioptr_t address_to_write; + address_to_write = chip->chip_base_addr+reg_offs; chip->write_register(data, address_to_write); } -extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned address) +extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_offs) { - unsigned long address_to_read; - address_to_read = chip->chip_base_addr+address; + can_ioptr_t address_to_read; + address_to_read = chip->chip_base_addr+reg_offs; return chip->read_register(address_to_read); } extern inline void canobj_write_reg(const struct canchip_t *chip, const struct msgobj_t *obj, - unsigned char data, unsigned address) + unsigned char data, unsigned reg_offs) { - unsigned long address_to_write; - address_to_write = obj->obj_base_addr+address; + can_ioptr_t address_to_write; + address_to_write = obj->obj_base_addr+reg_offs; chip->write_register(data, address_to_write); } extern inline unsigned canobj_read_reg(const struct canchip_t *chip, const struct msgobj_t *obj, - unsigned address) + unsigned reg_offs) { - unsigned long address_to_read; - address_to_read = obj->obj_base_addr+address; + can_ioptr_t address_to_read; + address_to_read = obj->obj_base_addr+reg_offs; return chip->read_register(address_to_read); } #endif /*CONFIG_OC_LINCAN_DYNAMICIO*/ -int can_base_addr_fixup(struct candevice_t *candev, unsigned long new_base); +int can_base_addr_fixup(struct candevice_t *candev, can_ioptr_t new_base); int can_request_io_region(unsigned long start, unsigned long n, const char *name); void can_release_io_region(unsigned long start, unsigned long n); int can_request_mem_region(unsigned long start, unsigned long n, const char *name); @@ -505,3 +512,6 @@ void can_filltimestamp(canmsg_tstamp_t *ptimestamp) #ifdef CAN_WITH_RTL extern int can_rtl_priority; #endif /*CAN_WITH_RTL*/ + +extern struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *chip,void *data)); +extern void cleanup_usbdev(struct candevice_t *dev);