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

port-probe: MMPortProbeAtCommand always has constant command strings

Browse Source
This commit is contained in:
Aleksander Morgado
2020-01-31 10:45:54 +01:00
parent accd1a5841
commit 9e24226364
7 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/altair/mm-plugin-altair-lte.c
View File

@@ -41,9 +41,9 @@ MM_PLUGIN_DEFINE_MINOR_VERSION
take longer to respond after a reset.
*/
static const MMPortProbeAtCommand custom_at_probe[] = {
{ (gchar *) "AT", 7, mm_port_probe_response_processor_is_at },
{ (gchar *) "AT", 7, mm_port_probe_response_processor_is_at },
{ (gchar *) "AT", 7, mm_port_probe_response_processor_is_at },
{ "AT", 7, mm_port_probe_response_processor_is_at },
{ "AT", 7, mm_port_probe_response_processor_is_at },
{ "AT", 7, mm_port_probe_response_processor_is_at },
{ NULL }
};

6
plugins/nokia/mm-plugin-nokia-icera.c
View File

@@ -33,9 +33,9 @@ MM_PLUGIN_DEFINE_MINOR_VERSION
/* Custom commands for AT probing */
static const MMPortProbeAtCommand custom_at_probe[] = {
{ (gchar *) "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ (gchar *) "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ (gchar *) "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ NULL }
};

6
plugins/nokia/mm-plugin-nokia.c
View File

@@ -34,9 +34,9 @@ MM_PLUGIN_DEFINE_MINOR_VERSION
/* Custom commands for AT probing */
static const MMPortProbeAtCommand custom_at_probe[] = {
{ (gchar *) "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ (gchar *) "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ (gchar *) "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ "ATE1 E0", 3, mm_port_probe_response_processor_is_at },
{ NULL }
};

6
plugins/pantech/mm-plugin-pantech.c
View File

@@ -66,9 +66,9 @@ port_probe_response_processor_is_pantech_at (const gchar *command,
}
static const MMPortProbeAtCommand custom_at_probe[] = {
{ (gchar *) "ATE0", 3, port_probe_response_processor_is_pantech_at },
{ (gchar *) "ATE0", 3, port_probe_response_processor_is_pantech_at },
{ (gchar *) "ATE0", 3, port_probe_response_processor_is_pantech_at },
{ "ATE0", 3, port_probe_response_processor_is_pantech_at },
{ "ATE0", 3, port_probe_response_processor_is_pantech_at },
{ "ATE0", 3, port_probe_response_processor_is_pantech_at },
{ NULL }
};

6
plugins/zte/mm-plugin-zte.c
View File

@@ -51,9 +51,9 @@ MM_PLUGIN_DEFINE_MINOR_VERSION
* We use this command also for checking AT support in the port.
*/
static const MMPortProbeAtCommand custom_at_probe[] = {
{ (gchar *) "ATE0+CPMS?", 3, mm_port_probe_response_processor_is_at },
{ (gchar *) "ATE0+CPMS?", 3, mm_port_probe_response_processor_is_at },
{ (gchar *) "ATE0+CPMS?", 3, mm_port_probe_response_processor_is_at },
{ "ATE0+CPMS?", 3, mm_port_probe_response_processor_is_at },
{ "ATE0+CPMS?", 3, mm_port_probe_response_processor_is_at },
{ "ATE0+CPMS?", 3, mm_port_probe_response_processor_is_at },
{ NULL }
};

3
src/mm-port-probe-at.h
View File

@@ -52,7 +52,7 @@ typedef gboolean (* MMPortProbeAtResponseProcessor) (const gchar *command,
/* Struct to configure port probing commands */
typedef struct {
/* The AT command */
gchar *command;
const gchar *command;
/* Timeout of the command, in seconds */
guint timeout;
/* The response processor */
@@ -76,5 +76,4 @@ gboolean mm_port_probe_response_processor_is_at (const gchar *command,
GVariant **result,
GError **result_error);
#endif /* MM_PORT_PROBE_AT_H */

26
src/mm-port-probe.c
View File

@@ -1104,35 +1104,35 @@ serial_probe_at (MMPortProbe *self)
}
static const MMPortProbeAtCommand at_probing[] = {
{ (gchar *)"AT", 3, mm_port_probe_response_processor_is_at },
{ (gchar *)"AT", 3, mm_port_probe_response_processor_is_at },
{ (gchar *)"AT", 3, mm_port_probe_response_processor_is_at },
{ "AT", 3, mm_port_probe_response_processor_is_at },
{ "AT", 3, mm_port_probe_response_processor_is_at },
{ "AT", 3, mm_port_probe_response_processor_is_at },
{ NULL }
};
static const MMPortProbeAtCommand vendor_probing[] = {
{ (gchar *)"+CGMI", 3, mm_port_probe_response_processor_string },
{ (gchar *)"+GMI", 3, mm_port_probe_response_processor_string },
{ (gchar *)"I", 3, mm_port_probe_response_processor_string },
{ "+CGMI", 3, mm_port_probe_response_processor_string },
{ "+GMI", 3, mm_port_probe_response_processor_string },
{ "I", 3, mm_port_probe_response_processor_string },
{ NULL }
};
static const MMPortProbeAtCommand product_probing[] = {
{ (gchar *)"+CGMM", 3, mm_port_probe_response_processor_string },
{ (gchar *)"+GMM", 3, mm_port_probe_response_processor_string },
{ (gchar *)"I", 3, mm_port_probe_response_processor_string },
{ "+CGMM", 3, mm_port_probe_response_processor_string },
{ "+GMM", 3, mm_port_probe_response_processor_string },
{ "I", 3, mm_port_probe_response_processor_string },
{ NULL }
};
static const MMPortProbeAtCommand icera_probing[] = {
{ (gchar *)"%IPSYS?", 3, mm_port_probe_response_processor_string },
{ (gchar *)"%IPSYS?", 3, mm_port_probe_response_processor_string },
{ (gchar *)"%IPSYS?", 3, mm_port_probe_response_processor_string },
{ "%IPSYS?", 3, mm_port_probe_response_processor_string },
{ "%IPSYS?", 3, mm_port_probe_response_processor_string },
{ "%IPSYS?", 3, mm_port_probe_response_processor_string },
{ NULL }
};
static const MMPortProbeAtCommand xmm_probing[] = {
{ (gchar *)"+XACT=?", 3, mm_port_probe_response_processor_string },
{ "+XACT=?", 3, mm_port_probe_response_processor_string },
{ NULL }
};