commit d9661956a297e6d7a3e5809f50e332dc9c9811a9
author Darin Petkov <petkov@chromium.org> Wed Aug 03 16:25:42 2011 -0700
committer Darin Petkov <petkov@chromium.org> Thu Aug 04 15:03:48 2011 -0700
tree 79106028f63d06cb52bbfddc7f136ec1ca519985
parent 5dec5f4e469a24f1ad508a210d1d23f228bc09a3

shill: Register the modem, create service and obtain signal strength.

Also, listen for registration info and signal quality change notifications.

BUG=chromium-os:18315
TEST=unit tests, tested on device

Change-Id: I19e5e97257bc53f2004d6b7f0606da2553be4b5d
Reviewed-on: http://gerrit.chromium.org/gerrit/5328
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

cellular.cc

diff --git a/cellular.cc b/cellular.cc
index 2ca6951..5a26d75 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -108,10 +108,6 @@
       state_(kStateDisabled),
       dbus_owner_(owner),
       dbus_path_(path),
-      service_(new CellularService(control_interface,
-                                   dispatcher,
-                                   manager,
-                                   this)),
       service_registered_(false),
       allow_roaming_(false),
       prl_version_(0),
@@ -183,7 +179,6 @@
   }
   GetModemInfo();
   GetModemRegistrationState();
-  ReportEnabled();
   // TODO(petkov): Device::Start();
 }
 
@@ -193,6 +188,7 @@
   cdma_proxy_.reset();
   manager_->DeregisterService(service_);
   service_ = NULL;  // Breaks a reference cycle.
+  state_ = kStateDisabled;
   // TODO(petkov): Device::Stop();
 }
 
@@ -209,7 +205,7 @@
     case kTypeCDMA:
       cdma_proxy_.reset(
           ProxyFactory::factory()->CreateModemCDMAProxy(
-              dbus_path_, dbus_owner_));
+              this, dbus_path_, dbus_owner_));
       break;
     default: NOTREACHED();
   }
@@ -285,6 +281,7 @@
       break;
     default: NOTREACHED();
   }
+  HandleNewRegistrationState();
 }
 
 void Cellular::GetCDMARegistrationState() {
@@ -301,15 +298,94 @@
   NOTIMPLEMENTED();
 }
 
-void Cellular::ReportEnabled() {
+bool Cellular::IsModemRegistered() {
+  return cdma_.registration_state_1x !=
+      MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN ||
+      cdma_.registration_state_evdo !=
+      MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN;
+  // TODO(petkov): Handle GSM states.
+}
+
+void Cellular::HandleNewRegistrationState() {
+  VLOG(2) << __func__;
+  if (!IsModemRegistered()) {
+    service_ = NULL;
+    if (state_ == kStateConnected || state_ == kStateRegistered) {
+      state_ = kStateEnabled;
+    }
+    return;
+  }
+
+  if (state_ == kStateEnabled) {
+    state_ = kStateRegistered;
+  }
+  if (!service_.get()) {
+    // For now, no endpoint is created. Revisit if necessary.
+    CreateService();
+  }
+  GetModemSignalQuality();
+  // TODO(petkov): Update the service.
+}
+
+void Cellular::GetModemSignalQuality() {
+  uint32 strength = 0;
+  switch (type_) {
+    case kTypeGSM:
+      strength = GetGSMSignalQuality();
+      break;
+    case kTypeCDMA:
+      strength = GetCDMASignalQuality();
+      break;
+    default: NOTREACHED();
+  }
+  HandleNewSignalQuality(strength);
+}
+
+uint32 Cellular::GetCDMASignalQuality() {
+  CHECK_EQ(kTypeCDMA, type_);
+  // TODO(petkov): Switch to asynchronous calls (crosbug.com/17583).
+  return cdma_proxy_->GetSignalQuality();
+}
+
+uint32 Cellular::GetGSMSignalQuality() {
   // TODO(petkov): Implement this.
   NOTIMPLEMENTED();
+  return 0;
+}
+
+void Cellular::HandleNewSignalQuality(uint32 strength) {
+  VLOG(2) << "Signal strength: " << strength;
+  if (service_.get()) {
+    service_->set_strength(strength);
+  }
+}
+
+void Cellular::CreateService() {
+  CHECK(!service_.get());
+  service_ =
+      new CellularService(control_interface_, dispatcher_, manager_, this);
+  // TODO(petkov): Set activation_state.
+  // TODO(petkov): Set operator.
+  // TODO(petkov): Set old_url/usage_url.
 }
 
 bool Cellular::TechnologyIs(const Device::Technology type) {
   return type == Device::kCellular;
 }
 
+void Cellular::OnCDMARegistrationStateChanged(uint32 state_1x,
+                                              uint32 state_evdo) {
+  CHECK_EQ(kTypeCDMA, type_);
+  cdma_.registration_state_1x = state_1x;
+  cdma_.registration_state_evdo = state_evdo;
+  HandleNewRegistrationState();
+}
+
+void Cellular::OnCDMASignalQualityChanged(uint32 strength) {
+  CHECK_EQ(kTypeCDMA, type_);
+  HandleNewSignalQuality(strength);
+}
+
 Stringmaps Cellular::EnumerateNetworks() {
   Stringmaps to_return;
   for (vector<Network>::const_iterator it = found_networks_.begin();