From: Pavel Pisa Date: Mon, 13 Feb 2012 16:32:58 +0000 (+0100) Subject: embedded: support access to the chip register wider then 8-bit. X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/1493648dc5520acf4c5dc9680a3cae3f918db64c?ds=sidebyside embedded: support access to the chip register wider then 8-bit. Signed-off-by: Pavel Pisa --- diff --git a/embedded/app/usbcan/can/main.h b/embedded/app/usbcan/can/main.h index b7d2c59..995e675 100644 --- a/embedded/app/usbcan/can/main.h +++ b/embedded/app/usbcan/can/main.h @@ -425,7 +425,7 @@ 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 reg_offs) +extern inline void can_write_reg(const struct canchip_t *chip, unsigned data, unsigned reg_offs) { can_outb(data, chip->chip_base_addr+reg_offs); } @@ -434,7 +434,7 @@ extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_o 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 reg_offs) + unsigned data, unsigned reg_offs) { can_outb(data, obj->obj_base_addr+reg_offs); } @@ -445,7 +445,7 @@ extern inline unsigned canobj_read_reg(const struct canchip_t *chip, const struc } #elif defined(CONFIG_OC_LINCAN_MEMIO_ONLY) -extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned reg_offs) +extern inline void can_write_reg(const struct canchip_t *chip, unsigned data, unsigned reg_offs) { can_writeb(data, chip->chip_base_addr+reg_offs); } @@ -454,7 +454,7 @@ extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_o 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 reg_offs) + unsigned data, unsigned reg_offs) { can_writeb(data, obj->obj_base_addr+reg_offs); } @@ -472,7 +472,7 @@ extern inline unsigned canobj_read_reg(const struct canchip_t *chip, const struc /* 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 reg_offs) +extern inline void can_write_reg(const struct canchip_t *chip, unsigned data, unsigned reg_offs) { can_ioptr_t address_to_write; address_to_write = chip->chip_base_addr+reg_offs; @@ -487,7 +487,7 @@ extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_o } extern inline void canobj_write_reg(const struct canchip_t *chip, const struct msgobj_t *obj, - unsigned char data, unsigned reg_offs) + unsigned data, unsigned reg_offs) { can_ioptr_t address_to_write; address_to_write = obj->obj_base_addr+reg_offs;