summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/handshake.c69
-rw-r--r--src/master_posix.c126
2 files changed, 103 insertions, 92 deletions
diff --git a/src/handshake.c b/src/handshake.c
new file mode 100644
index 0000000..f525f3c
--- /dev/null
+++ b/src/handshake.c
@@ -0,0 +1,69 @@
+#include <stdint.h>
+#include "handshake.h"
+
+/**
+ * Case HS_IDLE
+ *
+ */
+hs_status_t HS_func_0(p_stream_t stream, void **args)
+{
+ int hs_status = HS_STATE_0;
+ uint8_t MDR_req_buf[2] = {0x0, 0x1};
+ if (stream.write(MDR_req_buf, 2, NULL, &stream) != 0) {
+ hs_status = HS_STATE_FAIL;
+ }
+ else {
+ hs_status = HS_STATE_1;
+ }
+ return hs_status;
+}
+
+hs_status_t HS_func_1(p_stream_t stream, void **args)
+{
+ int hs_status = HS_STATE_1;
+ uint8_t MDR_ACK_buf[2] = {0x0, 0x0};
+ if (stream.read(MDR_ACK_buf, 2, NULL, &stream) != 0);
+ else {
+ uint8_t ACK_flag = MDR_ACK_buf[1];
+ if (ACK_flag == 0xFF) {
+ /* Assign MDR_len for forward propogation in FSM */
+ args[0] = malloc(sizeof(uint16_t));
+ args[0] = &MDR_ACK_buf[0];
+ hs_status = HS_STATE_2;
+ }
+ else {
+ hs_status = HS_STATE_FAIL;
+ }
+ }
+ return hs_status;
+}
+
+hs_status_t HS_func_2(p_stream_t stream, void **args)
+{
+ int hs_status = HS_STATE_2;
+ uint8_t MDR_CTS_buf[2] = {0x0, 0x02};
+ if (stream.write(MDR_CTS_buf, 2, NULL, &stream) != 0) {
+ hs_status = HS_STATE_FAIL;
+ }
+ else {
+ hs_status = HS_STATE_3;
+ }
+ return hs_status;
+}
+
+hs_status_t HS_func_3(p_stream_t stream, void **args)
+{
+ int hs_status = HS_STATE_3;
+ uint8_t *MDR_buf, *MDR_len = (uint8_t*)args[0];
+ MDR_buf = (uint8_t*)malloc(*MDR_len);
+
+ if (stream.read(MDR_buf, *MDR_len, NULL, &stream) != 0) {
+ hs_status = HS_STATE_FAIL;
+ }
+ else {
+ args[1] = malloc(sizeof(uint8_t)*(*MDR_len));
+ memcpy(args[1], MDR_buf, *MDR_len);
+ hs_status = HS_STATE_SUCCESS;
+ }
+ return hs_status;
+}
diff --git a/src/master_posix.c b/src/master_posix.c
index dc8be7a..c5ed3f5 100644
--- a/src/master_posix.c
+++ b/src/master_posix.c
@@ -30,6 +30,7 @@
#include "stream.h"
#include "stream_stdio.h"
#include "port.h"
+#include "handshake.h"
/* FreeRTOS+POSIX. should go in the port folder */
/* #include "FreeRTOS_POSIX/pthread.h" */
@@ -54,6 +55,10 @@
#define BUS_DEVICE_LIMIT 2
+hs_func_t hs_jumptable[NUM_STATES] = {
+ HS_STATE_TABLE(EXPAND_AS_JUMPTABLE)
+};
+
device_info_t *device_info[BUS_DEVICE_LIMIT] = {NULL};
subscription_info_t* subs_info[BUS_DEVICE_LIMIT];
uint32_t allocated[4]={0};
@@ -78,7 +83,6 @@ static void *handshake_func(void * pvArgs);
static void *dataflow_func(void *pvArgs);
static void *routing_func(void *pvArgs);
-hs_status_t handshake(uint32_t i2c_addr);
dataflow_status_t device_dataflow(uint8_t i2c_addr, uint32_t SOR_code, uint8_t routing_buf_idx);
bool routing(void);
bool cmd_routing(void);
@@ -129,15 +133,39 @@ void vStartPOSIXMaster(void *pvParams)
}
static void *handshake_func(void * pvArgs)
-{
- hs_status_t hs_status;
+{
printf("Handshake thread started %s", LINE_BREAK);
-
for (;;) {
for (int dev_idx = 0; dev_idx < BUS_DEVICE_LIMIT-1; dev_idx++) {
if (todo_hs_or_not_todo_hs(GET_ADDR_FROM_IDX(dev_idx))) {
- hs_status = handshake(GET_ADDR_FROM_IDX(dev_idx));
- dev_sts[dev_idx] = get_state_from_hs_status(GET_ADDR_FROM_IDX(dev_idx), hs_status);
+ int hs_state = HS_STATE_0;
+ void **args;
+ args = malloc(sizeof(uint8_t*)*2);
+
+ uint32_t dev_idx = 0; /*< Do something with this, not relevant anymore */
+
+ while (hs_state != HS_STATE_FAIL && hs_state != HS_STATE_SUCCESS)
+ hs_state = hs_jumptable[hs_state](stream, args);
+
+ if (hs_state == HS_STATE_SUCCESS) {
+ s2m_MDR_response MDR_res_message = s2m_MDR_response_init_default;
+ MDR_res_message.subscriptions.funcs.decode = decode_subscriptions_callback;
+ MDR_res_message.subscriptions.arg = (void*)dev_idx;
+ pb_istream_t MDR_res_stream = pb_istream_from_buffer(args[1],
+ *(uint16_t*)args[0]);
+ if (!pb_decode(&MDR_res_stream, s2m_MDR_response_fields, &MDR_res_message)) {
+ hs_state = HS_STATE_FAIL;
+ }
+ else {
+ device_info[dev_idx] = malloc(sizeof(device_info_t));
+ device_info[dev_idx]->i2c_addr = 0x0;
+ device_info[dev_idx]->device_id = dev_idx;
+ device_info[dev_idx]->MDR = MDR_res_message;
+ hs_state = HS_REGISTERED;
+ }
+ }
+
+ dev_sts[dev_idx] = get_state_from_hs_status(GET_ADDR_FROM_IDX(dev_idx), hs_state);
}
}
}
@@ -167,92 +195,6 @@ static void *routing_func(void *pvArgs)
return NULL;
}
-/* This function should go into its own file, with a normalized state machine implementation */
-hs_status_t handshake(uint32_t i2c_addr)
-{
- /* Handshake variables */
- uint8_t hs_sts = IDLE;
- uint8_t *MDR_buf;
- uint32_t dev_idx = GET_IDX_FROM_ADDR(i2c_addr);
- uint16_t MDR_len = 0;
-
- void **vptr = malloc(sizeof(uint8_t*)*2);
- vptr[0] = malloc(sizeof(uint8_t*));
- vptr[0] = &i2c_addr;
-
- s2m_MDR_response MDR_res_message = s2m_MDR_response_init_default;
-
- while (hs_sts != HS_FAILED && hs_sts != HS_REGISTERED) {
- switch (hs_sts) {
- case (IDLE):
- {
- uint8_t MDR_req_buf[2] = {0x0, 0x1};
- if (stream.write(MDR_req_buf, 2, vptr, &stream) != 0) {
- hs_sts = HS_FAILED;
- }
- else {
- hs_sts = HS_MDR_ACK;
- }
- break;
- }
- case (HS_MDR_ACK):
- {
- uint8_t MDR_ACK_buf[2] = {0x0, 0x0};
- if (stream.read(MDR_ACK_buf, 2, vptr, &stream) != 0) {
- hs_sts = HS_FAILED;
- }
- else {
- uint8_t ACK_flag = MDR_ACK_buf[1];
- if (ACK_flag == 0xFF) {
- MDR_len = MDR_ACK_buf[0];
- hs_sts = HS_MDR_CTS;
- }
- else {
- hs_sts = HS_FAILED;
- }
- }
- break;
- }
- case (HS_MDR_CTS):
- {
- uint8_t MDR_CTS_buf[2] = {0x0, 0x02};
- if (stream.write(MDR_CTS_buf, 2, vptr, &stream) != 0) {
- hs_sts = HS_FAILED;
- }
- else {
- hs_sts = HS_MDR_MDR;
- }
- break;
- }
- case (HS_MDR_MDR):
- {
- MDR_buf = (uint8_t*)malloc(MDR_len);
- if (stream.read(MDR_buf, MDR_len, vptr, &stream) != 0) {
- hs_sts = HS_FAILED;
- }
- else {
- MDR_res_message.subscriptions.funcs.decode = decode_subscriptions_callback;
- MDR_res_message.subscriptions.arg = (void*)dev_idx;
- pb_istream_t MDR_res_stream = pb_istream_from_buffer(MDR_buf, MDR_len);
- if (!pb_decode(&MDR_res_stream, s2m_MDR_response_fields, &MDR_res_message)) {
- hs_sts = HS_FAILED;
- }
- else {
- device_info[dev_idx] = malloc(sizeof(device_info_t));
- device_info[dev_idx]->i2c_addr = i2c_addr;
- device_info[dev_idx]->device_id = dev_idx;
- device_info[dev_idx]->MDR = MDR_res_message;
-
- hs_sts = HS_REGISTERED;
- }
- }
- break;
- }
- }
- }
- return hs_sts;
-}
-
dataflow_status_t device_dataflow(uint8_t i2c_addr, uint32_t SOR_code, volatile uint8_t rbuf_idx)
{
uint8_t dev_idx = GET_IDX_FROM_ADDR(i2c_addr);
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-12 03:15:15 +0000