mb9bf560l changed usb driver to use updated set_peripheral function

Author: itzandroidtab

targets/chip/mb9bf566k/io/usb.hpp

@@ -51,8 +51,8 @@ namespace klib::mb9bf566k::io::periph::lqfp_48 {
         using connect = detail::usb::usb<pins::package::lqfp_48::p43, detail::usb::mode::connect, core::mb9bf560l::io::detail::alternate::system_function::usbp0e<true>>;
 
         // these two pins are switched using the special port settings register
-        using dplus = detail::usb::usb<pins::package::lqfp_48::p47, detail::usb::mode::dplus, core::mb9bf560l::io::detail::alternate::none>;
-        using dminus = detail::usb::usb<pins::package::lqfp_48::p46, detail::usb::mode::dminus, core::mb9bf560l::io::detail::alternate::none>;
+        using dplus = detail::usb::usb<pins::package::lqfp_48::p47, detail::usb::mode::dplus, core::mb9bf560l::io::detail::alternate::special::usb0c<true>>;
+        using dminus = detail::usb::usb<pins::package::lqfp_48::p46, detail::usb::mode::dminus, core::mb9bf560l::io::detail::alternate::special::usb0c<true>>;
     };
 }
 

targets/core/cypress/mb9bf560l/port.hpp

@@ -91,7 +91,7 @@ namespace klib::core::mb9bf560l::io::detail::pins {
         if constexpr (alternate::periph::id == spsr_id) {
             // clear the alternate function if it is set
             peripheral_helper_clear_alternate(
-                &Pin::port::port->SPRS, alternate::periph::offset, alternate::periph::bits, alternate::value
+                &Pin::port::port->SPSR, alternate::periph::offset, alternate::periph::bits, alternate::value
             );
         }
         else {
@@ -158,7 +158,7 @@ namespace klib::core::mb9bf560l::io::detail::pins {
         if constexpr (Periph::periph::id == spsr_id) {
             // set the value from the peripheral into the register
             peripheral_helper_set_alternate(
-                &Pin::port::port->SPRS, Periph::periph::offset, Periph::periph::bits, Periph::value
+                &Pin::port::port->SPSR, Periph::periph::offset, Periph::periph::bits, Periph::value
             );
         }
         else {
@@ -196,7 +196,7 @@ namespace klib::core::mb9bf560l::io::detail::alternate {
     // blocks. This is extremly anoying as we need to 
     // clear all the other functions this pin can have.
     namespace special {
-        // register SPRS (note we use ID 255 for this register)
+        // register SPSR (note we use ID 255 for this register)
         // alternate function for usb1c
         template <uint8_t Value>
         struct usb1c: public detail::pins::peripheral_helper<detail::pins::peripheral_helper_impl<detail::pins::spsr_id, 5, 1>, Value> {};

targets/core/cypress/mb9bf560l/usb.hpp

@@ -762,8 +762,9 @@ namespace klib::core::mb9bf560l::io {
             // enable power to the usb clock
             CLK_GATING->CKEN2 |= 0x1 << Usb::id;
 
-            // setup the io 
-            GPIO->SPSR = GPIO->SPSR | (0x1 << (Usb::id + 4));
+            // setup the io (note setting one of the pins sets both. We do it just in case)
+            target::io::detail::pins::set_peripheral<typename Usb::dplus::pin, typename Usb::dplus::periph>();
+            target::io::detail::pins::set_peripheral<typename Usb::dminus::pin, typename Usb::dminus::periph>();
 
             // check if we need to enable the USB connect pin
             if constexpr (UsbConnect) {