Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e61bb00d7a | ||
|
|
aa761753d7 | ||
|
|
85540d4ad2 |
6
Makefile
6
Makefile
@@ -1,4 +1,8 @@
|
|||||||
TOPTARGETS := all clean dist
|
TOPTARGETS := all clean dist
|
||||||
|
AMSREV := $(shell git rev-parse --short HEAD)
|
||||||
|
ifneq (, $(strip $(shell git status --porcelain 2>/dev/null)))
|
||||||
|
AMSREV := $(AMSREV)-dirty
|
||||||
|
endif
|
||||||
|
|
||||||
all: fusee creport
|
all: fusee creport
|
||||||
fusee:
|
fusee:
|
||||||
@@ -21,7 +25,7 @@ dist: fusee creport
|
|||||||
$(eval MICROVER = $(shell grep '\ATMOSPHERE_RELEASE_VERSION_MICRO\b' common/include/atmosphere/version.h \
|
$(eval MICROVER = $(shell grep '\ATMOSPHERE_RELEASE_VERSION_MICRO\b' common/include/atmosphere/version.h \
|
||||||
| tr -s [:blank:] \
|
| tr -s [:blank:] \
|
||||||
| cut -d' ' -f3))
|
| cut -d' ' -f3))
|
||||||
$(eval AMSVER = $(MAJORVER).$(MINORVER).$(MICROVER))
|
$(eval AMSVER = $(MAJORVER).$(MINORVER).$(MICROVER)-$(AMSREV))
|
||||||
rm -rf atmosphere-$(AMSVER)
|
rm -rf atmosphere-$(AMSVER)
|
||||||
rm -rf out
|
rm -rf out
|
||||||
mkdir atmosphere-$(AMSVER)
|
mkdir atmosphere-$(AMSVER)
|
||||||
|
|||||||
@@ -19,6 +19,6 @@
|
|||||||
|
|
||||||
#define ATMOSPHERE_RELEASE_VERSION_MAJOR 0
|
#define ATMOSPHERE_RELEASE_VERSION_MAJOR 0
|
||||||
#define ATMOSPHERE_RELEASE_VERSION_MINOR 7
|
#define ATMOSPHERE_RELEASE_VERSION_MINOR 7
|
||||||
#define ATMOSPHERE_RELEASE_VERSION_MICRO 1
|
#define ATMOSPHERE_RELEASE_VERSION_MICRO 2
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@@ -124,12 +124,14 @@ Result LayeredRomFS::Read(void *buffer, size_t size, u64 offset) {
|
|||||||
fatalSimple(0xF601);
|
fatalSimple(0xF601);
|
||||||
}
|
}
|
||||||
read_so_far += cur_read_size;
|
read_so_far += cur_read_size;
|
||||||
|
offset += cur_read_size;
|
||||||
} else {
|
} else {
|
||||||
/* Handle padding explicitly. */
|
/* Handle padding explicitly. */
|
||||||
cur_source_ind++;
|
cur_source_ind++;
|
||||||
/* Zero out the padding we skip, here. */
|
/* Zero out the padding we skip, here. */
|
||||||
memset((void *)((uintptr_t)buffer + read_so_far), 0, ((*this->p_source_infos)[cur_source_ind]).virtual_offset - (cur_source->virtual_offset + cur_source->size));
|
memset((void *)((uintptr_t)buffer + read_so_far), 0, ((*this->p_source_infos)[cur_source_ind]).virtual_offset - offset);
|
||||||
read_so_far += ((*this->p_source_infos)[cur_source_ind]).virtual_offset - (cur_source->virtual_offset + cur_source->size);
|
read_so_far += ((*this->p_source_infos)[cur_source_ind]).virtual_offset - offset;
|
||||||
|
offset = ((*this->p_source_infos)[cur_source_ind]).virtual_offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user