Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
d6c2c821
Commit
d6c2c821
authored
Oct 08, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor improvements in QCDT logic
parent
dfc65b95
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
dtb.cpp
native/jni/magiskboot/dtb.cpp
+7
-7
No files found.
native/jni/magiskboot/dtb.cpp
View file @
d6c2c821
...
...
@@ -223,11 +223,12 @@ static int dtb_patch(const qcdt_hdr *hdr, const char *in, const char *out) {
// Collect all dtbs
for
(
int
i
=
0
;
i
<
hdr
->
num_dtbs
;
++
i
)
{
auto
it
=
dtb_map
.
find
(
tables
[
i
].
offset
);
if
(
it
==
dtb_map
.
end
())
{
auto
fdt
=
xmalloc
(
tables
[
i
].
len
+
256
);
memcpy
(
fdt
,
buf
+
tables
[
i
].
offset
,
tables
[
i
].
len
);
fdt_open_into
(
fdt
,
fdt
,
tables
[
i
].
len
+
256
);
if
(
dtb_map
.
find
(
tables
[
i
].
offset
)
==
dtb_map
.
end
())
{
auto
blob
=
buf
+
tables
[
i
].
offset
;
int
size
=
fdt_totalsize
(
blob
);
auto
fdt
=
xmalloc
(
size
+
256
);
memcpy
(
fdt
,
blob
,
size
);
fdt_open_into
(
fdt
,
fdt
,
size
+
256
);
dtb_map
[
tables
[
i
].
offset
]
=
{
fdt
,
tables
[
i
].
offset
};
}
}
...
...
@@ -257,16 +258,15 @@ static int dtb_patch(const qcdt_hdr *hdr, const char *in, const char *out) {
// Write dtbs
for
(
auto
&
val
:
dtb_map
)
{
write_zero
(
fd
,
align_off
(
lseek
(
fd
,
0
,
SEEK_CUR
),
page_size
));
val
.
second
.
offset
=
lseek
(
fd
,
0
,
SEEK_CUR
);
auto
fdt
=
val
.
second
.
fdt
;
fdt_pack
(
fdt
);
int
size
=
fdt_totalsize
(
fdt
);
xwrite
(
fd
,
fdt
,
size
);
val
.
second
.
len
=
do_align
(
size
,
page_size
);
write_zero
(
fd
,
align_off
(
lseek
(
fd
,
0
,
SEEK_CUR
),
page_size
));
free
(
fdt
);
}
write_zero
(
fd
,
align_off
(
lseek
(
fd
,
0
,
SEEK_CUR
),
page_size
));
// Patch tables
auto
tables_rw
=
reinterpret_cast
<
Table
*>
(
addr
+
sizeof
(
qcdt_hdr
));
...
...
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