diff --git a/APP_Framework/Framework/control/shared/control_io.c b/APP_Framework/Framework/control/shared/control_io.c index adeac87e3..f66917152 100644 --- a/APP_Framework/Framework/control/shared/control_io.c +++ b/APP_Framework/Framework/control/shared/control_io.c @@ -76,7 +76,7 @@ void Uart485Init(uint32_t baud_rate, uint8_t data_bits, uint8_t stop_bits, uint8 ioctl_cfg.args = &pin_param; PrivIoctl(pin_fd, OPE_CFG, &ioctl_cfg); - uart_fd = open(CONTROL_FRAMEWORK_UART_DEV, O_RDWR); + uart_fd = PrivOpen(CONTROL_FRAMEWORK_UART_DEV, O_RDWR); if (uart_fd < 0) { printf("open fd error %d\n", uart_fd); return; diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.h b/APP_Framework/Framework/transform_layer/xizi/transform.h index ef1894c32..6bcbbe8c4 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.h +++ b/APP_Framework/Framework/transform_layer/xizi/transform.h @@ -43,6 +43,9 @@ extern "C" { #define NAME_NUM_MAX 32 +#define LINKLIST_FLAG_FIFO 0x00 +#define LINKLIST_FLAG_PRIO 0x01 + #ifndef EVENT_AND #define EVENT_AND (1 << 0) #endif @@ -169,6 +172,8 @@ struct SerialDataCfg uint16_t serial_buffer_size; int32 serial_timeout; + int (*dev_recv_callback) (void *dev, size_t length); + uint8_t is_ext_uart; uint8_t ext_uart_no; enum ExtSerialPortConfigure port_configure; diff --git a/APP_Framework/lib/lorawan/lora_radio_driver b/APP_Framework/lib/lorawan/lora_radio_driver index 1c3adb915..2d8abd3ef 160000 --- a/APP_Framework/lib/lorawan/lora_radio_driver +++ b/APP_Framework/lib/lorawan/lora_radio_driver @@ -1 +1 @@ -Subproject commit 1c3adb9154f30ed25877ae00f81a636d28141b08 +Subproject commit 2d8abd3eff2a2d5257e17c7f59acb2ba938cb90e diff --git a/APP_Framework/lib/lorawan/lorawan_devicenode b/APP_Framework/lib/lorawan/lorawan_devicenode index dbced0da1..197c320b9 160000 --- a/APP_Framework/lib/lorawan/lorawan_devicenode +++ b/APP_Framework/lib/lorawan/lorawan_devicenode @@ -1 +1 @@ -Subproject commit dbced0da18e8378f2a5c921a67321b7a88401465 +Subproject commit 197c320b9917366b6107db30b05bbb51254e7eb4 diff --git a/APP_Framework/lib/lorawan/lorawan_gateway_single_channel b/APP_Framework/lib/lorawan/lorawan_gateway_single_channel index 1ad4dbc9d..6ec2a3d26 160000 --- a/APP_Framework/lib/lorawan/lorawan_gateway_single_channel +++ b/APP_Framework/lib/lorawan/lorawan_gateway_single_channel @@ -1 +1 @@ -Subproject commit 1ad4dbc9ddf9472f461e19b8321b68b240fb7827 +Subproject commit 6ec2a3d2645b63a6d3d9c4db9f23c653525efbdf