Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
7cef6c46
Commit
7cef6c46
authored
12 years ago
by
Oleg Hahm
Browse files
Options
Downloads
Patches
Plain Diff
* adapted thread_stack_init() for ARM and msp430 to the new prototype introduced by
bd5b4662
parent
bd5b4662
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile.include
+2
-2
2 additions, 2 deletions
Makefile.include
cpu/arm_common/Makefile
+0
-2
0 additions, 2 deletions
cpu/arm_common/Makefile
cpu/arm_common/arm_cpu.c
+2
-2
2 additions, 2 deletions
cpu/arm_common/arm_cpu.c
cpu/msp430-common/cpu.c
+2
-2
2 additions, 2 deletions
cpu/msp430-common/cpu.c
with
6 additions
and
8 deletions
Makefile.include
+
2
−
2
View file @
7cef6c46
...
...
@@ -4,8 +4,8 @@ CFLAGS += -DBOARD=$(BB)
export
CFLAGS
# mandatory include!
include
$(RIOTBASE)/Makefile.modules
include
$(RIOTBOARD)/$(BOARD)/Makefile.include
include
$(RIOTBASE)/Makefile.modules
# your binaries to link
BASELIBS
+=
$(
RIOTBOARD
)
/
$(
BOARD
)
/bin/
$(
BOARD
)
_base.a
...
...
@@ -36,7 +36,7 @@ clean:
rm
-f
$(
PROJBINDIR
)
/
*
flash
:
all
$(
FLASH
)
$(
PORT
)
$(
PROJBINDIR
)
/
$(
PROJECT
)
.hex
$(
FLASH
ER
)
$(
PORT
)
$(
PROJBINDIR
)
/
$(
PROJECT
)
.hex
term
:
$(
TERM
)
$(
PORT
)
...
...
This diff is collapsed.
Click to expand it.
cpu/arm_common/Makefile
+
0
−
2
View file @
7cef6c46
...
...
@@ -3,5 +3,3 @@ INCLUDES = -Iinclude -I../$(CPU)/include -I../../sys/lib -I../../drivers/include
include
$(RIOTBASE)/Makefile.base
This diff is collapsed.
Click to expand it.
cpu/arm_common/arm_cpu.c
+
2
−
2
View file @
7cef6c46
...
...
@@ -33,10 +33,10 @@ void thread_yield() {
// Processor specific routine - here for ARM7
// sizeof(void*) = sizeof(int)
//----------------------------------------------------------------------------
char
*
thread_stack_init
(
void
*
task_func
,
void
*
stack_start
)
char
*
thread_stack_init
(
void
*
task_func
,
void
*
stack_start
,
int
stack_size
)
{
unsigned
int
*
stk
;
stk
=
(
unsigned
int
*
)
stack_start
;
stk
=
(
unsigned
int
*
)
stack_start
+
stack_size
;
stk
--
;
*
stk
=
0x77777777
;
...
...
This diff is collapsed.
Click to expand it.
cpu/msp430-common/cpu.c
+
2
−
2
View file @
7cef6c46
...
...
@@ -97,10 +97,10 @@ void cpu_switch_context_exit(void){
//----------------------------------------------------------------------------
// Processor specific routine - here for MSP
//----------------------------------------------------------------------------
char
*
thread_stack_init
(
void
*
task_func
,
void
*
stack_start
)
char
*
thread_stack_init
(
void
*
task_func
,
void
*
stack_start
,
int
stack_size
)
{
unsigned
short
*
stk
;
stk
=
(
unsigned
short
*
)
stack_start
;
stk
=
(
unsigned
short
*
)
stack_start
+
stack_size
;
*
stk
=
(
unsigned
short
)
sched_task_exit
;
--
stk
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment