From 851b44975e77686a0daec786470845000a8b7d2d Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Tue, 2 Jan 2018 19:00:09 +0100 Subject: [PATCH] Replace i32_t by int32_t --- minix/drivers/vmm_guest/vbox/vmmdev.h | 4 ++-- minix/fs/mfs/inode.c | 8 ++++---- minix/fs/mfs/inode.h | 2 +- minix/fs/mfs/super.h | 2 +- minix/fs/mfs/type.h | 8 ++++---- minix/include/minix/acpi.h | 2 +- minix/include/minix/btrace.h | 2 +- minix/include/minix/virtio.h | 24 ++++++++++++------------ minix/lib/libvirtio/virtio.c | 8 ++++---- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/minix/drivers/vmm_guest/vbox/vmmdev.h b/minix/drivers/vmm_guest/vbox/vmmdev.h index c3332e1d8..4f3fa7617 100644 --- a/minix/drivers/vmm_guest/vbox/vmmdev.h +++ b/minix/drivers/vmm_guest/vbox/vmmdev.h @@ -31,7 +31,7 @@ struct VMMDevRequestHeader { uint32_t size; uint32_t version; uint32_t type; - i32_t result; + int32_t result; uint32_t reserved[2]; }; @@ -58,7 +58,7 @@ struct VMMDevEvents { struct VMMDevHGCMHeader { struct VMMDevRequestHeader header; uint32_t flags; - i32_t result; + int32_t result; }; #define VMMDEV_HGCM_SVCLOC_LOCALHOST_EXISTING 2 diff --git a/minix/fs/mfs/inode.c b/minix/fs/mfs/inode.c index 852ccb729..63c29cdd7 100644 --- a/minix/fs/mfs/inode.c +++ b/minix/fs/mfs/inode.c @@ -439,10 +439,10 @@ int norm; /* TRUE = do not swap bytes; FALSE = swap */ dip->d2_uid = (i16_t) conv2(norm,rip->i_uid); dip->d2_nlinks = (uint16_t) conv2(norm,rip->i_nlinks); dip->d2_gid = (uint16_t) conv2(norm,rip->i_gid); - dip->d2_size = (i32_t) conv4(norm,rip->i_size); - dip->d2_atime = (i32_t) conv4(norm,rip->i_atime); - dip->d2_ctime = (i32_t) conv4(norm,rip->i_ctime); - dip->d2_mtime = (i32_t) conv4(norm,rip->i_mtime); + dip->d2_size = (int32_t) conv4(norm,rip->i_size); + dip->d2_atime = (int32_t) conv4(norm,rip->i_atime); + dip->d2_ctime = (int32_t) conv4(norm,rip->i_ctime); + dip->d2_mtime = (int32_t) conv4(norm,rip->i_mtime); for (i = 0; i < V2_NR_TZONES; i++) dip->d2_zone[i] = (zone_t) conv4(norm, (long) rip->i_zone[i]); } diff --git a/minix/fs/mfs/inode.h b/minix/fs/mfs/inode.h index 9753c47e2..861ddc0c7 100644 --- a/minix/fs/mfs/inode.h +++ b/minix/fs/mfs/inode.h @@ -22,7 +22,7 @@ EXTERN struct inode { uint16_t i_nlinks; /* how many links to this file */ uint16_t i_uid; /* user id of the file's owner */ uint16_t i_gid; /* group number */ - i32_t i_size; /* current file size in bytes */ + int32_t i_size; /* current file size in bytes */ uint32_t i_atime; /* time of last access (V2 only) */ uint32_t i_mtime; /* when was file data last changed */ uint32_t i_ctime; /* when was inode itself changed (V2 only)*/ diff --git a/minix/fs/mfs/super.h b/minix/fs/mfs/super.h index 864538ec2..4aab532bf 100644 --- a/minix/fs/mfs/super.h +++ b/minix/fs/mfs/super.h @@ -29,7 +29,7 @@ EXTERN struct super_block { zone1_t s_firstdatazone_old; /* number of first data zone (small) */ short s_log_zone_size; /* log2 of blocks/zone */ unsigned short s_flags; /* FS state flags */ - i32_t s_max_size; /* maximum file size on this device */ + int32_t s_max_size; /* maximum file size on this device */ zone_t s_zones; /* number of zones (replaces s_nzones in V2) */ short s_magic; /* magic number to recognize super-blocks */ diff --git a/minix/fs/mfs/type.h b/minix/fs/mfs/type.h index 742cd35f7..6bd36234b 100644 --- a/minix/fs/mfs/type.h +++ b/minix/fs/mfs/type.h @@ -9,10 +9,10 @@ typedef struct { /* V2.x disk inode */ uint16_t d2_nlinks; /* how many links to this file. HACK! */ i16_t d2_uid; /* user id of the file's owner. */ uint16_t d2_gid; /* group number HACK! */ - i32_t d2_size; /* current file size in bytes */ - i32_t d2_atime; /* when was file data last accessed */ - i32_t d2_mtime; /* when was file data last changed */ - i32_t d2_ctime; /* when was inode data last changed */ + int32_t d2_size; /* current file size in bytes */ + int32_t d2_atime; /* when was file data last accessed */ + int32_t d2_mtime; /* when was file data last changed */ + int32_t d2_ctime; /* when was inode data last changed */ zone_t d2_zone[V2_NR_TZONES]; /* block nums for direct, ind, and dbl ind */ } d2_inode; diff --git a/minix/include/minix/acpi.h b/minix/include/minix/acpi.h index fcc37e03a..4fcb4e7ef 100644 --- a/minix/include/minix/acpi.h +++ b/minix/include/minix/acpi.h @@ -24,7 +24,7 @@ struct acpi_get_irq_req { /* response from acpi to acpi_get_irq_req */ struct acpi_get_irq_resp { endpoint_t m_source; /* message header */ - i32_t irq; + int32_t irq; uint32_t __padding[7]; }; diff --git a/minix/include/minix/btrace.h b/minix/include/minix/btrace.h index ef5427b97..b4f9ae884 100644 --- a/minix/include/minix/btrace.h +++ b/minix/include/minix/btrace.h @@ -27,7 +27,7 @@ typedef struct { uint32_t size; /* request size, ioctl request, or access */ uint64_t position; /* starting disk position */ uint32_t flags; /* transfer flags */ - i32_t result; /* request result; OK, bytes, or error */ + int32_t result; /* request result; OK, bytes, or error */ uint32_t start_time; /* request service start time (us) */ uint32_t finish_time; /* request service completion time (us) */ } btrace_entry; /* (32 bytes) */ diff --git a/minix/include/minix/virtio.h b/minix/include/minix/virtio.h index 9aab03356..885bda5e1 100644 --- a/minix/include/minix/virtio.h +++ b/minix/include/minix/virtio.h @@ -115,12 +115,12 @@ void virtio_irq_disable(struct virtio_device *dev); int virtio_had_irq(struct virtio_device *dev); -uint32_t virtio_read32(struct virtio_device *dev, i32_t offset); -uint16_t virtio_read16(struct virtio_device *dev, i32_t offset); -uint8_t virtio_read8(struct virtio_device *dev, i32_t offset); -void virtio_write32(struct virtio_device *dev, i32_t offset, uint32_t val); -void virtio_write16(struct virtio_device *dev, i32_t offset, uint16_t val); -void virtio_write8(struct virtio_device *dev, i32_t offset, uint8_t val); +uint32_t virtio_read32(struct virtio_device *dev, int32_t offset); +uint16_t virtio_read16(struct virtio_device *dev, int32_t offset); +uint8_t virtio_read8(struct virtio_device *dev, int32_t offset); +void virtio_write32(struct virtio_device *dev, int32_t offset, uint32_t val); +void virtio_write16(struct virtio_device *dev, int32_t offset, uint16_t val); +void virtio_write8(struct virtio_device *dev, int32_t offset, uint8_t val); /* @@ -130,11 +130,11 @@ void virtio_write8(struct virtio_device *dev, i32_t offset, uint8_t val); * Something like: * read(off) --> readX(20 + (msi ? 4 : 0) + off) */ -uint32_t virtio_sread32(struct virtio_device *dev, i32_t offset); -uint16_t virtio_sread16(struct virtio_device *dev, i32_t offset); -uint8_t virtio_sread8(struct virtio_device *dev, i32_t offset); -void virtio_swrite32(struct virtio_device *dev, i32_t offset, uint32_t val); -void virtio_swrite16(struct virtio_device *dev, i32_t offset, uint16_t val); -void virtio_swrite8(struct virtio_device *dev, i32_t offset, uint8_t val); +uint32_t virtio_sread32(struct virtio_device *dev, int32_t offset); +uint16_t virtio_sread16(struct virtio_device *dev, int32_t offset); +uint8_t virtio_sread8(struct virtio_device *dev, int32_t offset); +void virtio_swrite32(struct virtio_device *dev, int32_t offset, uint32_t val); +void virtio_swrite16(struct virtio_device *dev, int32_t offset, uint16_t val); +void virtio_swrite8(struct virtio_device *dev, int32_t offset, uint8_t val); #endif /* _MINIX_VIRTIO_H */ diff --git a/minix/lib/libvirtio/virtio.c b/minix/lib/libvirtio/virtio.c index da0044136..5176bee35 100644 --- a/minix/lib/libvirtio/virtio.c +++ b/minix/lib/libvirtio/virtio.c @@ -831,7 +831,7 @@ virtio_guest_supports(struct virtio_device *dev, int bit) /* Just some wrappers around sys_read */ #define VIRTIO_READ_XX(xx, suff) \ u##xx##_t \ -virtio_read##xx(struct virtio_device *dev, i32_t off) \ +virtio_read##xx(struct virtio_device *dev, int32_t off) \ { \ int r; \ uint32_t ret; \ @@ -851,7 +851,7 @@ VIRTIO_READ_XX(8, b) /* Just some wrappers around sys_write */ #define VIRTIO_WRITE_XX(xx, suff) \ void \ -virtio_write##xx(struct virtio_device *dev, i32_t off, u##xx##_t val) \ +virtio_write##xx(struct virtio_device *dev, int32_t off, u##xx##_t val) \ { \ int r; \ if ((r = sys_out##suff(dev->port + off, val)) != OK) \ @@ -868,7 +868,7 @@ VIRTIO_WRITE_XX(8, b) /* Just some wrappers around sys_read */ #define VIRTIO_SREAD_XX(xx, suff) \ u##xx##_t \ -virtio_sread##xx(struct virtio_device *dev, i32_t off) \ +virtio_sread##xx(struct virtio_device *dev, int32_t off) \ { \ int r; \ uint32_t ret; \ @@ -893,7 +893,7 @@ VIRTIO_SREAD_XX(8, b) /* Just some wrappers around sys_write */ #define VIRTIO_SWRITE_XX(xx, suff) \ void \ -virtio_swrite##xx(struct virtio_device *dev, i32_t off, u##xx##_t val) \ +virtio_swrite##xx(struct virtio_device *dev, int32_t off, u##xx##_t val) \ { \ int r; \ off += VIRTIO_DEV_SPECIFIC_OFF; \