sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Userled driver: Rename functions to make it more consistent and avoid confusion

Browse Source
This commit is contained in:
Jari van Ewijk 2021-10-04 15:07:34 +02:00 committed by Xiang Xiao
parent e4752fbaee
commit 20bf309939
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/leds/userled_lower.c
View File

@ -40,9 +40,9 @@
static userled_set_t
userled_supported(FAR const struct userled_lowerhalf_s *lower);
static void userled_led(FAR const struct userled_lowerhalf_s *lower,
int led, bool ledon);
static void userled_ledset(FAR const struct userled_lowerhalf_s *lower,
static void userled_setled(FAR const struct userled_lowerhalf_s *lower,
int led, bool ledon);
static void userled_setall(FAR const struct userled_lowerhalf_s *lower,
userled_set_t ledset);
/****************************************************************************
@ -56,8 +56,8 @@ static uint32_t g_lednum;
static const struct userled_lowerhalf_s g_userled_lower =
{
.ll_supported = userled_supported,
.ll_led = userled_led,
.ll_ledset = userled_ledset,
.ll_setled = userled_setled,
.ll_setall = userled_setall,
};
/****************************************************************************
@ -80,28 +80,28 @@ userled_supported(FAR const struct userled_lowerhalf_s *lower)
}
/****************************************************************************
* Name: userled_led
* Name: userled_setled
*
* Description:
* Set the current state of one LED
*
****************************************************************************/
static void userled_led(FAR const struct userled_lowerhalf_s *lower,
int led, bool ledon)
static void userled_setled(FAR const struct userled_lowerhalf_s *lower,
int led, bool ledon)
{
board_userled(led, ledon);
}
/****************************************************************************
* Name: userled_led
* Name: userled_setall
*
* Description:
* Set the state of all LEDs
*
****************************************************************************/
static void userled_ledset(FAR const struct userled_lowerhalf_s *lower,
static void userled_setall(FAR const struct userled_lowerhalf_s *lower,
userled_set_t ledset)
{
board_userled_all(ledset);

16
drivers/leds/userled_upper.c
View File

@ -316,8 +316,8 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer,
/* Read and return the current state of the LEDs */
lower = priv->lu_lower;
DEBUGASSERT(lower && lower->ll_ledset);
lower->ll_ledset(lower, ledset);
DEBUGASSERT(lower && lower->ll_setall);
lower->ll_setall(lower, ledset);
userled_givesem(&priv->lu_exclsem);
return (ssize_t)sizeof(userled_set_t);
@ -416,8 +416,8 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
/* Set the LED state */
lower = priv->lu_lower;
DEBUGASSERT(lower != NULL && lower->ll_led != NULL);
lower->ll_led(lower, led, ledon);
DEBUGASSERT(lower != NULL && lower->ll_setled != NULL);
lower->ll_setled(lower, led, ledon);
ret = OK;
}
}
@ -446,8 +446,8 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
/* Set the new LED state */
lower = priv->lu_lower;
DEBUGASSERT(lower != NULL && lower->ll_led != NULL);
lower->ll_ledset(lower, ledset);
DEBUGASSERT(lower != NULL && lower->ll_setall != NULL);
lower->ll_setall(lower, ledset);
ret = OK;
}
}
@ -536,9 +536,9 @@ int userled_register(FAR const char *devname,
DEBUGASSERT(lower && lower->ll_supported);
priv->lu_supported = lower->ll_supported(lower);
DEBUGASSERT(lower && lower->ll_ledset);
DEBUGASSERT(lower && lower->ll_setall);
priv->lu_ledset = 0;
lower->ll_ledset(lower, priv->lu_ledset);
lower->ll_setall(lower, priv->lu_ledset);
/* And register the LED driver */

8
include/nuttx/leds/userled.h
View File

@ -65,7 +65,7 @@
#define ULEDIOC_SETALL _ULEDIOC(0x0003)
/* Command: ULEDIOC_GETALL
* Description: Get the state of one LED.
* Description: Get the state of all LEDs.
* Argument: A write-able pointer to a userled_set_t memory location in
* which to return the LED state.
* Return: Zero (OK) on success. Minus one will be returned on failure
@ -119,12 +119,12 @@ struct userled_lowerhalf_s
/* Set the current state of one LED */
CODE void (*ll_led)(FAR const struct userled_lowerhalf_s *lower,
int led, bool ledon);
CODE void (*ll_setled)(FAR const struct userled_lowerhalf_s *lower,
int led, bool ledon);
/* Set the state of all LEDs */
CODE void (*ll_ledset)(FAR const struct userled_lowerhalf_s *lower,
CODE void (*ll_setall)(FAR const struct userled_lowerhalf_s *lower,
userled_set_t ledset);
};