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

FTDI support: add minimal debugging output

Browse source 
Copied the libdivecomputer macros for convenience.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-05-29 20:56:42 -07:00
parent c05fe9fc9b
commit cbe03fd88d
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/libdivecomputer.c
View file

@ -38,6 +38,16 @@ static int stoptime, stopdepth, ndl, po2, cns;
static bool in_deco, first_temp_is_air; static bool in_deco, first_temp_is_air;
static int current_gas_index; static int current_gas_index;
/* logging bits from libdivecomputer */
#ifndef __ANDROID__
#define INFO(context, fmt, ...) fprintf(stderr, "INFO: " fmt "\n", ##__VA_ARGS__)
#define ERROR(context, fmt, ...) fprintf(stderr, "ERROR: " fmt "\n", ##__VA_ARGS__)
#else
#include <android/log.h>
#define INFO(context, fmt, ...) __android_log_print(ANDROID_LOG_DEBUG, __FILE__, "INFO: " fmt "\n", ##__VA_ARGS__)
#define ERROR(context, fmt, ...) __android_log_print(ANDROID_LOG_DEBUG, __FILE__, "ERROR: " fmt "\n", ##__VA_ARGS__)
#endif
/* /*
* Directly taken from libdivecomputer's examples/common.c to improve * Directly taken from libdivecomputer's examples/common.c to improve
* the error messages resulting from libdc's return codes * the error messages resulting from libdc's return codes
@ -1076,6 +1086,9 @@ const char *do_libdivecomputer_import(device_data_t *data)
#ifdef SERIAL_FTDI #ifdef SERIAL_FTDI
} else if (!strcmp(data->devname, "ftdi")) { } else if (!strcmp(data->devname, "ftdi")) {
rc = dc_context_set_custom_serial(data->context, &serial_ftdi_ops); rc = dc_context_set_custom_serial(data->context, &serial_ftdi_ops);
INFO(0, "setting up ftdi ops");
#else
INFO(0, "FTDI disabled");
#endif #endif
} }
@ -1086,7 +1099,7 @@ const char *do_libdivecomputer_import(device_data_t *data)
{ {
#endif #endif
rc = dc_device_open(&data->device, data->context, data->descriptor, data->devname); rc = dc_device_open(&data->device, data->context, data->descriptor, data->devname);
INFO(0, "dc_deveice_open error value of %d", rc);
if (rc != DC_STATUS_SUCCESS && subsurface_access(data->devname, R_OK | W_OK) != 0) if (rc != DC_STATUS_SUCCESS && subsurface_access(data->devname, R_OK | W_OK) != 0)
err = translate("gettextFromC", "Insufficient privileges to open the device %s %s (%s)"); err = translate("gettextFromC", "Insufficient privileges to open the device %s %s (%s)");
} }

6
core/serial_ftdi.c
View file

@ -121,6 +121,7 @@ static dc_status_t serial_ftdi_sleep (ftdi_serial_t *device, unsigned long timeo
// Used internally for opening ftdi devices // Used internally for opening ftdi devices
static int serial_ftdi_open_device (struct ftdi_context *ftdi_ctx) static int serial_ftdi_open_device (struct ftdi_context *ftdi_ctx)
{ {
INFO(0, "serial_ftdi_open_device called");
int accepted_pids[] = { 0x6001, 0x6010, 0x6011, // Suunto (Smart Interface), Heinrichs Weikamp int accepted_pids[] = { 0x6001, 0x6010, 0x6011, // Suunto (Smart Interface), Heinrichs Weikamp
0xF460, // Oceanic 0xF460, // Oceanic
0xF680, // Suunto 0xF680, // Suunto
@ -131,6 +132,7 @@ static int serial_ftdi_open_device (struct ftdi_context *ftdi_ctx)
for (i = 0; i < num_accepted_pids; i++) { for (i = 0; i < num_accepted_pids; i++) {
pid = accepted_pids[i]; pid = accepted_pids[i];
ret = ftdi_usb_open (ftdi_ctx, VID, pid); ret = ftdi_usb_open (ftdi_ctx, VID, pid);
INFO(0, "FTDI tried VID %04x pid %04x ret %d\n", VID, pid, ret);
if (ret == -3) // Device not found if (ret == -3) // Device not found
continue; continue;
else else
@ -145,13 +147,14 @@ static int serial_ftdi_open_device (struct ftdi_context *ftdi_ctx)
// Initialise ftdi_context and use it to open the device // Initialise ftdi_context and use it to open the device
static dc_status_t serial_ftdi_open (void **userdata, const char* name) static dc_status_t serial_ftdi_open (void **userdata, const char* name)
{ {
INFO(0, "serial_ftdi_open called");
// Allocate memory. // Allocate memory.
ftdi_serial_t *device = (ftdi_serial_t *) malloc (sizeof (ftdi_serial_t)); ftdi_serial_t *device = (ftdi_serial_t *) malloc (sizeof (ftdi_serial_t));
if (device == NULL) { if (device == NULL) {
SYSERROR (context, errno); SYSERROR (context, errno);
return DC_STATUS_NOMEMORY; return DC_STATUS_NOMEMORY;
} }
INFO(0, "setting up ftdi_ctx");
struct ftdi_context *ftdi_ctx = ftdi_new(); struct ftdi_context *ftdi_ctx = ftdi_new();
if (ftdi_ctx == NULL) { if (ftdi_ctx == NULL) {
free(device); free(device);
@ -171,6 +174,7 @@ static dc_status_t serial_ftdi_open (void **userdata, const char* name)
device->nbits = 0; device->nbits = 0;
// Initialize device ftdi context // Initialize device ftdi context
INFO(0, "initialize ftdi_ctx");
ftdi_init(ftdi_ctx); ftdi_init(ftdi_ctx);
if (ftdi_set_interface(ftdi_ctx,INTERFACE_ANY)) { if (ftdi_set_interface(ftdi_ctx,INTERFACE_ANY)) {