andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change to dcd_get_frame_number

Browse Source
This commit is contained in:
hathach
2018-12-21 12:46:20 +07:00
parent 426064201a
commit 6f17b4e019
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/dcd.h
View File

@@ -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

4
src/portable/microchip/samd21/dcd_samd21.c
View File

@@ -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;
}
/*------------------------------------------------------------------*/

4
src/portable/microchip/samd51/dcd_samd51.c
View File

@@ -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;
}
/*------------------------------------------------------------------*/

4
src/portable/nordic/nrf5x/dcd_nrf5x.c
View File

@@ -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;
}
//--------------------------------------------------------------------+

4
src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c
View File

@@ -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)

4
src/portable/nxp/lpc17_40/dcd_lpc17_40.c
View File

@@ -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);
}
//--------------------------------------------------------------------+

4
src/portable/nxp/lpc18_43/dcd_lpc18_43.c
View File

@@ -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;
}
//--------------------------------------------------------------------+