To prevent future name collisions "chip_t" changed to "canchip_t"

[lincan.git] / lincan / src / sja1000p.c

diff --git a/lincan/src/sja1000p.c b/lincan/src/sja1000p.c
index 39dff690ddebe684fdc5abd999bdb254dcc5c2eb..dd9d696ae14f059384dbd8cb4f5d7dbe5a3f96f0 100644 (file)
--- a/lincan/src/sja1000p.c
+++ b/lincan/src/sja1000p.c
@@ -18,7 +18,7 @@
  * sja1000p_enable_configuration - enable chip configuration mode
  * @chip: pointer to chip state structure
  */
-int sja1000p_enable_configuration(struct chip_t *chip)
+int sja1000p_enable_configuration(struct canchip_t *chip)
 {
        int i=0;
        enum sja1000_PeliCAN_MOD flags;
@@ -48,7 +48,7 @@ int sja1000p_enable_configuration(struct chip_t *chip)
  * sja1000p_disable_configuration - disable chip configuration mode
  * @chip: pointer to chip state structure
  */
-int sja1000p_disable_configuration(struct chip_t *chip)
+int sja1000p_disable_configuration(struct canchip_t *chip)
 {
        int i=0;
        enum sja1000_PeliCAN_MOD flags;
@@ -86,7 +86,7 @@ int sja1000p_disable_configuration(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_chip_config(struct chip_t *chip)
+int sja1000p_chip_config(struct canchip_t *chip)
 {
        int i;
        unsigned char n, r;
@@ -138,7 +138,7 @@ int sja1000p_chip_config(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_extended_mask(struct chip_t *chip, unsigned long code, unsigned  long mask)
+int sja1000p_extended_mask(struct canchip_t *chip, unsigned long code, unsigned  long mask)
 {
        int i;
 
@@ -173,7 +173,7 @@ int sja1000p_extended_mask(struct chip_t *chip, unsigned long code, unsigned  lo
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
+int sja1000p_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
                                                        int sampl_pt, int flags)
 {
        int best_error = 1000000000, error;
@@ -240,7 +240,7 @@ int sja1000p_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
  *
  * File: src/sja1000p.c
  */
-void sja1000p_read(struct chip_t *chip, struct msgobj_t *obj) {
+void sja1000p_read(struct canchip_t *chip, struct msgobj_t *obj) {
        int i, flags, len, datastart;
        do {
                flags = can_read_reg(chip,SJAFRM);
@@ -286,7 +286,7 @@ void sja1000p_read(struct chip_t *chip, struct msgobj_t *obj) {
  *     Positive value indicates immediate reception of message.
  * File: src/sja1000p.c
  */
-int sja1000p_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
+int sja1000p_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj)
 {
        int status;
        status=can_read_reg(chip,SJASR);
@@ -325,7 +325,7 @@ int sja1000p_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_pre_write_config(struct chip_t *chip, struct msgobj_t *obj, 
+int sja1000p_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj, 
                                                        struct canmsg_t *msg)
 {
        int i=0; 
@@ -404,7 +404,7 @@ int sja1000p_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_send_msg(struct chip_t *chip, struct msgobj_t *obj, 
+int sja1000p_send_msg(struct canchip_t *chip, struct msgobj_t *obj, 
                                                        struct canmsg_t *msg)
 {
        can_write_reg(chip, sjaCMR_TR, SJACMR);
@@ -421,7 +421,7 @@ int sja1000p_send_msg(struct chip_t *chip, struct msgobj_t *obj,
  *     Zero value indicates finishing of all issued transmission requests.
  * File: src/sja1000p.c
  */
-int sja1000p_check_tx_stat(struct chip_t *chip)
+int sja1000p_check_tx_stat(struct canchip_t *chip)
 {
        if (can_read_reg(chip,SJASR) & sjaSR_TCS)
                return 0;
@@ -438,7 +438,7 @@ int sja1000p_check_tx_stat(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_set_btregs(struct chip_t *chip, unsigned short btr0, 
+int sja1000p_set_btregs(struct canchip_t *chip, unsigned short btr0, 
                                                        unsigned short btr1)
 {
        if (sja1000p_enable_configuration(chip))
@@ -459,7 +459,7 @@ int sja1000p_set_btregs(struct chip_t *chip, unsigned short btr0,
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_start_chip(struct chip_t *chip)
+int sja1000p_start_chip(struct canchip_t *chip)
 {
        enum sja1000_PeliCAN_MOD flags;
 
@@ -476,7 +476,7 @@ int sja1000p_start_chip(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_stop_chip(struct chip_t *chip)
+int sja1000p_stop_chip(struct canchip_t *chip)
 {
        enum sja1000_PeliCAN_MOD flags;
 
@@ -495,7 +495,7 @@ int sja1000p_stop_chip(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_remote_request(struct chip_t *chip, struct msgobj_t *obj)
+int sja1000p_remote_request(struct canchip_t *chip, struct msgobj_t *obj)
 {
        CANMSG("sja1000p_remote_request not implemented\n");
        return -ENOSYS;
@@ -510,7 +510,7 @@ int sja1000p_remote_request(struct chip_t *chip, struct msgobj_t *obj)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_standard_mask(struct chip_t *chip, unsigned short code,
+int sja1000p_standard_mask(struct canchip_t *chip, unsigned short code,
                unsigned short mask)
 {
        CANMSG("sja1000p_standard_mask not implemented\n");
@@ -524,7 +524,7 @@ int sja1000p_standard_mask(struct chip_t *chip, unsigned short code,
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_clear_objects(struct chip_t *chip)
+int sja1000p_clear_objects(struct canchip_t *chip)
 {
        CANMSG("sja1000p_clear_objects not implemented\n");
        return -ENOSYS;
@@ -538,7 +538,7 @@ int sja1000p_clear_objects(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_config_irqs(struct chip_t *chip, short irqs)
+int sja1000p_config_irqs(struct canchip_t *chip, short irqs)
 {
        CANMSG("sja1000p_config_irqs not implemented\n");
        return -ENOSYS;
@@ -555,7 +555,7 @@ int sja1000p_config_irqs(struct chip_t *chip, short irqs)
  * sja1000p_irq_write_handler() for transmit events.
  * File: src/sja1000p.c
  */
-void sja1000p_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
+void sja1000p_irq_write_handler(struct canchip_t *chip, struct msgobj_t *obj)
 {
        int cmd;
        
@@ -601,7 +601,7 @@ void sja1000p_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
  * @irq: interrupt vector number, this value is system specific
  * @dev_id: driver private pointer registered at time of request_irq() call.
  *     The CAN driver uses this pointer to store relationship of interrupt
- *     to chip state structure - @struct chip_t
+ *     to chip state structure - @struct canchip_t
  * @regs: system dependent value pointing to registers stored in exception frame
  * 
  * Interrupt handler is activated when state of CAN controller chip changes,
@@ -611,7 +611,7 @@ void sja1000p_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
  * message queues.
  * File: src/sja1000p.c
  */
-int sja1000p_irq_handler(int irq, struct chip_t *chip)
+int sja1000p_irq_handler(int irq, struct canchip_t *chip)
 {
        int irq_register, status, error_code;
        struct msgobj_t *obj=chip->msgobj[0];
@@ -696,7 +696,7 @@ int sja1000p_irq_handler(int irq, struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/sja1000p.c
  */
-int sja1000p_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj)
+int sja1000p_wakeup_tx(struct canchip_t *chip, struct msgobj_t *obj)
 {
        
        can_preempt_disable();
@@ -752,7 +752,7 @@ int sja1000p_register(struct chipspecops_t *chipspecops)
  *
  * Return Value: returns negative number in the case of fail
  */
-int sja1000p_fill_chipspecops(struct chip_t *chip)
+int sja1000p_fill_chipspecops(struct canchip_t *chip)
 {
        chip->chip_type="sja1000p";
        chip->max_objects=1;