api: fix up introspection and header documentation for modem consolidation

This commit is contained in:
Dan Williams 2011-03-03 20:16:16 -06:00
parent 5bce4adfbb
commit 69f2c75956
2 changed files with 26 additions and 9 deletions

View file

@ -89,7 +89,21 @@ typedef enum {
/* For backwards compat */
#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
/* Types of NetworkManager devices */
/**
* NMDeviceType:
* @NM_DEVICE_TYPE_UNKNOWN: unknown device
* @NM_DEVICE_TYPE_ETHERNET: a wired ethernet device
* @NM_DEVICE_TYPE_WIFI: an 802.11 WiFi device
* @NM_DEVICE_TYPE_UNUSED1: not used
* @NM_DEVICE_TYPE_UNUSED2: not used
* @NM_DEVICE_TYPE_BT: a Bluetooth device supporting PAN or DUN access protocols
* @NM_DEVICE_TYPE_OLPC_MESH: an OLPC XO mesh networking device
* @NM_DEVICE_TYPE_WIMAX: an 802.16e Mobile WiMAX broadband device
* @NM_DEVICE_TYPE_MODEM: a modem supporting analog telephone, CDMA/EVDO,
* GSM/UMTS, or LTE network access protocols
*
* #NMState values indicate the current overall networking state.
*/
typedef enum {
NM_DEVICE_TYPE_UNKNOWN = 0,
NM_DEVICE_TYPE_ETHERNET = 1,

View file

@ -182,15 +182,11 @@
The device is an 802.11 WiFi device.
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="GSM" value="3">
<tp:docstring>
The device is a GSM/GPRS/EDGE/UMTS/HSPA cellular WAN device.
</tp:docstring>
<tp:enumvalue suffix="UNUSED1" value="3">
<tp:docstring>Unused</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="CDMA" value="4">
<tp:docstring>
The device is a CDMA IS-95/1xRTT/EVDO cellular WAN device.
</tp:docstring>
<tp:enumvalue suffix="UNUSED2" value="4">
<tp:docstring>Unused</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="BT" value="5">
<tp:docstring>
@ -207,6 +203,13 @@
The device is an 802.16e Mobile WiMAX device.
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="MODEM" value="8">
<tp:docstring>
The device is a modem supporting one or more of analog telephone,
CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
wireline data network.
</tp:docstring>
</tp:enumvalue>
</tp:enum>
<tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u">