From c13c9806f957ebc675462737f4b328d3ab89e028 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 10 Jul 2023 17:29:22 +0800
Subject: [PATCH] update gpsd.c
---
apue/5.Comport/comport.h | 102 +++++++++++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 47 deletions(-)
diff --git a/apue/5.Comport/comport.h b/apue/5.Comport/comport.h
index 9339836..6088592 100644
--- a/apue/5.Comport/comport.h
+++ b/apue/5.Comport/comport.h
@@ -1,13 +1,13 @@
/*********************************************************************************
- * Copyright: (C) 2018 LingYun IoT System Studio
+ * Copyright: (C) 2020 LingYun IoT System Studio
* All rights reserved.
*
* Filename: comport.h
* Description: This head file is for the common TTY/Serial port operator library
*
- * Version: 1.0.0(10/17/2018~)
+ * Version: 1.0.0(06/29/2020~)
* Author: Guo Wenxue <guowenxue@gmail.com>
- * ChangeLog: 1, Release initial version on "10/17/2018 03:33:25 PM"
+ * ChangeLog: 1, Release initial version on "06/29/2020 03:33:25 PM"
*
********************************************************************************/
#ifndef __COMPORT_H_
@@ -27,8 +27,6 @@
#include <sys/stat.h>
#include <sys/select.h>
-#define BUF_64 64
-
#ifndef DEVNAME_LEN
#define DEVNAME_LEN 64
#endif
@@ -40,67 +38,77 @@
#define COM_PRINT(format,args...) do{} while(0);
#endif
-//#define msleep(m) {struct timespec cSleep; cSleep.tv_sec = 0; cSleep.tv_nsec = m * 1000; nanosleep(&cSleep, 0);}
-
typedef struct comport_s
{
- char dev_name[DEVNAME_LEN];
- unsigned char databit, parity, stopbit, flowctrl;
- long baudrate;
-
int fd;
- int frag_size;
+ char dev_name[DEVNAME_LEN];
+
+ long baudrate;
+ unsigned char databit;
+ unsigned char parity;
+ unsigned char stopbit;
+ unsigned char flowctrl;
+
+ int frag_size;
} comport_t;
-/*
- * description: initialise the comport structure
+
+/*+-----------------------------------------------------------------------------------------+
+ * description: Initialise the comport structure
*
- * input args: $dev_name: The comport device name path, such as '/dev/ttyS3'
+ * input args:
+ * $comport: The comport work context pointer
+ * $dev_name: The comport device name path, such as '/dev/ttyS3'
* $baudrate: The baudrate, such as 115200
* $settings: The databit,parity,stopbit,flowctrl settings, such as '8N1N'
*
- * return value: The comport_t structure pointer, NULL means failure.
- */
-
-comport_t *comport_init(const char *dev_name, int baudrate, const char *settings);
+ * return value: 0: Successfully <0: Failure
+ *+-----------------------------------------------------------------------------------------+*/
+int comport_init(comport_t *comport, const char *dev_name, int baudrate, const char *settings);
-/*
- * description: Open the comport specified by $comport
- * input args: $comport: corresponding comport point
- * return value: The comport opened file description, <0 means failure
- */
-extern int comport_open(comport_t * comport);
-/*
- * description: read data from $comport in $timeout <ms> to $buf no more than $buf_size bytes
- * return value: the actual read data bytes, <0: read failure
- */
-extern int comport_recv(comport_t * comport, char *buf, int buf_size, unsigned long timeout);
-
-/*
- * description: write $send_bytes bytes data from $buf to $comport
- * return value: 0: write ok <0: write failure
- */
-extern int comport_send(comport_t * comport, char *buf, int send_bytes);
-
-/*
+/*+-----------------------------------------------------------------------------------------+
* description: display current comport settings such as databit,parity,stopbit,flowctrl
* input args: $comport: corresponding comport point
- */
-//extern void disp_settings(comport_t * comport);
+ *+-----------------------------------------------------------------------------------------+*/
+#ifdef COM_DEBUG
+extern void disp_settings(comport_t * comport);
+#endif
-/*
+
+
+/*+-----------------------------------------------------------------------------------------+
+ * description: Open the comport specified by $comport
+ * input args: $comport: comport work context
+ * return value: >0: The comport opened file description, <0: Failure
+ *+-----------------------------------------------------------------------------------------+*/
+extern int comport_open(comport_t * comport);
+
+
+
+/*+-----------------------------------------------------------------------------------------+
* description: close comport
* input args: $comport: corresponding comport point
- */
+ *+-----------------------------------------------------------------------------------------+*/
extern void comport_close(comport_t * comport);
-/*
- * description: terminat comport, close and free it
- * input args: $comport: corresponding comport point
- */
-extern void comport_term(comport_t * comport);
+
+/*+-----------------------------------------------------------------------------------------+
+ * description: write $send_bytes bytes data from $buf to $comport
+ * return value: 0: write ok <0: write failure
+ *+-----------------------------------------------------------------------------------------+*/
+extern int comport_send(comport_t * comport, char *buf, int send_bytes);
+
+
+
+/*+-----------------------------------------------------------------------------------------+
+ * description: read data from $comport in $timeout <ms> to $buf, no more than $buf_size bytes
+ * return value: the actual read data bytes, <0: read failure
+ *+-----------------------------------------------------------------------------------------+*/
+extern int comport_recv(comport_t * comport, char *buf, int buf_size, unsigned long timeout);
+
+
#endif
--
Gitblit v1.9.1