qmi: Move constants into qmi.h

Start collecting QMI-related constants in qmi.h.

BUG=None
TEST=Still builds

Change-Id: I2f96d1ecf88ec895318f128f85b1098addc56ef5
diff --git a/src/qmi.h b/src/qmi.h
index b2ce6a7..119f71b 100644
--- a/src/qmi.h
+++ b/src/qmi.h
@@ -15,6 +15,38 @@
 
 struct qmimsg;
 
+#define QMI_CID_NONE ((uint8_t)0x00)
+#define QMI_CID_BROADCAST ((uint8_t)0xFF)
+
+enum {
+  /** Control service */
+  QMI_SVC_CTL = 0x00,
+  /** Wireless Data Service */
+  QMI_SVC_WDS = 0x01,
+  /** Device Management Service */
+  QMI_SVC_DMS = 0x02,
+  /** Network Access Service */
+  QMI_SVC_NAS = 0x03,
+  /** Quality Of Service service */
+  QMI_SVC_QOS = 0x04,
+  /** Wireless Messaging Service */
+  QMI_SVC_WMS = 0x05,
+  /** Position Determination Service */
+  QMI_SVC_PDS = 0x06,
+  /** Authentication service */
+  QMI_SVC_AUTH = 0x07,
+
+  /** Voice service */
+  QMI_SVC_VOICE = 0x09,
+
+  /** Card Application Toolkit service */
+  QMI_SVC_CAT = 0xE0,
+  /** Remote Management Service */
+  QMI_SVC_RMS = 0xE1,
+  /** Open Mobile Alliance device management service */
+  QMI_SVC_OMA = 0xE2
+};
+
 /**
  * Gets the result (status and error) from a TLV message.
  */
diff --git a/src/qmictl.c b/src/qmictl.c
index 5203858..7d36079 100644
--- a/src/qmictl.c
+++ b/src/qmictl.c
@@ -25,8 +25,6 @@
 #include "qmimsg.h"
 #include "util.h"
 
-/* This will move to qmi.h once that exists and we add multiple services */
-#define QMI_SERVICE_CTL 0x00
 /* CTL is always client zero. */
 #define QMI_CTL_CLIENT 0x00
 
@@ -54,7 +52,7 @@
 {
   struct qmimsg *msg;
 
-  if (qmimsg_new(0, QMI_SERVICE_CTL, QMI_CTL_CLIENT,
+  if (qmimsg_new(0, QMI_SVC_CTL, QMI_CTL_CLIENT,
                  0, transaction, message,
                  &msg))
     return NULL;
@@ -65,7 +63,7 @@
 static void ctl_criteria(uint16_t transaction,
                          struct listen_criteria *criteria)
 {
-  criteria->service = QMI_SERVICE_CTL;
+  criteria->service = QMI_SVC_CTL;
   criteria->client = QMI_CTL_CLIENT;
   criteria->transaction = transaction;
 }
diff --git a/src/qmidev.c b/src/qmidev.c
index 417a6e8..1651e07 100644
--- a/src/qmidev.c
+++ b/src/qmidev.c
@@ -359,7 +359,7 @@
   if (listener->criteria.service != context->service)
     return;
 
-  if ((listener->criteria.client != QMI_CLIENT_BROADCAST) &&
+  if ((listener->criteria.client != QMI_CID_BROADCAST) &&
       (listener->criteria.client != context->client))
     return;
 
diff --git a/src/qmimsg.h b/src/qmimsg.h
index b830bb6..adca668 100644
--- a/src/qmimsg.h
+++ b/src/qmimsg.h
@@ -16,8 +16,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#define QMI_CLIENT_BROADCAST ((uint8_t)0xFF)
-
 struct qmimsg;
 
 /**