From 671c3ba04803df861ceb0220f6c6e921bbf627f7 Mon Sep 17 00:00:00 2001 From: Qukich Date: Mon, 25 Dec 2023 20:11:27 +0300 Subject: [PATCH 1/4] w --- .gitignore | 9 ++++ .idea/modules.xml | 2 +- CMakeLists.txt | 6 +++ client.c | 125 ---------------------------------------------- client.h | 24 --------- hdlc/client.c | 115 ++++++++++++++++++++++++++++++++++++++++++ hdlc/client.h | 30 +++++++++++ hdlc/fcs.c | 41 +++++++++++++++ hdlc/fcs.h | 18 +++++++ hdlc_frame.c | 108 --------------------------------------- hdlc_frame.h | 15 +++++- main.c | 25 ---------- uart_module.c | 82 ------------------------------ uart_module.h | 20 -------- 14 files changed, 233 insertions(+), 387 deletions(-) create mode 100644 .gitignore create mode 100644 CMakeLists.txt delete mode 100644 client.c delete mode 100644 client.h create mode 100644 hdlc/client.c create mode 100644 hdlc/client.h create mode 100644 hdlc/fcs.c create mode 100644 hdlc/fcs.h delete mode 100644 hdlc_frame.c delete mode 100644 main.c delete mode 100644 uart_module.c delete mode 100644 uart_module.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d8ff23 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +hdlc1.c +hdlc1.h +hdlc_frame.c +hdlc_frame.h +main1.c +uart.c +uart.h + +!./hdlc \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 639da93..4922bfe 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..5aea8e2 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.25) +project(untitled1 C) + +set(CMAKE_C_STANDARD 11) + +add_executable(untitled1 hdlc/fcs.h hdlc/fcs.c hdlc/hdlc.h hdlc/hdlc.c hdlc/main.c hdlc/client.c) diff --git a/client.c b/client.c deleted file mode 100644 index a456c45..0000000 --- a/client.c +++ /dev/null @@ -1,125 +0,0 @@ -#include "client.h" - -#include -#include - -#define START_FLAG 0x7E -#define END_FLAG 0x7E - -void init_Client(Client* client, bool test_is_valid, uint8_t address) { - client->TEST_IS_VALID = test_is_valid; - client->address = address; - client->_send_sequence_number = 0; - client->poll_final = 1; - client->_receive_sequence_number = 0; -} - - -void connect(Client* client) { - UFrame u_frame; - init_UFrame(&u_frame, client->address, client->poll_final, "BP", NULL, 0); - - uint8_t result[256]; - create_frame(&u_frame.base, result); - - - // Wait for acknowledgment frame - bool flag = true; - uint8_t data; - while(flag){ - data = uart_read(); - if (data > 0){ - flag = false; - } - } - - HDLCFrame frame; - init_HDLCFrame(&frame, 0, 0, &data + 3, 256 - 6); - if (validate(&data, 256)) { - return; - } else { - // Connection failed - } -} - -void send(Client* client, uint8_t* data, size_t data_length) { - connect(client); - - IFrame i_frame; - init_IFrame(&i_frame, client->address, client->_receive_sequence_number, client->poll_final, client->_send_sequence_number, data, data_length); - - uint8_t result[256]; - create_frame(&i_frame.base, result); - - uart_send_byte(*i_frame.base.data); - - client->_send_sequence_number++; -} - -void receive_data(uint8_t* recivedData) { - bool flag = true; - while(flag){ - *recivedData = uart_read(); - if (recivedData > 0){ - flag = false; - } - } -} - -#include - -bool validate(const uint8_t* frame, size_t length) { - if (length < 4 || frame[0] != START_FLAG || frame[length - 1] != END_FLAG) { - // Invalid frame length or missing start/end flag - return false; - } - - uint16_t received_fcs = (frame[length - 3] << 8) | frame[length - 2]; - uint16_t calculated_fcs = 0xFFFF; - - for (size_t i = 1; i < length - 3; i++) { - uint8_t byte = frame[i]; - calculated_fcs = (calculated_fcs >> 8) ^ (calculated_fcs << 8) ^ byte; - calculated_fcs &= 0xFFFF; - } - - return received_fcs == calculated_fcs; -} - -int sendSerialData(const char* port, uint8_t* data, size_t length) { - int serial_port = open(port, O_RDWR); - - if (serial_port < 0) { - perror("Error opening the serial port"); - return -1; - } - - ssize_t bytes_written = write(serial_port, data, length); - - if (bytes_written < 0) { - perror("Error writing to the serial port"); - return -1; - } - - close(serial_port); - return bytes_written; -} - -int receiveSerialData(const char* port, uint8_t* data, int length) { - int serial_port = open(port, O_RDWR); // Replace "port" with your serial port device - - if (serial_port < 0) { - perror("Error opening the serial port"); - return -1; - } - - ssize_t bytes_read = read(serial_port, data, length); - - if (bytes_read < 0) { - perror("Error reading from the serial port"); - return -1; - } - - close(serial_port); - return bytes_read; -} \ No newline at end of file diff --git a/client.h b/client.h deleted file mode 100644 index 0a19d58..0000000 --- a/client.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef CLIENT_H -#define CLIENT_H - -#include "hdlc_frame.h" -#include "uart_module.h" -#include -#include // Для использования size_t -#include - -typedef struct { - bool TEST_IS_VALID; - uint8_t address; - uint8_t _send_sequence_number; - uint8_t poll_final; - uint8_t _receive_sequence_number; -} Client; - -void init_Client(Client* client, bool test_is_valid, uint8_t address); -void connect(Client* client); -void send(Client* client, uint8_t* data, size_t data_length); -void receive_data(uint8_t* recivedData); -bool validate(const uint8_t* frame, size_t length); - -#endif diff --git a/hdlc/client.c b/hdlc/client.c new file mode 100644 index 0000000..cc9071f --- /dev/null +++ b/hdlc/client.c @@ -0,0 +1,115 @@ +#include "client.h" +#include "hdlc.h" +#include "stdio.h" +#include "stdbool.h" + +#define CONNECT_FRAME_PERIOD 200 +#define SIZE_DATA_BUFFER 64 +#define COUNT_BUFFERS 4 + +bool FLAG_FILL_BUFFER1 = false; +bool FLAG_FILL_BUFFER2 = false; +bool FLAG_FILL_BUFFER3 = false; +bool FLAG_FILL_BUFFER4 = false; + +#define ERR_INVALID_DATA_SIZE -1 +#define ERR_ALL_BUFFERS_FILL -2 + +struct Client hdlc_client; + +uint8_t buffer_data[COUNT_BUFFERS][SIZE_DATA_BUFFER]; + +struct Client init_hdlc_client(enum HDLCState *state){ + return hdlc_client; +} + +void connect(struct Client* client){ + client->state = CONNECTING; +} + +int send_data(struct Client* client, uint8_t* data, size_t data_len){ + if (data_len > 64){ + return ERR_INVALID_DATA_SIZE; + } + + if (!FLAG_FILL_BUFFER1){ + for(int i = 0; i < SIZE_DATA_BUFFER; i++){ + buffer_data[0][i] = data[i]; + } + + FLAG_FILL_BUFFER1 = true; + } else if (!FLAG_FILL_BUFFER2){ + for(int i = 0; i < SIZE_DATA_BUFFER; i++){ + buffer_data[1][i] = data[i]; + } + + FLAG_FILL_BUFFER2 = true; + } else if (!FLAG_FILL_BUFFER3){ + for(int i = 0; i < SIZE_DATA_BUFFER; i++){ + buffer_data[2][i] = data[i]; + } + + FLAG_FILL_BUFFER3 = true; + } if (!FLAG_FILL_BUFFER4){ + for(int i = 0; i < SIZE_DATA_BUFFER; i++){ + buffer_data[3][i] = data[i]; + } + + FLAG_FILL_BUFFER4 = true; + } else { + return ERR_ALL_BUFFERS_FILL; + } + + client->state = READY_STATE; +}; + +int get_frame(struct Client* client, uint8_t buffer[], size_t lenBuffer){ + hdlc_control_t control_send; + + switch (client->state) { + case CONNECTING: + if (client->connecting_frame_timeout <= 0){ + control_send.frame = HDLC_FRAME_ACK; + control_send.seq_no = 1; + + int ret = hdlc_frame_data(&control_send, NULL, 0, buffer, &lenBuffer); + if (ret < 0){ + printf("err in get_frame ACK: %d\n", ret); + } + + client->connecting_frame_timeout = CONNECT_FRAME_PERIOD; + } + break; + case READY_STATE: + control_send.frame = HDLC_FRAME_DATA; + control_send.seq_no = 1; + int ret = hdlc_frame_data(&control_send, buffer_data[0], SIZE_DATA_BUFFER, buffer, &lenBuffer); + if (ret < 0){ + printf("err in get_frame DATA: %d\n", ret); + } + break; + } + +// Yf + + return 0; +} + +int hdlc_get_raw_data(struct Client* client, uint8_t buffer[], size_t len_buffer){ + hdlc_control_t recv_control; + uint8_t recive[len_buffer]; + + int ret = hdlc_get_data(&recv_control, buffer, len_buffer, recive, + &len_buffer); + if (ret < 0){ + printf("err in get_raw_data: %d\n", ret); + } + if (recv_control.frame == HDLC_FRAME_ACK){ + client->state = IDLE_STATE; + } + return 0; +} + +void hdlc_timeout_handler(struct Client* client, int delta_time){ + client->connecting_frame_timeout -= delta_time; +} \ No newline at end of file diff --git a/hdlc/client.h b/hdlc/client.h new file mode 100644 index 0000000..64b0ba6 --- /dev/null +++ b/hdlc/client.h @@ -0,0 +1,30 @@ +#ifndef CLIENT_H +#define CLIENT_H + +#include +#include + +enum HDLCState { + UNINITIALIZED_STATE = 0, // состояние до инцилизации + IDLE_STATE, // Состояние ожидания начала + READY_STATE, // Состояние принятия + CONNECTING, // состояние соединения + DISCONNECTING, // состояния отключения + RECIVED // состояние приема и отправки +}; + +struct Client{ + enum HDLCState state; + int connecting_frame_timeout; //-1 +}; + +//название функций +struct Client init_hdlc_client(enum HDLCState *state); +void connect(struct Client* client); +int send_data(struct Client* client, uint8_t* data, size_t data_len); +int get_frame(struct Client* client, uint8_t buffer[], size_t lenBuffer); +//принимает буффер с уарта +int hdlc_get_raw_data(struct Client* client, uint8_t buffer[], size_t len_buffer); +void hdlc_timeout_handler(struct Client* client, int delta_time); + +#endif //CLIENT_H diff --git a/hdlc/fcs.c b/hdlc/fcs.c new file mode 100644 index 0000000..6e29cf8 --- /dev/null +++ b/hdlc/fcs.c @@ -0,0 +1,41 @@ +#include "fcs.h" + +/* + * CRC-Type: CRC16 CCIT + * Polynomial: 0x1021 (x^16+x^12+x^5+1) + * Lookup Table: Reflected + */ +static const unsigned short fcstab[256] = { + 0x0000, 0x1189, 0x2312, 0x329b, + 0x4624, 0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, + 0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, + 0x75b7, 0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, + 0xe876, 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, + 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, 0x3183, + 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, 0xbdcb, 0xac42, + 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, + 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, + 0x8868, 0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, + 0x0528, 0x37b3, 0x263a, 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, + 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, + 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, + 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, 0xffcf, + 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, 0x8408, 0x9581, + 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, + 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, + 0xd2ad, 0xc324, 0xf1bf, 0xe036, 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, + 0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, + 0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, + 0x5dfd, 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, + 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, 0xc60c, + 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, + 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, 0xf59f, + 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c, 0x79d7, 0x685e, + 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, + 0xb0a3, 0x8238, 0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, + 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, + 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; + +FCS_SIZE calc_fcs(FCS_SIZE fcs, unsigned char value) { + return (fcs >> 8) ^ fcstab[(fcs ^ value) & 0xff]; +} \ No newline at end of file diff --git a/hdlc/fcs.h b/hdlc/fcs.h new file mode 100644 index 0000000..6673d40 --- /dev/null +++ b/hdlc/fcs.h @@ -0,0 +1,18 @@ +#ifndef FCS_H +#define FCS_H + +#define FCS_INIT_VALUE 0xFFFF /* FCS initialization value. */ +#define FCS_GOOD_VALUE 0xF0B8 /* FCS value for valid frames. */ +#define FCS_INVERT_MASK 0xFFFF /* Invert the FCS value accordingly to the specification */ +#define FCS_SIZE unsigned short + +/** + * Calculates a new FCS based on the current value and value of data. + * + * @param fcs Current FCS value + * @param value The value to be added + * @returns Calculated FCS value + */ +FCS_SIZE calc_fcs(FCS_SIZE fcs, unsigned char value); + +#endif \ No newline at end of file diff --git a/hdlc_frame.c b/hdlc_frame.c deleted file mode 100644 index e7965c6..0000000 --- a/hdlc_frame.c +++ /dev/null @@ -1,108 +0,0 @@ -#include "hdlc_frame.h" - -#include - -#define START_FLAG 0x7E -#define END_FLAG 0x7E -#define ESCAPE_FLAG 0x7D -#define ESCAPE_XOR 0x20 - -void init_HDLCFrame(HDLCFrame* frame, uint8_t address, uint8_t control, uint8_t* data, size_t data_length) { - frame->address = address; - frame->control = control; - frame->data = data; - frame->data_length = data_length; -} - -uint16_t calculate_fcs(const HDLCFrame *frame, size_t i) { - uint16_t fcs = 0xFFFF; - - uint8_t data_bytes[2 + frame->data_length]; - data_bytes[0] = frame->address; - data_bytes[1] = frame->control; - memcpy(data_bytes + 2, frame->data, frame->data_length); - - for (size_t i = 0; i < frame->data_length + 2; i++) { - uint8_t byte = data_bytes[i]; - fcs = (fcs >> 8) ^ (fcs << 8) ^ byte; - fcs &= 0xFFFF; - } - - return fcs; -} - -void create_frame(const HDLCFrame* frame, uint8_t* result) { - size_t index = 0; - - result[index++] = START_FLAG; - result[index++] = frame->address; - result[index++] = frame->control; - - if (frame->data != NULL) { - for (size_t i = 0; i < frame->data_length; i++) { - uint8_t byte = frame->data[i]; - if (byte == START_FLAG || byte == END_FLAG || byte == ESCAPE_FLAG) { - result[index++] = ESCAPE_FLAG; - result[index++] = byte ^ ESCAPE_XOR; - } else { - result[index++] = byte; - } - } - } - - uint16_t fcs = calculate_fcs(frame, 0); - result[index++] = fcs & 0xFF; - result[index++] = (fcs >> 8) & 0xFF; - result[index++] = END_FLAG; -} - -void init_IFrame(IFrame* frame, uint8_t address, uint8_t receive_sequence_number, uint8_t poll_final, - uint8_t send_sequence_number, uint8_t* data, size_t data_length) { - init_HDLCFrame(&frame->base, address, - ((receive_sequence_number & 0b111) << 6) | ((poll_final & 0b1) << 4) | - ((send_sequence_number & 0b111) << 1) | 0, - data, data_length); - frame->receive_sequence_number = receive_sequence_number; - frame->poll_final = poll_final; - frame->send_sequence_number = send_sequence_number; -} - -void init_SFrame(SFrame* frame, uint8_t address, uint8_t receive_sequence_number, uint8_t poll_final, - const char* frame_type) { - uint8_t frame_type_value; - if (strcmp(frame_type, "RR") == 0) { - frame_type_value = 0; - } else if (strcmp(frame_type, "RNR") == 0) { - frame_type_value = 1; - } else if (strcmp(frame_type, "REJ") == 0) { - frame_type_value = 2; - } else if (strcmp(frame_type, "SREJ") == 0) { - frame_type_value = 3; - } else { - // Handle error - return; - } - - init_HDLCFrame(&frame->base, address, - ((receive_sequence_number & 0b111) << 6) | ((poll_final & 0b1) << 5) | - ((frame_type_value & 0b111) << 2) | 1, - NULL, 0); - frame->receive_sequence_number = receive_sequence_number; - frame->poll_final = poll_final; - frame->frame_type = frame_type; -} - -void init_UFrame(UFrame* frame, uint8_t address, uint8_t poll_final, const char* frame_type, - uint8_t* data, size_t data_length) { - uint8_t frame_type_value; - if (strcmp(frame_type, "BP") == 0) { - frame_type_value = 63; - } else { - // Handle error - return; - } - - init_HDLCFrame(&frame->base, address, (frame_type_value << 2) | 3, data, data_length); - frame->poll_final = poll_final; - frame->frame_type = frame_type; -} diff --git a/hdlc_frame.h b/hdlc_frame.h index c12eaf5..23056f3 100644 --- a/hdlc_frame.h +++ b/hdlc_frame.h @@ -2,17 +2,19 @@ #define HDLC_FRAME_H #include +#include typedef struct { uint8_t address; uint8_t control; uint8_t* data; size_t data_length; + int timeout; } HDLCFrame; void init_HDLCFrame(HDLCFrame* frame, uint8_t address, uint8_t control, uint8_t* data, size_t data_length); uint16_t calculate_fcs(const HDLCFrame *frame, size_t i); -void create_frame(const HDLCFrame* frame, uint8_t* result); +void create_frame(const HDLCFrame* frame, uint8_t* buffer); typedef struct { HDLCFrame base; @@ -31,8 +33,15 @@ typedef struct { const char* frame_type; } SFrame; +enum SFrameType{ + RR, + RNR, + REJ, + SREJ +}; + void init_SFrame(SFrame* frame, uint8_t address, uint8_t receive_sequence_number, uint8_t poll_final, - const char* frame_type); + enum SFrameType frame_type); typedef struct { HDLCFrame base; @@ -42,4 +51,6 @@ typedef struct { void init_UFrame(UFrame* frame, uint8_t address, uint8_t poll_final, const char* frame_type, uint8_t* data, size_t data_length); +bool validate_fcs(const uint8_t* frame, size_t length); + #endif diff --git a/main.c b/main.c deleted file mode 100644 index 93e2b83..0000000 --- a/main.c +++ /dev/null @@ -1,25 +0,0 @@ -#include -#include "config.h" -#include -#include -#include -#include "uart_hal.h" - - -int main(void) -{ - //example - uint8_t data = 'A'; - - uart_init(9600,0); - uart_send_byte(data); - sei(); - while (1) - { - if(uart_read_count() > 0){ - data = uart_read(); - uart_send_byte(data); - } - - } -} \ No newline at end of file diff --git a/uart_module.c b/uart_module.c deleted file mode 100644 index c4cbc2a..0000000 --- a/uart_module.c +++ /dev/null @@ -1,82 +0,0 @@ -#include "uart_hal.h" - -volatile static uint8_t rx_buffer[RX_BUFFER_SIZE] = {0}; -volatile static uint16_t rx_count = 0; -volatile static uint8_t uart_tx_busy = 1; -// кольцевой буффер -ISR(USART_RX_vect){ - - volatile static uint16_t rx_write_pos = 0; - - rx_buffer[rx_write_pos] = UDR0; - rx_count++; - rx_write_pos++; - if(rx_write_pos >= RX_BUFFER_SIZE){ - rx_write_pos = 0; - } - -} - - -ISR(USART_TX_vect){ - uart_tx_busy = 1; -} - - -void uart_init(uint32_t baud,uint8_t high_speed){ - - uint8_t speed = 16; - - if(high_speed != 0){ - speed = 8; - UCSR0A |= 1 << U2X0; - } - - baud = (F_CPU/(speed*baud)) - 1; - - UBRR0H = (baud & 0x0F00) >> 8; - UBRR0L = (baud & 0x00FF); - - UCSR0B |= (1 << TXEN0) | (1 << RXEN0) | (1 << TXCIE0) | (1 << RXCIE0); - -} - - -void uart_send_byte(uint8_t c){ - while(uart_tx_busy == 0); - uart_tx_busy = 0; - UDR0 = c; -} - -void uart_send_array(uint8_t *c,uint16_t len){ - for(uint16_t i = 0; i < len;i++){ - uart_send_byte(c[i]); - } -} - -void uart_send_string(uint8_t *c){ - uint16_t i = 0; - do{ - uart_send_byte(c[i]); - i++; - - }while(c[i] != '\0'); - uart_send_byte(c[i]); -} - -uint16_t uart_read_count(void){ - return rx_count; -} - -uint8_t uart_read(void){ - static uint16_t rx_read_pos = 0; - uint8_t data = 0; - - data = rx_buffer[rx_read_pos]; - rx_read_pos++; - rx_count--; - if(rx_read_pos >= RX_BUFFER_SIZE){ - rx_read_pos = 0; - } - return data; -} \ No newline at end of file diff --git a/uart_module.h b/uart_module.h deleted file mode 100644 index 284a941..0000000 --- a/uart_module.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef UART_HAL_H_ -#define UART_HAL_H_ - - -#include -#include "config.h" -#include -#include -#include - -#define RX_BUFFER_SIZE 128 - -void uart_init(uint32_t baud,uint8_t high_speed); -void uart_send_byte(uint8_t c); -void uart_send_array(uint8_t *c,uint16_t len); -void uart_send_string(uint8_t *c); -uint16_t uart_read_count(void); -uint8_t uart_read(void); - -#endif /* UART_HAL_H_ */ \ No newline at end of file From 0cd965969e89344450ecbc7dd7e2a5695edabba3 Mon Sep 17 00:00:00 2001 From: Qukich Date: Mon, 25 Dec 2023 20:11:57 +0300 Subject: [PATCH 2/4] w2 --- hdlc/hdlc.c | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++ hdlc/hdlc.h | 126 +++++++++++++++++++++++++ hdlc/main.c | 154 +++++++++++++++++++++++++++++++ 3 files changed, 541 insertions(+) create mode 100644 hdlc/hdlc.c create mode 100644 hdlc/hdlc.h create mode 100644 hdlc/main.c diff --git a/hdlc/hdlc.c b/hdlc/hdlc.c new file mode 100644 index 0000000..81e4781 --- /dev/null +++ b/hdlc/hdlc.c @@ -0,0 +1,261 @@ +#include "hdlc.h" + +// HDLC Control field bit positions +#define HDLC_CONTROL_S_OR_U_FRAME_BIT 0 +#define HDLC_CONTROL_SEND_SEQ_NO_BIT 1 +#define HDLC_CONTROL_S_FRAME_TYPE_BIT 2 +#define HDLC_CONTROL_POLL_BIT 4 +#define HDLC_CONTROL_RECV_SEQ_NO_BIT 5 + +// HDLC Control type definitions +#define HDLC_CONTROL_TYPE_RECEIVE_READY 0 +#define HDLC_CONTROL_TYPE_RECEIVE_NOT_READY 1 +#define HDLC_CONTROL_TYPE_REJECT 2 +#define HDLC_CONTROL_TYPE_SELECTIVE_REJECT 3 + +static hdlc_state_t hdlc_state = { + .control_escape = 0, + .fcs = FCS_INIT_VALUE, + .start_index = -1, + .end_index = -1, + .src_index = 0, + .dest_index = 0, +}; + +int hdlc_set_state(hdlc_state_t *state) { + if (!state) { + return -EINVAL; + } + + hdlc_state = *state; + return 0; +} + + +int hdlc_get_state(hdlc_state_t *state) { + if (!state) { + return -EINVAL; + } + + *state = hdlc_state; + return 0; +} + +void hdlc_escape_value(char value, char *dest, int *dest_index) { + // Check and escape the value if needed + if ((value == HDLC_FLAG_SEQUENCE) || (value == HDLC_CONTROL_ESCAPE)) { + dest[(*dest_index)++] = HDLC_CONTROL_ESCAPE; + value ^= 0x20; + } + + // Add the value to the destination buffer and increment destination index + dest[(*dest_index)++] = value; +} + +hdlc_control_t hdlc_get_control_type(unsigned char control) { + hdlc_control_t value; + + // Check if the frame is a S-frame (or U-frame) + if (control & (1 << HDLC_CONTROL_S_OR_U_FRAME_BIT)) { + // Check if S-frame type is a Receive Ready (ACK) + if (((control >> HDLC_CONTROL_S_FRAME_TYPE_BIT) & 0x3) + == HDLC_CONTROL_TYPE_RECEIVE_READY) { + value.frame = S_FRAME; + } else { + // Assume it is an NACK since Receive Not Ready, Selective Reject and U-frames are not supported + value.frame = S_FRAME_NACK; + } + + // Add the receive sequence number from the S-frame (or U-frame) + value.seq_no = (control >> HDLC_CONTROL_RECV_SEQ_NO_BIT); + } else { + // It must be an I-frame so add the send sequence number (receive sequence number is not used) + value.frame = I_FRAME; + value.seq_no = (control >> HDLC_CONTROL_SEND_SEQ_NO_BIT); + } + + return value; +} + +unsigned char hdlc_frame_control_type(hdlc_control_t *control) { + unsigned char value = 0; + + switch (control->frame) { + case I_FRAME: + // Create the HDLC I-frame control byte with Poll bit set + value |= (control->seq_no << HDLC_CONTROL_SEND_SEQ_NO_BIT); + value |= (1 << HDLC_CONTROL_POLL_BIT); + break; + case S_FRAME: + // Create the HDLC Receive Ready S-frame control byte with Poll bit cleared + value |= (control->seq_no << HDLC_CONTROL_RECV_SEQ_NO_BIT); + value |= (1 << HDLC_CONTROL_S_OR_U_FRAME_BIT); + break; + case S_FRAME_NACK: + // Create the HDLC Receive Ready S-frame control byte with Poll bit cleared + value |= (control->seq_no << HDLC_CONTROL_RECV_SEQ_NO_BIT); + value |= (HDLC_CONTROL_TYPE_REJECT << HDLC_CONTROL_S_FRAME_TYPE_BIT); + value |= (1 << HDLC_CONTROL_S_OR_U_FRAME_BIT); + break; + } + + return value; +} + +void hdlc_get_data_reset() { + hdlc_get_data_reset_with_state(&hdlc_state); +} + +void hdlc_get_data_reset_with_state(hdlc_state_t *state) { + state->fcs = FCS_INIT_VALUE; + state->start_index = state->end_index = -1; + state->src_index = state->dest_index = 0; + state->control_escape = 0; +} + +//int hdlc_get_data(hdlc_control_t *control, const char *src, +// unsigned int src_len, char *dest, unsigned int *dest_len) +int hdlc_get_data(hdlc_control_t *control, uint8_t *src, + size_t src_len, uint8_t *dest, size_t *dest_len){ + return hdlc_get_data_with_state(&hdlc_state, control, src, src_len, dest, dest_len); +} + +//int hdlc_get_data_with_state(hdlc_state_t *state, hdlc_control_t *control, const char *src, +// unsigned int src_len, char *dest, unsigned int *dest_len) +int hdlc_get_data_with_state(hdlc_state_t *state, hdlc_control_t *control, uint8_t *src, + size_t src_len, uint8_t *dest, size_t *dest_len){ + int ret; + char value; + unsigned int i; + + // Make sure that all parameters are valid + if (!state || !control || !src || !dest || !dest_len) { + return -EINVAL; + } + + // Run through the data bytes + for (i = 0; i < src_len; i++) { + // First find the start flag sequence + if (state->start_index < 0) { + if (src[i] == HDLC_FLAG_SEQUENCE) { + // Check if an additional flag sequence byte is present + if ((i < (src_len - 1)) && (src[i + 1] == HDLC_FLAG_SEQUENCE)) { + // Just loop again to silently discard it (accordingly to HDLC) + continue; + } + + state->start_index = state->src_index; + } + } else { + // Check for end flag sequence + if (src[i] == HDLC_FLAG_SEQUENCE) { + // Check if an additional flag sequence byte is present or earlier received + if (((i < (src_len - 1)) && (src[i + 1] == HDLC_FLAG_SEQUENCE)) + || ((state->start_index + 1) == state->src_index)) { + // Just loop again to silently discard it (accordingly to HDLC) + continue; + } + + state->end_index = state->src_index; + break; + } else if (src[i] == HDLC_CONTROL_ESCAPE) { + state->control_escape = 1; + } else { + // Update the value based on any control escape received + if (state->control_escape) { + state->control_escape = 0; + value = src[i] ^ 0x20; + } else { + value = src[i]; + } + + // Now update the FCS value + state->fcs = calc_fcs(state->fcs, value); + + if (state->src_index == state->start_index + 2) { + // Control field is the second byte after the start flag sequence + *control = hdlc_get_control_type(value); + } else if (state->src_index > (state->start_index + 2)) { + // Start adding the data values after the Control field to the buffer + dest[state->dest_index++] = value; + } + } + } + state->src_index++; + } + + // Check for invalid frame (no start or end flag sequence) + if ((state->start_index < 0) || (state->end_index < 0)) { + // Return no message and make sure destination length is 0 + *dest_len = 0; + ret = -ENOMSG; + } else { + // A frame is at least 4 bytes in size and has a valid FCS value + if ((state->end_index < (state->start_index + 4)) + || (state->fcs != FCS_GOOD_VALUE)) { + // Return FCS error and indicate that data up to end flag sequence in buffer should be discarded + *dest_len = i; + ret = -EIO; + } else { + // Return success and indicate that data up to end flag sequence in buffer should be discarded + *dest_len = state->dest_index - sizeof(state->fcs); + ret = i; + } + + // Reset values for next frame + hdlc_get_data_reset_with_state(state); + } + + return ret; +} + +//int hdlc_frame_data(hdlc_control_t *control, const char *src, +// unsigned int src_len, char *dest, unsigned int *dest_len) +int hdlc_frame_data(hdlc_control_t *control, uint8_t *src, + size_t src_len, uint8_t *dest, size_t *dest_len){ + unsigned int i; + int dest_index = 0; + unsigned char value = 0; + FCS_SIZE fcs = FCS_INIT_VALUE; + + // Make sure that all parameters are valid + if (!control || (!src && (src_len > 0)) || !dest || !dest_len) { + return -EINVAL; + } + + // Start by adding the start flag sequence + dest[dest_index++] = HDLC_FLAG_SEQUENCE; + + // Add the all-station address from HDLC (broadcast) + fcs = calc_fcs(fcs, HDLC_ALL_STATION_ADDR); + hdlc_escape_value(HDLC_ALL_STATION_ADDR, dest, &dest_index); + + // Add the framed control field value + value = hdlc_frame_control_type(control); + fcs = calc_fcs(fcs, value); + hdlc_escape_value(value, dest, &dest_index); + + // Only DATA frames should contain data + if (control->frame == HDLC_FRAME_DATA) { + // Calculate FCS and escape data + for (i = 0; i < src_len; i++) { + fcs = calc_fcs(fcs, src[i]); + hdlc_escape_value(src[i], dest, &dest_index); + } + } + + // Invert the FCS value accordingly to the specification + fcs ^= FCS_INVERT_MASK; + + // Run through the FCS bytes and escape the values + for (i = 0; i < sizeof(fcs); i++) { + value = ((fcs >> (8 * i)) & 0xFF); + hdlc_escape_value(value, dest, &dest_index); + } + + // Add end flag sequence and update length of frame + dest[dest_index++] = HDLC_FLAG_SEQUENCE; + *dest_len = dest_index; + + return 0; +} \ No newline at end of file diff --git a/hdlc/hdlc.h b/hdlc/hdlc.h new file mode 100644 index 0000000..4461414 --- /dev/null +++ b/hdlc/hdlc.h @@ -0,0 +1,126 @@ +// +// Created by 79513 on 15.12.2023. +// + +#ifndef HDLC_H +#define HDLC_H + +#include "fcs.h" +#include +#include "stdint.h" + +/** HDLC start/end flag sequence */ +#define HDLC_FLAG_SEQUENCE 0x7E + +/** HDLC control escape value */ +#define HDLC_CONTROL_ESCAPE 0x7D + +/** HDLC all station address */ +#define HDLC_ALL_STATION_ADDR 0xFF + +/** Supported HDLC frame types */ +typedef enum { + I_FRAME, + S_FRAME, + S_FRAME_NACK, +} hdlc_frame_t; + +/** Control field information */ +typedef struct { + hdlc_frame_t frame; + unsigned char seq_no :3; +} hdlc_control_t; + +/** Variables used in hdlc_get_data and hdlc_get_data_with_state + * to keep track of received buffers + */ +typedef struct { + char control_escape; + FCS_SIZE fcs; + int start_index; + int end_index; + int src_index; + int dest_index; +} hdlc_state_t; + +/** + * Set the hdlc state + * + * @param[in] state The new hdlc state to be used + * @retval 0 Success + * @retval -EINVAL Invalid parameter + */ +int hdlc_set_state(hdlc_state_t *state); + +/** + * Get current hdlc state + * + * @param[out] state Current hdlc state + * @retval 0 Success + * @retval -EINVAL Invalid parameter + */ +int hdlc_get_state(hdlc_state_t *state); + +/** + * Retrieves data from specified buffer containing the HDLC frame. Frames can be + * parsed from multiple buffers e.g. when received via UART. + * + * @param[out] control Control field structure with frame type and sequence number + * @param[in] src Source buffer with frame + * @param[in] src_len Source buffer length + * @param[out] dest Destination buffer (should be able to contain max frame size) + * @param[out] dest_len Destination buffer length + * @retval >=0 Success (size of returned value should be discarded from source buffer) + * @retval -EINVAL Invalid parameter + * @retval -ENOMSG Invalid message + * @retval -EIO Invalid FCS (size of dest_len should be discarded from source buffer) + * + * @see hdlc_get_data_with_state + */ +int hdlc_get_data(hdlc_control_t *control, uint8_t *src, + size_t src_len, uint8_t *dest, size_t *dest_len); + +/** + * Retrieves data from specified buffer containing the HDLC frame. Frames can be + * parsed from multiple buffers e.g. when received via UART. + * + * This function is a variation of @ref hdlc_get_data + * The difference is only in first argument: hdlc_state_t *state + * Data under that pointer is used to keep track of internal buffers. + * + * @see hdlc_get_data + */ +int hdlc_get_data_with_state(hdlc_state_t *state, hdlc_control_t *control, uint8_t *src, + size_t src_len, uint8_t *dest, size_t *dest_len); + +/** + * Resets values used in yahdlc_get_data function to keep track of received buffers + */ +void hdlc_get_data_reset(); + +/** + * This is a variation of @ref hdlc_get_data_reset + * Resets state values that are under the pointer provided as argument + * + * This function need to be called before the first call to hdlc_get_data_with_state + * when custom state storage is used. + * + * @see hdlc_get_data_reset + */ +void hdlc_get_data_reset_with_state(hdlc_state_t *state); + +/** + * Creates HDLC frame with specified data buffer. + * + * @param[in] control Control field structure with frame type and sequence number + * @param[in] src Source buffer with data + * @param[in] src_len Source buffer length + * @param[out] dest Destination buffer (should be bigger than source buffer) + * @param[out] dest_len Destination buffer length + * @retval 0 Success + * @retval -EINVAL Invalid parameter + */ +int hdlc_frame_data(hdlc_control_t *control, uint8_t *src, + size_t src_len, uint8_t *dest, size_t *dest_len); + +#endif //HDLC_H diff --git a/hdlc/main.c b/hdlc/main.c new file mode 100644 index 0000000..2b6f796 --- /dev/null +++ b/hdlc/main.c @@ -0,0 +1,154 @@ +//#include "hdlc.h" +#include "stdio.h" +#include "client.h" +#include +#include + +int main(){ + struct Client hdlc; + connect(&hdlc); + uint8_t frame_data[8]; + get_frame(&hdlc, frame_data, sizeof(frame_data), 0, 0); + + hdlc_get_raw_data(&hdlc, frame_data, sizeof(frame_data)); + + uint8_t send[64]; + uint8_t buffer[134]; + for (int i = 0; i < sizeof(send); i++) { + send[i] = (uint8_t) (rand() % 0x70); + } + send_data(&hdlc, send, sizeof(send_data)); + //get_frame(&hdlc, buffer, sizeof(buffer), send_data, sizeof(send_data)); + + hdlc_get_raw_data(&hdlc, buffer, sizeof(buffer)); + + // test 1 + +// int ret; +// uint8_t frame_data[8], recv_data[8]; +// size_t i, frame_length = 0, recv_length = 0; +// hdlc_control_t control_send, control_recv; + +// // Run through the supported sequence numbers (3-bit) +// for (i = 0; i <= 7; i++) { +// // Initialize the control field structure with frame type and sequence number +// control_send.frame = HDLC_FRAME_ACK; +// control_send.seq_no = i; +// +// // Create an empty frame with the control field information +// ret = hdlc_frame_data(&control_send, NULL, 0, frame_data, &frame_length); +// +// // Get the data from the frame +// ret = hdlc_get_data(&control_recv, frame_data, frame_length, recv_data, +// &recv_length); +// +// // Result should be frame_length minus start flag to be discarded and no bytes received +// if(ret != (int )frame_length - 1){ +// printf("err"); +// } +// } +// if (recv_length != 0){ +// printf("err2"); +// } +// +// if (control_send.frame != control_recv.frame){ +// printf("err3"); +// } +// +// if (control_send.seq_no != control_recv.seq_no){ +// printf("err4"); +// } + + // test 2 + + // Run through the supported sequence numbers (3-bit) +// for (i = 0; i <= 7; i++) { +// // Initialize the control field structure with frame type and sequence number +// control_send.frame = HDLC_FRAME_DATA; +// control_send.seq_no = i; +// +// char* input = "311"; +// uint8_t data = (uint8_t)atoi(input); +// +// // Create an empty frame with the control field information +// ret = hdlc_frame_data(&control_send, &data, 3, frame_data, &frame_length); +// if (ret != 0){ +// printf("err123\n"); +// } +// +// // Get the data from the frame +// ret = hdlc_get_data(&control_recv, frame_data, frame_length, recv_data, +// &recv_length); +// +// // Result should be frame_length minus start flag to be discarded and no bytes received +// if(ret != (int )frame_length - 1){ +// printf("err333\n"); +// } +// if (recv_length != 0){ +// printf("err2\n"); +// } +// +// // Verify the control field information +// if (control_send.frame != control_recv.frame){ +// printf("err3\n"); +// } +// +// if (control_send.seq_no != control_recv.seq_no){ +// printf("err4\n"); +// } +// } + +// int ret; +// hdlc_control_t control; +// uint8_t send_data[512], frame_data[530], recv_data[530]; +// size_t i, frame_length = 0, recv_length = 0, buf_length = 16; +// +// // Initialize data to be send with random values (up to 0x70 to keep below the values to be escaped) +// for (i = 0; i < sizeof(send_data); i++) { +// send_data[i] = (uint8_t) (rand() % 0x70); +// } +// +// // Initialize control field structure and create frame +// control.frame = HDLC_FRAME_DATA; +// ret = hdlc_frame_data(&control, send_data, sizeof(send_data), frame_data, +// &frame_length); +// +// // Check that frame length is maximum 2 bytes larger than data due to escape of FCS value +// if(frame_length >= ((sizeof(send_data) + 6) + 2)){ +// printf("1"); +// } +// if(ret != 0){ +// printf("2"); +// } +// +// // Run though the different buffers (simulating decode of buffers from UART) +// for (i = 0; i <= sizeof(send_data); i += buf_length) { +// // Decode the data +// ret = hdlc_get_data(&control, &frame_data[i], buf_length, recv_data, +// &recv_length); +// +// printf("%zu: %s\n", i, recv_data); +// +// if (i < sizeof(send_data)) { +// // All chunks until the last should return no message and zero length +// if (ret != -ENOMSG){ +// printf("3"); +// } +// if (recv_length != 0){ +// printf("1231"); +// } +// } else { +// if (ret > 7){ +// printf("332"); +// } +// if (recv_length != sizeof(send_data)){ +// printf("88888"); +// } +// // The last chunk should return max 6 frame bytes - 1 start flag sequence byte + 2 byte for the possible +// // escaped FCS = 7 bytes +//// BOOST_CHECK(ret <= 7); +//// BOOST_CHECK_EQUAL(recv_length, sizeof(send_data)); +// //printf("5"); +// } +// } +} \ No newline at end of file From 26c316f47a79e853b0141b8afca4ea25177e9a05 Mon Sep 17 00:00:00 2001 From: Qukich Date: Tue, 26 Dec 2023 12:18:19 +0300 Subject: [PATCH 3/4] com --- hdlc/client.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/hdlc/client.c b/hdlc/client.c index cc9071f..854c25b 100644 --- a/hdlc/client.c +++ b/hdlc/client.c @@ -12,6 +12,11 @@ bool FLAG_FILL_BUFFER2 = false; bool FLAG_FILL_BUFFER3 = false; bool FLAG_FILL_BUFFER4 = false; +bool FLAG_SEND_BUFFER1 = false; +bool FLAG_SEND_BUFFER2 = false; +bool FLAG_SEND_BUFFER3 = false; +bool FLAG_SEND_BUFFER4 = false; + #define ERR_INVALID_DATA_SIZE -1 #define ERR_ALL_BUFFERS_FILL -2 @@ -69,23 +74,47 @@ int get_frame(struct Client* client, uint8_t buffer[], size_t lenBuffer){ switch (client->state) { case CONNECTING: if (client->connecting_frame_timeout <= 0){ - control_send.frame = HDLC_FRAME_ACK; + control_send.frame = S_FRAME; control_send.seq_no = 1; int ret = hdlc_frame_data(&control_send, NULL, 0, buffer, &lenBuffer); if (ret < 0){ - printf("err in get_frame ACK: %d\n", ret); + printf("err in get_frame S_FRAME: %d\n", ret); } client->connecting_frame_timeout = CONNECT_FRAME_PERIOD; } break; case READY_STATE: - control_send.frame = HDLC_FRAME_DATA; + control_send.frame = I_FRAME; control_send.seq_no = 1; - int ret = hdlc_frame_data(&control_send, buffer_data[0], SIZE_DATA_BUFFER, buffer, &lenBuffer); - if (ret < 0){ - printf("err in get_frame DATA: %d\n", ret); + if (FLAG_FILL_BUFFER1 && !FLAG_SEND_BUFFER1){ + int ret = hdlc_frame_data(&control_send, buffer_data[0], SIZE_DATA_BUFFER, buffer, &lenBuffer); + if (ret < 0){ + printf("err in get_frame I_FRAME: %d\n", ret); + } + FLAG_SEND_BUFFER1 = true; + } + if (FLAG_FILL_BUFFER2 && !FLAG_SEND_BUFFER2){ + int ret = hdlc_frame_data(&control_send, buffer_data[1], SIZE_DATA_BUFFER, buffer, &lenBuffer); + if (ret < 0){ + printf("err in get_frame I_FRAME: %d\n", ret); + } + FLAG_SEND_BUFFER2 = true; + } + if (FLAG_FILL_BUFFER3 && !FLAG_SEND_BUFFER3){ + int ret = hdlc_frame_data(&control_send, buffer_data[2], SIZE_DATA_BUFFER, buffer, &lenBuffer); + if (ret < 0){ + printf("err in get_frame I_FRAME: %d\n", ret); + } + FLAG_SEND_BUFFER3 = true; + } + if (FLAG_FILL_BUFFER4 && !FLAG_SEND_BUFFER4){ + int ret = hdlc_frame_data(&control_send, buffer_data[3], SIZE_DATA_BUFFER, buffer, &lenBuffer); + if (ret < 0){ + printf("err in get_frame I_FRAME: %d\n", ret); + } + FLAG_SEND_BUFFER4 = true; } break; } From 941a9feef6d17d3da60803a73c6e11bdc1696de3 Mon Sep 17 00:00:00 2001 From: Qukich Date: Fri, 12 Jan 2024 14:17:34 +0300 Subject: [PATCH 4/4] rework send frames and init client --- hdlc/client.c | 145 ++++++++++++++++++++++++++------------------------ hdlc/client.h | 9 ++-- hdlc/hdlc.c | 2 +- hdlc/main.c | 30 +++++++---- hdlc_frame.h | 56 ------------------- 5 files changed, 101 insertions(+), 141 deletions(-) delete mode 100644 hdlc_frame.h diff --git a/hdlc/client.c b/hdlc/client.c index 854c25b..adf3bdd 100644 --- a/hdlc/client.c +++ b/hdlc/client.c @@ -1,31 +1,46 @@ #include "client.h" #include "hdlc.h" #include "stdio.h" -#include "stdbool.h" #define CONNECT_FRAME_PERIOD 200 #define SIZE_DATA_BUFFER 64 #define COUNT_BUFFERS 4 -bool FLAG_FILL_BUFFER1 = false; -bool FLAG_FILL_BUFFER2 = false; -bool FLAG_FILL_BUFFER3 = false; -bool FLAG_FILL_BUFFER4 = false; - -bool FLAG_SEND_BUFFER1 = false; -bool FLAG_SEND_BUFFER2 = false; -bool FLAG_SEND_BUFFER3 = false; -bool FLAG_SEND_BUFFER4 = false; - #define ERR_INVALID_DATA_SIZE -1 #define ERR_ALL_BUFFERS_FILL -2 - -struct Client hdlc_client; +#define ERR_INVALID_PARAMS -3 +#define ERR_INVALID_STATE -4 +#define ERR_FRAME_TIME_OUT -5 +#define ERR_INVALID_SEQ_NUMBER_FRAME -6 +#define ERR_TIMEOUT_ANSWER -7 uint8_t buffer_data[COUNT_BUFFERS][SIZE_DATA_BUFFER]; -struct Client init_hdlc_client(enum HDLCState *state){ - return hdlc_client; +int init_hdlc_client(int count_buffers, int size_data_buffer, int connecting_frame_timeout, struct Client* client){ + if (count_buffers <= 0){ + return ERR_INVALID_PARAMS; + } + + if (size_data_buffer <= 0){ + return ERR_INVALID_PARAMS; + } + + if (connecting_frame_timeout <= 0){ + return ERR_INVALID_PARAMS; + } + + client->state = IDLE_STATE; + client->connecting_frame_timeout = connecting_frame_timeout; + client->count_buffers = count_buffers; + client->size_data_buffer = size_data_buffer; + client->number_seq_frame = 0; + + for (int i = 0; i < sizeof(buffer_data); i++){ + for (int x = 0; x < sizeof(buffer_data[i]); x++){ + buffer_data[i][x] = -1; + } + } + return 0; } void connect(struct Client* client){ @@ -33,42 +48,30 @@ void connect(struct Client* client){ } int send_data(struct Client* client, uint8_t* data, size_t data_len){ - if (data_len > 64){ + if (client->state != READY_STATE){ + return ERR_INVALID_STATE; + } + + if (client->size_data_buffer < data_len){ return ERR_INVALID_DATA_SIZE; } - if (!FLAG_FILL_BUFFER1){ - for(int i = 0; i < SIZE_DATA_BUFFER; i++){ - buffer_data[0][i] = data[i]; + for(int i = 0; i < COUNT_BUFFERS; i++){ + if (buffer_data[i][0] == -1){ + for (int x = 0; x < data_len; x++){ + buffer_data[i][x] = data[x]; + } } - FLAG_FILL_BUFFER1 = true; - } else if (!FLAG_FILL_BUFFER2){ - for(int i = 0; i < SIZE_DATA_BUFFER; i++){ - buffer_data[1][i] = data[i]; + if (i == COUNT_BUFFERS - 1){ + return ERR_ALL_BUFFERS_FILL; } - - FLAG_FILL_BUFFER2 = true; - } else if (!FLAG_FILL_BUFFER3){ - for(int i = 0; i < SIZE_DATA_BUFFER; i++){ - buffer_data[2][i] = data[i]; - } - - FLAG_FILL_BUFFER3 = true; - } if (!FLAG_FILL_BUFFER4){ - for(int i = 0; i < SIZE_DATA_BUFFER; i++){ - buffer_data[3][i] = data[i]; - } - - FLAG_FILL_BUFFER4 = true; - } else { - return ERR_ALL_BUFFERS_FILL; } - client->state = READY_STATE; + client->state = RECIVING; }; -int get_frame(struct Client* client, uint8_t buffer[], size_t lenBuffer){ +int get_frame(struct Client *client, uint8_t buffer[], size_t lenBuffer) { hdlc_control_t control_send; switch (client->state) { @@ -76,10 +79,11 @@ int get_frame(struct Client* client, uint8_t buffer[], size_t lenBuffer){ if (client->connecting_frame_timeout <= 0){ control_send.frame = S_FRAME; control_send.seq_no = 1; + client->number_seq_frame = control_send.seq_no; int ret = hdlc_frame_data(&control_send, NULL, 0, buffer, &lenBuffer); if (ret < 0){ - printf("err in get_frame S_FRAME: %d\n", ret); + printf("err in get_frame ACK: %d\n", ret); } client->connecting_frame_timeout = CONNECT_FRAME_PERIOD; @@ -88,33 +92,17 @@ int get_frame(struct Client* client, uint8_t buffer[], size_t lenBuffer){ case READY_STATE: control_send.frame = I_FRAME; control_send.seq_no = 1; - if (FLAG_FILL_BUFFER1 && !FLAG_SEND_BUFFER1){ - int ret = hdlc_frame_data(&control_send, buffer_data[0], SIZE_DATA_BUFFER, buffer, &lenBuffer); - if (ret < 0){ - printf("err in get_frame I_FRAME: %d\n", ret); + for(int i = 0; i < COUNT_BUFFERS; i++){ + if (buffer_data[i][0] == -1){ + int ret = hdlc_frame_data(&control_send, buffer_data[i], SIZE_DATA_BUFFER, buffer, &lenBuffer); + if (ret < 0){ + printf("err in get_frame DATA: %d\n", ret); + } } - FLAG_SEND_BUFFER1 = true; - } - if (FLAG_FILL_BUFFER2 && !FLAG_SEND_BUFFER2){ - int ret = hdlc_frame_data(&control_send, buffer_data[1], SIZE_DATA_BUFFER, buffer, &lenBuffer); - if (ret < 0){ - printf("err in get_frame I_FRAME: %d\n", ret); + + if (i == COUNT_BUFFERS - 1){ + return ERR_ALL_BUFFERS_FILL; } - FLAG_SEND_BUFFER2 = true; - } - if (FLAG_FILL_BUFFER3 && !FLAG_SEND_BUFFER3){ - int ret = hdlc_frame_data(&control_send, buffer_data[2], SIZE_DATA_BUFFER, buffer, &lenBuffer); - if (ret < 0){ - printf("err in get_frame I_FRAME: %d\n", ret); - } - FLAG_SEND_BUFFER3 = true; - } - if (FLAG_FILL_BUFFER4 && !FLAG_SEND_BUFFER4){ - int ret = hdlc_frame_data(&control_send, buffer_data[3], SIZE_DATA_BUFFER, buffer, &lenBuffer); - if (ret < 0){ - printf("err in get_frame I_FRAME: %d\n", ret); - } - FLAG_SEND_BUFFER4 = true; } break; } @@ -125,16 +113,31 @@ int get_frame(struct Client* client, uint8_t buffer[], size_t lenBuffer){ } int hdlc_get_raw_data(struct Client* client, uint8_t buffer[], size_t len_buffer){ + if (client->connecting_frame_timeout <= 0){ + return ERR_FRAME_TIME_OUT; + } + hdlc_control_t recv_control; uint8_t recive[len_buffer]; int ret = hdlc_get_data(&recv_control, buffer, len_buffer, recive, &len_buffer); - if (ret < 0){ - printf("err in get_raw_data: %d\n", ret); + if (recv_control.seq_no != client->number_seq_frame){ + return ERR_INVALID_SEQ_NUMBER_FRAME; } - if (recv_control.frame == HDLC_FRAME_ACK){ - client->state = IDLE_STATE; + + if (ret < 0 && client->connecting_frame_timeout < 0){ + return ERR_TIMEOUT_ANSWER; + } + + switch (recv_control.frame) { + case S_FRAME: + client->state = READY_STATE; + break; + case I_FRAME: + break; + case S_FRAME_NACK: + break; } return 0; } diff --git a/hdlc/client.h b/hdlc/client.h index 64b0ba6..02e6aa9 100644 --- a/hdlc/client.h +++ b/hdlc/client.h @@ -10,19 +10,22 @@ enum HDLCState { READY_STATE, // Состояние принятия CONNECTING, // состояние соединения DISCONNECTING, // состояния отключения - RECIVED // состояние приема и отправки + RECIVING // состояние приема и отправки }; struct Client{ enum HDLCState state; int connecting_frame_timeout; //-1 + int size_data_buffer; + int count_buffers; + int number_seq_frame; }; //название функций -struct Client init_hdlc_client(enum HDLCState *state); +int init_hdlc_client(int count_buffers, int size_data_buffer, int connecting_frame_timeout, struct Client* client); void connect(struct Client* client); int send_data(struct Client* client, uint8_t* data, size_t data_len); -int get_frame(struct Client* client, uint8_t buffer[], size_t lenBuffer); +int get_frame(struct Client *client, uint8_t buffer[], size_t lenBuffer); //принимает буффер с уарта int hdlc_get_raw_data(struct Client* client, uint8_t buffer[], size_t len_buffer); void hdlc_timeout_handler(struct Client* client, int delta_time); diff --git a/hdlc/hdlc.c b/hdlc/hdlc.c index 81e4781..b15e619 100644 --- a/hdlc/hdlc.c +++ b/hdlc/hdlc.c @@ -236,7 +236,7 @@ int hdlc_frame_data(hdlc_control_t *control, uint8_t *src, hdlc_escape_value(value, dest, &dest_index); // Only DATA frames should contain data - if (control->frame == HDLC_FRAME_DATA) { + if (control->frame == I_FRAME) { // Calculate FCS and escape data for (i = 0; i < src_len; i++) { fcs = calc_fcs(fcs, src[i]); diff --git a/hdlc/main.c b/hdlc/main.c index 2b6f796..9dba0ae 100644 --- a/hdlc/main.c +++ b/hdlc/main.c @@ -6,21 +6,31 @@ int main(){ struct Client hdlc; + init_hdlc_client(2, 64, 200, &hdlc); connect(&hdlc); uint8_t frame_data[8]; - get_frame(&hdlc, frame_data, sizeof(frame_data), 0, 0); + uint8_t buffer_for_ex[8]; + get_frame(&hdlc, frame_data, sizeof(frame_data)); - hdlc_get_raw_data(&hdlc, frame_data, sizeof(frame_data)); - - uint8_t send[64]; - uint8_t buffer[134]; - for (int i = 0; i < sizeof(send); i++) { - send[i] = (uint8_t) (rand() % 0x70); + for (int i = 0; i < 200; i++){ + hdlc_timeout_handler(&hdlc, 1); + hdlc_get_raw_data(&hdlc, buffer_for_ex, sizeof(buffer_for_ex)); } - send_data(&hdlc, send, sizeof(send_data)); - //get_frame(&hdlc, buffer, sizeof(buffer), send_data, sizeof(send_data)); - hdlc_get_raw_data(&hdlc, buffer, sizeof(buffer)); + get_frame(&hdlc, frame_data, sizeof(frame_data)); + int i = hdlc_get_raw_data(&hdlc, frame_data, sizeof(frame_data)); + printf("%d", i); + + +// uint8_t send[64]; +// uint8_t buffer[134]; +// for (int i = 0; i < sizeof(send); i++) { +// send[i] = (uint8_t) (rand() % 0x70); +// } +// send_data(&hdlc, send, sizeof(send_data)); +// //get_frame(&hdlc, buffer, sizeof(buffer), send_data, sizeof(send_data)); +// +// hdlc_get_raw_data(&hdlc, buffer, sizeof(buffer)); // test 1 diff --git a/hdlc_frame.h b/hdlc_frame.h deleted file mode 100644 index 23056f3..0000000 --- a/hdlc_frame.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef HDLC_FRAME_H -#define HDLC_FRAME_H - -#include -#include - -typedef struct { - uint8_t address; - uint8_t control; - uint8_t* data; - size_t data_length; - int timeout; -} HDLCFrame; - -void init_HDLCFrame(HDLCFrame* frame, uint8_t address, uint8_t control, uint8_t* data, size_t data_length); -uint16_t calculate_fcs(const HDLCFrame *frame, size_t i); -void create_frame(const HDLCFrame* frame, uint8_t* buffer); - -typedef struct { - HDLCFrame base; - uint8_t receive_sequence_number; - uint8_t poll_final; - uint8_t send_sequence_number; -} IFrame; - -void init_IFrame(IFrame* frame, uint8_t address, uint8_t receive_sequence_number, uint8_t poll_final, - uint8_t send_sequence_number, uint8_t* data, size_t data_length); - -typedef struct { - HDLCFrame base; - uint8_t receive_sequence_number; - uint8_t poll_final; - const char* frame_type; -} SFrame; - -enum SFrameType{ - RR, - RNR, - REJ, - SREJ -}; - -void init_SFrame(SFrame* frame, uint8_t address, uint8_t receive_sequence_number, uint8_t poll_final, - enum SFrameType frame_type); - -typedef struct { - HDLCFrame base; - uint8_t poll_final; - const char* frame_type; -} UFrame; - -void init_UFrame(UFrame* frame, uint8_t address, uint8_t poll_final, const char* frame_type, uint8_t* data, size_t data_length); - -bool validate_fcs(const uint8_t* frame, size_t length); - -#endif