ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-11 06:54:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb_block_drv: calculate block count correctly

Browse Source 
Fixes #2823
This commit is contained in:
Christian Prochaska 2018-05-07 16:10:39 +02:00 committed by Christian Helmuth
parent 3d480ec947
commit 106a5f1d4d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/os/src/drivers/usb_block/main.cc
View File

@ -223,7 +223,7 @@ struct Usb::Block_driver : Usb::Completion,
Capacity_response_10 r((addr_t)data); Capacity_response_10 r((addr_t)data);
if (verbose_scsi) r.dump(); if (verbose_scsi) r.dump();
block_count = r.block_count(); block_count = r.last_block() + 1;
block_size = r.block_size(); block_size = r.block_size();
break; break;
} }
@ -232,7 +232,7 @@ struct Usb::Block_driver : Usb::Completion,
Capacity_response_16 r((addr_t)data); Capacity_response_16 r((addr_t)data);
if (verbose_scsi) r.dump(); if (verbose_scsi) r.dump();
block_count = r.block_count(); block_count = r.last_block() + 1;
block_size = r.block_size(); block_size = r.block_size();
break; break;
} }

20
repos/os/src/drivers/usb_block/scsi.h
View File

@ -176,18 +176,18 @@ struct Scsi::Capacity_response_10 : Genode::Mmio
{ {
enum { LENGTH = 8 }; enum { LENGTH = 8 };
struct Bc : Register<0x0, 32> { }; struct Lba : Register<0x0, 32> { };
struct Bs : Register<0x4, 32> { }; struct Bs : Register<0x4, 32> { };
Capacity_response_10(addr_t addr) : Mmio(addr) { } Capacity_response_10(addr_t addr) : Mmio(addr) { }
uint32_t block_count() const { return be32(read<Bc>()); } uint32_t last_block() const { return be32(read<Lba>()); }
uint32_t block_size() const { return be32(read<Bs>()); } uint32_t block_size() const { return be32(read<Bs>()); }
void dump() void dump()
{ {
Genode::log("--- Dump READ_CAPACITY_10 data ---"); Genode::log("--- Dump READ_CAPACITY_10 data ---");
Genode::log("Bc: ", Genode::Hex(block_count())); Genode::log("Lba: ", Genode::Hex(last_block()));
Genode::log("Bs: ", Genode::Hex(block_size())); Genode::log("Bs: ", Genode::Hex(block_size()));
} }
}; };
@ -197,18 +197,18 @@ struct Scsi::Capacity_response_16 : Genode::Mmio
{ {
enum { LENGTH = 32 }; enum { LENGTH = 32 };
struct Bc : Register<0x0, 64> { }; struct Lba : Register<0x0, 64> { };
struct Bs : Register<0x8, 32> { }; struct Bs : Register<0x8, 32> { };
Capacity_response_16(addr_t addr) : Mmio(addr) { } Capacity_response_16(addr_t addr) : Mmio(addr) { }
uint64_t block_count() const { return be64(read<Bc>()); } uint64_t last_block() const { return be64(read<Lba>()); }
uint32_t block_size() const { return be32(read<Bs>()); } uint32_t block_size() const { return be32(read<Bs>()); }
void dump() void dump()
{ {
Genode::log("--- Dump READ_CAPACITY_16 data ---"); Genode::log("--- Dump READ_CAPACITY_16 data ---");
Genode::log("Bc: ", Genode::Hex(block_count())); Genode::log("Lba: ", Genode::Hex(last_block()));
Genode::log("Bs: ", Genode::Hex(block_size())); Genode::log("Bs: ", Genode::Hex(block_size()));
} }
}; };