djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary memory barriers

This commit is contained in:
RetiredWizard 2023-02-13 19:46:35 -05:00
parent dcb6955fa5
commit 39d3d97ea4
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/broadcom/common-hal/neopixel_write/__init__.c
View File

@ -96,9 +96,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
// Wait for the clock to start up. // Wait for the clock to start up.
COMPLETE_MEMORY_READS; COMPLETE_MEMORY_READS;
icnt = 0; icnt = 0;
while ((CM_PWM->CS_b.BUSY == 0) && (icnt++ < 1000)) { while ((CM_PWM->CS_b.BUSY == 0) && (icnt++ < 1000)) {}
COMPLETE_MEMORY_READS;
}
} }
PWM0_Type *pwm = PWM0; PWM0_Type *pwm = PWM0;
@ -143,7 +141,6 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
icnt = 0; icnt = 0;
while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) { while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
COMPLETE_MEMORY_READS;
} }
// Dummy value for the first channel. // Dummy value for the first channel.
pwm->FIF1 = 0x000000; pwm->FIF1 = 0x000000;
@ -151,14 +148,12 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
icnt = 0; icnt = 0;
while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) { while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
COMPLETE_MEMORY_READS;
} }
pwm->FIF1 = expanded; pwm->FIF1 = expanded;
if (channel == 0) { if (channel == 0) {
icnt = 0; icnt = 0;
while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) { while ((pwm->STA_b.FULL1 == 1) && (icnt++ < 150)) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
COMPLETE_MEMORY_READS;
} }
// Dummy value for the second channel. // Dummy value for the second channel.
pwm->FIF1 = 0x000000; pwm->FIF1 = 0x000000;
@ -168,23 +163,19 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout,
icnt = 0; icnt = 0;
while ((pwm->STA_b.EMPT1 == 0) && (icnt++ < 2500)) { while ((pwm->STA_b.EMPT1 == 0) && (icnt++ < 2500)) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
COMPLETE_MEMORY_READS;
} }
// Wait for transmission to start. // Wait for transmission to start.
icnt = 0; icnt = 0;
while (((pwm->STA_b.STA1 == 0) && (pwm->STA_b.STA2 == 0)) && (icnt++ < 150)) { while (((pwm->STA_b.STA1 == 0) && (pwm->STA_b.STA2 == 0)) && (icnt++ < 150)) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
COMPLETE_MEMORY_READS;
} }
// Wait for transmission to complete. // Wait for transmission to complete.
icnt = 0; icnt = 0;
while (((pwm->STA_b.STA1 == 1) | (pwm->STA_b.STA2 == 1)) && (icnt++ < 150)) { while (((pwm->STA_b.STA1 == 1) | (pwm->STA_b.STA2 == 1)) && (icnt++ < 150)) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
COMPLETE_MEMORY_READS;
} }
// Shouldn't be anything left in queue but clear it so the clock doesn't crash if there is // Shouldn't be anything left in queue but clear it so the clock doesn't crash if there is
pwm->CTL = PWM0_CTL_CLRF1_Msk; pwm->CTL = PWM0_CTL_CLRF1_Msk;
COMPLETE_MEMORY_READS;
gpio_set_function(digitalinout->pin->number, GPIO_FUNCTION_OUTPUT); gpio_set_function(digitalinout->pin->number, GPIO_FUNCTION_OUTPUT);