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

at-serial-port: allow sending 'raw' commands

Browse Source 
Commands treated as 'raw' won't get the 'AT' prefix and will also not get the
trailing carriage return.
This commit is contained in:
Aleksander Morgado
2012-08-24 11:39:19 +02:00
parent d74336e96d
commit d9ea4a304c
8 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/huawei/mm-plugin-huawei.c
View File

@@ -213,6 +213,7 @@ huawei_custom_init_step (HuaweiCustomInitContext *ctx)
ctx->port,
"AT^CURC=0",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)curc_ready,
ctx);
@@ -232,6 +233,7 @@ huawei_custom_init_step (HuaweiCustomInitContext *ctx)
ctx->port,
"AT^GETPORTMODE",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)getportmode_ready,
ctx);

1
plugins/longcheer/mm-plugin-longcheer.c
View File

@@ -130,6 +130,7 @@ longcheer_custom_init_step (LongcheerCustomInitContext *ctx)
ctx->port,
"AT+GMR",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)gmr_ready,
ctx);

1
plugins/sierra/mm-plugin-sierra.c
View File

@@ -124,6 +124,7 @@ sierra_custom_init_step (SierraCustomInitContext *ctx)
ctx->port,
"AT+GCAP",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)gcap_ready,
ctx);

1
plugins/x22x/mm-plugin-x22x.c
View File

@@ -129,6 +129,7 @@ x22x_custom_init_step (X22xCustomInitContext *ctx)
ctx->port,
"AT+GMR",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)gmr_ready,
ctx);

13
src/mm-at-serial-port.c
View File

@@ -281,7 +281,7 @@ parse_unsolicited (MMSerialPort *port, GByteArray *response)
/*****************************************************************************/
static GByteArray *
at_command_to_byte_array (const char *command)
at_command_to_byte_array (const char *command, gboolean is_raw)
{
GByteArray *buf;
int cmdlen;
@@ -291,14 +291,19 @@ at_command_to_byte_array (const char *command)
cmdlen = strlen (command);
buf = g_byte_array_sized_new (cmdlen + 3);
if (!is_raw) {
/* Make sure there's an AT in the front */
if (!g_str_has_prefix (command, "AT"))
g_byte_array_append (buf, (const guint8 *) "AT", 2);
}
g_byte_array_append (buf, (const guint8 *) command, cmdlen);
if (!is_raw) {
/* Make sure there's a trailing carriage return */
if (command[cmdlen - 1] != '\r')
g_byte_array_append (buf, (const guint8 *) "\r", 1);
}
return buf;
}
@@ -307,6 +312,7 @@ void
mm_at_serial_port_queue_command (MMAtSerialPort *self,
const char *command,
guint32 timeout_seconds,
gboolean is_raw,
GCancellable *cancellable,
MMAtSerialResponseFn callback,
gpointer user_data)
@@ -317,7 +323,7 @@ mm_at_serial_port_queue_command (MMAtSerialPort *self,
g_return_if_fail (MM_IS_AT_SERIAL_PORT (self));
g_return_if_fail (command != NULL);
buf = at_command_to_byte_array (command);
buf = at_command_to_byte_array (command, is_raw);
g_return_if_fail (buf != NULL);
mm_serial_port_queue_command (MM_SERIAL_PORT (self),
@@ -333,6 +339,7 @@ void
mm_at_serial_port_queue_command_cached (MMAtSerialPort *self,
const char *command,
guint32 timeout_seconds,
gboolean is_raw,
GCancellable *cancellable,
MMAtSerialResponseFn callback,
gpointer user_data)
@@ -343,7 +350,7 @@ mm_at_serial_port_queue_command_cached (MMAtSerialPort *self,
g_return_if_fail (MM_IS_AT_SERIAL_PORT (self));
g_return_if_fail (command != NULL);
buf = at_command_to_byte_array (command);
buf = at_command_to_byte_array (command, is_raw);
g_return_if_fail (buf != NULL);
mm_serial_port_queue_command_cached (MM_SERIAL_PORT (self),

2
src/mm-at-serial-port.h
View File

@@ -93,6 +93,7 @@ void mm_at_serial_port_set_response_parser (MMAtSerialPort *self,
void mm_at_serial_port_queue_command (MMAtSerialPort *self,
const char *command,
guint32 timeout_seconds,
gboolean is_raw,
GCancellable *cancellable,
MMAtSerialResponseFn callback,
gpointer user_data);
@@ -100,6 +101,7 @@ void mm_at_serial_port_queue_command (MMAtSerialPort *self,
void mm_at_serial_port_queue_command_cached (MMAtSerialPort *self,
const char *command,
guint32 timeout_seconds,
gboolean is_raw,
GCancellable *cancellable,
MMAtSerialResponseFn callback,
gpointer user_data);

5
src/mm-base-modem-at.c
View File

@@ -201,6 +201,7 @@ at_sequence_parse_response (MMAtSerialPort *port,
ctx->port,
ctx->current->command,
ctx->current->timeout,
FALSE,
ctx->cancellable,
(MMAtSerialResponseFn)at_sequence_parse_response,
ctx);
@@ -209,6 +210,7 @@ at_sequence_parse_response (MMAtSerialPort *port,
ctx->port,
ctx->current->command,
ctx->current->timeout,
FALSE,
ctx->cancellable,
(MMAtSerialResponseFn)at_sequence_parse_response,
ctx);
@@ -288,6 +290,7 @@ mm_base_modem_at_sequence_full (MMBaseModem *self,
ctx->port,
ctx->current->command,
ctx->current->timeout,
FALSE,
ctx->cancellable,
(MMAtSerialResponseFn)at_sequence_parse_response,
ctx);
@@ -535,6 +538,7 @@ mm_base_modem_at_command_full (MMBaseModem *self,
port,
command,
timeout,
FALSE,
ctx->cancellable,
(MMAtSerialResponseFn)at_command_parse_response,
ctx);
@@ -543,6 +547,7 @@ mm_base_modem_at_command_full (MMBaseModem *self,
port,
command,
timeout,
FALSE,
ctx->cancellable,
(MMAtSerialResponseFn)at_command_parse_response,
ctx);

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

@@ -583,6 +583,7 @@ serial_probe_at (MMPortProbe *self)
MM_AT_SERIAL_PORT (task->serial),
task->at_commands->command,
task->at_commands->timeout,
FALSE,
task->at_probing_cancellable,
(MMAtSerialResponseFn)serial_probe_at_parse_response,
self);