diff options
Diffstat (limited to 'cpukit/libblock/include')
| -rw-r--r-- | cpukit/libblock/include/rtems/blkdev.h | 8 | ||||
| -rw-r--r-- | cpukit/libblock/include/rtems/ide_part_table.h | 24 |
2 files changed, 16 insertions, 16 deletions
diff --git a/cpukit/libblock/include/rtems/blkdev.h b/cpukit/libblock/include/rtems/blkdev.h index 5f3f6159ea..a873418196 100644 --- a/cpukit/libblock/include/rtems/blkdev.h +++ b/cpukit/libblock/include/rtems/blkdev.h @@ -27,7 +27,7 @@ extern "C" { /* Block device block number datatype */ -typedef rtems_unsigned32 blkdev_bnum; +typedef uint32_t blkdev_bnum; /* Block device request type */ typedef enum blkdev_request_op { @@ -51,7 +51,7 @@ typedef void (* blkdev_request_cb)(void *arg, * Block device scatter/gather buffer structure */ typedef struct blkdev_sg_buffer { - rtems_unsigned32 length; /* Buffer length */ + uint32_t length; /* Buffer length */ void *buffer; /* Buffer pointer */ } blkdev_sg_buffer; @@ -67,8 +67,8 @@ typedef struct blkdev_request { * contains error code */ blkdev_bnum start; /* Start block number */ - rtems_unsigned32 count; /* Number of blocks to be exchanged */ - rtems_unsigned32 bufnum; /* Number of buffers provided */ + uint32_t count; /* Number of blocks to be exchanged */ + uint32_t bufnum; /* Number of buffers provided */ blkdev_sg_buffer bufs[0];/* List of scatter/gather buffers */ } blkdev_request; diff --git a/cpukit/libblock/include/rtems/ide_part_table.h b/cpukit/libblock/include/rtems/ide_part_table.h index 12933e465a..6c3af11639 100644 --- a/cpukit/libblock/include/rtems/ide_part_table.h +++ b/cpukit/libblock/include/rtems/ide_part_table.h @@ -79,8 +79,8 @@ */ typedef struct sector_data_s { - unsigned32 sector_num; /* sector number on the device */ - unsigned8 data[0]; /* raw sector data */ + uint32_t sector_num; /* sector number on the device */ + uint8_t data[0]; /* raw sector data */ } sector_data_t; @@ -115,12 +115,12 @@ struct disk_desc_s; * contains all neccessary information about partition */ typedef struct part_desc_s { - unsigned8 bootable; /* is the partition active */ - unsigned8 sys_type; /* type of partition */ - unsigned8 log_id; /* logical number of partition */ - unsigned32 start; /* first partition sector, in absolute numeration */ - unsigned32 size; /* size in sectors */ - unsigned32 end; /* last partition sector, end = start + size - 1 */ + uint8_t bootable; /* is the partition active */ + uint8_t sys_type; /* type of partition */ + uint8_t log_id; /* logical number of partition */ + uint32_t start; /* first partition sector, in absolute numeration */ + uint32_t size; /* size in sectors */ + uint32_t end; /* last partition sector, end = start + size - 1 */ struct disk_desc_s *disk_desc; /* descriptor of disk, partition contains in */ struct part_desc_s *ext_part; /* extended partition containing this one */ @@ -134,11 +134,11 @@ typedef struct disk_desc_s { dev_t dev; /* device number */ /* device name in /dev filesystem */ - unsigned8 dev_name[RTEMS_IDE_PARTITION_DEV_NAME_LENGTH_MAX]; + uint8_t dev_name[RTEMS_IDE_PARTITION_DEV_NAME_LENGTH_MAX]; - unsigned32 sector_size; /* size of sector */ - unsigned32 sector_bits; /* the base-2 logarithm of sector_size */ - unsigned32 lba_size; /* total amount of sectors in lba address mode */ + uint32_t sector_size; /* size of sector */ + uint32_t sector_bits; /* the base-2 logarithm of sector_size */ + uint32_t lba_size; /* total amount of sectors in lba address mode */ int last_log_id; /* used for logical disks enumerating */ /* primary partition descriptors */ |