Merge branch 'master' into can-usb1

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

diff --git a/lincan/src/setup.c b/lincan/src/setup.c
index 32f504814843310903894586799589abe9233252..b051d04425f776c841616462e4c4c5cf7dda664b 100644 (file)
--- a/lincan/src/setup.c
+++ b/lincan/src/setup.c
@@ -44,6 +44,8 @@ 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, long clock);
 int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int objnr);
 
+int next_minor=0;
+
 /**
  * can_base_addr_fixup - relocates board physical memory addresses to the CPU accessible ones
  * @candev: pointer to the previously filled device/board, chips and message objects structures
@@ -103,7 +105,6 @@ int can_check_dev_taken(void *anydev)
  */
 int register_obj_struct(struct msgobj_t *obj, int minorbase)
 {
-       static int next_minor=0;
        int i;
 
        if(minorbase>=0)
@@ -181,6 +182,30 @@ int init_hw_struct(void)
        return 0;
 }
 
+/**
+ * init_new_hw_struct - initializes driver description structures for new hardware
+ *
+ * The function init_new_hw_struct() is used to initialize the hardware structure.
+ *
+ * Return Value: returns negative number in the case of fail
+ */
+int init_new_hw_struct(int devnr)
+{
+       int irq_param_idx=0;
+       int chan_param_idx=0;
+
+       if ( (hw[devnr] != NULL) & (devnr < MAX_HW_CARDS) ) {
+               hardware_p->nr_boards++;
+
+               if (init_device_struct(devnr, &chan_param_idx, &irq_param_idx)) {
+                       CANMSG("Error initializing candevice_t structures.\n");
+                       return -ENODEV;
+               }
+       }
+
+       return 0;
+}
+
 /**
  * init_device_struct - initializes single CAN device/board
  * @card: index into @hardware_p HW description