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

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

diff --git a/lincan/src/ems_cpcpci.c b/lincan/src/ems_cpcpci.c
index 893890957d84954efa1dda06659b7714589f004b..d20e2816696ca0ce089275ef87e1c99a33f22e49 100644 (file)
--- a/lincan/src/ems_cpcpci.c
+++ b/lincan/src/ems_cpcpci.c
@@ -123,7 +123,7 @@ int ems_cpcpci_request_io(struct candevice_t *candev)
         * can change when resources are temporarily released
         */
        for(i=0;i<candev->nr_all_chips;i++) {
-               struct chip_t *chip=candev->chip[i];
+               struct canchip_t *chip=candev->chip[i];
                if(!chip) continue;
                chip->chip_base_addr = candev->io_addr+
                        0x400 + i*EMS_CPCPCI_BYTES_PER_CIRCUIT;
@@ -183,9 +183,9 @@ unsigned ems_cpcpci_read_register(unsigned long address)
        return readb(address);
 }
 
-int ems_cpcpci_irq_handler(int irq, struct chip_t *chip)
+int ems_cpcpci_irq_handler(int irq, struct canchip_t *chip)
 {
-       //struct chip_t *chip=(struct chip_t *)dev_id;
+       //struct canchip_t *chip=(struct canchip_t *)dev_id;
        struct candevice_t *candev=chip->hostdevice;
        int i;
        unsigned long icr;
@@ -213,7 +213,7 @@ int ems_cpcpci_irq_handler(int irq, struct chip_t *chip)
 int ems_cpcpci_reset(struct candevice_t *candev)
 {
        int i=0,chip_nr;
-       struct chip_t *chip;
+       struct canchip_t *chip;
        unsigned cdr;
 
        DEBUGMSG("Resetting EMS_CPCPCI hardware ...\n");
@@ -343,7 +343,7 @@ int ems_cpcpci_init_chip_data(struct candevice_t *candev, int chipnr)
        return 0;
 }      
 
-int ems_cpcpci_init_obj_data(struct chip_t *chip, int objnr)
+int ems_cpcpci_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
        return 0;