From 0e21d07e5da9e39f66170403eda8cf9fff2f1795 Mon Sep 17 00:00:00 2001 From: deepikabhavnani Date: Wed, 22 Nov 2017 14:24:06 -0600 Subject: [PATCH] Block size as uint32_t gave incorrect device size --- SDBlockDevice.cpp | 2 +- SDBlockDevice.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SDBlockDevice.cpp b/SDBlockDevice.cpp index 66bb0793ee..0e3b88c631 100644 --- a/SDBlockDevice.cpp +++ b/SDBlockDevice.cpp @@ -882,7 +882,7 @@ static uint32_t ext_bits(unsigned char *data, int msb, int lsb) { return bits; } -uint32_t SDBlockDevice::_sd_sectors() { +bd_size_t SDBlockDevice::_sd_sectors() { uint32_t c_size, c_size_mult, read_bl_len; uint32_t block_len, mult, blocknr; uint32_t hc_c_size; diff --git a/SDBlockDevice.h b/SDBlockDevice.h index dae8c3b84e..267756c42c 100644 --- a/SDBlockDevice.h +++ b/SDBlockDevice.h @@ -189,8 +189,8 @@ private: uint32_t _go_idle_state(); int _initialise_card(); - uint32_t _sectors; - uint32_t _sd_sectors(); + bd_size_t _sectors; + bd_size_t _sd_sectors(); bool _is_valid_trim(bd_addr_t addr, bd_size_t size); @@ -226,8 +226,8 @@ private: } PlatformMutex _mutex; - uint32_t _block_size; - uint32_t _erase_size; + bd_size_t _block_size; + bd_size_t _erase_size; bool _is_initialized; bool _dbg; };