Followup to Bug 1041085 - Fix FM RDS HAL code on non-unified builds
authorMichael Wu <mwu@mozilla.com>
Tue, 30 Sep 2014 22:03:05 -0400
changeset 208142 bd57723075103065bafab6734afbf8d535a31715
parent 208141 546a247ea19b574a7c0ba85d81fc2508fee31ca3
child 208143 69db317519aa5118365ffe185f94df799c3a7558
push id27577
push usercbook@mozilla.com
push dateWed, 01 Oct 2014 13:05:47 +0000
treeherderautoland@835ef55e175e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1041085
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Followup to Bug 1041085 - Fix FM RDS HAL code on non-unified builds
hal/gonk/GonkFMRadio.cpp
--- a/hal/gonk/GonkFMRadio.cpp
+++ b/hal/gonk/GonkFMRadio.cpp
@@ -385,17 +385,17 @@ EnableFMRadio(const hal::FMRadioSettings
 
 void
 DisableFMRadio()
 {
   if (!sRadioEnabled)
     return;
 
   if (sRDSEnabled)
-    DisableRDS();
+    hal::DisableRDS();
 
   sRadioEnabled = false;
 
   if (sMsmFMMode) {
     int rc = setControl(V4L2_CID_PRIVATE_TAVARUA_STATE, FM_OFF);
     if (rc < 0) {
       HAL_LOG("Unable to turn off radio");
     }
@@ -617,17 +617,17 @@ readRDSDataThread(void* data)
 
       lastblock = blocknum;
       blocks[blocknum] = (rdsblocks[i].msb << 8) | rdsblocks[i].lsb;
 
       // Make sure we have all 4 blocks and that they're valid
       if (block_bitmap != 0x0F)
         continue;
 
-      FMRadioRDSGroup group;
+      hal::FMRadioRDSGroup group;
       group.blockA() = blocks[V4L2_RDS_BLOCK_A];
       group.blockB() = blocks[V4L2_RDS_BLOCK_B];
       group.blockC() = blocks[V4L2_RDS_BLOCK_C];
       group.blockD() = blocks[V4L2_RDS_BLOCK_D];
       NotifyFMRadioRDSGroup(group);
     }
   }