@@ -455,10 +455,10 @@ static qspi_status_t _qspi_init_direct(qspi_t *obj, const qspi_pinmap_t *pinmap,
455455 pin_mode (pinmap -> data3_pin , PullNone );
456456
457457 obj -> sclk = pinmap -> sclk_pin ;
458- pin_function (pinmap -> sclk_pin , pinmap -> sclk_pin );
458+ pin_function (pinmap -> sclk_pin , pinmap -> sclk_function );
459459 pin_mode (pinmap -> sclk_pin , PullNone );
460460 obj -> ssel = pinmap -> ssel_pin ;
461- pin_function (pinmap -> ssel_pin , pinmap -> ssel_pin );
461+ pin_function (pinmap -> ssel_pin , pinmap -> ssel_function );
462462 pin_mode (pinmap -> ssel_pin , PullNone );
463463
464464 /* 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
514514
515515 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 };
516516
517- QSPI_INIT_DIRECT (obj , & static_pinmap , hz , mode );
517+ return QSPI_INIT_DIRECT (obj , & static_pinmap , hz , mode );
518518}
519-
520519#else /* OCTOSPI */
521520#if STATIC_PINMAP_READY
522521#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,
578577 pin_mode (pinmap -> data3_pin , PullNone );
579578
580579 obj -> sclk = pinmap -> sclk_pin ;
581- pin_function (pinmap -> sclk_pin , pinmap -> sclk_pin );
580+ pin_function (pinmap -> sclk_pin , pinmap -> sclk_function );
582581 pin_mode (pinmap -> sclk_pin , PullNone );
583582 obj -> ssel = pinmap -> ssel_pin ;
584- pin_function (pinmap -> ssel_pin , pinmap -> ssel_pin );
583+ pin_function (pinmap -> ssel_pin , pinmap -> ssel_function );
585584 pin_mode (pinmap -> ssel_pin , PullNone );
586585
587586 return qspi_frequency (obj , hz );
@@ -615,7 +614,7 @@ qspi_status_t qspi_init(qspi_t *obj, PinName io0, PinName io1, PinName io2, PinN
615614
616615 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 };
617616
618- QSPI_INIT_DIRECT (obj , & static_pinmap , hz , mode );
617+ return QSPI_INIT_DIRECT (obj , & static_pinmap , hz , mode );
619618}
620619
621620#endif /* OCTOSPI */
0 commit comments