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

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

diff --git a/lincan/src/unican.c b/lincan/src/unican.c
index 957d5afd5aa49a773c538bd064d74b5eeaec7965..d93063ab7e92bceb4f668852b08e8b259407ffb7 100644 (file)
--- a/lincan/src/unican.c
+++ b/lincan/src/unican.c
@@ -43,12 +43,12 @@ long unican_bus_latency(struct msgobj_t *obj)
 
 /* * * unican Chip Functionality * * */
 
 
 /* * * unican Chip Functionality * * */
 

-int unican_enable_configuration(struct chip_t *chip)
+int unican_enable_configuration(struct canchip_t *chip)

 {
        return 0;
 }
 
 {
        return 0;
 }
 

-int unican_disable_configuration(struct chip_t *chip)
+int unican_disable_configuration(struct canchip_t *chip)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -60,7 +60,7 @@ int unican_disable_configuration(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_chip_config(struct chip_t *chip)
+int unican_chip_config(struct canchip_t *chip)

 {
        int ret;
        sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
 {
        int ret;
        sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;


@@ -125,7 +125,7 @@ int unican_chip_config(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_extended_mask(struct chip_t *chip, unsigned long code, unsigned  long mask)
+int unican_extended_mask(struct canchip_t *chip, unsigned long code, unsigned  long mask)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -142,7 +142,7 @@ int unican_extended_mask(struct chip_t *chip, unsigned long code, unsigned  long
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
+int unican_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,

                                                        int sampl_pt, int flags)
 {
        int ret;
                                                        int sampl_pt, int flags)
 {
        int ret;


@@ -184,7 +184,7 @@ int unican_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
  *
  * File: src/unican.c
  */
  *
  * File: src/unican.c
  */

-void unican_read(struct chip_t *chip, struct msgobj_t *obj) {
+void unican_read(struct canchip_t *chip, struct msgobj_t *obj) {

        sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
        __u16 *ptr16;
        __u16 u;
        sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
        __u16 *ptr16;
        __u16 u;


@@ -259,7 +259,7 @@ void unican_read(struct chip_t *chip, struct msgobj_t *obj) {
  *     Positive value indicates immediate reception of message.
  * File: src/unican.c
  */
  *     Positive value indicates immediate reception of message.
  * File: src/unican.c
  */

-int unican_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
+int unican_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -274,7 +274,7 @@ int unican_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_pre_write_config(struct chip_t *chip, struct msgobj_t *obj, 
+int unican_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj, 

                                                        struct canmsg_t *msg)
 {
        return 0;
                                                        struct canmsg_t *msg)
 {
        return 0;


@@ -291,7 +291,7 @@ int unican_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_send_msg(struct chip_t *chip, struct msgobj_t *obj, 
+int unican_send_msg(struct canchip_t *chip, struct msgobj_t *obj, 

                                                        struct canmsg_t *msg)
 {
        return 0;
                                                        struct canmsg_t *msg)
 {
        return 0;


@@ -306,7 +306,7 @@ int unican_send_msg(struct chip_t *chip, struct msgobj_t *obj,
  *     Zero value indicates finishing of all issued transmission requests.
  * File: src/unican.c
  */
  *     Zero value indicates finishing of all issued transmission requests.
  * File: src/unican.c
  */

-int unican_check_tx_stat(struct chip_t *chip)
+int unican_check_tx_stat(struct canchip_t *chip)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -320,7 +320,7 @@ int unican_check_tx_stat(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_set_btregs(struct chip_t *chip, unsigned short btr0, 
+int unican_set_btregs(struct canchip_t *chip, unsigned short btr0, 

                                                        unsigned short btr1)
 {
        int ret;
                                                        unsigned short btr1)
 {
        int ret;


@@ -342,7 +342,7 @@ int unican_set_btregs(struct chip_t *chip, unsigned short btr0,
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_start_chip(struct chip_t *chip)
+int unican_start_chip(struct canchip_t *chip)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -354,7 +354,7 @@ int unican_start_chip(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_stop_chip(struct chip_t *chip)
+int unican_stop_chip(struct canchip_t *chip)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -368,7 +368,7 @@ int unican_stop_chip(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_remote_request(struct chip_t *chip, struct msgobj_t *obj)
+int unican_remote_request(struct canchip_t *chip, struct msgobj_t *obj)

 {
        CANMSG("unican_remote_request not implemented\n");
        return -ENOSYS;
 {
        CANMSG("unican_remote_request not implemented\n");
        return -ENOSYS;


@@ -383,7 +383,7 @@ int unican_remote_request(struct chip_t *chip, struct msgobj_t *obj)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_standard_mask(struct chip_t *chip, unsigned short code,
+int unican_standard_mask(struct canchip_t *chip, unsigned short code,

                unsigned short mask)
 {
        CANMSG("unican_standard_mask not implemented\n");
                unsigned short mask)
 {
        CANMSG("unican_standard_mask not implemented\n");


@@ -397,7 +397,7 @@ int unican_standard_mask(struct chip_t *chip, unsigned short code,
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_clear_objects(struct chip_t *chip)
+int unican_clear_objects(struct canchip_t *chip)

 {
        CANMSG("unican_clear_objects not implemented\n");
        return -ENOSYS;
 {
        CANMSG("unican_clear_objects not implemented\n");
        return -ENOSYS;


@@ -411,7 +411,7 @@ int unican_clear_objects(struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_config_irqs(struct chip_t *chip, short irqs)
+int unican_config_irqs(struct canchip_t *chip, short irqs)

 {
 
        CANMSG("unican_config_irqs not implemented\n");
 {
 
        CANMSG("unican_config_irqs not implemented\n");


@@ -429,7 +429,7 @@ int unican_config_irqs(struct chip_t *chip, short irqs)
  * unican_irq_write_handler() for transmit events.
  * File: src/unican.c
  */
  * unican_irq_write_handler() for transmit events.
  * File: src/unican.c
  */

-void unican_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
+void unican_irq_write_handler(struct canchip_t *chip, struct msgobj_t *obj)

 {
        int cmd;
        sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
 {
        int cmd;
        sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;


@@ -531,7 +531,7 @@ void unican_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
 
 }
 
 
 }
 

-void unican_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
+void unican_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)

 {
        while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)) {
 
 {
        while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)) {
 


@@ -560,7 +560,7 @@ void unican_irq_sync_activities(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
  * @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,
  * @regs: system dependent value pointing to registers stored in exception frame
  * 
  * Interrupt handler is activated when state of CAN controller chip changes,


@@ -570,7 +570,7 @@ void unican_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
  * message queues.
  * File: src/unican.c
  */
  * message queues.
  * File: src/unican.c
  */

-int unican_irq_handler(int irq, struct chip_t *chip)
+int unican_irq_handler(int irq, struct canchip_t *chip)

 {
        sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
        struct msgobj_t *obj=chip->msgobj[0];
 {
        sCAN_CARD *chipext = (sCAN_CARD *)chip->chip_data;
        struct msgobj_t *obj=chip->msgobj[0];


@@ -626,7 +626,7 @@ int unican_irq_handler(int irq, struct chip_t *chip)
  * Return Value: negative value reports error.
  * File: src/unican.c
  */
  * Return Value: negative value reports error.
  * File: src/unican.c
  */

-int unican_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj)
+int unican_wakeup_tx(struct canchip_t *chip, struct msgobj_t *obj)

 {
        can_preempt_disable();
 
 {
        can_preempt_disable();
 


@@ -697,7 +697,7 @@ int unican_reset(struct candevice_t *candev)
 {
        int ret;
        int i;
 {
        int ret;
        int i;

-       struct chip_t *chip = candev->chip[0];
+       struct canchip_t *chip = candev->chip[0];

        sCAN_CARD *chipext;
        
 
        sCAN_CARD *chipext;
        
 


@@ -768,7 +768,7 @@ int unican_init_hw_data(struct candevice_t *candev)
  */
 int unican_init_chip_data(struct candevice_t *candev, int chipnr)
 {
  */
 int unican_init_chip_data(struct candevice_t *candev, int chipnr)
 {

-       struct chip_t *chip = candev->chip[chipnr];
+       struct canchip_t *chip = candev->chip[chipnr];

        chip->chip_type = "unican";
        chip->chip_base_addr = 0;
        chip->clock = 10000000;
        chip->chip_type = "unican";
        chip->chip_base_addr = 0;
        chip->clock = 10000000;


@@ -809,7 +809,7 @@ int unican_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/unican.c
  */
  * Return Value: The function always returns zero
  * File: src/unican.c
  */

-int unican_init_obj_data(struct chip_t *chip, int objnr)
+int unican_init_obj_data(struct canchip_t *chip, int objnr)

 {
        struct msgobj_t *obj=chip->msgobj[objnr];
        obj->obj_base_addr=chip->chip_base_addr;
 {
        struct msgobj_t *obj=chip->msgobj[objnr];
        obj->obj_base_addr=chip->chip_base_addr;