changeset 379:a38805b5b6d4

uptools/atcmd: smsend_pdugen.c split off from smsend_pduout.c
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 09 Mar 2018 00:27:24 +0000
parents e61525f082bd
children a8abaa85c378
files uptools/atcmd/Makefile uptools/atcmd/smsend_pdugen.c uptools/atcmd/smsend_pduout.c
diffstat 3 files changed, 41 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/uptools/atcmd/Makefile	Fri Mar 09 00:17:13 2018 +0000
+++ b/uptools/atcmd/Makefile	Fri Mar 09 00:27:24 2018 +0000
@@ -10,10 +10,11 @@
 SMDUMP_OBJS=	atinterf.o resp_parse.o smdump.o ${LIBCODING}
 
 SMSEND_OBJS=	atinterf.o resp_parse.o smsend_cmgw.o smsend_concat.o \
-		smsend_main.o smsend_pduout.o smsend_text.o ${LIBCODING}
+		smsend_main.o smsend_pdugen.o smsend_pduout.o smsend_text.o \
+		${LIBCODING}
 
 SMSENDM_OBJS=	atinterf.o resp_parse.o smsend_cmgw.o smsend_multmain.o \
-		smsend_pduout.o smsend_text.o ${LIBCODING}
+		smsend_pdugen.o smsend_pduout.o smsend_text.o ${LIBCODING}
 
 all:	${PROGS}
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/uptools/atcmd/smsend_pdugen.c	Fri Mar 09 00:27:24 2018 +0000
@@ -0,0 +1,37 @@
+/*
+ * This module implements the encoding part of SMS sending/writing in PDU mode.
+ */
+
+#include <sys/types.h>
+
+send_in_pdu_mode(da, textsrc, textlen, udh, udhl)
+	u_char *da, *textsrc, *udh;
+	unsigned textlen, udhl;
+{
+	u_char pdu[158];
+	unsigned pdulen;
+	char pduhex[317];
+
+	pdu[0] = 0;
+	pdulen = make_sms_submit_pdu(da, 0, 0, textsrc, textlen, udh, udhl,
+					pdu + 1);
+	make_hex_string(pdu, pdulen + 1, pduhex);
+	send_pdu_out(pduhex, pdulen);
+}
+
+send_pdu_ucs2(da, textsrc, textlen, udh, udhl)
+	u_char *da, *udh;
+	u_short *textsrc;
+	unsigned textlen, udhl;
+{
+	u_char ucs2_be[140], pdu[158];
+	unsigned pdulen;
+	char pduhex[317];
+
+	ucs2_out_bigend(textsrc, ucs2_be, textlen);
+	pdu[0] = 0;
+	pdulen = make_sms_submit_pdu_8bit(da, 0, 0x08, ucs2_be, textlen * 2,
+					  udh, udhl, pdu + 1);
+	make_hex_string(pdu, pdulen + 1, pduhex);
+	send_pdu_out(pduhex, pdulen);
+}
--- a/uptools/atcmd/smsend_pduout.c	Fri Mar 09 00:17:13 2018 +0000
+++ b/uptools/atcmd/smsend_pduout.c	Fri Mar 09 00:27:24 2018 +0000
@@ -1,8 +1,7 @@
 /*
- * This module implements SMS sending/writing in PDU mode.
+ * This module implements the output part of SMS sending/writing in PDU mode.
  */
 
-#include <sys/types.h>
 #include <stdio.h>
 
 extern void cmgw_callback();
@@ -32,35 +31,3 @@
 	sprintf(send_cmd, "AT+%s=%u", cmdname, pdulen);
 	atinterf_exec_cmd_needok(send_cmd, pduhex, callback);
 }
-
-send_in_pdu_mode(da, textsrc, textlen, udh, udhl)
-	u_char *da, *textsrc, *udh;
-	unsigned textlen, udhl;
-{
-	u_char pdu[158];
-	unsigned pdulen;
-	char pduhex[317];
-
-	pdu[0] = 0;
-	pdulen = make_sms_submit_pdu(da, 0, 0, textsrc, textlen, udh, udhl,
-					pdu + 1);
-	make_hex_string(pdu, pdulen + 1, pduhex);
-	send_pdu_out(pduhex, pdulen);
-}
-
-send_pdu_ucs2(da, textsrc, textlen, udh, udhl)
-	u_char *da, *udh;
-	u_short *textsrc;
-	unsigned textlen, udhl;
-{
-	u_char ucs2_be[140], pdu[158];
-	unsigned pdulen;
-	char pduhex[317];
-
-	ucs2_out_bigend(textsrc, ucs2_be, textlen);
-	pdu[0] = 0;
-	pdulen = make_sms_submit_pdu_8bit(da, 0, 0x08, ucs2_be, textlen * 2,
-					  udh, udhl, pdu + 1);
-	make_hex_string(pdu, pdulen + 1, pduhex);
-	send_pdu_out(pduhex, pdulen);
-}