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

sd_card: add card version information to interface

Browse Source 
Issue #1925
This commit is contained in:
Timo Wischer 2016-03-24 18:05:22 +01:00 committed by Christian Helmuth
parent 338cfe5a94
commit 036f3b5702
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
repos/os/src/drivers/sd_card/sd_card.h
View File

@ -95,7 +95,7 @@ namespace Sd_card {
struct Version : Bitfield<126 - BIT_BASE, 2> struct Version : Bitfield<126 - BIT_BASE, 2>
{ {
enum { STANDARD_CAPACITY = 0, HIGH_CAPACITY = 1, EXT_CSD = 3 }; enum Type { STANDARD_CAPACITY = 0, HIGH_CAPACITY = 1, EXT_CSD = 3 };
}; };
struct Mmc_spec_vers : Bitfield<122 - BIT_BASE, 4> { }; struct Mmc_spec_vers : Bitfield<122 - BIT_BASE, 4> { };
@ -361,11 +361,12 @@ namespace Sd_card {
unsigned _rca; unsigned _rca;
size_t _capacity_mb; size_t _capacity_mb;
const Csd3::Version::Type _version;
public: public:
Card_info(unsigned rca, size_t capacity_mb) Card_info(unsigned rca, size_t capacity_mb, const Csd3::Version::Type version)
: _rca(rca), _capacity_mb(capacity_mb) : _rca(rca), _capacity_mb(capacity_mb), _version(version)
{ } { }
/** /**
@ -377,6 +378,12 @@ namespace Sd_card {
* Return relative card address * Return relative card address
*/ */
unsigned rca() const { return _rca; } unsigned rca() const { return _rca; }
/**
* Returns the version of the card
*/
Csd3::Version::Type version() const { return _version; }
}; };
@ -517,7 +524,8 @@ namespace Sd_card {
throw Detection_failed(); throw Detection_failed();
} }
return Card_info(rca, _sd_card_device_size(csd) / 2); return Card_info(rca, _sd_card_device_size(csd) / 2,
static_cast<Csd3::Version::Type>(Csd3::Version::get(csd.csd3)));
} }
Card_info _detect_mmc() Card_info _detect_mmc()
@ -562,7 +570,8 @@ namespace Sd_card {
throw Detection_failed(); throw Detection_failed();
} }
return Card_info(rca, device_size); return Card_info(rca, device_size,
static_cast<Csd3::Version::Type>(Csd3::Version::get(csd.csd3)));
} }
}; };
} }