Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / main.h

diff --git a/lincan/include/main.h b/lincan/include/main.h
index 977724a6447136c215145dfc4377bd5a21971651..aad913dfcd979b7beae0e832b5dee002818aed0c 100644 (file)
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -406,6 +406,7 @@ struct mem_addr {
 /* Structure for the RTR queue */
 struct rtr_id {
        unsigned long id;
+       int ready_fl;
        struct canmsg_t *rtr_message;
        wait_queue_head_t rtr_wq;
        struct rtr_id *next;
@@ -429,7 +430,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);
 }
@@ -438,7 +439,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);
 }
@@ -449,7 +450,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);
 }
@@ -458,7 +459,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);
 }
@@ -476,7 +477,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;
@@ -491,7 +492,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;