|
@@ -526,19 +526,6 @@ static int gsm_stuff_frame(const u8 *input, u8 *output, int len)
|
|
return olen;
|
|
return olen;
|
|
}
|
|
}
|
|
|
|
|
|
-static void hex_packet(const unsigned char *p, int len)
|
|
|
|
-{
|
|
|
|
- int i;
|
|
|
|
- for (i = 0; i < len; i++) {
|
|
|
|
- if (i && (i % 16) == 0) {
|
|
|
|
- pr_cont("\n");
|
|
|
|
- pr_debug("");
|
|
|
|
- }
|
|
|
|
- pr_cont("%02X ", *p++);
|
|
|
|
- }
|
|
|
|
- pr_cont("\n");
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* gsm_send - send a control frame
|
|
* gsm_send - send a control frame
|
|
* @gsm: our GSM mux
|
|
* @gsm: our GSM mux
|
|
@@ -685,10 +672,10 @@ static void gsm_data_kick(struct gsm_mux *gsm)
|
|
len = msg->len + 2;
|
|
len = msg->len + 2;
|
|
}
|
|
}
|
|
|
|
|
|
- if (debug & 4) {
|
|
|
|
- pr_debug("gsm_data_kick:\n");
|
|
|
|
- hex_packet(gsm->txframe, len);
|
|
|
|
- }
|
|
|
|
|
|
+ if (debug & 4)
|
|
|
|
+ print_hex_dump_bytes("gsm_data_kick: ",
|
|
|
|
+ DUMP_PREFIX_OFFSET,
|
|
|
|
+ gsm->txframe, len);
|
|
|
|
|
|
if (gsm->output(gsm, gsm->txframe + skip_sof,
|
|
if (gsm->output(gsm, gsm->txframe + skip_sof,
|
|
len - skip_sof) < 0)
|
|
len - skip_sof) < 0)
|
|
@@ -2091,10 +2078,9 @@ static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len)
|
|
set_bit(TTY_DO_WRITE_WAKEUP, &gsm->tty->flags);
|
|
set_bit(TTY_DO_WRITE_WAKEUP, &gsm->tty->flags);
|
|
return -ENOSPC;
|
|
return -ENOSPC;
|
|
}
|
|
}
|
|
- if (debug & 4) {
|
|
|
|
- pr_debug("-->%d bytes out\n", len);
|
|
|
|
- hex_packet(data, len);
|
|
|
|
- }
|
|
|
|
|
|
+ if (debug & 4)
|
|
|
|
+ print_hex_dump_bytes("gsmld_output: ", DUMP_PREFIX_OFFSET,
|
|
|
|
+ data, len);
|
|
gsm->tty->ops->write(gsm->tty, data, len);
|
|
gsm->tty->ops->write(gsm->tty, data, len);
|
|
return len;
|
|
return len;
|
|
}
|
|
}
|
|
@@ -2148,10 +2134,9 @@ static unsigned int gsmld_receive_buf(struct tty_struct *tty,
|
|
char buf[64];
|
|
char buf[64];
|
|
char flags;
|
|
char flags;
|
|
|
|
|
|
- if (debug & 4) {
|
|
|
|
- pr_debug("Inbytes %dd\n", count);
|
|
|
|
- hex_packet(cp, count);
|
|
|
|
- }
|
|
|
|
|
|
+ if (debug & 4)
|
|
|
|
+ print_hex_dump_bytes("gsmld_receive: ", DUMP_PREFIX_OFFSET,
|
|
|
|
+ cp, count);
|
|
|
|
|
|
for (i = count, dp = cp, f = fp; i; i--, dp++) {
|
|
for (i = count, dp = cp, f = fp; i; i--, dp++) {
|
|
flags = *f++;
|
|
flags = *f++;
|