32a33,36
> #include "definitions.h"
> 
> #define USBHS USBHS_REGS
> #define PMC   PMC_REGS
34a39
> #include "component/usbhs.h"
136c141
<   USBHS->USBHS_DEVCTRL |= USBHS_DEVCTRL_RMWKUP;
---
>   USBHS->USBHS_DEVCTRL |= USBHS_DEVCTRL_RMWKUP(1);
147,148c152,153
<   USBHS->USBHS_CTRL = USBHS_CTRL_UIMOD | USBHS_CTRL_USBE;
<   while (USBHS_SR_CLKUSABLE != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE));
---
>   USBHS->USBHS_CTRL = USBHS_CTRL_UIMOD(1) | USBHS_CTRL_USBE(1);
>   while (USBHS_SR_CLKUSABLE(1) != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE(1)));
155c160
<   USBHS->USBHS_DEVIER = (USBHS_DEVIER_EORSTES | USBHS_DEVIER_SUSPES | USBHS_DEVIER_WAKEUPES);
---
>   USBHS->USBHS_DEVIER = (USBHS_DEVIER_EORSTES(1) | USBHS_DEVIER_SUSPES(1) | USBHS_DEVIER_WAKEUPES(1));
160c165
<   USBHS->USBHS_DEVICR = (USBHS_DEVICR_EORSTC | USBHS_DEVICR_SOFC | USBHS_DEVICR_WAKEUPC);
---
>   USBHS->USBHS_DEVICR = (USBHS_DEVICR_EORSTC(1) | USBHS_DEVICR_SOFC(1) | USBHS_DEVICR_WAKEUPC(1));
162c167
<   USBHS->USBHS_DEVIFR |= USBHS_DEVIFR_SUSPS;
---
>   USBHS->USBHS_DEVIFR |= USBHS_DEVIFR_SUSPS(1);
164c169
<   USBHS->USBHS_DEVICR = USBHS_DEVICR_WAKEUPC;
---
>   USBHS->USBHS_DEVICR = USBHS_DEVICR_WAKEUPC(1);
166c171
<   USBHS->USBHS_DEVCTRL &= ~USBHS_DEVCTRL_DETACH;
---
>   USBHS->USBHS_DEVCTRL &= ~USBHS_DEVCTRL_DETACH(1);
168c173
<   USBHS->USBHS_CTRL |= USBHS_CTRL_FRZCLK;
---
>   USBHS->USBHS_CTRL |= USBHS_CTRL_FRZCLK(1);
179,180c184,185
<   USBHS->USBHS_CTRL &= ~USBHS_CTRL_FRZCLK;
<   while (USBHS_SR_CLKUSABLE != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE));
---
>   USBHS->USBHS_CTRL &= ~USBHS_CTRL_FRZCLK(1);
>   while (USBHS_SR_CLKUSABLE(1) != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE(1)));
186c191
<   USBHS->USBHS_DEVCTRL |= USBHS_DEVCTRL_DETACH;
---
>   USBHS->USBHS_DEVCTRL |= USBHS_DEVCTRL_DETACH(1);
188c193
<   USBHS->USBHS_DEVCTRL &=~(USBHS_DEVCTRL_ADDEN | USBHS_DEVCTRL_UADD_Msk);
---
>   USBHS->USBHS_DEVCTRL &=~(USBHS_DEVCTRL_ADDEN(1) | USBHS_DEVCTRL_UADD_Msk);
217c222
<     if (int_status & USBHS_DEVEPTISR_CTRL_RXSTPI)
---
>     if (int_status & USBHS_DEVEPTISR_CTRL_RXSTPI(1))
227,228c232,233
<       USBHS->USBHS_DEVEPTICR[0] = USBHS_DEVEPTICR_CTRL_RXSTPIC;
<       USBHS->USBHS_DEVEPTIDR[0] = USBHS_DEVEPTIDR_CTRL_RXSTPEC;
---
>       USBHS->USBHS_DEVEPTICR[0] = USBHS_DEVEPTICR_CTRL_RXSTPIC(1);
>       USBHS->USBHS_DEVEPTIDR[0] = USBHS_DEVEPTIDR_CTRL_RXSTPEC(1);
230c235
<     if (int_status & USBHS_DEVEPTISR_RXOUTI)
---
>     if (int_status & USBHS_DEVEPTISR_RXOUTI(1))
251c256
<       USBHS->USBHS_DEVEPTICR[0] = USBHS_DEVEPTICR_RXOUTIC;
---
>       USBHS->USBHS_DEVEPTICR[0] = USBHS_DEVEPTICR_RXOUTIC(1);
257c262
<         USBHS->USBHS_DEVEPTIDR[0] = USBHS_DEVEPTIDR_RXOUTEC;
---
>         USBHS->USBHS_DEVEPTIDR[0] = USBHS_DEVEPTIDR_RXOUTEC(1);
261c266
<           USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_CTRL_RXSTPES;
---
>           USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_CTRL_RXSTPES(1);
265c270
<     if (int_status & USBHS_DEVEPTISR_TXINI)
---
>     if (int_status & USBHS_DEVEPTISR_TXINI(1))
268c273
<       USBHS->USBHS_DEVEPTIDR[0] = USBHS_DEVEPTIDR_TXINEC;
---
>       USBHS->USBHS_DEVEPTIDR[0] = USBHS_DEVEPTIDR_TXINEC(1);
280c285
<           USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_CTRL_RXSTPES;
---
>           USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_CTRL_RXSTPES(1);
286c291
<     if (int_status & USBHS_DEVEPTISR_RXOUTI)
---
>     if (int_status & USBHS_DEVEPTISR_RXOUTI(1))
305c310
<       USBHS->USBHS_DEVEPTIDR[ep_ix] = USBHS_DEVEPTIDR_FIFOCONC;
---
>       USBHS->USBHS_DEVEPTIDR[ep_ix] = USBHS_DEVEPTIDR_FIFOCONC(1);
307c312
<       USBHS->USBHS_DEVEPTICR[ep_ix] = USBHS_DEVEPTICR_RXOUTIC;
---
>       USBHS->USBHS_DEVEPTICR[ep_ix] = USBHS_DEVEPTICR_RXOUTIC(1);
313c318
<         USBHS->USBHS_DEVEPTIDR[ep_ix] = USBHS_DEVEPTIDR_RXOUTEC;
---
>         USBHS->USBHS_DEVEPTIDR[ep_ix] = USBHS_DEVEPTIDR_RXOUTEC(1);
317c322
<     if (int_status & USBHS_DEVEPTISR_TXINI)
---
>     if (int_status & USBHS_DEVEPTISR_TXINI(1))
320c325
<       USBHS->USBHS_DEVEPTICR[ep_ix] = USBHS_DEVEPTICR_TXINIC;
---
>       USBHS->USBHS_DEVEPTICR[ep_ix] = USBHS_DEVEPTICR_TXINIC(1);
330c335
<         USBHS->USBHS_DEVEPTIDR[ep_ix] = USBHS_DEVEPTIDR_TXINEC;
---
>         USBHS->USBHS_DEVEPTIDR[ep_ix] = USBHS_DEVEPTIDR_TXINEC(1);
338,339c343,344
<   uint32_t status = USBHS->UsbhsDevdma[ep_ix - 1].USBHS_DEVDMASTATUS;
<   if (status & USBHS_DEVDMASTATUS_CHANN_ENB)
---
>   uint32_t status = USBHS->USBHS_DEVDMA[ep_ix - 1].USBHS_DEVDMASTATUS;
>   if (status & USBHS_DEVDMASTATUS_CHANN_ENB(1))
344c349
<   USBHS->USBHS_DEVIDR = USBHS_DEVIDR_DMA_1 << (ep_ix - 1);
---
>   USBHS->USBHS_DEVIDR = USBHS_DEVIDR_DMA_1(1) << (ep_ix - 1);
348c353
<   if(USBHS->USBHS_DEVEPTCFG[ep_ix] & USBHS_DEVEPTCFG_EPDIR)
---
>   if(USBHS->USBHS_DEVEPTCFG[ep_ix] & USBHS_DEVEPTCFG_EPDIR(1))
363c368
<   if (int_status & USBHS_DEVISR_EORST)
---
>   if (int_status & USBHS_DEVISR_EORST(1))
366,367c371,372
<     USBHS->USBHS_CTRL &= ~USBHS_CTRL_FRZCLK;
<     while(USBHS_SR_CLKUSABLE != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE));
---
>     USBHS->USBHS_CTRL &= ~USBHS_CTRL_FRZCLK(1);
>     while(USBHS_SR_CLKUSABLE(1) != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE(1)));
375,378c380,383
<     USBHS->USBHS_DEVICR = USBHS_DEVICR_EORSTC;
<     USBHS->USBHS_DEVICR = USBHS_DEVICR_WAKEUPC;
<     USBHS->USBHS_DEVICR = USBHS_DEVICR_SUSPC;
<     USBHS->USBHS_DEVIER = USBHS_DEVIER_SUSPES;
---
>     USBHS->USBHS_DEVICR = USBHS_DEVICR_EORSTC(1);
>     USBHS->USBHS_DEVICR = USBHS_DEVICR_WAKEUPC(1);
>     USBHS->USBHS_DEVICR = USBHS_DEVICR_SUSPC(1);
>     USBHS->USBHS_DEVIER = USBHS_DEVIER_SUSPES(1);
383c388
<   if (int_status & USBHS_DEVISR_WAKEUP)
---
>   if (int_status & USBHS_DEVISR_WAKEUP(1))
385,389c390,394
<     USBHS->USBHS_CTRL &= ~USBHS_CTRL_FRZCLK;
<     while (USBHS_SR_CLKUSABLE != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE));
<     USBHS->USBHS_DEVICR = USBHS_DEVICR_WAKEUPC;
<     USBHS->USBHS_DEVIDR = USBHS_DEVIDR_WAKEUPEC;
<     USBHS->USBHS_DEVIER = USBHS_DEVIER_SUSPES;
---
>     USBHS->USBHS_CTRL &= ~USBHS_CTRL_FRZCLK(1);
>     while (USBHS_SR_CLKUSABLE(1) != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE(1)));
>     USBHS->USBHS_DEVICR = USBHS_DEVICR_WAKEUPC(1);
>     USBHS->USBHS_DEVIDR = USBHS_DEVIDR_WAKEUPEC(1);
>     USBHS->USBHS_DEVIER = USBHS_DEVIER_SUSPES(1);
394c399
<   if (int_status & USBHS_DEVISR_SUSP)
---
>   if (int_status & USBHS_DEVISR_SUSP(1))
397,402c402,407
<     USBHS->USBHS_CTRL &= ~USBHS_CTRL_FRZCLK;
<     while (USBHS_SR_CLKUSABLE != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE));
<     USBHS->USBHS_DEVICR = USBHS_DEVICR_SUSPC;
<     USBHS->USBHS_DEVIDR = USBHS_DEVIDR_SUSPEC;
<     USBHS->USBHS_DEVIER = USBHS_DEVIER_WAKEUPES;
<     USBHS->USBHS_CTRL |= USBHS_CTRL_FRZCLK;
---
>     USBHS->USBHS_CTRL &= ~USBHS_CTRL_FRZCLK(1);
>     while (USBHS_SR_CLKUSABLE(1) != (USBHS->USBHS_SR & USBHS_SR_CLKUSABLE(1)));
>     USBHS->USBHS_DEVICR = USBHS_DEVICR_SUSPC(1);
>     USBHS->USBHS_DEVIDR = USBHS_DEVIDR_SUSPEC(1);
>     USBHS->USBHS_DEVIER = USBHS_DEVIER_WAKEUPES(1);
>     USBHS->USBHS_CTRL |= USBHS_CTRL_FRZCLK(1);
407c412
<   if(int_status & USBHS_DEVISR_SOF)
---
>   if(int_status & USBHS_DEVISR_SOF(1))
417c422
<     if (int_status & (USBHS_DEVISR_PEP_0 << ep_ix))
---
>     if (int_status & (USBHS_DEVISR_PEP_0(1) << ep_ix))
427c432
<       if (int_status & (USBHS_DEVISR_DMA_1 << (ep_ix - 1)))
---
>       if (int_status & (USBHS_DEVISR_DMA_1(1) << (ep_ix - 1)))
450c455
<     USBHS->USBHS_DEVCTRL |= dev_addr | USBHS_DEVCTRL_ADDEN;
---
>     USBHS->USBHS_DEVCTRL |= dev_addr | USBHS_DEVCTRL_ADDEN(1);
481c486
<     USBHS->USBHS_DEVEPT |= USBHS_DEVEPT_EPEN0;
---
>     USBHS->USBHS_DEVEPT |= USBHS_DEVEPT_EPEN0(1);
488c493
<        USBHS_DEVEPTCFG_ALLOC
---
>        USBHS_DEVEPTCFG_ALLOC(1)
490,492c495,497
<     USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_RSTDTS;
<     USBHS->USBHS_DEVEPTIDR[0] = USBHS_DEVEPTIDR_CTRL_STALLRQC;
<     if (USBHS_DEVEPTISR_CFGOK == (USBHS->USBHS_DEVEPTISR[0] & USBHS_DEVEPTISR_CFGOK))
---
>     USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_RSTDTS(1);
>     USBHS->USBHS_DEVEPTIDR[0] = USBHS_DEVEPTIDR_CTRL_STALLRQC(1);
>     if (USBHS_DEVEPTISR_CFGOK(1) == (USBHS->USBHS_DEVEPTISR[0] & USBHS_DEVEPTISR_CFGOK(1)))
495c500
<       USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_CTRL_RXSTPES;
---
>       USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_CTRL_RXSTPES(1);
497c502
<       USBHS->USBHS_DEVIER = USBHS_DEVIER_PEP_0;
---
>       USBHS->USBHS_DEVIER = USBHS_DEVIER_PEP_0(1);
516c521
<        USBHS_DEVEPTCFG_AUTOSW |
---
>        USBHS_DEVEPTCFG_AUTOSW(1) |
529,532c534,537
<     USBHS->USBHS_DEVEPTCFG[epnum] |= USBHS_DEVEPTCFG_ALLOC;
<     USBHS->USBHS_DEVEPTIER[epnum] = USBHS_DEVEPTIER_RSTDTS;
<     USBHS->USBHS_DEVEPTIDR[epnum] = USBHS_DEVEPTIDR_CTRL_STALLRQC;
<     if (USBHS_DEVEPTISR_CFGOK == (USBHS->USBHS_DEVEPTISR[epnum] & USBHS_DEVEPTISR_CFGOK))
---
>     USBHS->USBHS_DEVEPTCFG[epnum] |= USBHS_DEVEPTCFG_ALLOC(1);
>     USBHS->USBHS_DEVEPTIER[epnum] = USBHS_DEVEPTIER_RSTDTS(1);
>     USBHS->USBHS_DEVEPTIDR[epnum] = USBHS_DEVEPTIDR_CTRL_STALLRQC(1);
>     if (USBHS_DEVEPTISR_CFGOK(1) == (USBHS->USBHS_DEVEPTISR[epnum] & USBHS_DEVEPTISR_CFGOK(1)))
580c585
<     USBHS->USBHS_DEVEPTICR[0] = USBHS_DEVEPTICR_TXINIC;
---
>     USBHS->USBHS_DEVEPTICR[0] = USBHS_DEVEPTICR_TXINIC(1);
584c589
<     USBHS->USBHS_DEVEPTIDR[ep_ix] = USBHS_DEVEPTIDR_FIFOCONC;
---
>     USBHS->USBHS_DEVEPTIDR[ep_ix] = USBHS_DEVEPTIDR_FIFOCONC(1);
586c591
<   USBHS->USBHS_DEVEPTIER[ep_ix] = USBHS_DEVEPTIER_TXINES;
---
>   USBHS->USBHS_DEVEPTIER[ep_ix] = USBHS_DEVEPTIER_TXINES(1);
602c607
<   
---
> 
604a610
>   
608c614,615
<       udd_dma_ctrl |= USBHS_DEVDMACONTROL_END_TR_IT | USBHS_DEVDMACONTROL_END_TR_EN;
---
>       DCACHE_INVALIDATE_BY_ADDR((uint32_t *)xfer->buffer, total_bytes );
>       udd_dma_ctrl |= USBHS_DEVDMACONTROL_END_TR_IT(1) | USBHS_DEVDMACONTROL_END_TR_EN(1);
610c617,618
<       udd_dma_ctrl |= USBHS_DEVDMACONTROL_END_B_EN;
---
>       DCACHE_CLEAN_BY_ADDR((uint32_t *)xfer->buffer, total_bytes );
>       udd_dma_ctrl |= USBHS_DEVDMACONTROL_END_B_EN(1);
612,613c620,621
<     USBHS->UsbhsDevdma[epnum - 1].USBHS_DEVDMAADDRESS = (uint32_t)buffer;
<     udd_dma_ctrl |= USBHS_DEVDMACONTROL_END_BUFFIT | USBHS_DEVDMACONTROL_CHANN_ENB;
---
>     USBHS->USBHS_DEVDMA[epnum - 1].USBHS_DEVDMAADDRESS = (uint32_t)buffer;
>     udd_dma_ctrl |= USBHS_DEVDMACONTROL_END_BUFFIT(1) | USBHS_DEVDMACONTROL_CHANN_ENB(1);
618c626
<     if (!(USBHS->UsbhsDevdma[epnum - 1].USBHS_DEVDMASTATUS & USBHS_DEVDMASTATUS_END_TR_ST))
---
>     if (!(USBHS->USBHS_DEVDMA[epnum - 1].USBHS_DEVDMASTATUS & USBHS_DEVDMASTATUS_END_TR_ST(1)))
620,621c628,629
<       USBHS->UsbhsDevdma[epnum - 1].USBHS_DEVDMACONTROL = udd_dma_ctrl;
<       USBHS->USBHS_DEVIER = USBHS_DEVIER_DMA_1 << (epnum - 1);
---
>       USBHS->USBHS_DEVDMA[epnum - 1].USBHS_DEVDMACONTROL = udd_dma_ctrl;
>       USBHS->USBHS_DEVIER = USBHS_DEVIER_DMA_1(1) << (epnum - 1);
635c643
<       USBHS->USBHS_DEVEPTIER[epnum] = USBHS_DEVEPTIER_RXOUTES;
---
>       USBHS->USBHS_DEVEPTIER[epnum] = USBHS_DEVEPTIER_RXOUTES(1);
666,667c674,675
<     uint32_t udd_dma_ctrl_lin = USBHS_DEVDMACONTROL_CHANN_ENB;
<     uint32_t udd_dma_ctrl_wrap = USBHS_DEVDMACONTROL_CHANN_ENB | USBHS_DEVDMACONTROL_END_BUFFIT;
---
>     uint32_t udd_dma_ctrl_lin = USBHS_DEVDMACONTROL_CHANN_ENB(1);
>     uint32_t udd_dma_ctrl_wrap = USBHS_DEVDMACONTROL_CHANN_ENB(1) | USBHS_DEVDMACONTROL_END_BUFFIT(1);
671,672c679,680
<       udd_dma_ctrl_lin |= USBHS_DEVDMACONTROL_END_TR_IT | USBHS_DEVDMACONTROL_END_TR_EN;
<       udd_dma_ctrl_wrap |= USBHS_DEVDMACONTROL_END_TR_IT | USBHS_DEVDMACONTROL_END_TR_EN;
---
>       udd_dma_ctrl_lin |= USBHS_DEVDMACONTROL_END_TR_IT(1) | USBHS_DEVDMACONTROL_END_TR_EN(1);
>       udd_dma_ctrl_wrap |= USBHS_DEVDMACONTROL_END_TR_IT(1) | USBHS_DEVDMACONTROL_END_TR_EN(1);
677c685
<         udd_dma_ctrl_lin |= USBHS_DEVDMACONTROL_END_B_EN;
---
>         udd_dma_ctrl_lin |= USBHS_DEVDMACONTROL_END_B_EN(1);
679c687
<       udd_dma_ctrl_wrap |= USBHS_DEVDMACONTROL_END_B_EN;
---
>       udd_dma_ctrl_wrap |= USBHS_DEVDMACONTROL_END_B_EN(1);
682c690
<     USBHS->UsbhsDevdma[epnum - 1].USBHS_DEVDMAADDRESS = (uint32_t)info.ptr_lin;
---
>     USBHS->USBHS_DEVDMA[epnum - 1].USBHS_DEVDMAADDRESS = (uint32_t)info.ptr_lin;
689c697
<       udd_dma_ctrl_lin |= USBHS_DEVDMASTATUS_DESC_LDST;
---
>       udd_dma_ctrl_lin |= USBHS_DEVDMASTATUS_DESC_LDST(1);
692c700
<       USBHS->UsbhsDevdma[epnum - 1].USBHS_DEVDMANXTDSC = (uint32_t)&dma_desc[epnum - 1];
---
>       USBHS->USBHS_DEVDMA[epnum - 1].USBHS_DEVDMANXTDSC = (uint32_t)&dma_desc[epnum - 1];
694c702
<       udd_dma_ctrl_lin |= USBHS_DEVDMACONTROL_END_BUFFIT;
---
>       udd_dma_ctrl_lin |= USBHS_DEVDMACONTROL_END_BUFFIT(1);
701c709
<     if (!(USBHS->UsbhsDevdma[epnum - 1].USBHS_DEVDMASTATUS & USBHS_DEVDMASTATUS_END_TR_ST))
---
>     if (!(USBHS->USBHS_DEVDMA[epnum - 1].USBHS_DEVDMASTATUS & USBHS_DEVDMASTATUS_END_TR_ST(1)))
703,704c711,712
<       USBHS->UsbhsDevdma[epnum - 1].USBHS_DEVDMACONTROL = udd_dma_ctrl_lin;
<       USBHS->USBHS_DEVIER = USBHS_DEVIER_DMA_1 << (epnum - 1);
---
>       USBHS->USBHS_DEVDMA[epnum - 1].USBHS_DEVDMACONTROL = udd_dma_ctrl_lin;
>       USBHS->USBHS_DEVIER = USBHS_DEVIER_DMA_1(1) << (epnum - 1);
718c726
<       USBHS->USBHS_DEVEPTIER[epnum] = USBHS_DEVEPTIER_RXOUTES;
---
>       USBHS->USBHS_DEVEPTIER[epnum] = USBHS_DEVEPTIER_RXOUTES(1);
732c740
<   USBHS->USBHS_DEVEPTIER[epnum] = USBHS_DEVEPTIER_CTRL_STALLRQS;
---
>   USBHS->USBHS_DEVEPTIER[epnum] = USBHS_DEVEPTIER_CTRL_STALLRQS(1);
736c744
<     USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_CTRL_RXSTPES;
---
>     USBHS->USBHS_DEVEPTIER[0] = USBHS_DEVEPTIER_CTRL_RXSTPES(1);
745,746c753,754
<   USBHS->USBHS_DEVEPTIDR[epnum] = USBHS_DEVEPTIDR_CTRL_STALLRQC;
<   USBHS->USBHS_DEVEPTIER[epnum] = USBHS_HSTPIPIER_RSTDTS;
---
>   USBHS->USBHS_DEVEPTIDR[epnum] = USBHS_DEVEPTIDR_CTRL_STALLRQC(1);
>   USBHS->USBHS_DEVEPTIER[epnum] = USBHS_HSTPIPIER_RSTDTS(1);