martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome-nodes: allow for TTY interface without ATTN line.

Browse Source
This commit is contained in:
Martin Preuss
2025-03-21 20:54:19 +01:00
parent 1fa0d976d2
commit c808f8640e
6 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
aqhome/ipc2/tty_endpoint.c
View File

@@ -29,7 +29,7 @@
* ------------------------------------------------------------------------------------------------
*/
AQH_OBJECT *AQH_TtyEndpoint2_new(AQH_EVENT_LOOP *eventLoop, int fd)
AQH_OBJECT *AQH_TtyEndpoint2_new(AQH_EVENT_LOOP *eventLoop, int fd, int noAttn)
{
int fdCopy;
AQH_OBJECT *fdReader;
@@ -46,6 +46,10 @@ AQH_OBJECT *AQH_TtyEndpoint2_new(AQH_EVENT_LOOP *eventLoop, int fd)
AQH_Object_Enable(msgReader);
fdWriter=AQH_TtyObject_new(eventLoop, fdCopy, AQH_FDOBJECT_FDMODE_WRITE);
if (noAttn) {
DBG_ERROR(NULL, "Adding noAttn flag");
AQH_Object_AddFlags(fdWriter, AQH_TTYOBJECT_FLAGS_NOATTN);
}
msgWriter=AQH_MsgWriter_new(eventLoop, fdWriter);
endpoint=AQH_Endpoint_new(eventLoop, msgReader, msgWriter);

2
aqhome/ipc2/tty_endpoint.h
View File

@@ -21,7 +21,7 @@
* @param eventLoop pointer to eventLoop
* @param fd open file descriptor for tty object (see @ref AQH_TtyObject_OpenAndInitDevice).
*/
AQHOME_API AQH_OBJECT *AQH_TtyEndpoint2_new(AQH_EVENT_LOOP *eventLoop, int fd);
AQHOME_API AQH_OBJECT *AQH_TtyEndpoint2_new(AQH_EVENT_LOOP *eventLoop, int fd, int noAttn);

48
aqhome/ipc2/tty_object.c
View File

@@ -61,24 +61,28 @@ AQH_OBJECT *AQH_TtyObject_new(AQH_EVENT_LOOP *eventLoop, int fd, int fdMode)
int _startMsg(AQH_OBJECT *o)
{
if (o) {
int fd;
int rv;
fd=AQH_FdObject_GetFd(o);
if (fd==-1)
return GWEN_ERROR_IO;
rv=_getAttn(fd);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
else if (rv==0) {
DBG_ERROR(NULL, "Line busy");
return GWEN_ERROR_TRY_AGAIN; /* line busy */
}
else {
_setAttn(fd, 0); /* set ATTN low */
if (AQH_Object_GetFlags(o) & AQH_TTYOBJECT_FLAGS_NOATTN)
return 0;
else {
int fd;
int rv;
fd=AQH_FdObject_GetFd(o);
if (fd==-1)
return GWEN_ERROR_IO;
rv=_getAttn(fd);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
return rv;
}
else if (rv==0) {
DBG_ERROR(NULL, "Line busy");
return GWEN_ERROR_TRY_AGAIN; /* line busy */
}
else {
_setAttn(fd, 0); /* set ATTN low */
return 0;
}
}
}
else
@@ -90,11 +94,13 @@ int _startMsg(AQH_OBJECT *o)
void _endMsg(AQH_OBJECT *o)
{
if (o) {
int fd;
if (!(AQH_Object_GetFlags(o) & AQH_TTYOBJECT_FLAGS_NOATTN)) {
int fd;
fd=AQH_FdObject_GetFd(o);
if (fd>=0) {
_setAttn(fd, 1); /* set ATTN high */
fd=AQH_FdObject_GetFd(o);
if (fd>=0) {
_setAttn(fd, 1); /* set ATTN high */
}
}
}
}

2
aqhome/ipc2/tty_object.h
View File

@@ -14,6 +14,8 @@
#include <termios.h>
#define AQH_TTYOBJECT_FLAGS_NOATTN 0x0001
/**
* Create Tty object for given filedescriptor and in given mode (read or write)