oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aligning makedev macros, dev_t still 32bits

Browse Source 
Change-Id: Ib343d9b459ff0eeac70c4e54c23fe2e82a137100
This commit is contained in:
Lionel Sambuc 2013-10-25 16:59:54 +02:00
parent 5ae60510dc
commit c9072ba0bb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/sys/types.h
View File

@ -183,7 +183,9 @@ typedef __daddr_t daddr_t; /* disk address */
typedef int64_t daddr_t; /* disk address */ typedef int64_t daddr_t; /* disk address */
#endif #endif
#if defined(__minix) /* LSC: Wait until bigger message to enlarge the data type. */
typedef uint32_t dev_t; /* device number */ typedef uint32_t dev_t; /* device number */
#endif /* defined(__minix) */
typedef uint32_t fixpt_t; /* fixed point number */ typedef uint32_t fixpt_t; /* fixed point number */
#ifndef gid_t #ifndef gid_t
@ -289,12 +291,11 @@ typedef int32_t __devmajor_t, __devminor_t;
#define devmajor_t __devmajor_t #define devmajor_t __devmajor_t
#define devminor_t __devminor_t #define devminor_t __devminor_t
#define NODEVMAJOR (-1) #define NODEVMAJOR (-1)
/* LSC Our major / minor numbering scheme is not the exactly the same, to be updated? */ #define major(x) ((devmajor_t)(((uint32_t)(x) & 0x000fff00) >> 8))
#define major(x) ((devmajor_t)(((uint32_t)(x) & 0x0000ff00) >> 8)) #define minor(x) ((devminor_t)((((uint32_t)(x) & 0xfff00000) >> 12) | \
#define minor(x) ((devminor_t)( \
(((uint32_t)(x) & 0x000000ff) >> 0))) (((uint32_t)(x) & 0x000000ff) >> 0)))
#define makedev(x,y) ((dev_t)((((x) << 8) & 0x0000ff00) | \ #define makedev(x,y) ((dev_t)((((x) << 8) & 0x000fff00) | \
\ (((y) << 12) & 0xfff00000) | \
(((y) << 0) & 0x000000ff))) (((y) << 0) & 0x000000ff)))
#endif #endif