mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 20:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Smart Trak tool compile fix

Browse source 
In commit 70e2404492 ("Stop accessing the internals of
dc_descriptor_t") the structure definition of the libdivecomputer
descriptor was removed from Subsurface and replaced with accessor
functions. This adapts the Smart Trakl import tool to use the same
accessor functions, which allows it to compile again in current master.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-01-17 09:53:56 -08:00
parent e1ee577c4f
commit 22267762ce
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
smtk-import/smartrak.c
View file

@ -607,8 +607,8 @@ static int prepare_data(int data_model, dc_family_t dc_fam, device_data_t *dev_d
dev_data->context = NULL; dev_data->context = NULL;
dev_data->descriptor = get_data_descriptor(data_model, dc_fam); dev_data->descriptor = get_data_descriptor(data_model, dc_fam);
if (dev_data->descriptor) { if (dev_data->descriptor) {
dev_data->vendor = copy_string(dev_data->descriptor->vendor); dev_data->vendor = copy_string(dc_descriptor_get_vendor(dev_data->descriptor));
dev_data->product = copy_string(dev_data->descriptor->product); dev_data->product = copy_string(dc_descriptor_get_product(dev_data->descriptor));
dev_data->model = smtk_concat_str(dev_data->model, "", "%s %s", dev_data->vendor, dev_data->product); dev_data->model = smtk_concat_str(dev_data->model, "", "%s %s", dev_data->vendor, dev_data->product);
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
} else { } else {
@ -625,10 +625,10 @@ static int prepare_data(int data_model, dc_family_t dc_fam, device_data_t *dev_d
static dc_status_t libdc_buffer_complete(device_data_t *dev_data, unsigned char *hdr_buffer, int hdr_length, static dc_status_t libdc_buffer_complete(device_data_t *dev_data, unsigned char *hdr_buffer, int hdr_length,
unsigned char *prf_buffer, int prf_length, unsigned char *compl_buf) unsigned char *prf_buffer, int prf_length, unsigned char *compl_buf)
{ {
switch (dev_data->descriptor->type) { switch (dc_descriptor_get_type(dev_data->descriptor)) {
case DC_FAMILY_UWATEC_ALADIN: case DC_FAMILY_UWATEC_ALADIN:
case DC_FAMILY_UWATEC_MEMOMOUSE: case DC_FAMILY_UWATEC_MEMOMOUSE:
compl_buf[3] = (unsigned char) dev_data->descriptor->model; compl_buf[3] = (unsigned char) dc_descriptor_get_model(dev_data->descriptor);
memcpy(compl_buf+hdr_length, prf_buffer, prf_length); memcpy(compl_buf+hdr_length, prf_buffer, prf_length);
break; break;
case DC_FAMILY_UWATEC_SMART: case DC_FAMILY_UWATEC_SMART:
@ -708,7 +708,7 @@ void smartrak_import(const char *file, struct dive_table *divetable)
if (rc == DC_STATUS_SUCCESS) { if (rc == DC_STATUS_SUCCESS) {
prf_buffer = mdb_ole_read_full(mdb, col[coln(PROFILE)], &prf_length); prf_buffer = mdb_ole_read_full(mdb, col[coln(PROFILE)], &prf_length);
if (prf_length > 0) { if (prf_length > 0) {
if (devdata->descriptor->type == DC_FAMILY_UWATEC_ALADIN || devdata->descriptor->type == DC_FAMILY_UWATEC_MEMOMOUSE) if (dc_descriptor_get_type(devdata->descriptor) == DC_FAMILY_UWATEC_ALADIN || dc_descriptor_get_type(devdata->descriptor) == DC_FAMILY_UWATEC_MEMOMOUSE)
hdr_length = 18; hdr_length = 18;
compl_buffer = calloc(hdr_length+prf_length, sizeof(char)); compl_buffer = calloc(hdr_length+prf_length, sizeof(char));
rc = libdc_buffer_complete(devdata, hdr_buffer, hdr_length, prf_buffer, prf_length, compl_buffer); rc = libdc_buffer_complete(devdata, hdr_buffer, hdr_length, prf_buffer, prf_length, compl_buffer);