d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys/geom: Use C99 fixed-width integer types.

Browse Source 
No functional change.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D33635
This commit is contained in:
John Baldwin 2021-12-28 09:41:51 -08:00
parent db269074ff
commit 0ff783dc15
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/geom/geom_ccd.c
View File

@ -166,10 +166,10 @@ struct ccd_s {
u_int sc_ndisks; /* number of components */
struct ccdcinfo *sc_cinfo; /* component info */
struct ccdiinfo *sc_itable; /* interleave table */
u_int32_t sc_secsize; /* # bytes per sector */
uint32_t sc_secsize; /* # bytes per sector */
int sc_pick; /* side of mirror picked */
daddr_t sc_blk[2]; /* mirror localization */
u_int32_t sc_offset; /* actual offset used */
uint32_t sc_offset; /* actual offset used */
};
static g_start_t g_ccd_start;

36
sys/geom/part/g_part_bsd64.c
View File

@ -58,18 +58,18 @@ FEATURE(geom_part_bsd64, "GEOM partitioning class for 64-bit BSD disklabels");
struct disklabel64 {
char d_reserved0[512]; /* reserved or unused */
u_int32_t d_magic; /* the magic number */
u_int32_t d_crc; /* crc32() d_magic through last part */
u_int32_t d_align; /* partition alignment requirement */
u_int32_t d_npartitions; /* number of partitions */
uint32_t d_magic; /* the magic number */
uint32_t d_crc; /* crc32() d_magic through last part */
uint32_t d_align; /* partition alignment requirement */
uint32_t d_npartitions; /* number of partitions */
struct uuid d_stor_uuid; /* unique uuid for label */
u_int64_t d_total_size; /* total size incl everything (bytes) */
u_int64_t d_bbase; /* boot area base offset (bytes) */
uint64_t d_total_size; /* total size incl everything (bytes) */
uint64_t d_bbase; /* boot area base offset (bytes) */
/* boot area is pbase - bbase */
u_int64_t d_pbase; /* first allocatable offset (bytes) */
u_int64_t d_pstop; /* last allocatable offset+1 (bytes) */
u_int64_t d_abase; /* location of backup copy if not 0 */
uint64_t d_pbase; /* first allocatable offset (bytes) */
uint64_t d_pstop; /* last allocatable offset+1 (bytes) */
uint64_t d_abase; /* location of backup copy if not 0 */
u_char d_packname[64];
u_char d_reserved[64];
@ -86,15 +86,15 @@ struct disklabel64 {
* is identified by its uuid.
*/
struct partition64 { /* the partition table */
u_int64_t p_boffset; /* slice relative offset, in bytes */
u_int64_t p_bsize; /* size of partition, in bytes */
u_int8_t p_fstype;
u_int8_t p_unused01; /* reserved, must be 0 */
u_int8_t p_unused02; /* reserved, must be 0 */
u_int8_t p_unused03; /* reserved, must be 0 */
u_int32_t p_unused04; /* reserved, must be 0 */
u_int32_t p_unused05; /* reserved, must be 0 */
u_int32_t p_unused06; /* reserved, must be 0 */
uint64_t p_boffset; /* slice relative offset, in bytes */
uint64_t p_bsize; /* size of partition, in bytes */
uint8_t p_fstype;
uint8_t p_unused01; /* reserved, must be 0 */
uint8_t p_unused02; /* reserved, must be 0 */
uint8_t p_unused03; /* reserved, must be 0 */
uint32_t p_unused04; /* reserved, must be 0 */
uint32_t p_unused05; /* reserved, must be 0 */
uint32_t p_unused06; /* reserved, must be 0 */
struct uuid p_type_uuid;/* mount type as UUID */
struct uuid p_stor_uuid;/* unique uuid for storage */
} d_partitions[MAXPARTITIONS64];/* actually may be more */

2
sys/geom/raid/md_intel.c
View File

@ -80,7 +80,7 @@ struct intel_raid_map {
struct intel_raid_vol {
uint8_t name[16];
u_int64_t total_sectors __packed;
uint64_t total_sectors __packed;
uint32_t state;
#define INTEL_ST_BOOTABLE 0x00000001
#define INTEL_ST_BOOT_DEVICE 0x00000002

36
sys/geom/raid/md_jmicron.c
View File

@ -52,29 +52,29 @@ static MALLOC_DEFINE(M_MD_JMICRON, "md_jmicron_data", "GEOM_RAID JMicron metadat
#define JMICRON_MAX_SPARE 2
struct jmicron_raid_conf {
u_int8_t signature[2];
uint8_t signature[2];
#define JMICRON_MAGIC "JM"
u_int16_t version;
uint16_t version;
#define JMICRON_VERSION 0x0001
u_int16_t checksum;
u_int8_t filler_1[10];
u_int32_t disk_id;
u_int32_t offset;
u_int32_t disk_sectors_high;
u_int16_t disk_sectors_low;
u_int8_t filler_2[2];
u_int8_t name[16];
u_int8_t type;
uint16_t checksum;
uint8_t filler_1[10];
uint32_t disk_id;
uint32_t offset;
uint32_t disk_sectors_high;
uint16_t disk_sectors_low;
uint8_t filler_2[2];
uint8_t name[16];
uint8_t type;
#define JMICRON_T_RAID0 0
#define JMICRON_T_RAID1 1
#define JMICRON_T_RAID01 2
#define JMICRON_T_CONCAT 3
#define JMICRON_T_RAID5 5
u_int8_t stripe_shift;
u_int16_t flags;
uint8_t stripe_shift;
uint16_t flags;
#define JMICRON_F_READY 0x0001
#define JMICRON_F_BOOTABLE 0x0002
#define JMICRON_F_BADSEC 0x0004
@ -82,13 +82,13 @@ struct jmicron_raid_conf {
#define JMICRON_F_UNSYNC 0x0020
#define JMICRON_F_NEWEST 0x0040
u_int8_t filler_3[4];
u_int32_t spare[JMICRON_MAX_SPARE];
u_int32_t disks[JMICRON_MAX_DISKS];
uint8_t filler_3[4];
uint32_t spare[JMICRON_MAX_SPARE];
uint32_t disks[JMICRON_MAX_DISKS];
#define JMICRON_DISK_MASK 0xFFFFFFF0
#define JMICRON_SEG_MASK 0x0000000F
u_int8_t filler_4[32];
u_int8_t filler_5[384];
uint8_t filler_4[32];
uint8_t filler_5[384];
};
struct g_raid_md_jmicron_perdisk {