iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/nolibc/types: move makedev to types.h and make it a macro

Browse Source 
The makedev() man page says it's supposed to be a macro and that some
OSes have it with the other ones in sys/types.h so it now makes sense
to move it to types.h as a macro. Let's also define major() and
minor() that perform the reverse operation.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
Willy Tarreau 2022-02-07 17:23:25 +01:00 committed by Paul E. McKenney
parent 306c9fd4c6
commit eba6d00d38
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/include/nolibc/nolibc.h
View File

@ -116,13 +116,4 @@ const char *ltoa(long in)
return pos + 1; return pos + 1;
} }
/* Here come a few helper functions */
/* WARNING, it only deals with the 4096 first majors and 256 first minors */
static __attribute__((unused))
dev_t makedev(unsigned int major, unsigned int minor)
{
return ((major & 0xfff) << 8) | (minor & 0xff);
}
#endif /* _NOLIBC_H */ #endif /* _NOLIBC_H */

5
tools/include/nolibc/types.h
View File

@ -162,4 +162,9 @@ struct stat {
time_t st_ctime; /* time of last status change */ time_t st_ctime; /* time of last status change */
}; };
/* WARNING, it only deals with the 4096 first majors and 256 first minors */
#define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff)))
#define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff))
#define minor(dev) ((unsigned int)(((dev) & 0xff))
#endif /* _NOLIBC_TYPES_H */ #endif /* _NOLIBC_TYPES_H */