commit a1e0a1c5a6f60a257cec29341ae6b318550d151a
author Darin Petkov <petkov@chromium.org> Thu Aug 25 15:08:33 2011 -0700
committer Darin Petkov <petkov@chromium.org> Fri Aug 26 10:04:22 2011 -0700
tree 7e2f7d00c4c419ee967c92f0bce7bd2ccc51e410
parent bf1861b28b61d2338116e4416ac8f2a45f7045ce

shill: Register GSM modem as part of device start up.

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

Change-Id: Ie8f8a8ce4fd185226a9f55f4fcd62224e7318c3c
Reviewed-on: http://gerrit.chromium.org/gerrit/6683
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>

cellular.h

diff --git a/cellular.h b/cellular.h
index 4409a6a..da5d5f8 100644
--- a/cellular.h
+++ b/cellular.h
@@ -14,6 +14,7 @@
 #include "shill/dbus_properties.h"
 #include "shill/device.h"
 #include "shill/modem_cdma_proxy_interface.h"
+#include "shill/modem_gsm_network_proxy_interface.h"
 #include "shill/modem_proxy_interface.h"
 #include "shill/refptr_types.h"
 #include "shill/shill_event.h"
@@ -25,6 +26,7 @@
 
 class Cellular : public Device,
                  public ModemCDMAProxyListener,
+                 public ModemGSMNetworkProxyListener,
                  public ModemProxyListener {
  public:
   enum Type {
@@ -185,10 +187,10 @@
   FRIEND_TEST(CellularTest, GetTypeString);
   FRIEND_TEST(CellularTest, InitProxiesCDMA);
   FRIEND_TEST(CellularTest, InitProxiesGSM);
-  FRIEND_TEST(CellularTest, Start);
   FRIEND_TEST(CellularTest, StartConnected);
+  FRIEND_TEST(CellularTest, StartCDMARegister);
+  FRIEND_TEST(CellularTest, StartGSM);
   FRIEND_TEST(CellularTest, StartLinked);
-  FRIEND_TEST(CellularTest, StartRegister);
 
   static const char kPhoneNumberCDMA[];
   static const char kPhoneNumberGSM[];
@@ -264,6 +266,13 @@
                                               uint32 state_evdo);
   virtual void OnCDMASignalQualityChanged(uint32 strength);
 
+  // Signal callbacks inherited from ModemGSMNetworkProxyListener.
+  virtual void OnGSMNetworkModeChanged(uint32 mode);
+  virtual void OnGSMRegistrationInfoChanged(uint32 status,
+                                            const std::string &operator_code,
+                                            const std::string &operator_name);
+  virtual void OnGSMSignalQualityChanged(uint32 quality);
+
   // Signal callbacks inherited from ModemProxyListener.
   virtual void OnModemStateChanged(uint32 old_state,
                                    uint32 new_state,
@@ -278,6 +287,7 @@
   scoped_ptr<ModemProxyInterface> proxy_;
   scoped_ptr<ModemSimpleProxyInterface> simple_proxy_;
   scoped_ptr<ModemCDMAProxyInterface> cdma_proxy_;
+  scoped_ptr<ModemGSMNetworkProxyInterface> gsm_network_proxy_;
 
   CDMA cdma_;
 
@@ -300,6 +310,7 @@
   std::string hardware_revision_;
   bool scanning_;
   uint16 scan_interval_;
+  std::string selected_network_;
   std::vector<Network> found_networks_;
   SimLockStatus sim_lock_status_;
   Operator home_provider_;