Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 212f999

Browse files
authored
Merge pull request #444 from pennam/blockdev-fix
BlockDevices: minor fixes to cleanup compile warnings
2 parents f64f904 + e8858c0 commit 212f999

File tree

5 files changed

+34
-29
lines changed

5 files changed

+34
-29
lines changed

‎libraries/BlockDevices/QSPIFlashBlockDevice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ int QSPIFlashBlockDevice::write(const void *buffer, bd_addr_t add, bd_size_t _si
287287
R_QSPI_BankSet(&ctrl, bank);
288288
rv = R_QSPI_Write(&ctrl, (uint8_t *)(buffer), (uint8_t*)address, chunk);
289289
address += chunk;
290-
buffer += chunk;
290+
buffer = (uint8_t *)(buffer) + chunk;
291291

292292
if(rv == FSP_SUCCESS) {
293293
rv = get_flash_status();
@@ -328,7 +328,7 @@ int QSPIFlashBlockDevice::erase(bd_addr_t add, bd_size_t _size) {
328328

329329
uint32_t num_of_blocks = (_size / erase_block_size);
330330

331-
for(int i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
331+
for(uint32_t i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
332332
/* set bank */
333333
uint32_t bank = add / READ_PAGE_SIZE;
334334
uint32_t address = base_address + ((add + i * erase_block_size) % READ_PAGE_SIZE);

‎libraries/BlockDevices/QSPIFlashBlockDevice.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,25 +70,27 @@
7070

7171
class QSPIFlashBlockDevice : public BlockDevice {
7272
private:
73-
bool opened;
74-
73+
74+
pin_t ck;
75+
pin_t cs;
76+
pin_t io0;
77+
pin_t io1;
78+
pin_t io2;
79+
pin_t io3;
80+
7581
bd_addr_t base_address;
7682
bd_size_t total_size;
7783
bd_size_t read_block_size;
7884
bd_size_t erase_block_size;
7985
bd_size_t write_block_size;
8086

87+
bool opened;
88+
8189
bool is_address_correct(bd_addr_t add);
8290

8391
qspi_instance_ctrl_t ctrl;
8492
spi_flash_cfg_t cfg;
8593
qspi_extended_cfg_t ext_cfg;
86-
pin_t ck;
87-
pin_t cs;
88-
pin_t io0;
89-
pin_t io1;
90-
pin_t io2;
91-
pin_t io3;
9294

9395
fsp_err_t get_flash_status();
9496

‎libraries/BlockDevices/SDCardBlockDevice.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ SDCardBlockDevice::~SDCardBlockDevice() {
166166
/* CALLBACK */
167167
/* -------------------------------------------------------------------------- */
168168
void SDCardBlockDevice::SDCardBlockDeviceCbk(sdmmc_callback_args_t *arg) {
169-
int open_status = -1;
170169
if(arg != nullptr) {
171170
sdmmc_event_t event = arg->event;
172171

@@ -368,8 +367,9 @@ int SDCardBlockDevice::read(void *buffer, bd_addr_t add, bd_size_t _size) {
368367
uint32_t num_of_blocks = (_size / read_block_size);
369368
uint32_t start_add_of_block = (add / read_block_size);
370369
rv = FSP_SUCCESS;
371-
for(int i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
372-
rv = R_SDHI_Read (&ctrl, (uint8_t *)(buffer + (i * read_block_size)), start_add_of_block + i, 1);
370+
for(uint32_t i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
371+
uint8_t *buf = (uint8_t *)buffer;
372+
rv = R_SDHI_Read (&ctrl, buf + (i * read_block_size), start_add_of_block + i, 1);
373373
if(rv == FSP_SUCCESS) {
374374
rv = wait_for_completition();
375375
}
@@ -404,8 +404,9 @@ int SDCardBlockDevice::write(const void *buffer, bd_addr_t add, bd_size_t _size)
404404
uint32_t num_of_blocks = (_size / write_block_size);
405405
uint32_t start_block_number = (add / write_block_size);
406406
rv = FSP_SUCCESS;
407-
for(int i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
408-
rv = R_SDHI_Write (&ctrl, (uint8_t *)(buffer + (i * write_block_size)), start_block_number + i, 1);
407+
for(uint32_t i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
408+
uint8_t *buf = (uint8_t *)buffer;
409+
rv = R_SDHI_Write (&ctrl, buf + (i * write_block_size), start_block_number + i, 1);
409410
if(rv == FSP_SUCCESS) {
410411
rv = wait_for_completition();
411412
}
@@ -439,7 +440,7 @@ int SDCardBlockDevice::erase(bd_addr_t add, bd_size_t _size) {
439440
uint32_t num_of_blocks = (_size / erase_block_size);
440441
uint32_t start_block_number = (add / erase_block_size);
441442
rv = FSP_SUCCESS;
442-
for(int i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
443+
for(uint32_t i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
443444
rv = R_SDHI_Erase (&ctrl, start_block_number + i, 1);
444445
if(rv == FSP_SUCCESS) {
445446
rv = wait_for_completition();

‎libraries/BlockDevices/SDCardBlockDevice.h

Lines changed: 12 additions & 10 deletions
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

‎libraries/Storage/storage_common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
extern "C" {
88
#endif
99

10-
//#define STORAGE_DEBUG
11-
//#define STORAGE_ASSERT
10+
#define STORAGE_DEBUG
11+
#define STORAGE_ASSERT
1212

1313
/* -------------------------------------------------------------------------- */
1414
/* STORAGE DEBUG */
@@ -61,7 +61,7 @@ static inline void rns_storage_dbg_mem(uint8_t *b, uint32_t _size)
6161
{
6262
if (b != nullptr) {
6363
Serial.println("");
64-
for(int i = 0; i < _size; i++) {
64+
for(uint32_t i = 0; i < _size; i++) {
6565
if(i != 0 && i % PRINT_SIZE == 0) {
6666
if(i != 0)
6767
Serial.println();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /