Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
49136786
Commit
49136786
authored
Jun 02, 2012
by
Dean Camera
Browse files
Fix UC3 support in the BUILD build system module. Fix bug in the EVK1101 board buttons driver.
parent
5ce60f25
Changes
2
Hide whitespace changes
Inline
Side-by-side
LUFA/Build/lufa.build.in
View file @
49136786
...
...
@@ -114,8 +114,10 @@ endif
C_FLAGS += -Wstrict-prototypes
# Create a list of flags to pass to the linker
LD_FLAGS += -Wl,-Map=$(TARGET).map,--cref -Wl,--gc-sections -lm
ifneq ($(F_CPU), UC3)
LD_FLAGS += -lm -Wl,-Map=$(TARGET).map,--cref -Wl,--gc-sections
ifeq ($(ARCH), UC3)
LD_FLAGS += --rodata-writable -Wl,--direct-data
else
LD_FLAGS += -Wl,--relax
endif
...
...
@@ -126,8 +128,8 @@ ifneq ($(UNKNOWN_SOURCE),)
endif
# Determine flags to pass to the size utility based on its reported features
SIZE_MCU_FLAG = $(shell
avr-
size --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) )
SIZE_FORMAT_FLAG = $(shell
avr-
size --help | grep -- --format=.*avr > /dev/null && echo --format=avr )
SIZE_MCU_FLAG = $(shell
$(CROSS)
size --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) )
SIZE_FORMAT_FLAG = $(shell
$(CROSS)
size --help | grep -- --format=.*avr > /dev/null && echo --format=avr )
begin:
...
...
@@ -150,7 +152,7 @@ checksource:
size:
@echo $(MSG_SIZE_CMD) Determining size of \"$(TARGET).elf\"
@if test -f $(TARGET).elf; then \
avr-
size $(SIZE_MCU_FLAG) $(SIZE_FORMAT_FLAG) $(TARGET).elf ; 2>/dev/null; \
$(CROSS)
size $(SIZE_MCU_FLAG) $(SIZE_FORMAT_FLAG) $(TARGET).elf ; 2>/dev/null; \
fi
.PHONY: begin elf hex lss size end
...
...
LUFA/Drivers/Board/UC3/EVK1101/Buttons.h
View file @
49136786
...
...
@@ -98,7 +98,7 @@
static
inline
uint32_t
Buttons_GetStatus
(
void
)
ATTR_WARN_UNUSED_RESULT
;
static
inline
uint32_t
Buttons_GetStatus
(
void
)
{
return
(
~
(
AVR32_GPIO
.
port
[
JOY_MOVE
_PORT
].
pvr
&
(
BUTTONS_BUTTON1
|
BUTTONS_BUTTON2
)));
return
(
~
(
AVR32_GPIO
.
port
[
BUTTONS
_PORT
].
pvr
&
(
BUTTONS_BUTTON1
|
BUTTONS_BUTTON2
)));
}
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment