commit e9d12e0c5ac2ff59803d808d4785700b4cc0583f
author Darin Petkov <petkov@chromium.org> Wed Jul 27 15:09:37 2011 -0700
committer Darin Petkov <petkov@chromium.org> Thu Jul 28 15:52:50 2011 -0700
tree e568b29dc4d249cbd5bb1cd6a70d96b5f00f0bf3
parent 102a7757c1f1bb13e3d409ed513feda23707c8a2

shill: Enable the ModemManager.Modem on Cellular device start.

Also, move DBus.Object/Connection properties to the Cellular device,
initializing them to the right values.

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

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

cellular.h

diff --git a/cellular.h b/cellular.h
index 5b63b1d..e684361 100644
--- a/cellular.h
+++ b/cellular.h
@@ -6,10 +6,9 @@
 #define SHILL_CELLULAR_
 
 #include <string>
-#include <utility>
 
 #include <base/basictypes.h>
-#include <chromeos/dbus/service_constants.h>
+#include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
 #include "shill/device.h"
 #include "shill/refptr_types.h"
@@ -17,12 +16,26 @@
 
 namespace shill {
 
+class ModemProxyInterface;
+
 class Cellular : public Device {
  public:
+  enum Type {
+    kTypeGSM,
+    kTypeCDMA
+  };
+
+  enum State {
+    kStateDisabled,
+    kStateEnabled,
+    kStateRegistered,
+    kStateConnected,
+  };
+
   class Network {
    public:
     Network();
-    virtual ~Network();
+    ~Network();
 
     const std::string &GetStatus() const;
     void SetStatus(const std::string &status);
@@ -43,28 +56,41 @@
 
    private:
     Stringmap dict_;
+
     DISALLOW_COPY_AND_ASSIGN(Network);
   };
 
   struct SimLockStatus {
    public:
-    SimLockStatus();
-    virtual ~SimLockStatus();
+    SimLockStatus() : retries_left(0) {}
+
     std::string lock_type;
     uint32 retries_left;
   };
 
+  // |owner| is the ModemManager DBus service owner (e.g., ":1.17"). |path| is
+  // the ModemManager.Modem DBus object path (e.g.,
+  // "/org/chromium/ModemManager/Gobi/0").
   Cellular(ControlInterface *control_interface,
            EventDispatcher *dispatcher,
            Manager *manager,
-           const std::string& link,
-           int interface_index);
-  ~Cellular();
-  void Start();
-  void Stop();
-  bool TechnologyIs(Device::Technology type);
+           const std::string &link_name,
+           int interface_index,
+           Type type,
+           const std::string &owner,
+           const std::string &path);
+  virtual ~Cellular();
+
+  // Inherited from Device.
+  virtual void Start();
+  virtual void Stop();
+  virtual bool TechnologyIs(Technology type);
 
  private:
+  FRIEND_TEST(CellularTest, GetStateString);
+  FRIEND_TEST(CellularTest, GetTypeString);
+  FRIEND_TEST(CellularTest, Start);
+
   Stringmaps EnumerateNetworks();
   StrIntPair SimLockStatusToProperty();
   void HelpRegisterDerivedStringmaps(const std::string &name,
@@ -74,6 +100,16 @@
                                      StrIntPair(Cellular::*get)(void),
                                      bool(Cellular::*set)(const StrIntPair&));
 
+  std::string GetTypeString();
+  std::string GetStateString();
+
+  Type type_;
+  State state_;
+
+  const std::string dbus_owner_;  // ModemManager.Modem
+  const std::string dbus_path_;  // ModemManager.Modem
+  scoped_ptr<ModemProxyInterface> proxy_;
+
   ServiceRefPtr service_;
   bool service_registered_;