Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-11-30 20:15:21 +08:00
commit 16fba2b2fa
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 11 additions and 0 deletions

View File

@ -37,6 +37,15 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
#define kNumTopBits 24
#define kTopValue ((UInt32)1 << kNumTopBits)
@@ -703,7 +704,7 @@ static ELzmaDummy LzmaDec_TryDummy(const
static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
{
- p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
+ p->code = ((UInt32)readb(&data[1]) << 24) | ((UInt32)readb(&data[2]) << 16) | ((UInt32)readb(&data[3]) << 8) | ((UInt32)readb(&data[4]));
p->range = 0xFFFFFFFF;
p->needFlush = 0;
}
@@ -929,7 +930,7 @@ SRes LzmaProps_Decode(CLzmaProps *p, con
if (size < LZMA_PROPS_SIZE)
return SZ_ERROR_UNSUPPORTED;

View File

@ -243,6 +243,8 @@ define Device/zyxel_p-2812hnu-f3
DEVICE_VARIANT := F3
BOARD_NAME := P2812HNUF3
DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-wolfssl kmod-usb-dwc2
KERNEL_SIZE := 2048k
SUPPORTED_DEVICES += P2812HNUF3
DEFAULT := n
endef
TARGET_DEVICES += zyxel_p-2812hnu-f3