Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename GPDMA channel disable_force() to disable().

Browse Source 
There was nothing particularly forceful about the disable_force() code. Whether it's a "forced" operation depends on what happens before and after (HALT and ACTIVE flags are involved in a smooth disabling of the channel).
This commit is contained in:
Jared Boone 2016-01-10 10:11:16 -08:00
parent 43d6098c48
commit c75c167c25
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/baseband/audio_dma.cpp
View File

@ -208,8 +208,8 @@ void enable() {
}
void disable() {
gpdma_channel_i2s0_tx.disable_force();
gpdma_channel_i2s0_rx.disable_force();
gpdma_channel_i2s0_tx.disable();
gpdma_channel_i2s0_rx.disable();
}
buffer_t tx_empty_buffer() {

2
firmware/baseband/baseband_dma.cpp
View File

@ -149,7 +149,7 @@ bool is_enabled() {
}
void disable() {
gpdma_channel_sgpio.disable_force();
gpdma_channel_sgpio.disable();
}
baseband::buffer_t wait_for_rx_buffer() {

2
firmware/baseband/rssi_dma.cpp
View File

@ -157,7 +157,7 @@ bool is_enabled() {
}
void disable() {
gpdma_channel.disable_force();
gpdma_channel.disable();
}
rf::rssi::buffer_t wait_for_buffer() {

2
firmware/baseband/touch_dma.cpp
View File

@ -122,7 +122,7 @@ bool is_enabled() {
}
void disable() {
gpdma_channel.disable_force();
gpdma_channel.disable();
}
} /* namespace dma */

2
firmware/common/gpdma.cpp
View File

@ -54,7 +54,7 @@ void Channel::configure(
const LLI& first_lli,
const uint32_t config
) const {
disable_force();
disable();
clear_interrupts();
LPC_GPDMA_Channel_Type* const channel = &LPC_GPDMA->CH[number];

4
firmware/common/gpdma.hpp
View File

@ -313,7 +313,7 @@ public:
return LPC_GPDMA->CH[number].CONFIG & (1U << 0);
}
void disable_force() const {
void disable() const {
LPC_GPDMA->CH[number].CONFIG &= ~(1U << 0);
}
@ -349,7 +349,7 @@ public:
void disable() const {
for(const auto& channel : channels) {
channel.disable_force();
channel.disable();
}
LPC_GPDMA->CONFIG &= ~(1U << 0);
}