colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcdm: rename Novatel subsystem defines

Browse Source
This commit is contained in:
Dan Williams
2013-01-16 17:28:14 -06:00
parent b9d0a3275f
commit bf07f02cff
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libqcdm/src/commands.c
View File

@@ -1474,16 +1474,16 @@ qcdm_cmd_nw_subsys_modem_snapshot_cdma_new (char *buf,
cmd->hdr.code = DIAG_CMD_SUBSYS;
switch (chipset) {
case QCDM_NW_CHIPSET_6500:
cmd->hdr.subsys_id = DIAG_SUBSYS_NW_CONTROL_6500;
cmd->hdr.subsys_id = DIAG_SUBSYS_NOVATEL_6500;
break;
case QCDM_NW_CHIPSET_6800:
cmd->hdr.subsys_id = DIAG_SUBSYS_NW_CONTROL_6800;
cmd->hdr.subsys_id = DIAG_SUBSYS_NOVATEL_6800;
break;
default:
qcdm_assert_not_reached ();
}
cmd->hdr.subsys_cmd = htole16 (DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT);
cmd->technology = DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT_TECH_CDMA_EVDO;
cmd->hdr.subsys_cmd = htole16 (DIAG_SUBSYS_NOVATEL_MODEM_SNAPSHOT);
cmd->technology = DIAG_SUBSYS_NOVATEL_MODEM_SNAPSHOT_TECH_CDMA_EVDO;
cmd->snapshot_mask = htole32 (0xFFFF);
return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);

26
libqcdm/src/dm-commands.h
View File

@@ -131,10 +131,10 @@ enum {
DIAG_SUBSYS_SMS = 14, /* Wireless Messaging Service */
DIAG_SUBSYS_CM = 15, /* Call manager */
DIAG_SUBSYS_FS = 19, /* File System (EFS2) */
DIAG_SUBSYS_NW_CONTROL_6500 = 50, /* for Novatel Wireless MSM6500-based devices */
DIAG_SUBSYS_NOVATEL_6500 = 50, /* for Novatel Wireless MSM6500-based devices */
DIAG_SUBSYS_LTE = 68,
DIAG_SUBSYS_ZTE = 101, /* for ZTE EVDO devices */
DIAG_SUBSYS_NW_CONTROL_6800 = 250 /* for Novatel Wireless MSM6800-based devices */
DIAG_SUBSYS_NOVATEL_6800 = 250 /* for Novatel Wireless MSM6800-based devices */
};
/* WCDMA subsystem command codes */
@@ -159,18 +159,18 @@ enum {
DIAG_SUBSYS_CM_STATE_INFO = 0, /* Gets Call Manager state */
};
/* NW_CONTROL subsystem command codes (only for Novatel Wireless devices) */
/* NOVATEL subsystem command codes (only for Novatel Wireless devices) */
enum {
DIAG_SUBSYS_NW_CONTROL_AT_REQUEST = 3, /* AT commands via diag */
DIAG_SUBSYS_NW_CONTROL_AT_RESPONSE = 4,
DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT = 7,
DIAG_SUBSYS_NW_CONTROL_ERI = 8, /* Extended Roaming Indicator */
DIAG_SUBSYS_NW_CONTROL_PRL = 12,
DIAG_SUBSYS_NOVATEL_AT_REQUEST = 3, /* AT commands via diag */
DIAG_SUBSYS_NOVATEL_AT_RESPONSE = 4,
DIAG_SUBSYS_NOVATEL_MODEM_SNAPSHOT = 7,
DIAG_SUBSYS_NOVATEL_ERI = 8, /* Extended Roaming Indicator */
DIAG_SUBSYS_NOVATEL_PRL = 12,
};
enum {
DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT_TECH_CDMA_EVDO = 7,
DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT_TECH_WCDMA = 20,
DIAG_SUBSYS_NOVATEL_MODEM_SNAPSHOT_TECH_CDMA_EVDO = 7,
DIAG_SUBSYS_NOVATEL_MODEM_SNAPSHOT_TECH_WCDMA = 20,
};
enum {
@@ -459,15 +459,15 @@ struct DMCmdEventReportRsp {
} __attribute__ ((packed));
typedef struct DMCmdEventReportRsp DMCmdEventReportRsp;
/* DIAG_SUBSYS_NW_CONTROL_* subsys command */
/* DIAG_SUBSYS_NOVATEL_* subsys command */
struct DMCmdSubsysNwSnapshotReq {
DMCmdSubsysHeader hdr;
u_int8_t technology; /* DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT_TECH_* */
u_int8_t technology; /* DIAG_SUBSYS_NOVATEL_MODEM_SNAPSHOT_TECH_* */
u_int32_t snapshot_mask;
} __attribute__ ((packed));
typedef struct DMCmdSubsysNwSnapshotReq DMCmdSubsysNwSnapshotReq;
/* DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT response */
/* DIAG_SUBSYS_NOVATEL_MODEM_SNAPSHOT response */
struct DMCmdSubsysNwSnapshotRsp {
DMCmdSubsysHeader hdr;
u_int8_t response_code;