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

Make my last change more readable.

Browse Source 
As suggested by lategoodbye. Also make it more in line with the way
everything else is written.
This commit is contained in:
Jakob Skov-Pedersen
2013-03-17 09:15:43 +01:00
parent 363f59a149
commit 6166553755
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mbus/mbus-protocol.c
View File

@@ -2678,10 +2678,11 @@ mbus_data_variable_parse(mbus_frame *frame, mbus_data_variable *data)
while (i < frame->data_size) while (i < frame->data_size)
{ {
// Skip filler dif=2F // Skip filler dif=2F
while (((frame->data[i] & 0xFF) == 0x2F) && (i < frame->data_size)) { if ((frame->data[i] & 0xFF) == MBUS_DIB_DIF_IDLE_FILLER)
{
i++; i++;
continue;
} }
if (i == frame->data_size) break;
if ((record = mbus_data_record_new()) == NULL) if ((record = mbus_data_record_new()) == NULL)
{ {

1
mbus/mbus-protocol.h
View File

@@ -129,6 +129,7 @@ typedef struct _mbus_slave_data {
#define MBUS_DIB_VIF_EXTENSION_BIT 0x80 #define MBUS_DIB_VIF_EXTENSION_BIT 0x80
#define MBUS_DIB_DIF_MANUFACTURER_SPECIFIC 0x0F #define MBUS_DIB_DIF_MANUFACTURER_SPECIFIC 0x0F
#define MBUS_DIB_DIF_MORE_RECORDS_FOLLOW 0x1F #define MBUS_DIB_DIF_MORE_RECORDS_FOLLOW 0x1F
#define MBUS_DIB_DIF_IDLE_FILLER 0x2F
typedef struct _mbus_data_information_block { typedef struct _mbus_data_information_block {