wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced magic resultcodes from mbus_recv_frame with defines

Browse Source
This commit is contained in:
Stefan Wahren
2012-07-11 23:33:52 +02:00
parent ff37c4af8c
commit e6a52f97ea
11 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mbus/mbus-serial.c
View File

@ -245,7 +245,7 @@ mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame)
if (handle == NULL || frame == NULL)
{
fprintf(stderr, "%s: Invalid parameter.\n", __PRETTY_FUNCTION__);
return -1;
return MBUS_RECV_RESULT_ERROR;
}
memset((void *)buff, 0, sizeof(buff));
@ -264,7 +264,7 @@ mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame)
{
// fprintf(stderr, "%s: aborting recv frame (remaining = %d, len = %d, nread = %d)\n",
// __PRETTY_FUNCTION__, remaining, len, nread);
return -1;
return MBUS_RECV_RESULT_ERROR;
}
// printf("%s: Got %d byte [remaining %d, len %d]\n", __PRETTY_FUNCTION__, nread, remaining, len);
@ -288,7 +288,7 @@ mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame)
if (len == 0)
{
// No data received
return -1;
return MBUS_RECV_RESULT_TIMEOUT;
}
//
@ -301,16 +301,16 @@ mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame)
{
// Would be OK when e.g. scanning the bus, otherwise it is a failure.
// printf("%s: M-Bus layer failed to receive complete data.\n", __PRETTY_FUNCTION__);
return -2;
return MBUS_RECV_RESULT_INVALID;
}
if (len == -1)
{
fprintf(stderr, "%s: M-Bus layer failed to parse data.\n", __PRETTY_FUNCTION__);
return -1;
return MBUS_RECV_RESULT_ERROR;
}
return 0;
return MBUS_RECV_RESULT_OK;
}