1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00

Changed naming of SPI DMA resources to reflect the SPI bus number.

This commit is contained in:
Michael Keller 2021-07-28 00:55:55 +12:00
parent 864cf3f3b4
commit f4d840f5f8
11 changed files with 14 additions and 16 deletions

View file

@ -471,8 +471,8 @@ static void spiRxIrqHandler(dmaChannelDescriptor_t* descriptor)
}
}
// Mark this bus as being SPI and record the first owner to use it
bool spiSetBusInstance(extDevice_t *dev, uint32_t device, resourceOwner_e owner)
// Mark this bus as being SPI
bool spiSetBusInstance(extDevice_t *dev, uint32_t device)
{
if (device > SPIDEV_COUNT) {
return false;
@ -499,7 +499,6 @@ bool spiSetBusInstance(extDevice_t *dev, uint32_t device, resourceOwner_e owner)
bus->useDMA = false;
bus->useAtomicWait = false;
bus->deviceCount = 1;
bus->owner = owner;
bus->initTx = &dev->initTx;
bus->initRx = &dev->initRx;
@ -545,7 +544,7 @@ void spiInitBusDMA()
}
#endif
bus->dmaTxChannel = dmaTxChannelSpec->channel;
dmaInit(dmaTxIdentifier, bus->owner, 0);
dmaInit(dmaTxIdentifier, OWNER_SPI_MOSI, device + 1);
break;
}
}
@ -566,7 +565,7 @@ void spiInitBusDMA()
}
#endif
bus->dmaRxChannel = dmaRxChannelSpec->channel;
dmaInit(dmaRxIdentifier, bus->owner, 0);
dmaInit(dmaRxIdentifier, OWNER_SPI_MISO, device + 1);
break;
}
}