Index: tools/gen_common_defs.sh
===================================================================
diff -u -rb6566527169163c6500c50891a501052288d7a7b -re56eeb0a330a465c53a78a156f207350f1df4504
--- tools/gen_common_defs.sh	(.../gen_common_defs.sh)	(revision b6566527169163c6500c50891a501052288d7a7b)
+++ tools/gen_common_defs.sh	(.../gen_common_defs.sh)	(revision e56eeb0a330a465c53a78a156f207350f1df4504)
@@ -27,10 +27,22 @@
 PREFIX_MATCH=$4
 CPP_HEADER=$5
 
+TEMP_FILE="temp.txt"
+
 rm -rf "$COMMON_REPO"
 
 git clone -b "$COMMON_BRANCH" ssh://git@dvm-linux02:7999/comm/common.git "$COMMON_REPO"
 if [ $? -ne 0 ]; then echo "Could not clone common"; exit 1; fi
 
-grep -oh "$PREFIX_MATCH.* = .*," -- "$COMMON_REPO/$CPP_HEADER" > "$OUTPUT_FILE"
+if [ $(grep -oc "$PREFIX_MATCH.* = .*," -- "$COMMON_REPO/$CPP_HEADER") -gt 1 ]
+then
+    echo "Enumeration has assigned number"
+    grep -oh "$PREFIX_MATCH.* = .*," -- "$COMMON_REPO/$CPP_HEADER" > "$OUTPUT_FILE"
+else
+    echo "Enumeration has auto assigned number"
+    grep -oh "^    $PREFIX_MATCH[^;]*\/\/" -- "$COMMON_REPO/$CPP_HEADER" | grep -oh "$PREFIX_MATCH[^, ]*" > "$TEMP_FILE"
+    awk 'BEGIN{i=0} /.*/{printf "%s = %d\n",$0,i; i++}' "$TEMP_FILE" > "$OUTPUT_FILE"
+    rm "$TEMP_FILE"
+fi
+
 if [ $? -ne 0 ]; then echo "Error during grep"; exit 1; fi