From a47fe691fe2de2d919b4e6c06eb01a998d2c83ff Mon Sep 17 00:00:00 2001 From: jishengruofou Date: Wed, 7 Jan 2026 17:28:24 +0800 Subject: [PATCH 1/4] modify return value --- sample/cmux_sample_gsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/cmux_sample_gsm.c b/sample/cmux_sample_gsm.c index f24a398..db9cfa9 100644 --- a/sample/cmux_sample_gsm.c +++ b/sample/cmux_sample_gsm.c @@ -67,7 +67,7 @@ int cmux_sample(void) } LOG_I("cmux object channel (%s) attach successful.", CMUX_PPP_NAME); end: - return RT_EOK; + return result; } #ifdef CMUX_ATUO_INITIZATION INIT_APP_EXPORT(cmux_sample); From b35b6f66bbeeeff377c008dedce2446471cbb261 Mon Sep 17 00:00:00 2001 From: jishengruofou Date: Wed, 7 Jan 2026 18:05:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B6=88=E9=99=A4=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=91=8A=E8=AD=A6=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E5=86=85=E5=AD=98=E7=94=B3=E8=AF=B7=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=AF=B9=E5=86=85=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cmux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cmux.c b/src/cmux.c index 5a35f10..d5f2571 100644 --- a/src/cmux.c +++ b/src/cmux.c @@ -527,7 +527,7 @@ static void cmux_recv_processdata(struct cmux *cmux, rt_uint8_t *buf, rt_size_t * * @return length */ -static rt_size_t cmux_send_data(struct rt_device *dev, int port, rt_uint8_t type, const char *data, int length) +static rt_ssize_t cmux_send_data(struct rt_device *dev, int port, rt_uint8_t type, const char *data, int length) { /* flag, EA=1 C port, frame type, data_length 1-2 */ rt_uint8_t prefix[5] = {CMUX_HEAD_FLAG, CMUX_ADDRESS_EA | CMUX_ADDRESS_CR, 0, 0, 0}; @@ -649,12 +649,13 @@ rt_err_t cmux_init(struct cmux *object, const char *name, rt_uint8_t vcom_num, v object->vcom_num = vcom_num; object->vcoms = rt_malloc(vcom_num * sizeof(struct cmux_vcoms)); - rt_memset(object->vcoms, 0, vcom_num * sizeof(struct cmux_vcoms)); + if (object->vcoms == RT_NULL) { LOG_E("cmux vcoms malloc failed."); return -RT_ENOMEM; } + rt_memset(object->vcoms, 0, vcom_num * sizeof(struct cmux_vcoms)); object->buffer = cmux_buffer_init(); if (object->buffer == RT_NULL) From 125f48d4e41ee63939f808441966cdbd1914a161 Mon Sep 17 00:00:00 2001 From: jishengruofou Date: Wed, 7 Jan 2026 18:13:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B6=88=E9=99=A4=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=8C=B9=E9=85=8D=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cmux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmux.c b/src/cmux.c index d5f2571..a21e8f1 100644 --- a/src/cmux.c +++ b/src/cmux.c @@ -831,14 +831,14 @@ static rt_err_t cmux_vcom_close(rt_device_t dev) * * @return the result */ -static rt_size_t cmux_vcom_write(struct rt_device *dev, +static rt_ssize_t cmux_vcom_write(struct rt_device *dev, rt_off_t pos, const void *buffer, rt_size_t size) { struct cmux *cmux = RT_NULL; struct cmux_vcoms *vcom = (struct cmux_vcoms *)dev; - rt_size_t len; + rt_ssize_t len; cmux = _g_cmux; /* use virtual serial, we can write data into actual serial directly. */ @@ -856,7 +856,7 @@ static rt_size_t cmux_vcom_write(struct rt_device *dev, * * @return the result */ -static rt_size_t cmux_vcom_read(struct rt_device *dev, +static rt_ssize_t cmux_vcom_read(struct rt_device *dev, rt_off_t pos, void *buffer, rt_size_t size) From 98368410bfe542515567685fd72d971094078d48 Mon Sep 17 00:00:00 2001 From: jishengruofou Date: Thu, 8 Jan 2026 17:14:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A3=B0=E6=98=8E=E4=B8=AD=E7=9A=84=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmux.c b/src/cmux.c index a21e8f1..d7645d5 100644 --- a/src/cmux.c +++ b/src/cmux.c @@ -77,7 +77,7 @@ #endif #include -static rt_size_t cmux_send_data(struct rt_device *dev, int port, rt_uint8_t type, const char *data, int length); +static rt_ssize_t cmux_send_data(struct rt_device *dev, int port, rt_uint8_t type, const char *data, int length); static rt_slist_t cmux_list = RT_SLIST_OBJECT_INIT(cmux_list); /* only one cmux object can be created */ static struct cmux *_g_cmux = RT_NULL;