Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Aligning dev_t to 64bits.

Browse Source 
Change-Id: I630f72f8530dd4aaf05c35ca23683ae12c9f8328
This commit is contained in:
Lionel Sambuc
2013-11-15 19:01:25 +01:00
parent a00e322bea
commit 37598dccf1
40 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/minix/callnr.h
View File

@@ -353,7 +353,7 @@
#define VFS_MKNOD_NAME m1_p1 /* const char * */
#define VFS_MKNOD_LEN m1_i1 /* size_t */
#define VFS_MKNOD_MODE m1_i2 /* mode_t */
#define VFS_MKNOD_DEV m1_i3 /* dev_t */
#define VFS_MKNOD_DEV m1_ull1 /* dev_t */
/* Field names for the open(2), chdir(2), chmod(2), chroot(2), rmdir(2), and
* unlink(2) calls.

18
include/minix/ipc.h
View File

@@ -17,9 +17,10 @@
#define M3_LONG_STRING 44 /* current m3_ca1 size (may be increased) */
typedef struct {
uint64_t m1ull1;
int m1i1, m1i2, m1i3;
char *m1p1, *m1p2, *m1p3, *m1p4;
uint8_t padding[28];
uint8_t padding[20];
} mess_1;
_ASSERT_MSG_SIZE(mess_1);
@@ -28,7 +29,7 @@ typedef struct {
long m2l1, m2l2;
char *m2p1;
sigset_t sigset;
short m2s1;
short m2s1;
uint8_t padding[14];
} mess_2;
_ASSERT_MSG_SIZE(mess_2);
@@ -89,9 +90,10 @@ typedef struct {
_ASSERT_MSG_SIZE(mess_8);
typedef struct {
uint64_t m9ull1;
long m9l1, m9l2, m9l3, m9l4, m9l5;
short m9s1, m9s2, m9s3, m9s4;
uint8_t padding[28];
uint8_t padding[20];
} mess_9;
_ASSERT_MSG_SIZE(mess_9);
@@ -111,15 +113,15 @@ typedef struct {
_ASSERT_MSG_SIZE(mess_11);
typedef struct {
dev_t dev; /* 64bits long. */
void *block;
u32_t dev_offset_pages;
u32_t ino_offset_pages;
u32_t ino;
u32_t *flags_ptr;
u32_t dev;
u8_t pages;
u8_t flags;
uint8_t padding[30];
uint8_t padding[26];
} mess_vmmcp;
_ASSERT_MSG_SIZE(mess_vmmcp);
@@ -134,13 +136,13 @@ _ASSERT_MSG_SIZE(mess_notify);
typedef struct {
endpoint_t who;
u32_t offset;
u32_t dev;
dev_t dev;
u32_t ino;
u32_t vaddr;
u32_t len;
u16_t fd;
u16_t clearend_and_flags; /* low 12 bits are clearend, rest flags */
uint8_t padding[28];
uint8_t padding[24];
} mess_vm_vfs_mmap;
_ASSERT_MSG_SIZE(mess_vm_vfs_mmap);
@@ -186,6 +188,7 @@ typedef int _ASSERT_message[/* CONSTCOND */sizeof(message) == 64 ?1 : -1];
#define m1_p2 m_u.m_m1.m1p2
#define m1_p3 m_u.m_m1.m1p3
#define m1_p4 m_u.m_m1.m1p4
#define m1_ull1 m_u.m_m1.m1ull1
#define m2_i1 m_u.m_m2.m2i1
#define m2_i2 m_u.m_m2.m2i2
@@ -251,6 +254,7 @@ typedef int _ASSERT_message[/* CONSTCOND */sizeof(message) == 64 ?1 : -1];
#define m9_s2 m_u.m_m9.m9s2
#define m9_s3 m_u.m_m9.m9s3
#define m9_s4 m_u.m_m9.m9s4
#define m9_ull1 m_u.m_m9.m9ull1
#define m10_i1 m_u.m_m10.m10i1
#define m10_i2 m_u.m_m10.m10i2

2
include/minix/rs.h
View File

@@ -118,7 +118,7 @@ struct rprocpub {
unsigned sys_flags; /* sys flags */
endpoint_t endpoint; /* process endpoint number */
dev_t dev_nr; /* major device number or NO_DEV */
devmajor_t dev_nr; /* major device number or NO_DEV */
char label[RS_MAX_LABEL_LEN]; /* label of this service */
char proc_name[RS_MAX_LABEL_LEN]; /* process name of this service */

5
include/minix/vfsif.h
View File

@@ -8,8 +8,7 @@
#define REQ_ACTIME m9_l2
#define REQ_ACNSEC m9_l4
#define REQ_COUNT m9_l2
#define REQ_DEV m9_l5
#define REQ_DEV2 m9_l1
#define REQ_DEV m9_ull1
#define REQ_DIR_INO m9_l3
#define REQ_FLAGS m9_s3
#define REQ_GID m9_s1
@@ -41,7 +40,7 @@
#define REQ_UID m9_s4
/* VFS/FS reply fields */
#define RES_DEV m9_l4
#define RES_DEV m9_ull1
#define RES_GID m9_s1
#define RES_INODE_NR m9_l1
#define RES_FILE_SIZE_HI m9_l2

8
include/minix/vm.h
View File

@@ -24,7 +24,7 @@ int vm_watch_exit(endpoint_t ep);
int vm_forgetblock(u64_t id);
void vm_forgetblocks(void);
int minix_vfs_mmap(endpoint_t who, u32_t offset, u32_t len,
u32_t dev, u32_t ino, u16_t fd, u32_t vaddr, u16_t clearend, u16_t
dev_t dev, u32_t ino, u16_t fd, u32_t vaddr, u16_t clearend, u16_t
flags);
/* minix vfs mmap flags */
@@ -65,13 +65,13 @@ int vm_info_region(endpoint_t who, struct vm_region_info *vri, int
count, vir_bytes *next);
int vm_procctl(endpoint_t ep, int param);
int vm_set_cacheblock(void *block, u32_t dev, u64_t dev_offset,
int vm_set_cacheblock(void *block, dev_t dev, u64_t dev_offset,
u64_t ino, u64_t ino_offset, u32_t *flags, int blocksize);
void *vm_map_cacheblock(u32_t dev, u64_t dev_offset,
void *vm_map_cacheblock(dev_t dev, u64_t dev_offset,
u64_t ino, u64_t ino_offset, u32_t *flags, int blocksize);
int vm_clear_cache(u32_t dev);
int vm_clear_cache(dev_t dev);
/* flags for vm cache functions */
#define VMMC_FLAGS_LOCKED 0x01 /* someone is updating the flags; don't read/write */