diff options
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c | 14 | ||||
-rw-r--r-- | nuttx/configs/sam4l-xplained/src/sam_slcd.c | 14 | ||||
-rw-r--r-- | nuttx/configs/stm32ldiscovery/src/stm32_lcd.c | 14 | ||||
-rw-r--r-- | nuttx/configs/sure-pic32mx/src/pic32mx_lcd1602.c | 14 | ||||
-rw-r--r-- | nuttx/configs/vsn/src/sif.c | 6 |
5 files changed, 31 insertions, 31 deletions
diff --git a/nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c b/nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c index d12c6bdab..c03191b02 100644 --- a/nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c +++ b/nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c @@ -198,9 +198,9 @@ static void lcd_action(enum slcdcode_e code, uint8_t count); static ssize_t lcd_read(FAR struct file *, FAR char *, size_t); static ssize_t lcd_write(FAR struct file *, FAR const char *, size_t); -static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg); +static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg); #ifndef CONFIG_DISABLE_POLL -static int lcd_poll(FAR struct file *filp, FAR struct pollfd *fds, bool setup); +static int lcd_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup); #endif /**************************************************************************** @@ -662,14 +662,14 @@ static void lcd_action(enum slcdcode_e code, uint8_t count) * Name: lcd_read ****************************************************************************/ -static ssize_t lcd_read(FAR struct file *filp, FAR char *buffer, size_t len) +static ssize_t lcd_read(FAR struct file *filep, FAR char *buffer, size_t len) { uint8_t row; uint8_t column; int nread; /* Try to read the entire display. Notice that the seek offset - * (filp->f_pos) is ignored. It probably should be taken into account + * (filep->f_pos) is ignored. It probably should be taken into account * and also updated after each read and write. */ @@ -696,7 +696,7 @@ static ssize_t lcd_read(FAR struct file *filp, FAR char *buffer, size_t len) * Name: lcd_write ****************************************************************************/ -static ssize_t lcd_write(FAR struct file *filp, FAR const char *buffer, +static ssize_t lcd_write(FAR struct file *filep, FAR const char *buffer, size_t len) { struct lcd_instream_s instream; @@ -781,7 +781,7 @@ static ssize_t lcd_write(FAR struct file *filp, FAR const char *buffer, * Name: lcd_ioctl ****************************************************************************/ -static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg) +static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { switch (cmd) { @@ -851,7 +851,7 @@ static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg) ****************************************************************************/ #ifndef CONFIG_DISABLE_POLL -static int lcd_poll(FAR struct file *filp, FAR struct pollfd *fds, +static int lcd_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup) { if (setup) diff --git a/nuttx/configs/sam4l-xplained/src/sam_slcd.c b/nuttx/configs/sam4l-xplained/src/sam_slcd.c index 898c7e883..d8ed61bac 100644 --- a/nuttx/configs/sam4l-xplained/src/sam_slcd.c +++ b/nuttx/configs/sam4l-xplained/src/sam_slcd.c @@ -321,9 +321,9 @@ static void slcd_action(enum slcdcode_e code, uint8_t count); static ssize_t slcd_read(FAR struct file *, FAR char *, size_t); static ssize_t slcd_write(FAR struct file *, FAR const char *, size_t); -static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg); +static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg); #ifndef CONFIG_DISABLE_POLL -static int slcd_poll(FAR struct file *filp, FAR struct pollfd *fds, bool setup); +static int slcd_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup); #endif /**************************************************************************** @@ -856,13 +856,13 @@ static void slcd_action(enum slcdcode_e code, uint8_t count) * Name: slcd_read ****************************************************************************/ -static ssize_t slcd_read(FAR struct file *filp, FAR char *buffer, size_t len) +static ssize_t slcd_read(FAR struct file *filep, FAR char *buffer, size_t len) { int ret = 0; int i; /* Try to read the entire display. Notice that the seek offset - * (filp->f_pos) is ignored. It probably should be taken into account + * (filep->f_pos) is ignored. It probably should be taken into account * and also updated after each read and write. */ @@ -892,7 +892,7 @@ static ssize_t slcd_read(FAR struct file *filp, FAR char *buffer, size_t len) * Name: slcd_write ****************************************************************************/ -static ssize_t slcd_write(FAR struct file *filp, +static ssize_t slcd_write(FAR struct file *filep, FAR const char *buffer, size_t len) { struct slcd_instream_s instream; @@ -1006,7 +1006,7 @@ static ssize_t slcd_write(FAR struct file *filp, * Name: slcd_poll ****************************************************************************/ -static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg) +static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { switch (cmd) { @@ -1156,7 +1156,7 @@ static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg) ****************************************************************************/ #ifndef CONFIG_DISABLE_POLL -static int slcd_poll(FAR struct file *filp, FAR struct pollfd *fds, +static int slcd_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup) { if (setup) diff --git a/nuttx/configs/stm32ldiscovery/src/stm32_lcd.c b/nuttx/configs/stm32ldiscovery/src/stm32_lcd.c index c74836959..1c14bf595 100644 --- a/nuttx/configs/stm32ldiscovery/src/stm32_lcd.c +++ b/nuttx/configs/stm32ldiscovery/src/stm32_lcd.c @@ -323,9 +323,9 @@ static void slcd_action(enum slcdcode_e code, uint8_t count); static ssize_t slcd_read(FAR struct file *, FAR char *, size_t); static ssize_t slcd_write(FAR struct file *, FAR const char *, size_t); -static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg); +static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg); #ifndef CONFIG_DISABLE_POLL -static int slcd_poll(FAR struct file *filp, FAR struct pollfd *fds, bool setup); +static int slcd_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup); #endif /**************************************************************************** @@ -1085,13 +1085,13 @@ static void slcd_action(enum slcdcode_e code, uint8_t count) * Name: slcd_read ****************************************************************************/ -static ssize_t slcd_read(FAR struct file *filp, FAR char *buffer, size_t len) +static ssize_t slcd_read(FAR struct file *filep, FAR char *buffer, size_t len) { int ret = 0; int i; /* Try to read the entire display. Notice that the seek offset - * (filp->f_pos) is ignored. It probably should be taken into account + * (filep->f_pos) is ignored. It probably should be taken into account * and also updated after each read and write. */ @@ -1127,7 +1127,7 @@ static ssize_t slcd_read(FAR struct file *filp, FAR char *buffer, size_t len) * Name: slcd_write ****************************************************************************/ -static ssize_t slcd_write(FAR struct file *filp, +static ssize_t slcd_write(FAR struct file *filep, FAR const char *buffer, size_t len) { struct slcd_instream_s instream; @@ -1314,7 +1314,7 @@ static ssize_t slcd_write(FAR struct file *filp, * Name: slcd_poll ****************************************************************************/ -static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg) +static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { switch (cmd) { @@ -1457,7 +1457,7 @@ static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg) ****************************************************************************/ #ifndef CONFIG_DISABLE_POLL -static int slcd_poll(FAR struct file *filp, FAR struct pollfd *fds, +static int slcd_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup) { if (setup) diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_lcd1602.c b/nuttx/configs/sure-pic32mx/src/pic32mx_lcd1602.c index d12838b7d..9a881647e 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_lcd1602.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_lcd1602.c @@ -207,9 +207,9 @@ static void lcd_action(enum slcdcode_e code, uint8_t count); static ssize_t lcd_read(FAR struct file *, FAR char *, size_t); static ssize_t lcd_write(FAR struct file *, FAR const char *, size_t); -static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg); +static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg); #ifndef CONFIG_DISABLE_POLL -static int lcd_poll(FAR struct file *filp, FAR struct pollfd *fds, bool setup); +static int lcd_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup); #endif /**************************************************************************** @@ -817,14 +817,14 @@ static void lcd_action(enum slcdcode_e code, uint8_t count) * Name: lcd_read ****************************************************************************/ -static ssize_t lcd_read(FAR struct file *filp, FAR char *buffer, size_t len) +static ssize_t lcd_read(FAR struct file *filep, FAR char *buffer, size_t len) { uint8_t row; uint8_t column; int nread; /* Try to read the entire display. Notice that the seek offset - * (filp->f_pos) is ignored. It probably should be taken into account + * (filep->f_pos) is ignored. It probably should be taken into account * and also updated after each read and write. */ @@ -851,7 +851,7 @@ static ssize_t lcd_read(FAR struct file *filp, FAR char *buffer, size_t len) * Name: lcd_write ****************************************************************************/ -static ssize_t lcd_write(FAR struct file *filp, FAR const char *buffer, +static ssize_t lcd_write(FAR struct file *filep, FAR const char *buffer, size_t len) { struct lcd_instream_s instream; @@ -936,7 +936,7 @@ static ssize_t lcd_write(FAR struct file *filp, FAR const char *buffer, * Name: lcd_ioctl ****************************************************************************/ -static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg) +static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { switch (cmd) { @@ -1041,7 +1041,7 @@ static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg) ****************************************************************************/ #ifndef CONFIG_DISABLE_POLL -static int lcd_poll(FAR struct file *filp, FAR struct pollfd *fds, +static int lcd_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup) { if (setup) diff --git a/nuttx/configs/vsn/src/sif.c b/nuttx/configs/vsn/src/sif.c index 2dacc6f69..6fa0be5a2 100644 --- a/nuttx/configs/vsn/src/sif.c +++ b/nuttx/configs/vsn/src/sif.c @@ -475,7 +475,7 @@ int devsif_close(FAR struct file *filep) } -static ssize_t devsif_read(FAR struct file *filp, FAR char *buffer, size_t len) +static ssize_t devsif_read(FAR struct file *filep, FAR char *buffer, size_t len) { sif_sem_wait(); memset(buffer, 0, len); @@ -484,7 +484,7 @@ static ssize_t devsif_read(FAR struct file *filp, FAR char *buffer, size_t len) } -static ssize_t devsif_write(FAR struct file *filp, FAR const char *buffer, size_t len) +static ssize_t devsif_write(FAR struct file *filep, FAR const char *buffer, size_t len) { sif_sem_wait(); printf("getpid: %d\n", getpid() ); @@ -494,7 +494,7 @@ static ssize_t devsif_write(FAR struct file *filp, FAR const char *buffer, size_ #ifndef CONFIG_DISABLE_POLL -static int devsif_poll(FAR struct file *filp, FAR struct pollfd *fds, +static int devsif_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup) { if (setup) { |