From ce99bb92c6eb595ca5d336efa0ecb277df91fa38 Mon Sep 17 00:00:00 2001 From: "yuhuan.du" Date: Thu, 9 Feb 2023 17:03:23 +0800 Subject: [PATCH] [Modify] fix i2c recv delay && add tcu pdma for x2000 --- hardware/chip/x1600/csi/i2c.c | 8 ++++---- hardware/chip/x1600/drivers/eth_lwip.c | 2 +- hardware/chip/x1600/hal/drv_uart.c | 2 +- hardware/chip/x2000/package.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hardware/chip/x1600/csi/i2c.c b/hardware/chip/x1600/csi/i2c.c index fd8ab54f..af4f3606 100644 --- a/hardware/chip/x1600/csi/i2c.c +++ b/hardware/chip/x1600/csi/i2c.c @@ -50,7 +50,7 @@ csi_error_t csi_iic_init(csi_iic_t *iic, uint32_t idx) LL_GPIO_setPinMode(GPIOB_Instance, 30, GPIO_MODE_FUNCTION0);// for halley6 i2c pin export LL_GPIO_setPinMode(GPIOB_Instance, 31, GPIO_MODE_FUNCTION0);// for halley6 i2c pin export } - aos_mdelay(2); + HAL_Delay(2); if (HAL_I2C_Init(I2cHandle) != HAL_OK) { prom_printk("I2C init error!\n"); @@ -276,7 +276,7 @@ int32_t csi_iic_mem_send(csi_iic_t *iic, uint32_t devaddr,uint16_t memaddr, csi_ size = 0; } free(txbuf); - aos_mdelay(1); + HAL_Delay(1); return size; } @@ -314,7 +314,7 @@ int32_t csi_iic_mem_receive(csi_iic_t *iic,uint32_t devaddr, uint16_t memaddr,cs prom_printk("mem addr transmit error\n"); goto err; } - aos_mdelay(1); + HAL_Delay(1); #ifdef IT_MODE if(HAL_I2C_Master_Receive_IT(I2cHandle, devaddr, data, size) != HAL_OK) #else @@ -324,7 +324,7 @@ int32_t csi_iic_mem_receive(csi_iic_t *iic,uint32_t devaddr, uint16_t memaddr,cs prom_printk("mem read receive timeout\n"); goto err; } - aos_mdelay(1); + HAL_Delay(1); return size; err: free(txbuf); diff --git a/hardware/chip/x1600/drivers/eth_lwip.c b/hardware/chip/x1600/drivers/eth_lwip.c index 43894963..cc159c0e 100644 --- a/hardware/chip/x1600/drivers/eth_lwip.c +++ b/hardware/chip/x1600/drivers/eth_lwip.c @@ -111,7 +111,7 @@ void HAL_ETH_MspInit(ETH_HandleTypeDef *heth) { LL_GPIO_setPinMode(GPIOB_Instance, 31, GPIO_MODE_OUTPUT0); LL_GPIO_clearOutputPin(GPIOB_Instance,31); - aos_mdelay(10); + HAL_Delay(10); LL_GPIO_setOutputPin(GPIOB_Instance,31); /* TODO: CPM_Init */ diff --git a/hardware/chip/x1600/hal/drv_uart.c b/hardware/chip/x1600/hal/drv_uart.c index a6b74d84..53cf26c6 100644 --- a/hardware/chip/x1600/hal/drv_uart.c +++ b/hardware/chip/x1600/hal/drv_uart.c @@ -189,7 +189,7 @@ int32_t hal_uart_recv_II(uart_dev_t *uart, void *data, uint32_t count, /*等 uart 传输完成或者超时*/ while((handle->RxState != HAL_UART_STATE_READY) && --timeout) - aos_mdelay(1); + HAL_Delay(1); ; *received = count - handle->RxXferCount; diff --git a/hardware/chip/x2000/package.yaml b/hardware/chip/x2000/package.yaml index 665acd7a..068e0130 100644 --- a/hardware/chip/x2000/package.yaml +++ b/hardware/chip/x2000/package.yaml @@ -147,9 +147,9 @@ source_file: - libbare-cpu/drivers/drivers-x2000/src/x2000_ll_cpm.c - libbare-cpu/drivers/drivers-x2000/src/x2000_ll_ost_core.c - libbare-cpu/drivers/drivers-x2000/src/x2000_ll_ost_global.c - #- libbare-cpu/drivers/drivers-x2000/src/x2000_hal_tcu.c + - libbare-cpu/drivers/drivers-x2000/src/x2000_hal_tcu.c - libbare-cpu/drivers/drivers-x2000/src/x2000_hal_def.c - #- libbare-cpu/drivers/drivers-x2000/src/x2000_hal_pdma.c + - libbare-cpu/drivers/drivers-x2000/src/x2000_hal_pdma.c - libbare-cpu/drivers/drivers-x2000/src/x2000_ll_gpio.c ? - libbare-cpu/drivers/drivers-x2000/src/x2000_hal_wdt.c ? - libbare-cpu/drivers/drivers-x2000/src/x2000_hal_uart.c ? -- Gitee