developer
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add get touch coordinate function to xidatong-riscv64.

This commit is contained in:
TXuian 2022-07-15 01:26:58 -07:00
parent 1818e23744
commit e1999f5af9
3 changed files with 208 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
Ubiquitous/XiZi/board/xidatong-riscv64/board.c
View File

@ -13,26 +13,26 @@
* limitations under the License. * limitations under the License.
*/ */
/** /**
* @file board.c * @file board.c
* @brief support kd233-board init configure and start-up * @brief support kd233-board init configure and start-up
* @version 1.0 * @version 1.0
* @author AIIT XUOS Lab * @author AIIT XUOS Lab
* @date 2022-07-25 * @date 2022-07-25
*/ */
/************************************************* /*************************************************
File name: board.c File name: board.c
Description: support xidatong-riscv64-board init configure and driver/task/... init Description: support xidatong-riscv64-board init configure and driver/task/... init
Others: https://canaan-creative.com/developer Others: https://canaan-creative.com/developer
History: History:
1. Date: 2022-07-25 1. Date: 2022-07-25
Author: AIIT XUOS Lab Author: AIIT XUOS Lab
Modification: Modification:
1. support xidatong-riscv64-board InitBoardHardware 1. support xidatong-riscv64-board InitBoardHardware
2. support xidatong-riscv64-board Kd233Start 2. support xidatong-riscv64-board Kd233Start
3. support xidatong-riscv64-board shell cmd, include reboot, shutdown 3. support xidatong-riscv64-board shell cmd, include reboot, shutdown
*************************************************/ *************************************************/
#include <xizi.h> #include <xizi.h>
#include <clint.h> #include <clint.h>
@ -66,7 +66,7 @@ extern int HwTimerInit(void);
#if defined(FS_VFS) && defined (MOUNT_SDCARD) #if defined(FS_VFS) && defined (MOUNT_SDCARD)
#include <iot-vfs.h> #include <iot-vfs.h>
#include <sd_spi.h> #include <sd_spi.h>
extern SpiSdDeviceType SpiSdInit(struct Bus* bus, const char* dev_name, const char* drv_name, const char* sd_name); extern SpiSdDeviceType SpiSdInit(struct Bus *bus, const char *dev_name, const char *drv_name, const char *sd_name);
/** /**
* @description: Mount SD card * @description: Mount SD card
@ -74,14 +74,14 @@ extern SpiSdDeviceType SpiSdInit(struct Bus* bus, const char* dev_name, const ch
*/ */
int MountSDCard(void) int MountSDCard(void)
{ {
struct Bus* spi_bus; struct Bus *spi_bus;
spi_bus = BusFind(SPI_BUS_NAME_1); spi_bus = BusFind(SPI_BUS_NAME_1);
if (NONE == SpiSdInit(spi_bus, SPI_1_DEVICE_NAME_0, SPI_1_DRV_NAME, SPI_SD_NAME)) { if (NONE == SpiSdInit(spi_bus, SPI_1_DEVICE_NAME_0, SPI_1_DRV_NAME, SPI_SD_NAME)) {
KPrintf("MountSDCard SpiSdInit error!\n"); KPrintf("MountSDCard SpiSdInit error!\n");
return 0; return 0;
} }
if (EOK == MountFilesystem(SPI_BUS_NAME_1, SPI_SD_NAME, SPI_1_DRV_NAME, FSTYPE_FATFS, "/")) if (EOK == MountFilesystem(SPI_BUS_NAME_1, SPI_SD_NAME, SPI_1_DRV_NAME, FSTYPE_FATFS, "/"))
KPrintf("SPI SD card fatfs mounted\n"); KPrintf("SPI SD card fatfs mounted\n");
@ -91,37 +91,37 @@ int MountSDCard(void)
void InitBss(void) void InitBss(void)
{ {
unsigned int* dst; unsigned int *dst;
dst = &__bss_start; dst = &__bss_start;
while (dst < &__bss_end) { while (dst < &__bss_end){
*dst++ = 0; *dst++ = 0;
} }
} }
void Kd233Start(uint32_t mhartid) void Kd233Start(uint32_t mhartid)
{ {
switch (mhartid) { switch(mhartid) {
case CPU0: case CPU0:
InitBss(); InitBss();
/*kernel start entry*/ /*kernel start entry*/
entry(); entry();
break; break;
case CPU1: case CPU1:
while (0x2018050420191010 != cpu2_boot_flag) { ///< waiting for boot flag ,then start cpu1 core while(0x2018050420191010 != cpu2_boot_flag) { ///< waiting for boot flag ,then start cpu1 core
#ifndef ARCH_SMP #ifndef ARCH_SMP
asm volatile("wfi"); asm volatile("wfi");
#endif #endif
} }
#ifdef ARCH_SMP #ifdef ARCH_SMP
SecondaryCpuCStart(); SecondaryCpuCStart();
#endif #endif
break; break;
default: default:
break; break;
} }
} }
int Freq(void) int Freq(void)
@ -150,26 +150,26 @@ int Freq(void)
return 0; return 0;
} }
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC) | SHELL_CMD_PARAM_NUM(0), Freq, Freq, show frequency information); SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),Freq, Freq, show frequency information );
#ifdef ARCH_SMP #ifdef ARCH_SMP
extern int EnableHwclintIpi(void); extern int EnableHwclintIpi(void);
#endif #endif
struct InitSequenceDesc _board_init[] = struct InitSequenceDesc _board_init[] =
{ {
#ifdef BSP_USING_GPIO #ifdef BSP_USING_GPIO
{ "hw_pin", HwGpioInit }, { "hw_pin", HwGpioInit },
{ "io_config", IoConfigInit }, { "io_config", IoConfigInit },
#endif #endif
#ifdef BSP_USING_SPI #ifdef BSP_USING_SPI
{ "hw_spi", HwSpiInit }, { "hw_spi", HwSpiInit },
#endif #endif
#ifdef BSP_USING_I2C #ifdef BSP_USING_I2C
{ "hw_i2c", HwI2cInit }, { "hw_i2c", HwI2cInit },
#endif #endif
#ifdef BSP_USING_LCD #ifdef BSP_USING_LCD
{ "hw_lcd", HwLcdInit }, { "hw_lcd", HwLcdInit },
#endif #endif
#ifdef BSP_USING_HWTIMER #ifdef BSP_USING_HWTIMER
{ "hw_timer" , HwTimerInit }, { "hw_timer" , HwTimerInit },
@ -188,9 +188,9 @@ struct InitSequenceDesc _board_init[] =
void InitBoardHardware(void) void InitBoardHardware(void)
{ {
int i = 0; int i = 0;
int ret = 0; int ret = 0;
SysctlPllSetFreq(SYSCTL_PLL0, 800000000UL); SysctlPllSetFreq(SYSCTL_PLL0, 800000000UL);
SysctlPllSetFreq(SYSCTL_PLL1, 400000000UL); SysctlPllSetFreq(SYSCTL_PLL1, 400000000UL);
#ifdef BSP_USING_GPIO #ifdef BSP_USING_GPIO
@ -208,12 +208,12 @@ void InitBoardHardware(void)
#endif #endif
/* initialize memory system */ /* initialize memory system */
InitBoardMemory(MEMORY_START_ADDRESS, MEMORY_END_ADDRESS); InitBoardMemory(MEMORY_START_ADDRESS, MEMORY_END_ADDRESS);
#ifdef KERNEL_CONSOLE #ifdef KERNEL_CONSOLE
/* set console device */ /* set console device */
InstallConsole(KERNEL_CONSOLE_BUS_NAME, KERNEL_CONSOLE_DRV_NAME, KERNEL_CONSOLE_DEVICE_NAME); InstallConsole(KERNEL_CONSOLE_BUS_NAME, KERNEL_CONSOLE_DRV_NAME, KERNEL_CONSOLE_DEVICE_NAME);
KPrintf("\nconsole init completed.\n"); KPrintf("\nconsole init completed.\n");
KPrintf("board initialization......\n"); KPrintf("board initialization......\n");
#endif /* KERNEL_CONSOLE */ #endif /* KERNEL_CONSOLE */
@ -224,21 +224,21 @@ void InitBoardHardware(void)
#endif #endif
#ifdef KERNEL_COMPONENTS_INIT #ifdef KERNEL_COMPONENTS_INIT
for (i = 0; _board_init[i].fn != NONE; i++) { for(i = 0; _board_init[i].fn != NONE; i++) {
ret = _board_init[i].fn(); ret = _board_init[i].fn();
KPrintf("initialize %s %s\n", _board_init[i].fn_name, ret == 0 ? "success" : "failed"); KPrintf("initialize %s %s\n",_board_init[i].fn_name, ret == 0 ? "success" : "failed");
} }
#endif #endif
KPrintf("board init done.\n"); KPrintf("board init done.\n");
KPrintf("start kernel...\n"); KPrintf("start kernel...\n");
} }
void HwCpuReset(void) void HwCpuReset(void)
{ {
sysctl->soft_reset.soft_reset = 1; sysctl->soft_reset.soft_reset = 1;
while (RET_TRUE); while(RET_TRUE);
} }
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC) | SHELL_CMD_PARAM_NUM(0), Reboot, HwCpuReset, reset machine); SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),Reboot, HwCpuReset, reset machine );

54
Ubiquitous/XiZi/board/xidatong-riscv64/third_party_driver/gpio/drv_io_config.c
View File

@ -8,24 +8,24 @@
* 2019-03-19 ZYH first version * 2019-03-19 ZYH first version
*/ */
/** /**
* @file drv_io_config.c * @file drv_io_config.c
* @brief support xidatong-riscv64-board io configure * @brief support xidatong-riscv64-board io configure
* @version 1.0 * @version 1.0
* @author AIIT XUOS Lab * @author AIIT XUOS Lab
* @date 2022-07-25 * @date 2022-07-25
*/ */
/************************************************* /*************************************************
File name: drv_io_config.c File name: drv_io_config.c
Description: support kd233-board io configure Description: support kd233-board io configure
Others: take RT-Thread v4.0.2/bsp/k210/driver/drv_io_config.c for references Others: take RT-Thread v4.0.2/bsp/k210/driver/drv_io_config.c for references
https://github.com/RT-Thread/rt-thread/tree/v4.0.2 https://github.com/RT-Thread/rt-thread/tree/v4.0.2
History: History:
1. Date: 2022-07-25 1. Date: 2022-07-25
Author: AIIT XUOS Lab Author: AIIT XUOS Lab
Modification: support kd233-board io configure Modification: support kd233-board io configure
*************************************************/ *************************************************/
#include <xizi.h> #include <xizi.h>
#include <fpioa.h> #include <fpioa.h>
@ -40,13 +40,13 @@ static struct io_config
{ {
int io_num; int io_num;
fpioa_function_t func; fpioa_function_t func;
const char* FuncName; const char * FuncName;
} io_config[] = } io_config[] =
{ {
#ifdef BSP_USING_LCD #ifdef BSP_USING_LCD
IOCONFIG(BSP_LCD_CS_PIN, FUNC_SPI0_SS0), IOCONFIG(BSP_LCD_CS_PIN, FUNC_SPI0_SS0),
IOCONFIG(BSP_LCD_WR_PIN, FUNC_SPI0_SCLK), IOCONFIG(BSP_LCD_WR_PIN, FUNC_SPI0_SCLK),
IOCONFIG(BSP_LCD_DC_PIN, HS_GPIO(LCD_DC_PIN)), IOCONFIG(BSP_LCD_DC_PIN, HS_GPIO(LCD_DC_PIN)),
#endif #endif
#ifdef BSP_USING_SPI1 #ifdef BSP_USING_SPI1
@ -90,7 +90,7 @@ static int PrintIoConfig()
KPrintf("┌───────┬────────────────────────┐\n"); KPrintf("┌───────┬────────────────────────┐\n");
KPrintf("│Pin │Function │\n"); KPrintf("│Pin │Function │\n");
KPrintf("├───────┼────────────────────────┤\n"); KPrintf("├───────┼────────────────────────┤\n");
for (i = 0; i < sizeof io_config / sizeof io_config[0]; i++) for(i = 0; i < sizeof io_config / sizeof io_config[0]; i++)
{ {
KPrintf("│%-2d │%-24.24s│\n", io_config[i].io_num, io_config[i].FuncName); KPrintf("│%-2d │%-24.24s│\n", io_config[i].io_num, io_config[i].FuncName);
} }
@ -100,8 +100,8 @@ static int PrintIoConfig()
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC) | SHELL_CMD_PARAM_NUM(0), SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),
io, PrintIoConfig, print io config); io,PrintIoConfig,print io config);
int IoConfigInit(void) int IoConfigInit(void)
@ -122,10 +122,10 @@ int IoConfigInit(void)
sysctl_set_power_mode(SYSCTL_POWER_BANK3, SYSCTL_POWER_V33); sysctl_set_power_mode(SYSCTL_POWER_BANK3, SYSCTL_POWER_V33);
#endif #endif
for (i = 0; i < count; i++) for(i = 0; i < count; i++)
{ {
ret = FpioaSetFunction(io_config[i].io_num, io_config[i].func); ret = FpioaSetFunction(io_config[i].io_num, io_config[i].func);
if (ret != 0) if(ret != 0)
return ret; return ret;
} }

254
Ubiquitous/XiZi/board/xidatong-riscv64/third_party_driver/i2c/connect_i2c.c
View File

@ -8,30 +8,30 @@
* 2012-04-25 weety first version * 2012-04-25 weety first version
*/ */
/** /**
* @file connect_i2c.c * @file connect_i2c.c
* @brief support kd233-board i2c function and register to bus framework * @brief support kd233-board i2c function and register to bus framework
* @version 1.0 * @version 1.0
* @author AIIT XUOS Lab * @author AIIT XUOS Lab
* @date 2022-07-25 * @date 2022-07-25
*/ */
/************************************************* /*************************************************
File name: connect_i2c.c File name: connect_i2c.c
Description: support xidatong-riscv64-board i2c configure and i2c bus register function Description: support xidatong-riscv64-board i2c configure and i2c bus register function
Others: take RT-Thread v4.0.2/components/drivers/i2c/i2c-bit-ops.c for references Others: take RT-Thread v4.0.2/components/drivers/i2c/i2c-bit-ops.c for references
https://github.com/RT-Thread/rt-thread/tree/v4.0.2 https://github.com/RT-Thread/rt-thread/tree/v4.0.2
History: History:
1. Date: 2022-07-25 1. Date: 2022-07-25
Author: AIIT XUOS Lab Author: AIIT XUOS Lab
Modification: Modification:
1. support xidatong-riscv64-board i2c bit configure, write and read 1. support xidatong-riscv64-board i2c bit configure, write and read
2. support xidatong-riscv64-board i2c bus device and driver register 2. support xidatong-riscv64-board i2c bus device and driver register
*************************************************/ *************************************************/
#include <board.h> #include <board.h>
#include "gpio_common.h" #include "gpio_common.h"
#include"fpioa.h" #include"fpioa.h"
#include "connect_i2c.h" #include "connect_i2c.h"
#include <sleep.h> #include <sleep.h>
#include "sysctl.h" #include "sysctl.h"
@ -58,54 +58,52 @@ static I2cBusParam i2c_bus_param =
#define SdaHigh(done) SET_SDA(done, 1) #define SdaHigh(done) SET_SDA(done, 1)
#define SclLow(done) SET_SCL(done, 0) #define SclLow(done) SET_SCL(done, 0)
void I2cGpioInit(const I2cBusParam* bus_param) void I2cGpioInit(const I2cBusParam *bus_param)
{ {
gpio_init(); gpio_init ();
FpioaSetFunction(BSP_I2C_SDA, FUNC_GPIO3);//RISC-V FPIOA CFG FpioaSetFunction(BSP_I2C_SDA , FUNC_GPIO3 );//RISC-V FPIOA CFG
FpioaSetFunction(BSP_I2C_SCL, FUNC_GPIO4);//RISC-V FPIOA CFG FpioaSetFunction(BSP_I2C_SCL , FUNC_GPIO4 );//RISC-V FPIOA CFG
gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_OUTPUT); gpio_set_drive_mode(bus_param->i2c_sda_pin , GPIO_DM_OUTPUT );
gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_OUTPUT); gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_OUTPUT );
gpio_set_pin(bus_param->i2c_sda_pin, GPIO_PV_HIGH); gpio_set_pin(bus_param->i2c_sda_pin , GPIO_PV_HIGH );
gpio_set_pin(bus_param->i2c_scl_pin, GPIO_PV_HIGH); gpio_set_pin(bus_param->i2c_scl_pin , GPIO_PV_HIGH );
} }
static void SetSdaState(void* data, uint8 sda_state) static void SetSdaState(void *data, uint8 sda_state)
{ {
I2cBusParam* bus_param = (I2cBusParam*)data; I2cBusParam *bus_param = (I2cBusParam *)data;
if (sda_state) { if (sda_state) {
gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_OUTPUT); gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_OUTPUT );
gpio_set_pin(bus_param->i2c_sda_pin, GPIO_PV_HIGH); gpio_set_pin(bus_param->i2c_sda_pin , GPIO_PV_HIGH );
} } else {
else { gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_OUTPUT );
gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_OUTPUT); gpio_set_pin(bus_param->i2c_sda_pin , GPIO_PV_LOW );
gpio_set_pin(bus_param->i2c_sda_pin, GPIO_PV_LOW);
} }
} }
static void SetSclState(void* data, uint8 scl_state) static void SetSclState(void *data, uint8 scl_state)
{ {
I2cBusParam* bus_param = (I2cBusParam*)data; I2cBusParam *bus_param = (I2cBusParam *)data;
if (scl_state) { if (scl_state) {
gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_OUTPUT); gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_OUTPUT );
gpio_set_pin(bus_param->i2c_scl_pin, GPIO_PV_HIGH); gpio_set_pin(bus_param->i2c_scl_pin , GPIO_PV_HIGH );
} } else {
else { gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_OUTPUT );
gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_OUTPUT); gpio_set_pin(bus_param->i2c_scl_pin , GPIO_PV_LOW );
gpio_set_pin(bus_param->i2c_scl_pin, GPIO_PV_LOW);
} }
} }
static uint8 GetSdaState(void* data) static uint8 GetSdaState(void *data)
{ {
I2cBusParam* bus_param = (I2cBusParam*)data; I2cBusParam *bus_param = (I2cBusParam *)data;
gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_INPUT_PULL_UP); gpio_set_drive_mode (bus_param->i2c_sda_pin, GPIO_DM_INPUT_PULL_UP );
return gpio_get_pin(bus_param->i2c_sda_pin); return gpio_get_pin(bus_param->i2c_sda_pin);
} }
static uint8 GetSclState(void* data) static uint8 GetSclState(void *data)
{ {
I2cBusParam* bus_param = (I2cBusParam*)data; I2cBusParam *bus_param = (I2cBusParam *)data;
gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_INPUT_PULL_UP); gpio_set_drive_mode (bus_param->i2c_scl_pin, GPIO_DM_INPUT_PULL_UP );
return gpio_get_pin(bus_param->i2c_scl_pin); return gpio_get_pin(bus_param->i2c_scl_pin);
} }
@ -121,37 +119,37 @@ static const struct I2cHalDrvDone I2cDrvDone =
.timeout = 100 .timeout = 100
}; };
static x_err_t I2cBusReset(const I2cBusParam* bus_param) static x_err_t I2cBusReset(const I2cBusParam *bus_param)
{ {
int32 i = 0; int32 i = 0;
gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_INPUT_PULL_UP); gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_INPUT_PULL_UP );
if (GPIO_LOW == gpio_get_pin(bus_param->i2c_sda_pin)) { if (GPIO_LOW == gpio_get_pin(bus_param->i2c_sda_pin)) {
while (i++ < 9) { while (i++ < 9) {
gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_OUTPUT); gpio_set_drive_mode(bus_param->i2c_scl_pin, GPIO_DM_OUTPUT );
gpio_set_pin(bus_param->i2c_scl_pin, GPIO_PV_HIGH); gpio_set_pin(bus_param->i2c_scl_pin , GPIO_PV_HIGH );
usleep(100); usleep(100);
gpio_set_pin(bus_param->i2c_scl_pin, GPIO_PV_LOW); gpio_set_pin(bus_param->i2c_scl_pin , GPIO_PV_LOW );
usleep(100); usleep(100);
} }
} }
gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_INPUT_PULL_UP); gpio_set_drive_mode(bus_param->i2c_sda_pin, GPIO_DM_INPUT_PULL_UP );
if (GPIO_LOW == gpio_get_pin(bus_param->i2c_sda_pin)) { if (GPIO_LOW == gpio_get_pin(bus_param->i2c_sda_pin)) {
return -ERROR; return -ERROR;
} }
return EOK; return EOK;
} }
static __inline void I2cDelay(struct I2cHalDrvDone* done) static __inline void I2cDelay(struct I2cHalDrvDone *done)
{ {
done->udelay((done->delay_us + 1) >> 1); done->udelay((done->delay_us + 1) >> 1);
} }
static __inline void I2cDelay2(struct I2cHalDrvDone* done) static __inline void I2cDelay2(struct I2cHalDrvDone *done)
{ {
done->udelay(done->delay_us); done->udelay(done->delay_us);
} }
static x_err_t SclHigh(struct I2cHalDrvDone* done) static x_err_t SclHigh(struct I2cHalDrvDone *done)
{ {
x_ticks_t start; x_ticks_t start;
@ -173,14 +171,14 @@ done:
return EOK; return EOK;
} }
static void I2cStart(struct I2cHalDrvDone* done) static void I2cStart(struct I2cHalDrvDone *done)
{ {
SdaLow(done); SdaLow(done);
I2cDelay(done); I2cDelay(done);
SclLow(done); SclLow(done);
} }
static void I2cRestart(struct I2cHalDrvDone* done) static void I2cRestart(struct I2cHalDrvDone *done)
{ {
SdaHigh(done); SdaHigh(done);
SclHigh(done); SclHigh(done);
@ -190,7 +188,7 @@ static void I2cRestart(struct I2cHalDrvDone* done)
SclLow(done); SclLow(done);
} }
static void I2cStop(struct I2cHalDrvDone* done) static void I2cStop(struct I2cHalDrvDone *done)
{ {
SdaLow(done); SdaLow(done);
I2cDelay(done); I2cDelay(done);
@ -200,12 +198,12 @@ static void I2cStop(struct I2cHalDrvDone* done)
I2cDelay2(done); I2cDelay2(done);
} }
static __inline x_bool I2cWaitack(struct I2cHalDrvDone* done) static __inline x_bool I2cWaitack(struct I2cHalDrvDone *done)
{ {
x_bool ack; x_bool ack;
SdaHigh(done); SdaHigh(done);
GET_SDA(done); GET_SDA(done);
I2cDelay(done); I2cDelay(done);
if (SclHigh(done) < 0) { if (SclHigh(done) < 0) {
@ -220,12 +218,12 @@ static __inline x_bool I2cWaitack(struct I2cHalDrvDone* done)
return ack; return ack;
} }
static int32 I2cWriteb(struct I2cBus* bus, uint8 data) static int32 I2cWriteb(struct I2cBus *bus, uint8 data)
{ {
int32 i; int32 i;
uint8 bit; uint8 bit;
struct I2cHalDrvDone* done = (struct I2cHalDrvDone*)bus->private_data; struct I2cHalDrvDone *done = (struct I2cHalDrvDone *)bus->private_data;
for (i = 7; i >= 0; i--) { for (i = 7; i >= 0; i--) {
SclLow(done); SclLow(done);
@ -234,8 +232,8 @@ static int32 I2cWriteb(struct I2cBus* bus, uint8 data)
I2cDelay(done); I2cDelay(done);
if (SclHigh(done) < 0) { if (SclHigh(done) < 0) {
KPrintf("I2cWriteb: 0x%02x, " KPrintf("I2cWriteb: 0x%02x, "
"wait scl pin high timeout at bit %d", "wait scl pin high timeout at bit %d",
data, i); data, i);
return -ETIMEOUT; return -ETIMEOUT;
} }
@ -246,11 +244,11 @@ static int32 I2cWriteb(struct I2cBus* bus, uint8 data)
return I2cWaitack(done); return I2cWaitack(done);
} }
static int32 I2cReadb(struct I2cBus* bus) static int32 I2cReadb(struct I2cBus *bus)
{ {
uint8 i; uint8 i;
uint8 data = 0; uint8 data = 0;
struct I2cHalDrvDone* done = (struct I2cHalDrvDone*)bus->private_data; struct I2cHalDrvDone *done = (struct I2cHalDrvDone *)bus->private_data;
SdaHigh(done); SdaHigh(done);
GET_SDA(done); GET_SDA(done);
@ -260,7 +258,7 @@ static int32 I2cReadb(struct I2cBus* bus)
if (SclHigh(done) < 0) { if (SclHigh(done) < 0) {
KPrintf("I2cReadb: wait scl pin high " KPrintf("I2cReadb: wait scl pin high "
"timeout at bit %d", 7 - i); "timeout at bit %d", 7 - i);
return -ETIMEOUT; return -ETIMEOUT;
} }
@ -274,11 +272,11 @@ static int32 I2cReadb(struct I2cBus* bus)
return data; return data;
} }
static x_size_t I2cSendBytes(struct I2cBus* bus, struct I2cDataStandard* msg) static x_size_t I2cSendBytes(struct I2cBus *bus, struct I2cDataStandard *msg)
{ {
int32 ret; int32 ret;
x_size_t bytes = 0; x_size_t bytes = 0;
const uint8* ptr = msg->buf; const uint8 *ptr = msg->buf;
int32 count = msg->len; int32 count = msg->len;
uint16 ignore_nack = msg->flags & I2C_IGNORE_NACK; uint16 ignore_nack = msg->flags & I2C_IGNORE_NACK;
@ -286,14 +284,12 @@ static x_size_t I2cSendBytes(struct I2cBus* bus, struct I2cDataStandard* msg)
ret = I2cWriteb(bus, *ptr); ret = I2cWriteb(bus, *ptr);
if ((ret > 0) || (ignore_nack && (ret == 0))) { if ((ret > 0) || (ignore_nack && (ret == 0))) {
count--; count --;
ptr++; ptr ++;
bytes++; bytes ++;
} } else if (ret == 0) {
else if (ret == 0) {
return 0; return 0;
} } else {
else {
KPrintf("send bytes: error %d", ret); KPrintf("send bytes: error %d", ret);
return ret; return ret;
@ -303,9 +299,9 @@ static x_size_t I2cSendBytes(struct I2cBus* bus, struct I2cDataStandard* msg)
return bytes; return bytes;
} }
static x_err_t I2cSendAckOrNack(struct I2cBus* bus, int ack) static x_err_t I2cSendAckOrNack(struct I2cBus *bus, int ack)
{ {
struct I2cHalDrvDone* done = (struct I2cHalDrvDone*)bus->private_data; struct I2cHalDrvDone *done = (struct I2cHalDrvDone *)bus->private_data;
if (ack) if (ack)
SET_SDA(done, 0); SET_SDA(done, 0);
@ -320,11 +316,11 @@ static x_err_t I2cSendAckOrNack(struct I2cBus* bus, int ack)
return EOK; return EOK;
} }
static x_size_t I2cRecvBytes(struct I2cBus* bus, struct I2cDataStandard* msg) static x_size_t I2cRecvBytes(struct I2cBus *bus, struct I2cDataStandard *msg)
{ {
int32 val; int32 val;
int32 bytes = 0; int32 bytes = 0;
uint8* ptr = msg->buf; uint8 *ptr = msg->buf;
int32 count = msg->len; int32 count = msg->len;
const uint32 flags = msg->flags; const uint32 flags = msg->flags;
@ -332,14 +328,13 @@ static x_size_t I2cRecvBytes(struct I2cBus* bus, struct I2cDataStandard* msg)
val = I2cReadb(bus); val = I2cReadb(bus);
if (val >= 0) { if (val >= 0) {
*ptr = val; *ptr = val;
bytes++; bytes ++;
} } else {
else {
break; break;
} }
ptr++; ptr ++;
count--; count --;
if (!(flags & I2C_NO_READ_ACK)) { if (!(flags & I2C_NO_READ_ACK)) {
val = I2cSendAckOrNack(bus, count); val = I2cSendAckOrNack(bus, count);
@ -351,9 +346,9 @@ static x_size_t I2cRecvBytes(struct I2cBus* bus, struct I2cDataStandard* msg)
return bytes; return bytes;
} }
static int32 I2cSendAddress(struct I2cBus* bus, uint8 addr, int32 retries) static int32 I2cSendAddress(struct I2cBus *bus, uint8 addr, int32 retries)
{ {
struct I2cHalDrvDone* done = (struct I2cHalDrvDone*)bus->private_data; struct I2cHalDrvDone *done = (struct I2cHalDrvDone *)bus->private_data;
int32 i; int32 i;
x_err_t ret = 0; x_err_t ret = 0;
@ -369,11 +364,11 @@ static int32 I2cSendAddress(struct I2cBus* bus, uint8 addr, int32 retries)
return ret; return ret;
} }
static x_err_t I2cBitSendAddress(struct I2cBus* bus, struct I2cDataStandard* msg) static x_err_t I2cBitSendAddress(struct I2cBus *bus, struct I2cDataStandard *msg)
{ {
uint16 flags = msg->flags; uint16 flags = msg->flags;
uint16 ignore_nack = msg->flags & I2C_IGNORE_NACK; uint16 ignore_nack = msg->flags & I2C_IGNORE_NACK;
struct I2cHalDrvDone* done = (struct I2cHalDrvDone*)bus->private_data; struct I2cHalDrvDone *done = (struct I2cHalDrvDone *)bus->private_data;
uint8 addr1, addr2; uint8 addr1, addr2;
int32 retries; int32 retries;
@ -406,8 +401,7 @@ static x_err_t I2cBitSendAddress(struct I2cBus* bus, struct I2cDataStandard* msg
return -EPIO; return -EPIO;
} }
} }
} } else {
else {
addr1 = msg->addr << 1; addr1 = msg->addr << 1;
if (flags & I2C_RD) if (flags & I2C_RD)
addr1 |= 1; addr1 |= 1;
@ -419,11 +413,11 @@ static x_err_t I2cBitSendAddress(struct I2cBus* bus, struct I2cDataStandard* msg
return EOK; return EOK;
} }
static uint32 I2cWriteData(struct I2cHardwareDevice* i2c_dev, struct I2cDataStandard* msg) static uint32 I2cWriteData(struct I2cHardwareDevice *i2c_dev, struct I2cDataStandard *msg)
{ {
struct I2cBus* bus = (struct I2cBus*)i2c_dev->haldev.owner_bus; struct I2cBus *bus = (struct I2cBus *)i2c_dev->haldev.owner_bus;
bus->private_data = i2c_dev->haldev.owner_bus->private_data; bus->private_data = i2c_dev->haldev.owner_bus->private_data;
struct I2cHalDrvDone* done = (struct I2cHalDrvDone*)bus->private_data; struct I2cHalDrvDone *done = (struct I2cHalDrvDone *)bus->private_data;
int32 ret; int32 ret;
int32 i = 0; int32 i = 0;
uint16 ignore_nack; uint16 ignore_nack;
@ -445,11 +439,11 @@ static uint32 I2cWriteData(struct I2cHardwareDevice* i2c_dev, struct I2cDataStan
ret = I2cSendBytes(bus, msg); ret = I2cSendBytes(bus, msg);
if (ret >= 1) if (ret >= 1)
//KPrintf("write %d byte%s", ret, ret == 1 ? "" : "s"); //KPrintf("write %d byte%s", ret, ret == 1 ? "" : "s");
if (ret < msg->len) { if (ret < msg->len) {
if (ret >= 0) if (ret >= 0)
ret = -ERROR; ret = -ERROR;
goto out; goto out;
} }
} }
msg = msg->next; msg = msg->next;
i++; i++;
@ -462,11 +456,11 @@ out:
return ret; return ret;
} }
static uint32 I2cReadData(struct I2cHardwareDevice* i2c_dev, struct I2cDataStandard* msg) static uint32 I2cReadData(struct I2cHardwareDevice *i2c_dev, struct I2cDataStandard *msg)
{ {
struct I2cBus* bus = (struct I2cBus*)i2c_dev->haldev.owner_bus; struct I2cBus *bus = (struct I2cBus *)i2c_dev->haldev.owner_bus;
bus->private_data = i2c_dev->haldev.owner_bus->private_data; bus->private_data = i2c_dev->haldev.owner_bus->private_data;
struct I2cHalDrvDone* done = (struct I2cHalDrvDone*)bus->private_data; struct I2cHalDrvDone *done = (struct I2cHalDrvDone *)bus->private_data;
int32 ret; int32 ret;
int32 i = 0; int32 i = 0;
uint16 ignore_nack; uint16 ignore_nack;
@ -489,11 +483,11 @@ static uint32 I2cReadData(struct I2cHardwareDevice* i2c_dev, struct I2cDataStand
ret = I2cRecvBytes(bus, msg); ret = I2cRecvBytes(bus, msg);
if (ret >= 1) if (ret >= 1)
//KPrintf("read %d byte%s", ret, ret == 1 ? "" : "s"); //KPrintf("read %d byte%s", ret, ret == 1 ? "" : "s");
if (ret < msg->len) { if (ret < msg->len) {
if (ret >= 0) if (ret >= 0)
ret = -EPIO; ret = -EPIO;
goto out; goto out;
} }
} }
msg = msg->next; msg = msg->next;
i++; i++;
@ -506,36 +500,36 @@ out:
return ret; return ret;
} }
static uint32 I2cInit(struct I2cDriver* i2c_drv, struct BusConfigureInfo* configure_info) static uint32 I2cInit(struct I2cDriver *i2c_drv, struct BusConfigureInfo *configure_info)
{ {
NULL_PARAM_CHECK(i2c_drv); NULL_PARAM_CHECK(i2c_drv);
struct I2cHardwareDevice* i2c_dev = (struct I2cHardwareDevice*)i2c_drv->driver.owner_bus->owner_haldev; struct I2cHardwareDevice *i2c_dev = (struct I2cHardwareDevice *)i2c_drv->driver.owner_bus->owner_haldev;
if (configure_info->private_data) { if (configure_info->private_data) {
i2c_dev->i2c_dev_addr = *((uint16*)configure_info->private_data); i2c_dev->i2c_dev_addr = *((uint16 *)configure_info->private_data);
return EOK; return EOK;
} }
KPrintf("I2cInit need set i2c dev addr\n"); KPrintf("I2cInit need set i2c dev addr\n");
return ERROR; return ERROR;
} }
static uint32 I2cDrvConfigure(void* drv, struct BusConfigureInfo* configure_info) static uint32 I2cDrvConfigure(void *drv, struct BusConfigureInfo *configure_info)
{ {
NULL_PARAM_CHECK(drv); NULL_PARAM_CHECK(drv);
NULL_PARAM_CHECK(configure_info); NULL_PARAM_CHECK(configure_info);
x_err_t ret = EOK; x_err_t ret = EOK;
struct I2cDriver* i2c_drv = (struct I2cDriver*)drv; struct I2cDriver *i2c_drv = (struct I2cDriver *)drv;
switch (configure_info->configure_cmd) switch (configure_info->configure_cmd)
{ {
case OPE_INT: case OPE_INT:
ret = I2cInit(i2c_drv, configure_info); ret = I2cInit(i2c_drv, configure_info);
break; break;
default: default:
break; break;
} }
return ret; return ret;
@ -551,12 +545,12 @@ static const struct I2cDevDone i2c_dev_done =
}; };
/*Init i2c bus*/ /*Init i2c bus*/
static int BoardI2cBusInit(struct I2cBus* i2c_bus, struct I2cDriver* i2c_driver) static int BoardI2cBusInit(struct I2cBus *i2c_bus, struct I2cDriver *i2c_driver)
{ {
x_err_t ret = EOK; x_err_t ret = EOK;
/*Init the i2c bus */ /*Init the i2c bus */
i2c_bus->private_data = (void*)&I2cDrvDone; i2c_bus->private_data = (void *)&I2cDrvDone;
ret = I2cBusInit(i2c_bus, I2C_BUS_NAME_1); ret = I2cBusInit(i2c_bus, I2C_BUS_NAME_1);
if (EOK != ret) { if (EOK != ret) {
KPrintf("board_i2c_init I2cBusInit error %d\n", ret); KPrintf("board_i2c_init I2cBusInit error %d\n", ret);
@ -564,7 +558,7 @@ static int BoardI2cBusInit(struct I2cBus* i2c_bus, struct I2cDriver* i2c_driver)
} }
/*Init the i2c driver*/ /*Init the i2c driver*/
i2c_driver->private_data = (void*)&I2cDrvDone; i2c_driver->private_data = (void *)&I2cDrvDone;
ret = I2cDriverInit(i2c_driver, I2C_DRV_NAME_1); ret = I2cDriverInit(i2c_driver, I2C_DRV_NAME_1);
if (EOK != ret) { if (EOK != ret) {
KPrintf("board_i2c_init I2cDriverInit error %d\n", ret); KPrintf("board_i2c_init I2cDriverInit error %d\n", ret);
@ -576,7 +570,7 @@ static int BoardI2cBusInit(struct I2cBus* i2c_bus, struct I2cDriver* i2c_driver)
if (EOK != ret) { if (EOK != ret) {
KPrintf("board_i2c_init I2cDriverAttachToBus error %d\n", ret); KPrintf("board_i2c_init I2cDriverAttachToBus error %d\n", ret);
return ERROR; return ERROR;
} }
return ret; return ret;
} }
@ -594,13 +588,13 @@ static int BoardI2cDevBend(void)
if (EOK != ret) { if (EOK != ret) {
KPrintf("board_i2c_init I2cDeviceInit device %s error %d\n", I2C_1_DEVICE_NAME_0, ret); KPrintf("board_i2c_init I2cDeviceInit device %s error %d\n", I2C_1_DEVICE_NAME_0, ret);
return ERROR; return ERROR;
} }
ret = I2cDeviceAttachToBus(I2C_1_DEVICE_NAME_0, I2C_BUS_NAME_1); ret = I2cDeviceAttachToBus(I2C_1_DEVICE_NAME_0, I2C_BUS_NAME_1);
if (EOK != ret) { if (EOK != ret) {
KPrintf("board_i2c_init I2cDeviceAttachToBus device %s error %d\n", I2C_1_DEVICE_NAME_0, ret); KPrintf("board_i2c_init I2cDeviceAttachToBus device %s error %d\n", I2C_1_DEVICE_NAME_0, ret);
return ERROR; return ERROR;
} }
return ret; return ret;
} }
@ -630,7 +624,7 @@ int HwI2cInit(void)
if (EOK != ret) { if (EOK != ret) {
KPrintf("board_i2c_Init error ret %u\n", ret); KPrintf("board_i2c_Init error ret %u\n", ret);
return ERROR; return ERROR;
} }
I2cBusReset(&i2c_bus_param); I2cBusReset(&i2c_bus_param);
#endif #endif