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

Merge pull request #414 from tannewt/new_opt 

Turn on -Os and tweak neopixel for new code output.
This commit is contained in:
Dan Halbert 2017-11-06 21:53:16 -05:00 committed by GitHub
parent e2867eb4e9 182a946b0e
commit 048f0f0e4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/atmel-samd/Makefile
View File

@ -85,7 +85,7 @@ CFLAGS = -Os -DNDEBUG
endif
ifeq ($(CHIP_FAMILY), samd51)
CFLAGS = -O2 -DNDEBUG
CFLAGS = -Os -DNDEBUG
endif
#Debugging/Optimization

31
ports/atmel-samd/common-hal/neopixel_write/__init__.c
View File

@ -32,17 +32,16 @@
#include "tick.h"
#ifdef SAMD51
static inline void delay_cycles(uint8_t cycles) {
uint32_t start = SysTick->VAL;
uint32_t stop = start - cycles;
if (start < cycles) {
stop = 0xffffff + start - cycles;
while (SysTick->VAL < start || SysTick->VAL > stop) {}
} else {
// Make sure the systick value is between start and stop in case it
// wraps around before we read its value less than stop.
while (SysTick->VAL > stop && SysTick->VAL <= start) {}
}
// This magical macro makes sure the delay isn't optimized out and is the
// minimal three instructions.
#define delay_cycles(cycles) \
{ \
uint32_t t; \
asm volatile ( \
"movs %[t], %[c]\n\t" \
"loop%=:\n\t" \
"subs %[t], #1\n\t" \
"bne.n loop%=" : [t] "=r"(t) : [c] "I" (cycles)); \
}
#endif
@ -88,7 +87,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t* digitalinout,
asm("nop; nop;");
#endif
#ifdef SAMD51
delay_cycles(18);
delay_cycles(3);
#endif
if(p & bitMask) {
// This is the high delay unique to a one bit.
@ -97,7 +96,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t* digitalinout,
asm("nop; nop; nop; nop; nop; nop; nop;");
#endif
#ifdef SAMD51
delay_cycles(25);
delay_cycles(11);
#endif
*clr = pinMask;
} else {
@ -108,7 +107,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t* digitalinout,
asm("nop; nop;");
#endif
#ifdef SAMD51
delay_cycles(25);
delay_cycles(3);
#endif
}
if((bitMask >>= 1) != 0) {
@ -119,7 +118,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t* digitalinout,
asm("nop; nop; nop; nop; nop;");
#endif
#ifdef SAMD51
delay_cycles(44);
delay_cycles(20);
#endif
} else {
if(ptr >= end) break;
@ -130,7 +129,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t* digitalinout,
// above operations take.
// For the SK6812 its 0.6us +- 0.15us
#ifdef SAMD51
delay_cycles(50);
delay_cycles(15);
#endif
}
}

7
ports/atmel-samd/usb_mass_storage.c
View File

@ -259,6 +259,9 @@ int32_t usb_msc_xfer_done(uint8_t lun) {
if (active_read) {
active_addr += 1;
active_nblocks--;
if (active_nblocks == 0) {
active_read = false;
}
}
if (active_write) {
@ -272,10 +275,6 @@ int32_t usb_msc_xfer_done(uint8_t lun) {
// The start_read callback begins a read transaction which we accept but delay our response until the "main thread" calls usb_msc_background. Once it does, we read immediately from the drive into our cache and trigger the USB DMA to output the sector. Once the sector is transmitted, xfer_done will be called.
void usb_msc_background(void) {
if (active_read && !usb_busy) {
if (active_nblocks == 0) {
active_read = false;
return;
}
fs_user_mount_t * vfs = get_vfs(active_lun);
disk_read(vfs, sector_buffer, active_addr, 1);
// TODO(tannewt): Check the read result.