Bladeren bron

temporarily disable no SD on nrf5x

hathach 8 jaren geleden
bovenliggende
commit
ba223b2a05
1 gewijzigde bestanden met toevoegingen van 6 en 2 verwijderingen
  1. 6 2
      tinyusb/portable/nordic/nrf5x/hal_nrf5x.c

+ 6 - 2
tinyusb/portable/nordic/nrf5x/hal_nrf5x.c

@@ -94,12 +94,12 @@ bool tusb_hal_init(void)
 
 
     if (usb_reg & POWER_USBREGSTATUS_VBUSDETECT_Msk )
     if (usb_reg & POWER_USBREGSTATUS_VBUSDETECT_Msk )
     {
     {
-      power_usb_event_handler(POWER_DETECT);
+      power_usb_event_handler(NRF_EVT_POWER_USB_DETECTED);
     }
     }
 
 
     if (usb_reg & POWER_USBREGSTATUS_OUTPUTRDY_Msk )
     if (usb_reg & POWER_USBREGSTATUS_OUTPUTRDY_Msk )
     {
     {
-      power_usb_event_handler(POWER_READY);
+      power_usb_event_handler(NRF_EVT_POWER_USB_POWER_READY);
     }
     }
 
 
     // power_usb_event_handler must be called by SOC event hanlder
     // power_usb_event_handler must be called by SOC event hanlder
@@ -107,12 +107,14 @@ bool tusb_hal_init(void)
   }else
   }else
 #endif
 #endif
   {
   {
+#if 0
     // USB Power detection
     // USB Power detection
     const nrf_drv_power_usbevt_config_t config =
     const nrf_drv_power_usbevt_config_t config =
     {
     {
         .handler = (nrf_drv_power_usb_event_handler_t) power_usb_event_handler
         .handler = (nrf_drv_power_usb_event_handler_t) power_usb_event_handler
     };
     };
     return ( NRF_SUCCESS == nrf_drv_power_usbevt_init(&config) );
     return ( NRF_SUCCESS == nrf_drv_power_usbevt_init(&config) );
+#endif
   }
   }
 }
 }
 
 
@@ -192,9 +194,11 @@ void power_usb_event_handler(uint32_t event)
   }else
   }else
 #endif
 #endif
   {
   {
+    #if 0
     POWER_DETECT = NRF_DRV_POWER_USB_EVT_DETECTED;
     POWER_DETECT = NRF_DRV_POWER_USB_EVT_DETECTED;
     POWER_READY  = NRF_DRV_POWER_USB_EVT_READY;
     POWER_READY  = NRF_DRV_POWER_USB_EVT_READY;
     POWER_REMOVE = NRF_DRV_POWER_USB_EVT_REMOVED;
     POWER_REMOVE = NRF_DRV_POWER_USB_EVT_REMOVED;
+    #endif
   }
   }
 
 
   if ( POWER_DETECT == event )
   if ( POWER_DETECT == event )