Changed filling of the chip specific operations.

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

diff --git a/lincan/src/setup.c b/lincan/src/setup.c
index c5bb40abd910dc5a8c77a2425942fad4fc04506f..564b3c0ecd5995323dc54a0ea61ef93767b167bb 100644 (file)
--- a/lincan/src/setup.c
+++ b/lincan/src/setup.c
@@ -14,15 +14,10 @@
 #include "../include/setup.h"
 #include "../include/finish.h"
 
-extern int sja1000_register(struct chipspecops_t *chipspecops);
-extern int sja1000p_register(struct chipspecops_t *chipspecops);
-extern int i82527_register(struct chipspecops_t *chipspecops);
-
 int init_hwspecops(struct candevice_t *candev, int *irqnum_p);
 int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p);
 int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate);
 int init_obj_struct(struct candevice_t *candev, struct chip_t *hostchip, int objnr);
-int init_chipspecops(struct candevice_t *candev, int chipnr);
 
 /**
  * can_checked_malloc - memory allocation with registering of requested blocks
@@ -442,8 +437,8 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p)
  * @baudrate: baudrate in the units of 1Bd
  *
  * Chip structure is allocated and chip specific operations are filled by 
- * call to board specific init_chip_data() function and generic
- * init_chipspecops() function. The message objects are generated by 
+ * call to board specific init_chip_data() which calls chip specific
+ * fill_chipspecops(). The message objects are generated by 
  * calls to init_obj_struct() function.
  *
  * Return Value: returns negative number in the case of fail
@@ -474,9 +469,7 @@ int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudr
        chip->baudrate=baudrate;
        chip->flags=0x0;
 
-       candev->hwspecops->init_chip_data(candev,chipnr);
-
-       if (init_chipspecops(candev,chipnr))
+       if(candev->hwspecops->init_chip_data(candev,chipnr)<0)
                return -ENODEV;
 
        for (objnr=0; objnr<chip->max_objects; objnr++) {
@@ -567,35 +560,6 @@ int init_hwspecops(struct candevice_t *candev, int *irqnum_p)
 }
 
 
-/**
- * init_chipspecops - fills chip specific operations for board for known chip types
- * @candev: pointer to the corresponding CAN device/board
- * @chipnr: index of the chip in the device/board structure
- *
- * The function fills chip specific operations for next known generic chip
- * types "i82527", "sja1000", "sja1000p" (PeliCAN). Other non generic chip types
- * operations has to be initialized in the board specific init_chip_data() function.
- *
- * Return Value: returns negative number in the case of fail
- */
-int init_chipspecops(struct candevice_t *candev, int chipnr)
-{
-       if (!strcmp(candev->chip[chipnr]->chip_type,"i82527")) {
-               candev->chip[chipnr]->max_objects=15;
-               i82527_register(candev->chip[chipnr]->chipspecops);
-       } 
-       if (!strcmp(candev->chip[chipnr]->chip_type,"sja1000")) {
-               candev->chip[chipnr]->max_objects=1;
-               sja1000_register(candev->chip[chipnr]->chipspecops);
-       }
-       if (!strcmp(candev->chip[chipnr]->chip_type,"sja1000p")) {
-               candev->chip[chipnr]->max_objects=1;
-               sja1000p_register(candev->chip[chipnr]->chipspecops);
-       }
-
-       return 0;
-}
-
 #ifndef CAN_WITH_RTL
 
 /**