From 4ff72f080ceadccad8b05637de16af039b2d579b Mon Sep 17 00:00:00 2001 From: Liu_Weichao Date: Thu, 29 Apr 2021 15:06:43 +0800 Subject: [PATCH] fix resources linklist init error --- resources/can/dev_can.c | 2 +- resources/i2c/dev_i2c.c | 2 +- resources/pin/dev_pin.c | 6 +++--- resources/pin/drv_pin.c | 6 +++--- resources/rtc/dev_rtc.c | 2 +- resources/sdio/dev_sdio.c | 6 +++--- resources/sdio/drv_sdio.c | 6 +++--- resources/serial/dev_serial.c | 2 +- resources/spi/dev_spi.c | 2 +- resources/timer/dev_hwtimer.c | 2 +- resources/usb/dev_usb.c | 2 +- resources/watchdog/dev_wdt.c | 6 +++--- resources/watchdog/drv_wdt.c | 6 +++--- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/resources/can/dev_can.c b/resources/can/dev_can.c index 7a4c44ef..cc5007cf 100644 --- a/resources/can/dev_can.c +++ b/resources/can/dev_can.c @@ -59,7 +59,7 @@ int CanDeviceRegister(struct CanHardwareDevice *can_device, void *can_param, con x_err_t ret = EOK; static x_bool dev_link_flag = RET_FALSE; - if (dev_link_flag) { + if (!dev_link_flag) { CanDeviceLinkInit(); dev_link_flag = RET_TRUE; } diff --git a/resources/i2c/dev_i2c.c b/resources/i2c/dev_i2c.c index 2ef27abb..18f09bee 100644 --- a/resources/i2c/dev_i2c.c +++ b/resources/i2c/dev_i2c.c @@ -103,7 +103,7 @@ int I2cDeviceRegister(struct I2cHardwareDevice *i2c_device, void *i2c_param, con x_err_t ret = EOK; static x_bool dev_link_flag = RET_FALSE; - if (dev_link_flag) { + if (!dev_link_flag) { I2cDeviceLinkInit(); dev_link_flag = RET_TRUE; } diff --git a/resources/pin/dev_pin.c b/resources/pin/dev_pin.c index bd640ff0..b76de1f8 100644 --- a/resources/pin/dev_pin.c +++ b/resources/pin/dev_pin.c @@ -55,11 +55,11 @@ int PinDeviceRegister(struct PinHardwareDevice *pin_device, void *pin_param, con NULL_PARAM_CHECK(device_name); x_err_t ret = EOK; - static x_bool DevLinkFlag = RET_FALSE; + static x_bool dev_link_flag = RET_FALSE; - if (DevLinkFlag) { + if (!dev_link_flag) { PinDeviceLinkInit(); - DevLinkFlag = RET_TRUE; + dev_link_flag = RET_TRUE; } if (DEV_INSTALL != pin_device->haldev.dev_state) { diff --git a/resources/pin/drv_pin.c b/resources/pin/drv_pin.c index 2d01cd44..284c69a0 100644 --- a/resources/pin/drv_pin.c +++ b/resources/pin/drv_pin.c @@ -54,11 +54,11 @@ int PinDriverRegister(struct Driver *driver) NULL_PARAM_CHECK(driver); x_err_t ret = EOK; - static x_bool DriverLinkFlag = RET_FALSE; + static x_bool driver_link_flag = RET_FALSE; - if (!DriverLinkFlag) { + if (!driver_link_flag) { PinDrvLinkInit(); - DriverLinkFlag = RET_TRUE; + driver_link_flag = RET_TRUE; } DoubleLinkListInsertNodeAfter(&pindrv_linklist, &(driver->driver_link)); diff --git a/resources/rtc/dev_rtc.c b/resources/rtc/dev_rtc.c index 842ab0fc..e867b726 100644 --- a/resources/rtc/dev_rtc.c +++ b/resources/rtc/dev_rtc.c @@ -57,7 +57,7 @@ int RtcDeviceRegister(struct RtcHardwareDevice *rtc_device, void *rtc_param, con x_err_t ret = EOK; static x_bool dev_link_flag = RET_FALSE; - if (dev_link_flag) { + if (!dev_link_flag) { RtcDeviceLinkInit(); dev_link_flag = RET_TRUE; } diff --git a/resources/sdio/dev_sdio.c b/resources/sdio/dev_sdio.c index fa5ab433..b3e0fc5c 100644 --- a/resources/sdio/dev_sdio.c +++ b/resources/sdio/dev_sdio.c @@ -55,11 +55,11 @@ int SdioDeviceRegister(struct SdioHardwareDevice *sdio_device, const char *devic NULL_PARAM_CHECK(device_name); x_err_t ret = EOK; - static x_bool DevLinkFlag = RET_FALSE; + static x_bool dev_link_flag = RET_FALSE; - if (DevLinkFlag) { + if (!dev_link_flag) { SdioDeviceLinkInit(); - DevLinkFlag = RET_TRUE; + dev_link_flag = RET_TRUE; } if (DEV_INSTALL != sdio_device->haldev.dev_state) { diff --git a/resources/sdio/drv_sdio.c b/resources/sdio/drv_sdio.c index c13c9d7b..483ed213 100644 --- a/resources/sdio/drv_sdio.c +++ b/resources/sdio/drv_sdio.c @@ -54,11 +54,11 @@ int SdioDriverRegister(struct Driver *driver) NULL_PARAM_CHECK(driver); x_err_t ret = EOK; - static x_bool DriverLinkFlag = RET_FALSE; + static x_bool driver_link_flag = RET_FALSE; - if (!DriverLinkFlag) { + if (!driver_link_flag) { SdioDrvLinkInit(); - DriverLinkFlag = RET_TRUE; + driver_link_flag = RET_TRUE; } DoubleLinkListInsertNodeAfter(&sdiodrv_linklist, &(driver->driver_link)); diff --git a/resources/serial/dev_serial.c b/resources/serial/dev_serial.c index 732f12da..41a73621 100644 --- a/resources/serial/dev_serial.c +++ b/resources/serial/dev_serial.c @@ -812,7 +812,7 @@ int SerialDeviceRegister(struct SerialHardwareDevice *serial_device, void *seria x_err_t ret = EOK; static x_bool dev_link_flag = RET_FALSE; - if (dev_link_flag) { + if (!dev_link_flag) { SerialDeviceLinkInit(); dev_link_flag = RET_TRUE; } diff --git a/resources/spi/dev_spi.c b/resources/spi/dev_spi.c index 7970401b..94b6be6a 100644 --- a/resources/spi/dev_spi.c +++ b/resources/spi/dev_spi.c @@ -119,7 +119,7 @@ int SpiDeviceRegister(struct SpiHardwareDevice *spi_device, void *spi_param, con x_err_t ret = EOK; static x_bool dev_link_flag = RET_FALSE; - if (dev_link_flag) { + if (!dev_link_flag) { SpiDeviceLinkInit(); dev_link_flag = RET_TRUE; } diff --git a/resources/timer/dev_hwtimer.c b/resources/timer/dev_hwtimer.c index f6f5cebf..5a9b530a 100644 --- a/resources/timer/dev_hwtimer.c +++ b/resources/timer/dev_hwtimer.c @@ -57,7 +57,7 @@ int HwtimerDeviceRegister(struct HwtimerHardwareDevice *hwtimer_device, void *hw x_err_t ret = EOK; static x_bool dev_link_flag = RET_FALSE; - if (dev_link_flag) { + if (!dev_link_flag) { HwtimerDeviceLinkInit(); dev_link_flag = RET_TRUE; } diff --git a/resources/usb/dev_usb.c b/resources/usb/dev_usb.c index 3f744bd7..baa6dda8 100644 --- a/resources/usb/dev_usb.c +++ b/resources/usb/dev_usb.c @@ -59,7 +59,7 @@ int USBDeviceRegister(struct UsbHardwareDevice *usb_device, void *usb_param, con x_err_t ret = EOK; static x_bool dev_link_flag = RET_FALSE; - if (dev_link_flag) { + if (!dev_link_flag) { USBDeviceLinkInit(); dev_link_flag = RET_TRUE; } diff --git a/resources/watchdog/dev_wdt.c b/resources/watchdog/dev_wdt.c index 1be98869..7648f0a4 100644 --- a/resources/watchdog/dev_wdt.c +++ b/resources/watchdog/dev_wdt.c @@ -55,11 +55,11 @@ int WdtDeviceRegister(struct WdtHardwareDevice *wdt_device, const char *device_n NULL_PARAM_CHECK(device_name); x_err_t ret = EOK; - static x_bool DevLinkFlag = RET_FALSE; + static x_bool dev_link_flag = RET_FALSE; - if (DevLinkFlag) { + if (!dev_link_flag) { WdtDeviceLinkInit(); - DevLinkFlag = RET_TRUE; + dev_link_flag = RET_TRUE; } if (DEV_INSTALL != wdt_device->haldev.dev_state) { diff --git a/resources/watchdog/drv_wdt.c b/resources/watchdog/drv_wdt.c index 800e4e15..5856883c 100644 --- a/resources/watchdog/drv_wdt.c +++ b/resources/watchdog/drv_wdt.c @@ -54,11 +54,11 @@ int WdtDriverRegister(struct Driver *driver) NULL_PARAM_CHECK(driver); x_err_t ret = EOK; - static x_bool DriverLinkFlag = RET_FALSE; + static x_bool driver_link_flag = RET_FALSE; - if (!DriverLinkFlag) { + if (!driver_link_flag) { WdtDrvLinkInit(); - DriverLinkFlag = RET_TRUE; + driver_link_flag = RET_TRUE; } DoubleLinkListInsertNodeAfter(&wdtdrv_linklist, &(driver->driver_link));