X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4dc78b4651f006bf0404c8ec7db85651bcee7c2e..04ac67cc3cac14cd601daacd0592121ec0b84012:/lincan/include/sja1000.h diff --git a/lincan/include/sja1000.h b/lincan/include/sja1000.h index e592acb..b329e2b 100644 --- a/lincan/include/sja1000.h +++ b/lincan/include/sja1000.h @@ -36,15 +36,15 @@ int sja1000_enable_configuration(struct canchip_t *chip); int sja1000_disable_configuration(struct canchip_t *chip); int sja1000_chip_config(struct canchip_t *chip); int sja1000_standard_mask(struct canchip_t *chip, unsigned short code, unsigned short mask); -int sja1000_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw, +int sja1000_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw, int sampl_pt, int flags); int sja1000_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj); -int sja1000_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj, +int sja1000_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj, struct canmsg_t *msg); -int sja1000_send_msg(struct canchip_t *chip, struct msgobj_t *obj, +int sja1000_send_msg(struct canchip_t *chip, struct msgobj_t *obj, struct canmsg_t *msg); int sja1000_check_tx_stat(struct canchip_t *chip); -int sja1000_set_btregs(struct canchip_t *chip, unsigned short btr0, +int sja1000_set_btregs(struct canchip_t *chip, unsigned short btr0, unsigned short btr1); int sja1000_start_chip(struct canchip_t *chip); int sja1000_stop_chip(struct canchip_t *chip); @@ -139,7 +139,7 @@ enum sja1000_CDR { sjaCDR_CLK_OFF = 1<<3, // Clock Off sjaCDR_RXINPEN = 1<<5, // TX1 output is RX irq output sjaCDR_CBP = 1<<6, // Input Comparator By-Pass - sjaCDR_PELICAN = 1<<7 // PeliCAN Mode + sjaCDR_PELICAN = 1<<7 // PeliCAN Mode }; /* Output Control Register */