Merge branch 'master' into can-usb1

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

diff --git a/lincan/src/proc.c b/lincan/src/proc.c
index 4fb2343bf18fa43f7af4da87a58c2e749179e07a..e423b92725abca0012a166c2b1315554b03246fd 100644 (file)
--- a/lincan/src/proc.c
+++ b/lincan/src/proc.c
@@ -15,9 +15,11 @@
 
 #define __NO_VERSION__
 #include <linux/module.h>
 
 #define __NO_VERSION__
 #include <linux/module.h>

+#include <linux/mutex.h>

 
 int add_channel_to_procdir(struct candevice_t *candev);
 
 int add_channel_to_procdir(struct candevice_t *candev);

-int remove_channel_from_procdir(void);
+int remove_channels_from_procdir(void);
+int remove_channel_from_procdir(struct candevice_t *candev);

 int add_object_to_procdir(int chip_nr);
 int remove_object_from_procdir(int chip_nr);
 
 int add_object_to_procdir(int chip_nr);
 int remove_object_from_procdir(int chip_nr);
 


@@ -35,6 +37,7 @@ static int cc=0; /* static counter for each CAN chip */
 
 static struct canproc_t can_proc_base;
 static struct canproc_t *base=&can_proc_base;
 
 static struct canproc_t can_proc_base;
 static struct canproc_t *base=&can_proc_base;

+DEFINE_MUTEX(proc_mutex);              /* synchronize access to canproc_t array */

 
 /* The following functions are needed only for kernel version 2.2. Kernel
  * version 2.4 already defines them for us.
 
 /* The following functions are needed only for kernel version 2.2. Kernel
  * version 2.4 already defines them for us.


@@ -155,6 +158,9 @@ int can_init_procdir(void)
 {
        int board;
        struct candevice_t *candev;
 {
        int board;
        struct candevice_t *candev;

+
+       mutex_init(&proc_mutex);
+

        base->can_proc_entry = can_create_proc_entry("can", S_IFDIR | S_IRUGO |
                                        S_IXUGO, CAN_PROC_ROOT);
        if (base->can_proc_entry == NULL)
        base->can_proc_entry = can_create_proc_entry("can", S_IFDIR | S_IRUGO |
                                        S_IXUGO, CAN_PROC_ROOT);
        if (base->can_proc_entry == NULL)


@@ -168,13 +174,34 @@ int can_init_procdir(void)
        return 0;
 }
 
        return 0;
 }
 

+/* can_init_procentry registers entry of a new board in CAN directory tree at
+ * the proc system.
+ */
+int can_init_procentry(int board)
+{
+       struct candevice_t *candev;
+       candev=hardware_p->candevice[board];
+       if(candev)
+               return add_channel_to_procdir(candev);
+       return -ENODEV;
+}
+

 /* can_delete_procdir removes the entire CAN tree from the proc system */
 int can_delete_procdir(void)
 {
 /* can_delete_procdir removes the entire CAN tree from the proc system */
 int can_delete_procdir(void)
 {

-       if (remove_channel_from_procdir()) 
+       if (remove_channels_from_procdir())

                return -ENODEV;
        /* name: "can" */
                return -ENODEV;
        /* name: "can" */

-       if (can_remove_proc_entry(base->can_proc_entry, CAN_PROC_ROOT)) 
+       if (can_remove_proc_entry(base->can_proc_entry, CAN_PROC_ROOT))
+               return -ENODEV;
+
+       return 0;
+}
+
+/* can_delete_procentry removes device entries from CAN tree in the proc system */
+int can_delete_procentry(struct candevice_t *candev)
+{
+       if (remove_channel_from_procdir(candev))

                return -ENODEV;
 
        return 0;
                return -ENODEV;
 
        return 0;


@@ -214,58 +241,108 @@ int add_channel_to_procdir(struct candevice_t *candev)
 {
        int i=0;
 
 {
        int i=0;
 

-       for (i=0; i < candev->nr_all_chips; i++) {
+       mutex_lock(&proc_mutex);
+       for (i=0; i < MAX_TOT_CHIPS; i++){
+               if (!chips_p[i]) continue;
+               if (chips_p[i]->hostdevice != candev) continue;

 
 

-               base->channel[cc] = (struct channelproc_t *)
+               base->channel[i] = (struct channelproc_t *)

                        can_checked_malloc(sizeof(struct channelproc_t));
                        can_checked_malloc(sizeof(struct channelproc_t));

-               if (base->channel[cc] == NULL)
+               if (base->channel[i] == NULL){
+                       mutex_unlock(&proc_mutex);

                        return -ENOMEM;
                        return -ENOMEM;

+               }

 
 

-               sprintf(base->channel[cc]->ch_name, "channel%d",cc);
+               sprintf(base->channel[i]->ch_name, "channel%d",i);

 
 

-               base->channel[cc]->ch_entry = can_create_proc_entry(
-                                               base->channel[cc]->ch_name,
+               base->channel[i]->ch_entry = can_create_proc_entry(
+                                               base->channel[i]->ch_name,

                                                S_IFDIR | S_IRUGO |S_IXUGO,
                                                base->can_proc_entry);
 
                                                S_IFDIR | S_IRUGO |S_IXUGO,
                                                base->can_proc_entry);
 

-               if (base->channel[cc]->ch_entry == NULL)
+               if (base->channel[i]->ch_entry == NULL){
+                       mutex_unlock(&proc_mutex);

                        return -ENODEV;
                        return -ENODEV;

+               }

 
 

-               add_object_to_procdir(cc);
+               add_object_to_procdir(i);

 
                create_proc_read_entry("chip_info",        /* proc entry name */
                                       0,                  /* protection mask, 0->default */
 
                create_proc_read_entry("chip_info",        /* proc entry name */
                                       0,                  /* protection mask, 0->default */

-                                      base->channel[cc]->ch_entry,  /* parent dir, NULL->/proc */
+                                      base->channel[i]->ch_entry,  /* parent dir, NULL->/proc */

                                       can_chip_procinfo,
                                       can_chip_procinfo,

-                                      candev->chip[i]);
-
+                                      chips_p[i]);

                cc++;
        }
                cc++;
        }

+       mutex_unlock(&proc_mutex);

 
        return 0;
 }
 
 
        return 0;
 }
 

-int remove_channel_from_procdir(void)
+int remove_channels_from_procdir(void)

 {
 {

+       int i=0;
+
+       mutex_lock(&proc_mutex);
+       for (i=0; i < MAX_TOT_CHIPS; i++){
+               if (!chips_p[i]) continue;

 
 

-       while (cc != 0) {

                cc--;
 
                cc--;
 

-               if(!base->channel[cc]) continue;
+               if(!base->channel[i]) continue;

 
 

-               remove_proc_entry("chip_info", base->channel[cc]->ch_entry);
+               remove_proc_entry("chip_info", base->channel[i]->ch_entry);

 
 

-               if (remove_object_from_procdir(cc))
+               if (remove_object_from_procdir(i)){
+                       mutex_unlock(&proc_mutex);

                        return -ENODEV;
                        return -ENODEV;

+               }

 
                /* name: base->channel[cc]->ch_name */
 
                /* name: base->channel[cc]->ch_name */

-               if (can_remove_proc_entry(base->channel[cc]->ch_entry,
-                                                       base->can_proc_entry))
+               if (can_remove_proc_entry(base->channel[i]->ch_entry,
+                                                       base->can_proc_entry)){
+                       mutex_unlock(&proc_mutex);

                        return -ENODEV;
                        return -ENODEV;

+               }

 
 

-               can_checked_free(base->channel[cc]);
-               base->channel[cc] = NULL;
+               can_checked_free(base->channel[i]);
+               base->channel[i] = NULL;
+       }
+       mutex_unlock(&proc_mutex);
+
+       return 0;
+}
+
+int remove_channel_from_procdir(struct candevice_t *candev)
+{
+       int i=0,j=0;
+
+       mutex_lock(&proc_mutex);
+       for (i=0; i < MAX_TOT_CHIPS; i++){
+               if (!chips_p[i]) continue;
+               if (chips_p[i]->hostdevice != candev) continue;
+               if (!base->channel[i]) continue;
+
+               remove_proc_entry("chip_info", base->channel[i]->ch_entry);
+
+               if (remove_object_from_procdir(i)){
+                       mutex_unlock(&proc_mutex);
+                       return -ENODEV;
+               }
+
+               /* name: base->channel[cc]->ch_name */
+               if (can_remove_proc_entry(base->channel[i]->ch_entry,
+                                                       base->can_proc_entry)){
+                       mutex_unlock(&proc_mutex);
+                       return -ENODEV;
+               }
+
+               can_checked_free(base->channel[i]);
+               base->channel[i] = NULL;
+
+               cc--;

        }
        }

+       mutex_unlock(&proc_mutex);

 
        return 0;
 }
 
        return 0;
 }