Skip to content

Commit acd7244

Browse files
joevtdingusdev
authored andcommitted
scsiblockcmds: Fix compiler warnings.
1 parent 282dff1 commit acd7244

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

devices/common/scsi/scsiblockcmds.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,9 @@ int ScsiBlockCmds::read_capacity() {
208208
return ScsiPhase::STATUS;
209209
}
210210

211-
uint32_t last_lba = this->blk_dev->get_size_in_blocks() - 1;
212-
uint32_t blk_len = this->blk_dev->get_block_size();
211+
uint32_t last_lba = (uint32_t)std::min(
212+
this->blk_dev->get_size_in_blocks() - 1, 0xFFFFFFFFULL);
213+
uint32_t blk_len = this->blk_dev->get_block_size();
213214

214215
WRITE_DWORD_BE_A(&this->buf_ptr[0], last_lba);
215216
WRITE_DWORD_BE_A(&this->buf_ptr[4], blk_len);
@@ -220,8 +221,8 @@ int ScsiBlockCmds::read_capacity() {
220221
}
221222

222223
int ScsiBlockCmds::format_block_descriptors(uint8_t* out_ptr) {
223-
uint32_t nblocks = std::min((int64_t)this->blk_dev->get_size_in_blocks(),
224-
(int64_t)0xFFFFFFFFUL);
224+
uint32_t nblocks = (uint32_t)std::min(
225+
this->blk_dev->get_size_in_blocks(), 0xFFFFFFFFULL);
225226

226227
WRITE_DWORD_BE_A(&out_ptr[0], nblocks);
227228
WRITE_DWORD_BE_A(&out_ptr[4], (this->density_code << 24) |

0 commit comments

Comments
 (0)