rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-03 14:24:15 +01:00
Code Issues Releases Activity

[sam] test app (led blink) working using GCC and GDB server for debug

Browse Source
This commit is contained in:
Thibaut VIARD 2011-09-10 23:54:56 +02:00
parent 2963a37075
commit 0c2bba55c8
9 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk
View File

@ -69,7 +69,7 @@ C_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.c)
C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC))) C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC)))
# during development, remove some files # during development, remove some files
C_OBJ_FILTER=wiring_analog.o wiring_pulse.o C_OBJ_FILTER=wiring_analog.o wiring_pulse.o dlib_lowlevel_sam3.o
C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP)) C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP))

8
hardware/sam/system/libsam/build_gcc/sam3.mk
View File

@ -121,10 +121,10 @@ $(CHIP): create_output $(OUTPUT_LIB)
create_output: create_output:
@echo --- Preparing $(CHIP) files $(OUTPUT_PATH) $(OUTPUT_BIN) @echo --- Preparing $(CHIP) files $(OUTPUT_PATH) $(OUTPUT_BIN)
@echo ------------------------- @echo -------------------------
# @echo *$(C_SRC) @echo *$(C_SRC)
# @echo ------------------------- @echo -------------------------
# @echo *$(C_OBJ) @echo *$(C_OBJ)
# @echo ------------------------- @echo -------------------------
# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) # @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
# @echo ------------------------- # @echo -------------------------
# @echo *$(A_SRC) # @echo *$(A_SRC)

4
hardware/sam/system/libsam/cmsis/sam3s/source/templates/exceptions.c
View File

@ -31,9 +31,9 @@ extern "C" {
#ifdef __GNUC__ #ifdef __GNUC__
/* Cortex-M3 core handlers */ /* Cortex-M3 core handlers */
extern void Reset_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ; //extern void Reset_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ;
extern void NMI_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ; extern void NMI_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ;
extern void HardFault_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ; //extern void HardFault_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ;
extern void MemManage_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ; extern void MemManage_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ;
extern void BusFault_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ; extern void BusFault_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ;
extern void UsageFault_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ; extern void UsageFault_Handler( void ) __attribute__ ((weak, alias ("Dummy_Handler"))) ;

4
hardware/sam/system/libsam/cmsis/sam3s/source/templates/gcc/startup_sam3s.c
View File

@ -73,7 +73,7 @@ IntFunc exception_table[] = {
/* Configure Initial Stack Pointer, using linker-generated symbols */ /* Configure Initial Stack Pointer, using linker-generated symbols */
(IntFunc)(&pdwStack[STACK_SIZE-1]), (IntFunc)(&pdwStack[STACK_SIZE-1]),
ResetException, Reset_Handler,
NMI_Handler, NMI_Handler,
HardFault_Handler, HardFault_Handler,
@ -134,7 +134,7 @@ IntFunc exception_table[] = {
* \brief This is the code that gets called on processor reset. * \brief This is the code that gets called on processor reset.
* To initialize the device, and call the main() routine. * To initialize the device, and call the main() routine.
*/ */
void ResetException( void ) void Reset_Handler( void )
{ {
uint32_t *pSrc, *pDest ; uint32_t *pSrc, *pDest ;

2
hardware/sam/system/libsam/cmsis/sam3s/source/templates/system_sam3s.c
View File

@ -132,7 +132,7 @@ extern void SystemCoreClockUpdate( void )
break; break;
} }
} }
if (PMC->PMC_MCKR & PMC_MCKR_CSS_Msk == PMC_MCKR_CSS_PLLA_CLK) { if ((PMC->PMC_MCKR & PMC_MCKR_CSS_Msk) == PMC_MCKR_CSS_PLLA_CLK) {
SystemCoreClock *= ((((PMC->CKGR_PLLAR) >> CKGR_PLLAR_MULA_Pos) & 0x7FF) + 1); SystemCoreClock *= ((((PMC->CKGR_PLLAR) >> CKGR_PLLAR_MULA_Pos) & 0x7FF) + 1);
SystemCoreClock /= ((((PMC->CKGR_PLLAR) >> CKGR_PLLAR_DIVA_Pos) & 0x0FF)); SystemCoreClock /= ((((PMC->CKGR_PLLAR) >> CKGR_PLLAR_DIVA_Pos) & 0x0FF));
} }

5
hardware/sam/variants/common/UART.h
View File

@ -26,9 +26,12 @@ class UARTClass : public HardwareSerial
void IrqHandler( void ) ; void IrqHandler( void ) ;
#if defined __GNUC__ /* GCC CS3 */
using Print::write ; // pull in write(str) and write(buf, size) from Print
#elif defined __ICCARM__ /* IAR Ewarm 5.41+ */
virtual void write( const char *str ) ; virtual void write( const char *str ) ;
virtual void write( const uint8_t *buffer, size_t size ) ; virtual void write( const uint8_t *buffer, size_t size ) ;
// using Print::write ; // pull in write(str) and write(buf, size) from Print #endif
}; };
#endif // _UART_CLASS_ #endif // _UART_CLASS_

5
hardware/sam/variants/common/USART.h
View File

@ -26,9 +26,12 @@ class USARTClass : public HardwareSerial
void IrqHandler( void ) ; void IrqHandler( void ) ;
#if defined __GNUC__ /* GCC CS3 */
using Print::write ; // pull in write(str) and write(buf, size) from Print
#elif defined __ICCARM__ /* IAR Ewarm 5.41+ */
virtual void write( const char *str ) ; virtual void write( const char *str ) ;
virtual void write( const uint8_t *buffer, size_t size ) ; virtual void write( const uint8_t *buffer, size_t size ) ;
// using Print::write ; // pull in write(str) and write(buf, size) from Print #endif
}; };
#endif // _USART_CLASS_ #endif // _USART_CLASS_

2
hardware/sam/variants/sam3s_ek/build_gcc/libvariant_sam3s_ek.mk
View File

@ -139,7 +139,7 @@ $(addprefix $(OUTPUT_PATH)/,$(C_OBJ)): $(OUTPUT_PATH)/%.o: %.c
$(addprefix $(OUTPUT_PATH)/,$(CPP_OBJ)): $(OUTPUT_PATH)/%.o: %.cpp $(addprefix $(OUTPUT_PATH)/,$(CPP_OBJ)): $(OUTPUT_PATH)/%.o: %.cpp
# @$(CC) -c $(CPPFLAGS) $< -o $@ # @$(CC) -c $(CPPFLAGS) $< -o $@
$(CC) -xc++ -c $(CPPFLAGS) $< -o $@ @$(CC) -xc++ -c $(CPPFLAGS) $< -o $@
$(addprefix $(OUTPUT_PATH)/,$(A_OBJ)): $(OUTPUT_PATH)/%.o: %.s $(addprefix $(OUTPUT_PATH)/,$(A_OBJ)): $(OUTPUT_PATH)/%.o: %.s
@$(AS) -c $(ASFLAGS) $< -o $@ @$(AS) -c $(ASFLAGS) $< -o $@

4
hardware/sam/variants/sam3s_ek/variant.h
View File

@ -33,10 +33,10 @@
/** Name of the board */ /** Name of the board */
#define VARIANT_NAME "SAM3S-EK" #define VARIANT_NAME "SAM3S-EK"
/*
#define VARIANT_REV_A #define VARIANT_REV_A
*/ /*
#define VARIANT_REV_B #define VARIANT_REV_B
*/
/** Frequency of the board main oscillator */ /** Frequency of the board main oscillator */
#define VARIANT_MAINOSC 12000000 #define VARIANT_MAINOSC 12000000