Index: tools/gen_alarm_ids.sh
===================================================================
diff -u -r3f12fb75e3d92e3ecbcb86a4b9b284dd0b05e26f -r02eff24a2b116fe3d71d8275eeb78f419302efd6
--- tools/gen_alarm_ids.sh	(.../gen_alarm_ids.sh)	(revision 3f12fb75e3d92e3ecbcb86a4b9b284dd0b05e26f)
+++ tools/gen_alarm_ids.sh	(.../gen_alarm_ids.sh)	(revision 02eff24a2b116fe3d71d8275eeb78f419302efd6)
@@ -17,20 +17,22 @@
 
 if [[ "$1" == "-h" || "$1" == "--help" || $# -eq 0 ]]; then
     currentFile=$(basename "$0")
-    echo "Usage: ./$currentFile <alarm_ids_txt_dst> <clone_common_dst>, <common_branch>"
+    echo "Usage: ./$currentFile <alarm_ids_txt_dst> <clone_common_dst> <common_branch> <prefix_match> <cpp_header>"
     exit 1
 fi
 
 OUTPUT_FILE=$1
 COMMON_REPO=$2
 COMMON_BRANCH=$3
+PREFIX_MATCH=$4
+CPP_HEADER=$5
 
 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 "ALARM_ID_.* = [0-9]*" -- "$COMMON_REPO/AlarmDefs.h" > "$OUTPUT_FILE"
+grep -oh "$PREFIX_MATCH.* = .*," -- "$COMMON_REPO/$CPP_HEADER" > "$OUTPUT_FILE"
 if [ $? -ne 0 ]; then echo "Error during grep"; exit 1; fi
 
 rm -rf "$COMMON_REPO"