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

garmin: some fields are defined in all message types

Browse Source 
It turns out that the timestamp field can exist across all message
types, as can a few other special fields.

Split those out as "ANY" type fields, so that we get the field
descriptor without having to fill in every message descriptor.

This also makes the message descriptors smaller, since we no longer need
to worry about the high-numbered (253) timestamp field in the arrays.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2018-08-28 15:00:54 -07:00
parent 2c7479ad1c
commit b65b2318f1
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/garmin_parser.c
View File

@ -139,6 +139,11 @@ struct field_desc {
static const struct field_desc name##_field_##type = { #name, parse_##name##_##type }; \
static int parse_##name(struct garmin_parser_t *garmin, type data)
// All msg formats can have a timestamp
DECLARE_FIELD(ANY, timestamp, UINT32) { return 0; }
DECLARE_FIELD(ANY, message_index, UINT16) { return 0; }
DECLARE_FIELD(ANY, part_index, UINT32) { return 0; }
// FILE msg
DECLARE_FIELD(FILE, file_type, ENUM) { return 0; }
DECLARE_FIELD(FILE, manufacturer, UINT16) { return 0; }
@ -148,11 +153,9 @@ DECLARE_FIELD(FILE, creation_time, UINT32) { return 0; }
// SESSION msg
DECLARE_FIELD(SESSION, start_time, UINT32) { return 0; }
DECLARE_FIELD(SESSION, timestamp, UINT32) { return 0; }
// RECORD msg
DECLARE_FIELD(RECORD, start_time, UINT32) { return 0; }
DECLARE_FIELD(RECORD, timestamp, UINT32) { return 0; }
struct msg_desc {
@ -183,20 +186,18 @@ DECLARE_MESG(ZONES_TARGET) = { };
DECLARE_MESG(SPORT) = { };
DECLARE_MESG(SESSION) = {
.maxfield = 254,
.maxfield = 3,
.field = {
SET_FIELD(SESSION, 2, start_time, UINT32),
SET_FIELD(SESSION, 253, timestamp, UINT32),
}
};
DECLARE_MESG(LAP) = { };
DECLARE_MESG(RECORD) = {
.maxfield = 254,
.maxfield = 3,
.field = {
SET_FIELD(RECORD, 2, start_time, UINT32),
SET_FIELD(RECORD, 253, timestamp, UINT32),
}
};
@ -343,9 +344,23 @@ static int traverse_regular(struct garmin_parser_t *garmin,
}
// Certain field numbers have fixed meaning across all messages
switch (field_nr) {
case 250:
field_desc = &ANY_part_index_field_UINT32;
break;
case 253:
field_desc = &ANY_timestamp_field_UINT32;
break;
case 254:
field_desc = &ANY_message_index_field_UINT16;
break;
default:
field_desc = NULL;
if (field_nr < msg_desc->maxfield)
field_desc = msg_desc->field[field_nr];
}
if (field_desc) {
field_desc->parse(garmin, data);