FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add additional messages for diagnostic purposes.

Browse Source
This commit is contained in:
Jef Driesen 2012-08-25 07:48:24 +02:00
parent 645bd89d8a
commit ea3f833d8d
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/serial_posix.c
View File

@ -176,6 +176,9 @@ serial_configure (serial_t *device, int baudrate, int databits, int parity, int
if (device == NULL)
return -1; // EINVAL (Invalid argument)
INFO (device->context, "Configure: baudrate=%i, databits=%i, parity=%i, stopbits=%i, flowcontrol=%i",
baudrate, databits, parity, stopbits, flowcontrol);
// Retrieve the current settings.
struct termios tty;
if (tcgetattr (device->fd, &tty) != 0) {
@ -424,6 +427,8 @@ serial_set_timeout (serial_t *device, long timeout)
if (device == NULL)
return -1; // EINVAL (Invalid argument)
INFO (device->context, "Timeout: value=%li", timeout);
device->timeout = timeout;
return 0;
@ -524,6 +529,8 @@ serial_read (serial_t *device, void *data, unsigned int size)
nbytes += n;
}
HEXDUMP (device->context, DC_LOGLEVEL_INFO, "Read", (unsigned char *) data, nbytes);
return nbytes;
}
@ -607,6 +614,8 @@ serial_write (serial_t *device, const void *data, unsigned int size)
}
}
HEXDUMP (device->context, DC_LOGLEVEL_INFO, "Write", (unsigned char *) data, nbytes);
return nbytes;
}
@ -617,6 +626,10 @@ serial_flush (serial_t *device, int queue)
if (device == NULL)
return -1; // EINVAL (Invalid argument)
INFO (device->context, "Flush: queue=%u, input=%i, output=%i", queue,
serial_get_received (device),
serial_get_transmitted (device));
int flags = 0;
switch (queue) {
@ -661,6 +674,8 @@ serial_set_break (serial_t *device, int level)
if (device == NULL)
return -1; // EINVAL (Invalid argument)
INFO (device->context, "Break: value=%i", level);
unsigned long action = (level ? TIOCSBRK : TIOCCBRK);
if (ioctl (device->fd, action, NULL) != 0 && NOPTY) {
@ -678,6 +693,8 @@ serial_set_dtr (serial_t *device, int level)
if (device == NULL)
return -1; // EINVAL (Invalid argument)
INFO (device->context, "DTR: value=%i", level);
unsigned long action = (level ? TIOCMBIS : TIOCMBIC);
int value = TIOCM_DTR;
@ -696,6 +713,8 @@ serial_set_rts (serial_t *device, int level)
if (device == NULL)
return -1; // EINVAL (Invalid argument)
INFO (device->context, "RTS: value=%i", level);
unsigned long action = (level ? TIOCMBIS : TIOCMBIC);
int value = TIOCM_RTS;
@ -775,6 +794,8 @@ serial_sleep (serial_t *device, unsigned long timeout)
if (device == NULL)
return -1;
INFO (device->context, "Sleep: value=%lu", timeout);
struct timespec ts;
ts.tv_sec = (timeout / 1000);
ts.tv_nsec = (timeout % 1000) * 1000000;

21
src/serial_win32.c
View File

@ -155,6 +155,9 @@ serial_configure (serial_t *device, int baudrate, int databits, int parity, int
if (device == NULL)
return -1; // ERROR_INVALID_PARAMETER (The parameter is incorrect)
INFO (device->context, "Configure: baudrate=%i, databits=%i, parity=%i, stopbits=%i, flowcontrol=%i",
baudrate, databits, parity, stopbits, flowcontrol);
// Retrieve the current settings.
DCB dcb;
if (!GetCommState (device->hFile, &dcb)) {
@ -255,6 +258,8 @@ serial_set_timeout (serial_t *device, long timeout)
if (device == NULL)
return -1; // ERROR_INVALID_PARAMETER (The parameter is incorrect)
INFO (device->context, "Timeout: value=%li", timeout);
// Retrieve the current timeouts.
COMMTIMEOUTS timeouts;
if (!GetCommTimeouts (device->hFile, &timeouts)) {
@ -338,6 +343,8 @@ serial_read (serial_t *device, void* data, unsigned int size)
return -1;
}
HEXDUMP (device->context, DC_LOGLEVEL_INFO, "Read", (unsigned char *) data, dwRead);
return dwRead;
}
@ -389,6 +396,8 @@ serial_write (serial_t *device, const void* data, unsigned int size)
}
}
HEXDUMP (device->context, DC_LOGLEVEL_INFO, "Write", (unsigned char *) data, dwWritten);
return dwWritten;
}
@ -399,6 +408,10 @@ serial_flush (serial_t *device, int queue)
if (device == NULL)
return -1; // ERROR_INVALID_PARAMETER (The parameter is incorrect)
INFO (device->context, "Flush: queue=%u, input=%i, output=%i", queue,
serial_get_received (device),
serial_get_transmitted (device));
DWORD flags = 0;
switch (queue) {
@ -450,6 +463,8 @@ serial_set_break (serial_t *device, int level)
if (device == NULL)
return -1; // ERROR_INVALID_PARAMETER (The parameter is incorrect)
INFO (device->context, "Break: value=%i", level);
if (level) {
if (!SetCommBreak (device->hFile)) {
SYSERROR (device->context, GetLastError ());
@ -471,6 +486,8 @@ serial_set_dtr (serial_t *device, int level)
if (device == NULL)
return -1; // ERROR_INVALID_PARAMETER (The parameter is incorrect)
INFO (device->context, "DTR: value=%i", level);
int status = (level ? SETDTR : CLRDTR);
if (!EscapeCommFunction (device->hFile, status)) {
@ -488,6 +505,8 @@ serial_set_rts (serial_t *device, int level)
if (device == NULL)
return -1; // ERROR_INVALID_PARAMETER (The parameter is incorrect)
INFO (device->context, "RTS: value=%i", level);
int status = (level ? SETRTS : CLRRTS);
if (!EscapeCommFunction (device->hFile, status)) {
@ -568,6 +587,8 @@ serial_sleep (serial_t *device, unsigned long timeout)
if (device == NULL)
return -1;
INFO (device->context, "Sleep: value=%lu", timeout);
Sleep (timeout);
return 0;