Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(PeriphDrivers): Resolve incorrect DMA request in DMA-based SPI transactions for all parts #1059

Merged
merged 6 commits into from
Jul 2, 2024
Prev Previous commit
Next Next commit
refactor(PeriphDrivers): merge reqselTx/Rx setting in MXC_SPI_RevA1_S…
…laveTransactionDMA
  • Loading branch information
JeonChangmin committed Jun 26, 2024
commit 4674b6f081cd1f5536ddaf4e37d377273437b628
14 changes: 1 addition & 13 deletions Libraries/PeriphDrivers/Source/SPI/spi_ai87.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,23 +445,11 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

default:
return E_BAD_PARAM;
break;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

Expand Down
13 changes: 1 addition & 12 deletions Libraries/PeriphDrivers/Source/SPI/spi_es17.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,22 +294,11 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

default:
return E_BAD_PARAM;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

Expand Down
13 changes: 1 addition & 12 deletions Libraries/PeriphDrivers/Source/SPI/spi_me11.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,22 +292,11 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPIMSSTX;
break;

default:
return E_BAD_PARAM;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPIMSSTX;
reqselRx = MXC_DMA_REQUEST_SPIMSSRX;
break;

Expand Down
14 changes: 1 addition & 13 deletions Libraries/PeriphDrivers/Source/SPI/spi_me12.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,23 +401,11 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

default:
return E_BAD_PARAM;
break;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

Expand Down
18 changes: 2 additions & 16 deletions Libraries/PeriphDrivers/Source/SPI/spi_me13.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,30 +329,16 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
break;

default:
return E_BAD_PARAM;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
reqselRx = MXC_DMA_REQUEST_SPI2RX;
break;

Expand Down
18 changes: 2 additions & 16 deletions Libraries/PeriphDrivers/Source/SPI/spi_me14.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,30 +398,16 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req, mxc_dma_regs_t *dma)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
break;

default:
return E_BAD_PARAM;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
reqselRx = MXC_DMA_REQUEST_SPI2RX;
break;

Expand Down
18 changes: 2 additions & 16 deletions Libraries/PeriphDrivers/Source/SPI/spi_me15.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,30 +311,16 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
break;

default:
return E_BAD_PARAM;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
reqselRx = MXC_DMA_REQUEST_SPI2RX;
break;

Expand Down
20 changes: 3 additions & 17 deletions Libraries/PeriphDrivers/Source/SPI/spi_me16.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,35 +308,21 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
break;

case 3:
reqselTx = MXC_DMA_REQUEST_SPI3TX;
break;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
reqselRx = MXC_DMA_REQUEST_SPI1TX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
reqselRx = MXC_DMA_REQUEST_SPI2TX;
break;

case 3:
reqselTx = MXC_DMA_REQUEST_SPI3TX;
reqselRx = MXC_DMA_REQUEST_SPI3TX;
break;
}
Expand Down
14 changes: 1 addition & 13 deletions Libraries/PeriphDrivers/Source/SPI/spi_me17.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,23 +459,11 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

default:
return E_BAD_PARAM;
break;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

Expand Down
24 changes: 4 additions & 20 deletions Libraries/PeriphDrivers/Source/SPI/spi_me18.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,38 +442,22 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0TX;
break;
case 1:
reqselRx = MXC_DMA_REQUEST_SPI1TX;
break;
case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
break;
case 3:
reqselTx = MXC_DMA_REQUEST_SPI3TX;
break;
case 4:
reqselTx = MXC_DMA_REQUEST_SPI4TX;
break;
default:
return E_BAD_PARAM;
break;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;
case 1:
reqselRx = MXC_DMA_REQUEST_SPI1TX;
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;
case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
reqselTx = MXC_DMA_REQUEST_SPI2RX;
break;
case 3:
reqselTx = MXC_DMA_REQUEST_SPI3TX;
reqselTx = MXC_DMA_REQUEST_SPI3RX;
break;
case 4:
reqselTx = MXC_DMA_REQUEST_SPI4TX;
reqselTx = MXC_DMA_REQUEST_SPI4RX;
break;
default:
Expand Down
19 changes: 3 additions & 16 deletions Libraries/PeriphDrivers/Source/SPI/spi_me21.c
Original file line number Diff line number Diff line change
Expand Up @@ -328,36 +328,23 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
break;

default:
return E_BAD_PARAM;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

case 2:
reqselTx = MXC_DMA_REQUEST_SPI2TX;
reqselRx = MXC_DMA_REQUEST_SPI2RX;
break;

default:
return E_BAD_PARAM;
}

return MXC_SPI_RevA1_SlaveTransactionDMA((mxc_spi_reva_req_t *)req, reqselTx, reqselRx,
MXC_DMA);
}
Expand Down
11 changes: 0 additions & 11 deletions Libraries/PeriphDrivers/Source/SPI/spi_me30.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,17 +384,6 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req, mxc_dma_regs_t *dma)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPITX;
break;

default:
return E_BAD_PARAM;
break;
}
}

if (req->rxData != NULL) {
switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPIRX;
break;

Expand Down
18 changes: 2 additions & 16 deletions Libraries/PeriphDrivers/Source/SPI/spi_me55.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,30 +325,16 @@ int MXC_SPI_SlaveTransactionDMA(mxc_spi_req_t *req)
switch (spi_num) {
case 0:
reqselTx = MXC_DMA_REQUEST_SPI0TX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
break;

case 3:
reqselTx = MXC_DMA_REQUEST_SPI3TX;
break;

default:
return E_BAD_PARAM;
}

switch (spi_num) {
case 0:
reqselRx = MXC_DMA_REQUEST_SPI0RX;
break;

case 1:
reqselTx = MXC_DMA_REQUEST_SPI1TX;
reqselRx = MXC_DMA_REQUEST_SPI1RX;
break;

case 3:
reqselTx = MXC_DMA_REQUEST_SPI3TX;
reqselRx = MXC_DMA_REQUEST_SPI3RX;
break;

Expand Down