change to dcd_get_frame_number

src/device/dcd.h

@@ -100,8 +100,8 @@ void dcd_int_disable(uint8_t rhport);
 void dcd_set_address(uint8_t rhport, uint8_t dev_addr);
 void dcd_set_config (uint8_t rhport, uint8_t config_num);
 
-// Get current micro-frame number
-uint32_t dcd_get_microframe(uint8_t rhport);
+// Get current frame number
+uint32_t dcd_get_frame_number(uint8_t rhport);
 
 /*------------------------------------------------------------------*/
 /* Event Function

src/portable/microchip/samd21/dcd_samd21.c

@@ -124,10 +124,10 @@ void dcd_set_config (uint8_t rhport, uint8_t config_num)
   // Nothing to do
 }
 
-uint32_t dcd_get_microframe(uint8_t rhport)
+uint32_t dcd_get_frame_number(uint8_t rhport)
 {
   (void) rhport;
-  return USB->DEVICE.FNUM.reg & (TU_BIT(14) - 1);
+  return USB->DEVICE.FNUM.bit.FNUM;
 }
 
 /*------------------------------------------------------------------*/

src/portable/microchip/samd51/dcd_samd51.c

@@ -129,10 +129,10 @@ void dcd_set_config (uint8_t rhport, uint8_t config_num)
   // Nothing to do
 }
 
-uint32_t dcd_get_microframe(uint8_t rhport)
+uint32_t dcd_get_frame_number(uint8_t rhport)
 {
   (void) rhport;
-  return USB->DEVICE.FNUM.reg & (TU_BIT(14) - 1);
+  return USB->DEVICE.FNUM.bit.FNUM;
 }
 
 /*------------------------------------------------------------------*/

src/portable/nordic/nrf5x/dcd_nrf5x.c

@@ -221,10 +221,10 @@ void dcd_set_config (uint8_t rhport, uint8_t config_num)
   // Nothing to do
 }
 
-uint32_t dcd_get_microframe(uint8_t rhport)
+uint32_t dcd_get_frame_number(uint8_t rhport)
 {
   (void) rhport;
-  return NRF_USBD->FRAMECNTR << 3;
+  return NRF_USBD->FRAMECNTR;
 }
 
 //--------------------------------------------------------------------+

src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c

@@ -165,11 +165,11 @@ void dcd_set_address(uint8_t rhport, uint8_t dev_addr)
   LPC_USB->DEVCMDSTAT |= dev_addr;
 }
 
-uint32_t dcd_get_microframe(uint8_t rhport)
+uint32_t dcd_get_frame_number(uint8_t rhport)
 {
   (void) rhport;
 
-  return (LPC_USB->INFO & (TU_BIT(11) - 1)) << 3;
+  return LPC_USB->INFO & (TU_BIT(11) - 1);
 }
 
 bool dcd_init(uint8_t rhport)

src/portable/nxp/lpc17_40/dcd_lpc17_40.c

@@ -227,10 +227,10 @@ void dcd_set_config(uint8_t rhport, uint8_t config_num)
   sie_write(SIE_CMDCODE_CONFIGURE_DEVICE, 1, 1);
 }
 
-uint32_t dcd_get_microframe(uint8_t rhport)
+uint32_t dcd_get_frame_number(uint8_t rhport)
 {
   (void) rhport;
-  return ((uint32_t) sie_read(SIE_CMDCODE_READ_FRAME_NUMBER)) << 3;
+  return (uint32_t) sie_read(SIE_CMDCODE_READ_FRAME_NUMBER);
 }
 
 //--------------------------------------------------------------------+

src/portable/nxp/lpc18_43/dcd_lpc18_43.c

@@ -174,9 +174,9 @@ void dcd_set_config(uint8_t rhport, uint8_t config_num)
   // nothing to do
 }
 
-uint32_t dcd_get_microframe(uint8_t rhport)
+uint32_t dcd_get_frame_number(uint8_t rhport)
 {
-  return LPC_USB[rhport]->FRINDEX_D;
+  return LPC_USB[rhport]->FRINDEX_D >> 3;
 }
 
 //--------------------------------------------------------------------+