Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clean up some naming: fd vs. fildes vs. filedes and filep vs filp

Browse Source
This commit is contained in:
Gregory Nutt
2013-09-28 16:50:07 -06:00
parent cab85f2e6a
commit 4e3c5d61e3
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
+7 -7
View File
@@ -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_read(FAR struct file *, FAR char *, size_t);
static ssize_t lcd_write(FAR struct file *, FAR const 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 #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 #endif
/**************************************************************************** /****************************************************************************
@@ -662,14 +662,14 @@ static void lcd_action(enum slcdcode_e code, uint8_t count)
* Name: lcd_read * 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 row;
uint8_t column; uint8_t column;
int nread; int nread;
/* Try to read the entire display. Notice that the seek offset /* 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. * 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 * 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) size_t len)
{ {
struct lcd_instream_s instream; 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 * 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) switch (cmd)
{ {
@@ -851,7 +851,7 @@ static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_DISABLE_POLL #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) bool setup)
{ {
if (setup) if (setup)
configs/sam4l-xplained/src/sam_slcd.c
+7 -7
View File
@@ -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_read(FAR struct file *, FAR char *, size_t);
static ssize_t slcd_write(FAR struct file *, FAR const 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 #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 #endif
/**************************************************************************** /****************************************************************************
@@ -856,13 +856,13 @@ static void slcd_action(enum slcdcode_e code, uint8_t count)
* Name: slcd_read * 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 ret = 0;
int i; int i;
/* Try to read the entire display. Notice that the seek offset /* 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. * 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 * 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) FAR const char *buffer, size_t len)
{ {
struct slcd_instream_s instream; struct slcd_instream_s instream;
@@ -1006,7 +1006,7 @@ static ssize_t slcd_write(FAR struct file *filp,
* Name: slcd_poll * 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) switch (cmd)
{ {
@@ -1156,7 +1156,7 @@ static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_DISABLE_POLL #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) bool setup)
{ {
if (setup) if (setup)
configs/stm32ldiscovery/src/stm32_lcd.c
+7 -7
View File
@@ -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_read(FAR struct file *, FAR char *, size_t);
static ssize_t slcd_write(FAR struct file *, FAR const 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 #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 #endif
/**************************************************************************** /****************************************************************************
@@ -1085,13 +1085,13 @@ static void slcd_action(enum slcdcode_e code, uint8_t count)
* Name: slcd_read * 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 ret = 0;
int i; int i;
/* Try to read the entire display. Notice that the seek offset /* 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. * 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 * 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) FAR const char *buffer, size_t len)
{ {
struct slcd_instream_s instream; struct slcd_instream_s instream;
@@ -1314,7 +1314,7 @@ static ssize_t slcd_write(FAR struct file *filp,
* Name: slcd_poll * 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) switch (cmd)
{ {
@@ -1457,7 +1457,7 @@ static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_DISABLE_POLL #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) bool setup)
{ {
if (setup) if (setup)
configs/sure-pic32mx/src/pic32mx_lcd1602.c
+7 -7
View File
@@ -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_read(FAR struct file *, FAR char *, size_t);
static ssize_t lcd_write(FAR struct file *, FAR const 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 #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 #endif
/**************************************************************************** /****************************************************************************
@@ -817,14 +817,14 @@ static void lcd_action(enum slcdcode_e code, uint8_t count)
* Name: lcd_read * 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 row;
uint8_t column; uint8_t column;
int nread; int nread;
/* Try to read the entire display. Notice that the seek offset /* 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. * 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 * 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) size_t len)
{ {
struct lcd_instream_s instream; 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 * 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) switch (cmd)
{ {
@@ -1041,7 +1041,7 @@ static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_DISABLE_POLL #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) bool setup)
{ {
if (setup) if (setup)
configs/vsn/src/sif.c
+3 -3
View File
@@ -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(); sif_sem_wait();
memset(buffer, 0, len); 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(); sif_sem_wait();
printf("getpid: %d\n", getpid() ); 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 #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) bool setup)
{ {
if (setup) { if (setup) {