-#define AddrTxOffset 0
-#define CountTxOffset 2
-#define AddrRxOffset 4
-#define CountRxOffset 6
-
-#define ReadEpDTB_AddrRx(Slot) ReadEpDTB(Slot,AddrRxOffset)
-#define ReadEpDTB_CountRx(Slot) ReadEpDTB(Slot,CountRxOffset)
-#define ReadEpDTB_AddrTx(Slot) ReadEpDTB(Slot,AddrTxOffset)
-#define ReadEpDTB_CountTx(Slot) ReadEpDTB(Slot,CountTxOffset)
-
-#define WriteEpDTB_AddrRx(Slot,Data) WriteEpDTB(Slot,AddrRxOffset,Data)
-#define WriteEpDTB_CountRx(Slot,Data) WriteEpDTB(Slot,CountRxOffset,Data)
-#define WriteEpDTB_AddrTx(Slot,Data) WriteEpDTB(Slot,AddrTxOffset,Data)
-#define WriteEpDTB_CountTx(Slot,Data) WriteEpDTB(Slot,CountTxOffset,Data)
+#define ADDR_TX_OFFSET offsetof(stm32_UsbBd, AddrTx)
+#define COUNT_TX_OFFSET offsetof(stm32_UsbBd, CountTx)
+#define ADDR_RX_OFFSET offsetof(stm32_UsbBd, AddrRx)
+#define COUNT_RX_OFFSET offsetof(stm32_UsbBd, CountRx)