Skip to content

Commit c265d86

Browse files
committed
SDCardBlockDevice: fix ctor initialization order
1 parent 12b34e3 commit c265d86

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

Diff for: libraries/BlockDevices/SDCardBlockDevice.h

+12-10
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,22 @@ enum class CmdStatus {
6060

6161
class SDCardBlockDevice : public BlockDevice {
6262
private:
63-
sdmmc_device_t sd_card_info;
63+
pin_t ck;
64+
pin_t cmd;
65+
pin_t d0;
66+
pin_t d1;
67+
pin_t d2;
68+
pin_t d3;
69+
pin_t cd;
70+
pin_t wp;
6471
bd_addr_t base_address;
6572
bd_size_t total_size;
6673
bd_size_t read_block_size;
6774
bd_size_t erase_block_size;
6875
bd_size_t write_block_size;
76+
bool opened;
6977
sdhi_instance_ctrl_t ctrl;
78+
sdmmc_device_t sd_card_info;
7079
sdmmc_cfg_t cfg;
7180

7281
#ifdef USE_DMAC
@@ -84,22 +93,15 @@ class SDCardBlockDevice : public BlockDevice {
8493
transfer_cfg_t dtc_cfg;
8594
transfer_instance_t dtc_instance;
8695
#endif
87-
pin_t ck;
88-
pin_t cmd;
89-
pin_t d0;
90-
pin_t d1;
91-
pin_t d2;
92-
pin_t d3;
93-
pin_t cd;
94-
pin_t wp;
96+
9597
static volatile bool initialized;
9698
static volatile bool card_inserted;
9799
static volatile CmdStatus st;
98100
static void SDCardBlockDeviceCbk(sdmmc_callback_args_t *);
99101
virtual int write(const void *buffer, bd_addr_t addr, bd_size_t size) override;
100102
virtual int open() override;
101103
virtual int close() override;
102-
bool opened;
104+
103105
fsp_err_t wait_for_completition();
104106
public:
105107

0 commit comments

Comments
 (0)