ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made win16 serial comms less of a CPU hog.

This commit is contained in:
Ove Kaaven 1999-11-25 21:57:32 +00:00 committed by Alexandre Julliard
parent d16319ce22
commit 542b29db13
2 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/comm.h
View File

@ -20,7 +20,7 @@ struct DosDeviceStruct {
unsigned obuf_size,obuf_head,obuf_tail;
/* notifications */
int wnd, n_read, n_write;
HANDLE service;
HANDLE s_read, s_write;
};
extern void COMM_Init(void);

41
misc/comm.c
View File

@ -272,11 +272,17 @@ static void CALLBACK comm_notification( ULONG_PTR private )
if (ptr->obuf_tail >= ptr->obuf_size)
ptr->obuf_tail = 0;
/* flag event */
if ((ptr->obuf_tail == ptr->obuf_head) && (ptr->eventmask & EV_TXEMPTY)) {
if (ptr->obuf_tail == ptr->obuf_head) {
if (ptr->s_write) {
SERVICE_Delete( ptr->s_write );
ptr->s_write = INVALID_HANDLE_VALUE;
}
if (ptr->eventmask & EV_TXEMPTY) {
*(WORD*)(unknown[cid]) |= EV_TXEMPTY;
mask |= CN_EVENT;
}
}
}
} while (len > 0);
/* check for notification */
if (ptr->wnd && (ptr->n_write>0) && (prev>=ptr->n_write) &&
@ -292,6 +298,24 @@ static void CALLBACK comm_notification( ULONG_PTR private )
}
}
static void comm_waitread(struct DosDeviceStruct *ptr)
{
if (ptr->s_read != INVALID_HANDLE_VALUE) return;
ptr->s_read = SERVICE_AddObject( FILE_DupUnixHandle( ptr->fd,
GENERIC_READ | SYNCHRONIZE ),
comm_notification,
(ULONG_PTR)ptr );
}
static void comm_waitwrite(struct DosDeviceStruct *ptr)
{
if (ptr->s_write != INVALID_HANDLE_VALUE) return;
ptr->s_write = SERVICE_AddObject( FILE_DupUnixHandle( ptr->fd,
GENERIC_WRITE | SYNCHRONIZE ),
comm_notification,
(ULONG_PTR)ptr );
}
/**************************************************************************
* BuildCommDCB (USER.213)
*/
@ -456,12 +480,9 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
return IE_MEMORY;
}
COM[port].service = SERVICE_AddObject( FILE_DupUnixHandle( COM[port].fd,
GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE ),
comm_notification,
(ULONG_PTR)&COM[port] );
/* bootstrap notifications, just in case */
comm_notification( (ULONG_PTR)&COM[port] );
COM[port].s_read = INVALID_HANDLE_VALUE;
COM[port].s_write = INVALID_HANDLE_VALUE;
comm_waitread( &COM[port] );
return port;
}
}
@ -502,7 +523,8 @@ INT16 WINAPI CloseComm16(INT16 cid)
/* COM port */
SEGPTR_FREE(unknown[cid]); /* [LW] */
SERVICE_Delete( COM[cid].service );
SERVICE_Delete( COM[cid].s_write );
SERVICE_Delete( COM[cid].s_read );
/* free buffers */
free(ptr->outbuf);
free(ptr->inbuf);
@ -1178,10 +1200,12 @@ INT16 WINAPI TransmitCommChar16(INT16 cid,CHAR chTransmit)
if (write(ptr->fd, &chTransmit, 1) == -1) {
/* didn't work, queue it */
ptr->xmit = chTransmit;
comm_waitwrite(ptr);
}
} else {
/* data in queue, let this char be transmitted next */
ptr->xmit = chTransmit;
comm_waitwrite(ptr);
}
ptr->commerror = 0;
@ -1311,6 +1335,7 @@ INT16 WINAPI WriteComm16(INT16 cid, LPSTR lpvBuf, INT16 cbWrite)
ptr->obuf_head = 0;
lpvBuf += status;
length += status;
comm_waitwrite(ptr);
}
ptr->commerror = 0;