Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
magic-lantern
magic-lantern
Commits
54ffdf193a52
Commit
27092462
authored
Mar 24, 2010
by
hudson@kremvax.wan
Browse files
Use stubs to locate alloc_dma_memory() and fix bootflags for 2.0.4
parent
09dc0e8711bf
Changes
3
Hide whitespace changes
Inline
Side-by-side
bootflags.c
View file @
54ffdf19
...
@@ -96,10 +96,8 @@ void
...
@@ -96,10 +96,8 @@ void
bootflag_write_bootblock
(
void
)
bootflag_write_bootblock
(
void
)
{
{
gui_stop_menu
();
gui_stop_menu
();
void
*
(
*
AllocateUncacheableMemory
)(
size_t
)
=
(
void
*
)
0xff99b3a8
;
void
(
*
FreeUncacheableMemory
)(
const
void
*
)
=
(
void
*
)
0xff99b3dc
;
uint8_t
*
block
=
A
lloc
ateUncacheableM
emory
(
0x200
);
uint8_t
*
block
=
a
lloc
_dma_m
emory
(
0x200
);
bmp_printf
(
FONT_MED
,
0
,
40
,
"mem=%08x read=%08x"
,
block
,
cf_device
->
read_block
);
bmp_printf
(
FONT_MED
,
0
,
40
,
"mem=%08x read=%08x"
,
block
,
cf_device
->
read_block
);
int
rc
=
cf_device
->
read_block
(
cf_device
,
0x0
,
1
,
block
);
int
rc
=
cf_device
->
read_block
(
cf_device
,
0x0
,
1
,
block
);
msleep
(
100
);
msleep
(
100
);
...
@@ -114,7 +112,7 @@ bootflag_write_bootblock( void )
...
@@ -114,7 +112,7 @@ bootflag_write_bootblock( void )
rc
=
cf_device
->
write_block
(
cf_device
,
0x0
,
1
,
block
);
rc
=
cf_device
->
write_block
(
cf_device
,
0x0
,
1
,
block
);
bmp_printf
(
FONT_MED
,
600
,
60
,
"write=%d"
,
rc
);
bmp_printf
(
FONT_MED
,
600
,
60
,
"write=%d"
,
rc
);
F
ree
UncacheableM
emory
(
block
);
f
ree
_dma_m
emory
(
block
);
}
}
...
...
dryos.h
View file @
54ffdf19
...
@@ -675,5 +675,16 @@ FreeMemory(
...
@@ -675,5 +675,16 @@ FreeMemory(
void
*
buf
void
*
buf
);
);
/** Allocate DMA memory for writing to the CF card */
extern
void
*
alloc_dma_memory
(
size_t
len
);
extern
void
free_dma_memory
(
const
void
*
len
);
#endif
#endif
stubs-5d2.204.S
View file @
54ffdf19
...
@@ -126,3 +126,5 @@ NSTUB( 0xFF890188, gui_massive_event_loop )
...
@@ -126,3 +126,5 @@ NSTUB( 0xFF890188, gui_massive_event_loop )
NSTUB
(
0
xFF9B3910
,
gui_timer_something
)
NSTUB
(
0
xFF9B3910
,
gui_timer_something
)
NSTUB
(
0
xFFCB48CC
,
audio_thresholds
)
NSTUB
(
0
xFFCB48CC
,
audio_thresholds
)
NSTUB
(
0
xFF85B438
,
sounddev_active_in
)
NSTUB
(
0
xFF85B438
,
sounddev_active_in
)
NSTUB
(
0
xFF9B9FD0
,
alloc_dma_memory
)
NSTUB
(
0
xFF9BA004
,
free_dma_memory
)
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