clearing garbage in source code breaking compilation

Change-Id: Ib938507cbdbcd6233957df4e7f7673166cb56e83
Signed-off-by: Dominig ar Foll Intel Open Source <dominig.arfoll@fridu.net>
(cherry picked from commit 6a3c9a9a626387ede16e3427eabdc8c91114c62f)

4 files changed, 15 insertions, 16 deletions

diff --git a/intel-minnow/CMakeLists.txt b/intel-minnow/CMakeLists.txt
index fc67013..15fdb0b 100644
--- a/intel-minnow/CMakeLists.txt
+++ b/intel-minnow/CMakeLists.txt
@@ -21,7 +21,7 @@ if(HAL_INTEL_HDA)
 	PROJECT_TARGET_ADD(hal-intel-minnow)
 
 		# Define project Targets
-		ADD_LIBRARY(${TARGET_NAME} MODULE IntelHdaHAL.c)
+		ADD_LIBRARY(${TARGET_NAME} MODULE Intel-HAL-minnow.c)
 
 		# Binder exposes a unique public entry point
 		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
diff --git a/intel-minnow/IntelHdaHAL.c b/intel-minnow/Intel-HAL-minnow.c
index 99412f0..48a2cdb 100644
--- a/intel-minnow/IntelHdaHAL.c
+++ b/intel-minnow/Intel-HAL-minnow.c
@@ -27,7 +27,7 @@
 // Define few private tag for not standard functions
 #define PCM_Volume_Multimedia 1000
 #define PCM_Volume_Navigation 1001
-#define PCM_Volume_Emergency      1002
+#define PCM_Volume_Emergency  1002
 
 // Default Values for MasterVolume Ramping
 STATIC halVolRampT volRampMaster= {
@@ -126,10 +126,9 @@ STATIC halVolRampT volRampFallback= {
 
 // Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities.
 STATIC alsaHalMapT  alsaHalMap[]= {
-  { .tag=Video_Playback_Volume, .ctl={.name="Video_Volume", .value=100 } },
-  { .tag=Phone_Playback_Volume, .ctl={.name="Phone_Volume", .value=100 } },
+  { .tag=Master_Playback_Volume, .ctl={.name="Video_Volume", .value=100 } },
   { .tag=PCM_Playback_Volume  , .ctl={.name="PCM Playback Volume", .value=100 } },
-  { .tag=IEC958 Playback Switch, .ctl={.name="IEC958 Playback Switch" } },
+  { .tag=PCM_Playback_Switch, .ctl={.name="IEC958 Playback Switch" } },
 
   // Sound card does not have hardware volume ramping
   { .tag=Master_Playback_Ramp   , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="Master Playback Volume Ramp",
diff --git a/intel-pc/CMakeLists.txt b/intel-pc/CMakeLists.txt
index 68cc902..ad1878c 100644
--- a/intel-pc/CMakeLists.txt
+++ b/intel-pc/CMakeLists.txt
@@ -21,7 +21,7 @@ if(HAL_INTEL_HDA)
 	PROJECT_TARGET_ADD(hal-intel-pc)
 
 		# Define project Targets
-		ADD_LIBRARY(${TARGET_NAME} MODULE IntelHdaHAL.c)
+		ADD_LIBRARY(${TARGET_NAME} MODULE Intel-HAL-pc.c)
 
 		# Binder exposes a unique public entry point
 		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
diff --git a/intel-pc/IntelHdaHAL.c b/intel-pc/Intel-HAL-pc.c
index e2be738..39de13b 100644
--- a/intel-pc/IntelHdaHAL.c
+++ b/intel-pc/Intel-HAL-pc.c
@@ -26,8 +26,8 @@
 
 // Define few private tag for not standard functions
 #define PCM_Volume_Multimedia 1000
-#define PCM_Volume_Navigation 1001Laptop
-#define PCM_Volume_Emergency      1002
+#define PCM_Volume_Navigation 1001
+#define PCM_Volume_Emergency  1002
 
 // Default Values for MasterVolume Ramping
 STATIC halVolRampT volRampMaster= {
@@ -65,7 +65,7 @@ STATIC halVolRampT volRampPhone= {
     .delay   = 50*1000, // ramping delay in us
     .stepDown= 2,
     .stepUp  = 2,
-};Laptop
+};
 
 STATIC halVolRampT volRampNavigation= {
     .slave   = Navigation_Playback_Volume,
@@ -89,7 +89,7 @@ STATIC halVolRampT volRampVideo= {
 };
 
 STATIC halVolRampT volRampStreaming= {
-    .slave   = Streaming_Playback_VoluLaptopme,
+    .slave   = Streaming_Playback_Volume,
     .delay   = 50*1000, // ramping delay in us
     .stepDown= 2,
     .stepUp  = 4,
@@ -98,7 +98,7 @@ STATIC halVolRampT volRampStreaming= {
 STATIC halVolRampT volRampMultimedia= {
     .slave   = Multimedia_Playback_Volume,
     .delay   = 50*1000, // ramping delay in us
-    .stepDown= 2,Laptop
+    .stepDown= 2,
     .stepUp  = 4,
 };
 
@@ -112,7 +112,7 @@ STATIC halVolRampT volRampRadio= {
 STATIC halVolRampT volRampCustomLow= {
     .slave   = CustomLow_Playback_Volume,
     .delay   = 50*1000, // ramping delay in us
-    .stepDown= 2,Laptop
+    .stepDown= 2,
     .stepUp  = 4,
 };
 
@@ -124,7 +124,7 @@ STATIC halVolRampT volRampFallback= {
 };
 
 
-// Map HAL hight sndctl with Alsa numidLaptop and optionally with a custom callback for non Alsa supported functionalities.
+// Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities.
 STATIC alsaHalMapT  alsaHalMap[]= {
   { .tag=Master_Playback_Volume, .ctl={.name="Master Playback Volume", .value=100 } },
   { .tag=PCM_Playback_Volume     , .ctl={.name="PCM Playback Volume", .value=100 } },
@@ -147,7 +147,7 @@ STATIC alsaHalMapT  alsaHalMap[]= {
     .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="CustomHigh_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
   },
   { .tag=Phone_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampPhone}, .info="RampUp Phone Volume",
-    .ctl={.numid=CTL_AUTO, .type=SNLaptopD_CTL_ELEM_TYPE_INTEGER,.name="Phone_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Phone_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
   },
   { .tag=Navigation_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampNavigation}, .info="RampUp Navigation Volume",
     .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Navigation_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
@@ -156,11 +156,11 @@ STATIC alsaHalMapT  alsaHalMap[]= {
     .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="CustomMedium_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
   },
   { .tag=Video_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampVideo}, .info="RampUp Video Volume",
-    .ctl={.numid=CTL_AUTO, .type=SNLaptopD_CTL_ELEM_TYPE_INTEGER,.name="Video_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Video_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
   },
   { .tag=Streaming_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampStreaming}, .info="RampUp Streaming Volume",
     .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Streaming_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
-  },OnErrorExitOnErrorExit
+  },
   { .tag=Multimedia_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampMultimedia}, .info="RampUp Multimedia Volume",
     .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Multimedia_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
   },