Skip to content

Commit df4a5b1

Browse files
committed
Remove some warnings
1 parent e5e1fec commit df4a5b1

File tree

4 files changed

+47
-12
lines changed

4 files changed

+47
-12
lines changed

cores/arduino/cm_backtrace/cmb_def.h

+10-3
Original file line numberDiff line numberDiff line change
@@ -395,18 +395,25 @@ if (!(EXPR)) \
395395
}
396396
#pragma diag_default=Pe940
397397
#elif defined(__GNUC__)
398+
399+
#ifdef __cplusplus
400+
# define CMSREGISTER
401+
#else
402+
# define CMSREGISTER register
403+
#endif
404+
398405
__attribute__( ( always_inline ) ) static inline uint32_t cmb_get_msp(void) {
399-
register uint32_t result;
406+
CMSREGISTER uint32_t result;
400407
__asm volatile ("MRS %0, msp\n" : "=r" (result) );
401408
return(result);
402409
}
403410
__attribute__( ( always_inline ) ) static inline uint32_t cmb_get_psp(void) {
404-
register uint32_t result;
411+
CMSREGISTER uint32_t result;
405412
__asm volatile ("MRS %0, psp\n" : "=r" (result) );
406413
return(result);
407414
}
408415
__attribute__( ( always_inline ) ) static inline uint32_t cmb_get_sp(void) {
409-
register uint32_t result;
416+
CMSREGISTER uint32_t result;
410417
__asm volatile ("MOV %0, sp\n" : "=r" (result) );
411418
return(result);
412419
}

cores/arduino/main.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "Arduino.h"
2-
#include "cm_backtrace/cm_backtrace.h"
2+
extern "C" {
3+
#include "cm_backtrace/cm_backtrace.h"
4+
}
35

46
/* TODO: make me configurable by the variant */
57
extern const uint32_t __StackTop;
@@ -120,7 +122,7 @@ void arduino_main(void)
120122
/* for printf compatibility */
121123
extern "C" __attribute__((weak)) int _write (int fhdl, const void *buf, size_t count) {
122124
(void)fhdl;
123-
Serial.write_raw((uint8_t*)buf, count);
125+
return Serial.write_raw((uint8_t*)buf, count);
124126
}
125127
#endif
126128

cores/arduino/usb/USB.cpp

+22-6
Original file line numberDiff line numberDiff line change
@@ -391,34 +391,50 @@ extern "C" __attribute((weak)) void tud_hid_set_report_cb(uint8_t instance, uint
391391

392392

393393
extern "C" __attribute((weak)) int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize) {
394-
394+
(void) lun;
395+
(void) lba;
396+
(void) offset;
397+
(void) buffer;
398+
(void) bufsize;
395399
return 0;
396400
}
397401

398402

399403
extern "C" __attribute((weak)) int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize) {
400-
404+
(void) lun;
405+
(void) lba;
406+
(void) offset;
407+
(void) buffer;
408+
(void) bufsize;
401409
return 0;
402410
}
403411

404412

405413
extern "C" __attribute((weak)) void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16], uint8_t product_rev[4]) {
406-
414+
(void) lun;
415+
(void) vendor_id;
416+
(void) product_id;
417+
(void) product_rev;
407418
}
408419

409420

410421
extern "C" __attribute((weak)) bool tud_msc_test_unit_ready_cb(uint8_t lun) {
411-
422+
(void) lun;
412423
return false;
413424
}
414425

415426

416427
extern "C" __attribute((weak)) void tud_msc_capacity_cb(uint8_t lun, uint32_t* block_count, uint16_t* block_size) {
417-
428+
(void) lun;
429+
(void) block_count;
430+
(void) block_size;
418431
}
419432

420433

421434
extern "C" __attribute((weak)) int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize) {
422-
435+
(void) lun;
436+
(void) scsi_cmd;
437+
(void) buffer;
438+
(void) bufsize;
423439
return -1;
424440
}

variants/PORTENTA_C33/variant.cpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ agt_extended_cfg_t TIMER_ETHERNET_extend;
222222
timer_cfg_t TIMER_ETHERNET_cfg;
223223

224224

225-
void startETHClock() {
225+
fsp_err_t startETHClock() {
226226
pinPeripheral(ETHERNET_CLK_PIN, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | IOPORT_PERIPHERAL_AGT));
227227

228228
TIMER_ETHERNET_extend.count_source = AGT_CLOCK_PCLKB;
@@ -246,10 +246,20 @@ void startETHClock() {
246246
TIMER_ETHERNET_cfg.cycle_end_irq = FSP_INVALID_VECTOR;
247247

248248
fsp_err_t err = R_AGT_Open(&TIMER_ETHERNET_ctrl,&TIMER_ETHERNET_cfg);
249+
if (err != FSP_SUCCESS) {
250+
return err;
251+
}
249252
err = R_AGT_Enable(&TIMER_ETHERNET_ctrl);
253+
if (err != FSP_SUCCESS) {
254+
return err;
255+
}
250256
err = R_AGT_Start(&TIMER_ETHERNET_ctrl);
257+
if (err != FSP_SUCCESS) {
258+
return err;
259+
}
251260

252261
FspTimer::set_timer_is_used(AGT_TIMER, AGT_TIMER_CHANNEL);
262+
return err;
253263
}
254264

255265
void initVariant() {

0 commit comments

Comments
 (0)