@@ -455,10 +455,10 @@ static qspi_status_t _qspi_init_direct(qspi_t *obj, const qspi_pinmap_t *pinmap,
455
455
pin_mode (pinmap -> data3_pin , PullNone );
456
456
457
457
obj -> sclk = pinmap -> sclk_pin ;
458
- pin_function (pinmap -> sclk_pin , pinmap -> sclk_pin );
458
+ pin_function (pinmap -> sclk_pin , pinmap -> sclk_function );
459
459
pin_mode (pinmap -> sclk_pin , PullNone );
460
460
obj -> ssel = pinmap -> ssel_pin ;
461
- pin_function (pinmap -> ssel_pin , pinmap -> ssel_pin );
461
+ pin_function (pinmap -> ssel_pin , pinmap -> ssel_function );
462
462
pin_mode (pinmap -> ssel_pin , PullNone );
463
463
464
464
/* The OctoSPI IO Manager OCTOSPIM configuration is supported in a simplified mode in mbed-os
@@ -514,9 +514,8 @@ qspi_status_t qspi_init(qspi_t *obj, PinName io0, PinName io1, PinName io2, PinN
514
514
515
515
const qspi_pinmap_t static_pinmap = {peripheral , io0 , function_io0 , io1 , function_io1 , io2 , function_io2 , io3 , function_io3 , sclk , function_sclk , ssel , function_ssel };
516
516
517
- QSPI_INIT_DIRECT (obj , & static_pinmap , hz , mode );
517
+ return QSPI_INIT_DIRECT (obj , & static_pinmap , hz , mode );
518
518
}
519
-
520
519
#else /* OCTOSPI */
521
520
#if STATIC_PINMAP_READY
522
521
#define QSPI_INIT_DIRECT qspi_init_direct
@@ -578,10 +577,10 @@ static qspi_status_t _qspi_init_direct(qspi_t *obj, const qspi_pinmap_t *pinmap,
578
577
pin_mode (pinmap -> data3_pin , PullNone );
579
578
580
579
obj -> sclk = pinmap -> sclk_pin ;
581
- pin_function (pinmap -> sclk_pin , pinmap -> sclk_pin );
580
+ pin_function (pinmap -> sclk_pin , pinmap -> sclk_function );
582
581
pin_mode (pinmap -> sclk_pin , PullNone );
583
582
obj -> ssel = pinmap -> ssel_pin ;
584
- pin_function (pinmap -> ssel_pin , pinmap -> ssel_pin );
583
+ pin_function (pinmap -> ssel_pin , pinmap -> ssel_function );
585
584
pin_mode (pinmap -> ssel_pin , PullNone );
586
585
587
586
return qspi_frequency (obj , hz );
@@ -615,7 +614,7 @@ qspi_status_t qspi_init(qspi_t *obj, PinName io0, PinName io1, PinName io2, PinN
615
614
616
615
const qspi_pinmap_t static_pinmap = {peripheral , io0 , function_io0 , io1 , function_io1 , io2 , function_io2 , io3 , function_io3 , sclk , function_sclk , ssel , function_ssel };
617
616
618
- QSPI_INIT_DIRECT (obj , & static_pinmap , hz , mode );
617
+ return QSPI_INIT_DIRECT (obj , & static_pinmap , hz , mode );
619
618
}
620
619
621
620
#endif /* OCTOSPI */
0 commit comments