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

Setup the 2 byte command header internally

Browse Source 
Instead of setting up the two byte command header in every function,
move this logic to a central place.
This commit is contained in:
Jef Driesen 2023-08-25 18:31:11 +02:00
parent 072f0d4242
commit a7e7439cab
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/mares_iconhd.c
View File

@ -21,7 +21,6 @@
#include <string.h> // memcpy, memcmp #include <string.h> // memcpy, memcmp
#include <stdlib.h> // malloc, free #include <stdlib.h> // malloc, free
#include <assert.h> // assert
#include "mares_iconhd.h" #include "mares_iconhd.h"
#include "context-private.h" #include "context-private.h"
@ -178,19 +177,21 @@ mares_iconhd_get_model (mares_iconhd_device_t *device)
static dc_status_t static dc_status_t
mares_iconhd_packet (mares_iconhd_device_t *device, mares_iconhd_packet (mares_iconhd_device_t *device,
const unsigned char command[], unsigned int csize, unsigned char cmd,
const unsigned char data[], unsigned int size,
unsigned char answer[], unsigned int asize) unsigned char answer[], unsigned int asize)
{ {
dc_status_t status = DC_STATUS_SUCCESS; dc_status_t status = DC_STATUS_SUCCESS;
dc_device_t *abstract = (dc_device_t *) device; dc_device_t *abstract = (dc_device_t *) device;
assert (csize >= 2);
if (device_is_cancelled (abstract)) if (device_is_cancelled (abstract))
return DC_STATUS_CANCELLED; return DC_STATUS_CANCELLED;
// Send the command header to the dive computer. // Send the command header to the dive computer.
status = dc_iostream_write (device->iostream, command, 2, NULL); const unsigned char command[2] = {
cmd, cmd ^ XOR,
};
status = dc_iostream_write (device->iostream, command, sizeof(command), NULL);
if (status != DC_STATUS_SUCCESS) { if (status != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to send the command."); ERROR (abstract->context, "Failed to send the command.");
return status; return status;
@ -211,8 +212,8 @@ mares_iconhd_packet (mares_iconhd_device_t *device,
} }
// Send the command payload to the dive computer. // Send the command payload to the dive computer.
if (csize > 2) { if (size) {
status = dc_iostream_write (device->iostream, command + 2, csize - 2, NULL); status = dc_iostream_write (device->iostream, data, size, NULL);
if (status != DC_STATUS_SUCCESS) { if (status != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to send the command."); ERROR (abstract->context, "Failed to send the command.");
return status; return status;
@ -244,11 +245,11 @@ mares_iconhd_packet (mares_iconhd_device_t *device,
} }
static dc_status_t static dc_status_t
mares_iconhd_transfer (mares_iconhd_device_t *device, const unsigned char command[], unsigned int csize, unsigned char answer[], unsigned int asize) mares_iconhd_transfer (mares_iconhd_device_t *device, unsigned char cmd, const unsigned char data[], unsigned int size, unsigned char answer[], unsigned int asize)
{ {
unsigned int nretries = 0; unsigned int nretries = 0;
dc_status_t rc = DC_STATUS_SUCCESS; dc_status_t rc = DC_STATUS_SUCCESS;
while ((rc = mares_iconhd_packet (device, command, csize, answer, asize)) != DC_STATUS_SUCCESS) { while ((rc = mares_iconhd_packet (device, cmd, data, size, answer, asize)) != DC_STATUS_SUCCESS) {
// Automatically discard a corrupted packet, // Automatically discard a corrupted packet,
// and request a new one. // and request a new one.
if (rc != DC_STATUS_PROTOCOL && rc != DC_STATUS_TIMEOUT) if (rc != DC_STATUS_PROTOCOL && rc != DC_STATUS_TIMEOUT)
@ -283,23 +284,21 @@ mares_iconhd_read_object(mares_iconhd_device_t *device, dc_event_progress_t *pro
// Transfer the init packet. // Transfer the init packet.
unsigned char rsp_init[16]; unsigned char rsp_init[16];
unsigned char cmd_init[18] = { unsigned char cmd_init[16] = {
CMD_OBJ_INIT,
CMD_OBJ_INIT ^ XOR,
0x40, 0x40,
(index >> 0) & 0xFF, (index >> 0) & 0xFF,
(index >> 8) & 0xFF, (index >> 8) & 0xFF,
subindex & 0xFF subindex & 0xFF
}; };
memset (cmd_init + 6, 0x00, sizeof(cmd_init) - 6); memset (cmd_init + 6, 0x00, sizeof(cmd_init) - 6);
status = mares_iconhd_transfer (device, cmd_init, sizeof (cmd_init), rsp_init, sizeof (rsp_init)); status = mares_iconhd_transfer (device, CMD_OBJ_INIT, cmd_init, sizeof (cmd_init), rsp_init, sizeof (rsp_init));
if (status != DC_STATUS_SUCCESS) { if (status != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to transfer the init packet."); ERROR (abstract->context, "Failed to transfer the init packet.");
return status; return status;
} }
// Verify the packet header. // Verify the packet header.
if (memcmp (cmd_init + 3, rsp_init + 1, 3) != 0) { if (memcmp (cmd_init + 1, rsp_init + 1, 3) != 0) {
ERROR (abstract->context, "Unexpected packet header."); ERROR (abstract->context, "Unexpected packet header.");
return DC_STATUS_PROTOCOL; return DC_STATUS_PROTOCOL;
} }
@ -347,8 +346,7 @@ mares_iconhd_read_object(mares_iconhd_device_t *device, dc_event_progress_t *pro
// Transfer the segment packet. // Transfer the segment packet.
unsigned char rsp_segment[1 + 504]; unsigned char rsp_segment[1 + 504];
unsigned char cmd_segment[] = {cmd, cmd ^ XOR}; status = mares_iconhd_transfer (device, cmd, NULL, 0, rsp_segment, len + 1);
status = mares_iconhd_transfer (device, cmd_segment, sizeof (cmd_segment), rsp_segment, len + 1);
if (status != DC_STATUS_SUCCESS) { if (status != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to transfer the segment packet."); ERROR (abstract->context, "Failed to transfer the segment packet.");
return status; return status;
@ -447,8 +445,7 @@ mares_iconhd_device_open (dc_device_t **out, dc_context_t *context, dc_iostream_
dc_iostream_purge (device->iostream, DC_DIRECTION_ALL); dc_iostream_purge (device->iostream, DC_DIRECTION_ALL);
// Send the version command. // Send the version command.
unsigned char command[] = {CMD_VERSION, CMD_VERSION ^ XOR}; status = mares_iconhd_transfer (device, CMD_VERSION, NULL, 0,
status = mares_iconhd_transfer (device, command, sizeof (command),
device->version, sizeof (device->version)); device->version, sizeof (device->version));
if (status != DC_STATUS_SUCCESS) { if (status != DC_STATUS_SUCCESS) {
goto error_free_iostream; goto error_free_iostream;
@ -460,9 +457,8 @@ mares_iconhd_device_open (dc_device_t **out, dc_context_t *context, dc_iostream_
// Read the size of the flash memory. // Read the size of the flash memory.
unsigned int memsize = 0; unsigned int memsize = 0;
if (device->model == QUAD) { if (device->model == QUAD) {
unsigned char cmd_flash[] = {CMD_FLASHSIZE, CMD_FLASHSIZE ^ XOR};
unsigned char rsp_flash[4] = {0}; unsigned char rsp_flash[4] = {0};
status = mares_iconhd_transfer (device, cmd_flash, sizeof (cmd_flash), rsp_flash, sizeof (rsp_flash)); status = mares_iconhd_transfer (device, CMD_FLASHSIZE, NULL, 0, rsp_flash, sizeof (rsp_flash));
if (status != DC_STATUS_SUCCESS) { if (status != DC_STATUS_SUCCESS) {
WARNING (context, "Failed to read the flash memory size."); WARNING (context, "Failed to read the flash memory size.");
} else { } else {
@ -575,7 +571,7 @@ mares_iconhd_device_read (dc_device_t *abstract, unsigned int address, unsigned
len = device->packetsize; len = device->packetsize;
// Read the packet. // Read the packet.
unsigned char command[] = {CMD_READ, CMD_READ ^ XOR, unsigned char command[] = {
(address ) & 0xFF, (address ) & 0xFF,
(address >> 8) & 0xFF, (address >> 8) & 0xFF,
(address >> 16) & 0xFF, (address >> 16) & 0xFF,
@ -584,7 +580,7 @@ mares_iconhd_device_read (dc_device_t *abstract, unsigned int address, unsigned
(len >> 8) & 0xFF, (len >> 8) & 0xFF,
(len >> 16) & 0xFF, (len >> 16) & 0xFF,
(len >> 24) & 0xFF}; (len >> 24) & 0xFF};
rc = mares_iconhd_transfer (device, command, sizeof (command), data, len); rc = mares_iconhd_transfer (device, CMD_READ, command, sizeof (command), data, len);
if (rc != DC_STATUS_SUCCESS) if (rc != DC_STATUS_SUCCESS)
return rc; return rc;