gex/gex-client-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed some comments and moved internal helpers into gex_client

Browse Source
This commit is contained in:
MightyPork
2017-12-25 23:27:47 +01:00
parent dfea46decb
commit 5291d530d7
6 changed files with 78 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-2
View File
@@ -11,8 +11,6 @@ set(SOURCE_FILES
gex/serial/serial.h
gex/gex_client.c
gex/gex_client.h
gex/gex_helpers.c
gex/gex_helpers.h
gex/gex_internal.h
gex/gex_message_types.h
gex/utils/hexdump.c
gex/TF_Integration.c
-1
View File
@@ -5,7 +5,6 @@
#include <errno.h>
#include "TinyFrame.h"
#include "utils/hexdump.h"
#include "gex.h"
#include "gex_internal.h"
gex/gex_client.c
+78 -5
View File
@@ -16,9 +16,23 @@
#include "serial.h"
#include "gex_internal.h"
#include "gex_message_types.h"
#include "gex_helpers.h"
#include "utils/payload_parser.h"
/** Delete recursively all GEX callsign look-up table entries */
static void destroy_unit_lookup(GexClient *gex);
/** Get lookup entry for unit name */
static GexUnit *find_unit_by_callsign(GexClient *gex, uint8_t callsign);
/** Get lookup entry for unit name */
static GexUnit *find_unit_by_name(GexClient *gex, const char *name);
/** Get callsign for unit name */
static uint8_t find_callsign_by_name(GexClient *gex, const char *name);
// --------------------------------
/** Get the system unit */
GexUnit *GEX_SysUnit(GexClient *gex)
{
@@ -44,7 +58,7 @@ static TF_Result unit_report_lst(TinyFrame *tf, TF_Msg *msg)
uint8_t callsign = msg->data[0];
uint8_t rpt_type = msg->data[1];
GexUnit *lu = gex_find_unit_by_callsign(gex, callsign);
GexUnit *lu = find_unit_by_callsign(gex, callsign);
GexMsg gexMsg = {
.payload = (uint8_t *) (msg->data + 2),
@@ -68,7 +82,7 @@ static TF_Result list_units_lst(TinyFrame *tf, TF_Msg *msg)
{
GexClient *gex = tf->userdata;
gex_destroy_unit_lookup(gex);
destroy_unit_lookup(gex);
// Parse the payload
PayloadParser pp = pp_start((uint8_t*)msg->data, msg->len, NULL);
@@ -122,7 +136,7 @@ TinyFrame *GEX_GetTF(GexClient *gex)
/** Find a unit */
GexUnit *GEX_GetUnit(GexClient *gex, const char *name)
{
GexUnit *u = gex_find_unit_by_name(gex, name);
GexUnit *u = find_unit_by_name(gex, name);
if (u == NULL) {
fprintf(stderr, "!! Unit %s not found!\n", name);
}
@@ -245,7 +259,66 @@ void GEX_DeInit(GexClient *gex)
{
if (gex == NULL) return;
fsync(gex->acm_fd);
gex_destroy_unit_lookup(gex);
destroy_unit_lookup(gex);
TF_DeInit(gex->tf);
free(gex);
}
// --------------------------------------------------------
/** Delete recursively all GEX callsign look-up table entries */
static void destroy_unit_lookup(GexClient *gex)
{
assert(gex != NULL);
GexUnit *next = gex->ulu_head;
while (next != NULL) {
GexUnit *cur = next;
next = next->next;
free(cur->name);
free(cur->type);
free(cur);
}
gex->ulu_head = NULL;
}
/** Get lookup entry for unit name */
static GexUnit *find_unit_by_callsign(GexClient *gex, uint8_t callsign)
{
assert(gex != NULL);
GexUnit *next = gex->ulu_head;
while (next != NULL) {
if (next->callsign == callsign) {
return next;
}
next = next->next;
}
return NULL;
}
/** Get lookup entry for unit name */
static GexUnit *find_unit_by_name(GexClient *gex, const char *name)
{
assert(gex != NULL);
assert(name != NULL);
GexUnit *next = gex->ulu_head;
while (next != NULL) {
if (strcmp(next->name, name) == 0) {
return next;
}
next = next->next;
}
return NULL;
}
/** Get callsign for unit name */
static uint8_t find_callsign_by_name(GexClient *gex, const char *name)
{
assert(gex != NULL);
GexUnit *lu = find_unit_by_name(gex, name);
return (uint8_t) ((lu == NULL) ? 0 : lu->callsign);
}
gex/gex_helpers.c
-67
View File
@@ -1,67 +0,0 @@
//
// Created by MightyPork on 2017/12/19.
//
#include <malloc.h>
#include <assert.h>
#define GEX_H // to allow including other headers
#include "gex_defines.h"
#include "gex_helpers.h"
#include "gex_internal.h"
/** Delete recursively all GEX callsign look-up table entries */
void gex_destroy_unit_lookup(GexClient *gex)
{
assert(gex != NULL);
struct gex_unit *next = gex->ulu_head;
while (next != NULL) {
struct gex_unit *cur = next;
next = next->next;
free(cur->name);
free(cur->type);
free(cur);
}
gex->ulu_head = NULL;
}
/** Get lookup entry for unit name */
struct gex_unit *gex_find_unit_by_callsign(GexClient *gex, uint8_t callsign)
{
assert(gex != NULL);
struct gex_unit *next = gex->ulu_head;
while (next != NULL) {
if (next->callsign == callsign) {
return next;
}
next = next->next;
}
return NULL;
}
/** Get lookup entry for unit name */
struct gex_unit *gex_find_unit_by_name(GexClient *gex, const char *name)
{
assert(gex != NULL);
assert(name != NULL);
struct gex_unit *next = gex->ulu_head;
while (next != NULL) {
if (strcmp(next->name, name) == 0) {
return next;
}
next = next->next;
}
return NULL;
}
/** Get callsign for unit name */
uint8_t gex_find_callsign_by_name(GexClient *gex, const char *name)
{
assert(gex != NULL);
struct gex_unit *lu = gex_find_unit_by_name(gex, name);
return (uint8_t) ((lu == NULL) ? 0 : lu->callsign);
}
gex/gex_helpers.h
-26
View File
@@ -1,26 +0,0 @@
//
// Created by MightyPork on 2017/12/19.
//
#ifndef GEX_CLIENT_GEX_HELPERS_H
#define GEX_CLIENT_GEX_HELPERS_H
#ifndef GEX_H
#error "Include gex.h instead!"
#endif
#include "gex_defines.h"
/** Delete recursively all GEX callsign look-up table entries */
void gex_destroy_unit_lookup(GexClient *gex);
/** Get lookup entry for unit name */
GexUnit *gex_find_unit_by_callsign(GexClient *gex, uint8_t callsign);
/** Get lookup entry for unit name */
GexUnit *gex_find_unit_by_name(GexClient *gex, const char *name);
/** Get callsign for unit name */
uint8_t gex_find_callsign_by_name(GexClient *gex, const char *name);
#endif //GEX_CLIENT_GEX_HELPERS_H
gex/gex_unit.c
-5
View File
@@ -9,7 +9,6 @@
#define GEX_H // to allow including other headers
#include "gex_defines.h"
#include "gex_helpers.h"
#include "gex_message_types.h"
#include "gex_unit.h"
#include "gex_internal.h"
@@ -33,8 +32,6 @@ static void GEX_LL_Query(GexUnit *unit, uint8_t cmd,
assert(unit != NULL);
assert(unit->gex != NULL);
// fprintf(stderr, "raw pld? %d\n", raw_pld);
GexClient *gex = unit->gex;
uint8_t callsign = 0;
@@ -100,8 +97,6 @@ static TF_Result sync_query_lst(TinyFrame *tf, TF_Msg *msg)
GexClient *gex = tf->userdata;
assert(gex != NULL);
// fprintf(stderr, "sync query lst called <-\n");
// clone the message
gex->squery_msg.len = msg->len;
gex->squery_msg.unit = msg->userdata;