Removed XML device from master structure.

master/master.c

@@ -102,8 +102,7 @@ static struct kobj_type ktype_ec_master = {
 
 int ec_master_init(ec_master_t *master, /**< EtherCAT master */
                    unsigned int index, /**< master index */
-                   unsigned int eoeif_count, /**< number of EoE interfaces */
-                   dev_t dev_num /**< number for XML cdev's */
+                   unsigned int eoeif_count /**< number of EoE interfaces */
                    )
 {
     ec_eoe_t *eoe, *next_eoe;
@@ -164,12 +163,6 @@ int ec_master_init(ec_master_t *master, /**< EtherCAT master */
     master->sdo_timer.data = (unsigned long) master;
     init_completion(&master->sdo_complete);
 
-    // init XML character device
-    if (ec_xmldev_init(&master->xmldev, master, dev_num)) {
-        EC_ERR("Failed to init XML character device.\n");
-        goto out_return;
-    }
-
     // create EoE handlers
     for (i = 0; i < eoeif_count; i++) {
         if (!(eoe = (ec_eoe_t *) kmalloc(sizeof(ec_eoe_t), GFP_KERNEL))) {
@@ -216,8 +209,6 @@ out_clear_eoe:
         ec_eoe_clear(eoe);
         kfree(eoe);
     }
-    ec_xmldev_clear(&master->xmldev);
-out_return:
     return -1;
 }
 
@@ -261,7 +252,6 @@ void ec_master_clear(struct kobject *kobj /**< kobject of the master */)
 
     ec_fsm_master_clear(&master->fsm);
     ec_datagram_clear(&master->fsm_datagram);
-    ec_xmldev_clear(&master->xmldev);
 
     // clear EoE objects
     list_for_each_entry_safe(eoe, next_eoe, &master->eoe_handlers, list) {

master/master.h

@@ -49,7 +49,6 @@
 
 #include "device.h"
 #include "domain.h"
-#include "xmldev.h"
 #include "fsm_master.h"
 
 /*****************************************************************************/
@@ -102,8 +101,6 @@ struct ec_master
     ec_device_t *device; /**< EtherCAT device */
     struct semaphore device_sem; /**< device semaphore */
 
-    ec_xmldev_t xmldev; /**< XML character device */
-
     ec_fsm_master_t fsm; /**< master state machine */
     ec_datagram_t fsm_datagram; /**< datagram used for state machines */
     ec_master_mode_t mode; /**< master mode */
@@ -150,7 +147,7 @@ struct ec_master
 /*****************************************************************************/
 
 // master creation/deletion
-int ec_master_init(ec_master_t *, unsigned int, unsigned int, dev_t);
+int ec_master_init(ec_master_t *, unsigned int, unsigned int);
 void ec_master_destroy(ec_master_t *);
 
 // mode transitions

master/module.c

@@ -45,6 +45,7 @@
 #include "globals.h"
 #include "master.h"
 #include "device.h"
+#include "xmldev.h"
 
 /*****************************************************************************/
 
@@ -56,7 +57,8 @@ void __exit ec_cleanup_module(void);
 static int ec_master_count = 1; /**< parameter value, number of masters */
 static int ec_eoeif_count = 0; /**< parameter value, number of EoE interf. */
 static struct list_head ec_masters; /**< list of masters */
-static dev_t device_number;
+static dev_t device_number; /**< XML character device number */
+ec_xmldev_t xmldev; /**< XML character device */
 
 char *ec_master_version_str = EC_MASTER_VERSION;
 
@@ -112,7 +114,7 @@ int __init ec_init_module(void)
             goto out_free;
         }
 
-        if (ec_master_init(master, i, ec_eoeif_count, device_number))
+        if (ec_master_init(master, i, ec_eoeif_count))
             goto out_free;
 
         list_add_tail(&master->list, &ec_masters);