Skip to content

Commit 431b980

Browse files
aentingeraentinger
committed
Extending OTA header to incorporate magic number/version field
1 parent 356a11a commit 431b980

File tree

4 files changed

+2156
-2132
lines changed

4 files changed

+2156
-2132
lines changed

‎libraries/SNU/extras/NiNaBoot/NiNaBoot.ino

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,35 @@ int main() {
154154
{
155155
WiFiStorageFile update_file = WiFiStorage.open(UPDATE_FILE_NAME_LZSS);
156156

157+
union HeaderVersion
158+
{
159+
typedef struct __attribute__((packed))
160+
{
161+
uint32_t header_version : 6;
162+
uint32_t compression : 1;
163+
uint32_t signature : 1;
164+
uint32_t spare : 4;
165+
uint32_t payload_target : 4;
166+
uint32_t payload_major : 8;
167+
uint32_t payload_minor : 8;
168+
uint32_t payload_patch : 8;
169+
uint32_t payload_build_num : 24;
170+
} field;
171+
uint8_t buf[sizeof(field)];
172+
static_assert(sizeof(buf) == 8, "Error: sizeof(HEADER.VERSION) != 8");
173+
};
174+
157175
union
158176
{
159177
struct __attribute__((packed))
160178
{
161179
uint32_t len;
162180
uint32_t crc32;
181+
uint32_t magic_number;
182+
HeaderVersion hdr_version;
163183
} header;
164184
uint8_t buf[sizeof(header)];
185+
static_assert(sizeof(buf) == 20, "Error: sizeof(HEADER) != 20");
165186
} ota_header;
166187
uint32_t crc32, bytes_read;
167188
uint8_t crc_buf[128];
@@ -170,12 +191,15 @@ int main() {
170191
update_file.read(ota_header.buf, sizeof(ota_header.buf));
171192

172193
/* ... and check first length ... */
173-
if (ota_header.header.len != (update_file.size() - sizeof(ota_header.buf))) {
194+
if (ota_header.header.len != (update_file.size() - sizeof(ota_header.header.len) - sizeof(ota_header.header.crc32))) {
174195
update_file.close();
175196
update_file.erase();
176197
goto boot;
177198
}
178-
/* ... and the CRC second ... initialize CRC ... */
199+
200+
/* ... and the CRC second ... rewind to start of CRC verified header ... */
201+
update_file.seek(sizeof(ota_header.header.len) + sizeof(ota_header.header.crc32));
202+
/* ... initialize CRC ... */
179203
crc32 = 0xFFFFFFFF;
180204
/* ... and calculate over file ... */
181205
for(bytes_read = 0;

‎libraries/SNU/src/boot/mkrvidor4000.h

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
0x00, 0x80, 0x00, 0x20, 0x45, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
2-
0x2d, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1+
0x00, 0x80, 0x00, 0x20, 0x51, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
2+
0x39, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
33
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
5-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
6-
0x99, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
7-
0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0xf1, 0x44, 0x00, 0x00,
8-
0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x31, 0x45, 0x00, 0x00,
9-
0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
10-
0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
11-
0x31, 0x43, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
12-
0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
13-
0x00, 0x00, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
14-
0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00,
15-
0x2d, 0x45, 0x00, 0x00, 0x2d, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
5+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
6+
0xa5, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
7+
0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0xfd, 0x44, 0x00, 0x00,
8+
0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x3d, 0x45, 0x00, 0x00,
9+
0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
10+
0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
11+
0x3d, 0x43, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
12+
0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
13+
0x00, 0x00, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
14+
0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00,
15+
0x39, 0x45, 0x00, 0x00, 0x39, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1616
0x10, 0xb5, 0x06, 0x4c, 0x23, 0x78, 0x00, 0x2b, 0x07, 0xd1, 0x05, 0x4b,
1717
0x00, 0x2b, 0x02, 0xd0, 0x04, 0x48, 0x00, 0xe0, 0x00, 0xbf, 0x01, 0x23,
1818
0x23, 0x70, 0x10, 0xbd, 0xf0, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
@@ -21,79 +21,80 @@
2121
0x00, 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x20, 0xe0, 0x6f, 0x00, 0x00,
2222
0x1f, 0xb5, 0x14, 0x00, 0x04, 0x22, 0x00, 0x23, 0x01, 0x92, 0x03, 0xaa,
2323
0x00, 0x92, 0x0a, 0x00, 0x01, 0x00, 0x63, 0x20, 0x03, 0x93, 0x00, 0xf0,
24-
0x95, 0xfd, 0x03, 0x98, 0x20, 0x60, 0xc0, 0x43, 0xc0, 0x0f, 0x40, 0xb2,
25-
0x04, 0xb0, 0x10, 0xbd, 0x13, 0xb5, 0x04, 0x00, 0x03, 0xf0, 0x90, 0xff,
24+
0x9b, 0xfd, 0x03, 0x98, 0x20, 0x60, 0xc0, 0x43, 0xc0, 0x0f, 0x40, 0xb2,
25+
0x04, 0xb0, 0x10, 0xbd, 0x13, 0xb5, 0x04, 0x00, 0x03, 0xf0, 0x96, 0xff,
2626
0x01, 0xaa, 0xc1, 0xb2, 0x20, 0x00, 0xff, 0xf7, 0xe3, 0xff, 0xc3, 0x17,
2727
0x18, 0x1a, 0xc0, 0x0f, 0x16, 0xbd, 0xf0, 0xb5, 0x06, 0x68, 0x43, 0x68,
2828
0x85, 0xb0, 0x14, 0x00, 0xb2, 0x18, 0x05, 0x00, 0x03, 0x91, 0x9a, 0x42,
2929
0x03, 0xd9, 0x00, 0x24, 0x9e, 0x42, 0x10, 0xd2, 0x9c, 0x1b, 0xaf, 0x68,
30-
0x38, 0x00, 0x03, 0xf0, 0x75, 0xff, 0x03, 0x9b, 0xc2, 0xb2, 0x00, 0x93,
31-
0x01, 0x94, 0x33, 0x00, 0x39, 0x00, 0x61, 0x20, 0x00, 0xf0, 0x66, 0xfd,
30+
0x38, 0x00, 0x03, 0xf0, 0x7b, 0xff, 0x03, 0x9b, 0xc2, 0xb2, 0x00, 0x93,
31+
0x01, 0x94, 0x33, 0x00, 0x39, 0x00, 0x61, 0x20, 0x00, 0xf0, 0x6c, 0xfd,
3232
0x2b, 0x68, 0x1b, 0x19, 0x2b, 0x60, 0x20, 0x00, 0x05, 0xb0, 0xf0, 0xbd,
33-
0x70, 0xb5, 0x85, 0x68, 0x04, 0x00, 0x28, 0x00, 0x03, 0xf0, 0x60, 0xff,
33+
0x70, 0xb5, 0x85, 0x68, 0x04, 0x00, 0x28, 0x00, 0x03, 0xf0, 0x66, 0xff,
3434
0x22, 0x1d, 0xc1, 0xb2, 0x28, 0x00, 0xff, 0xf7, 0xb3, 0xff, 0x60, 0x68,
3535
0x70, 0xbd, 0x37, 0xb5, 0x00, 0x24, 0x85, 0x68, 0x04, 0x60, 0x28, 0x00,
36-
0x03, 0xf0, 0x52, 0xff, 0x29, 0x00, 0xc2, 0xb2, 0x01, 0x94, 0x00, 0x94,
37-
0x23, 0x00, 0x62, 0x20, 0x00, 0xf0, 0x44, 0xfd, 0x37, 0xbd, 0x00, 0x00,
36+
0x03, 0xf0, 0x58, 0xff, 0x29, 0x00, 0xc2, 0xb2, 0x01, 0x94, 0x00, 0x94,
37+
0x23, 0x00, 0x62, 0x20, 0x00, 0xf0, 0x4a, 0xfd, 0x37, 0xbd, 0x00, 0x00,
3838
0x30, 0xb5, 0xff, 0x25, 0x06, 0x4c, 0x8a, 0x18, 0x91, 0x42, 0x08, 0xd0,
3939
0x0b, 0x78, 0x01, 0x31, 0x43, 0x40, 0x2b, 0x40, 0x9b, 0x00, 0x1b, 0x59,
40-
0x00, 0x0a, 0x58, 0x40, 0xf4, 0xe7, 0x30, 0xbd, 0xf0, 0x60, 0x00, 0x00,
41-
0xf0, 0xb5, 0x99, 0x4c, 0x02, 0x25, 0xa5, 0x44, 0x00, 0xaf, 0x02, 0xf0,
42-
0xeb, 0xfa, 0x03, 0xf0, 0x17, 0xfe, 0x01, 0x20, 0x02, 0xf0, 0x0e, 0xfa,
43-
0x01, 0x21, 0x94, 0x48, 0x01, 0xf0, 0xc6, 0xfc, 0x03, 0x22, 0x93, 0x49,
44-
0x21, 0x20, 0x02, 0xf0, 0xdb, 0xf8, 0xfa, 0x20, 0x80, 0x00, 0x02, 0xf0,
45-
0x01, 0xfa, 0x90, 0x4c, 0x90, 0x4e, 0x20, 0x00, 0x01, 0xf0, 0x54, 0xf8,
46-
0x4a, 0x23, 0x08, 0x21, 0xfb, 0x62, 0x78, 0x18, 0x2a, 0x3b, 0xc1, 0x18,
47-
0x03, 0x22, 0x20, 0x00, 0xbe, 0x62, 0x3d, 0x63, 0x01, 0xf0, 0x64, 0xf8,
48-
0x89, 0x49, 0x20, 0x23, 0xb9, 0x62, 0x08, 0x21, 0x4a, 0x22, 0x78, 0x18,
49-
0xc0, 0x18, 0xfa, 0x62, 0x49, 0x3a, 0x01, 0x00, 0x3a, 0x63, 0x20, 0x00,
50-
0x52, 0x19, 0x01, 0xf0, 0x55, 0xf8, 0x08, 0x23, 0xbe, 0x62, 0x40, 0x26,
51-
0x3d, 0x63, 0xf9, 0x18, 0x1e, 0x35, 0x4b, 0x19, 0x19, 0x00, 0x03, 0x22,
52-
0x20, 0x00, 0xfe, 0x62, 0x01, 0xf0, 0x48, 0xf8, 0x01, 0x22, 0x7b, 0x49,
53-
0xfe, 0x62, 0x38, 0x3e, 0xbb, 0x19, 0xb9, 0x62, 0x3a, 0x63, 0x59, 0x19,
54-
0x02, 0x32, 0x20, 0x00, 0x01, 0xf0, 0x3c, 0xf8, 0xbb, 0x19, 0x76, 0x49,
55-
0x98, 0x19, 0x03, 0xf0, 0xcd, 0xfc, 0x75, 0x48, 0x00, 0xf0, 0x30, 0xfa,
56-
0xff, 0x28, 0x00, 0xd1, 0x86, 0xe0, 0x00, 0xf0, 0x27, 0xfa, 0xbb, 0x19,
57-
0x01, 0x00, 0x98, 0x19, 0x03, 0xf0, 0xdf, 0xfc, 0xbb, 0x19, 0x6f, 0x49,
58-
0x58, 0x19, 0x03, 0xf0, 0xbb, 0xfc, 0xbb, 0x19, 0x59, 0x19, 0x98, 0x19,
59-
0x03, 0xf0, 0xfd, 0xfc, 0xbb, 0x19, 0x04, 0x00, 0x58, 0x19, 0x03, 0xf0,
60-
0x69, 0xfc, 0x00, 0x2c, 0x6e, 0xd1, 0x68, 0x4d, 0x28, 0x68, 0xff, 0xf7,
61-
0x29, 0xff, 0x00, 0x28, 0x00, 0xd1, 0x7b, 0xe0, 0x29, 0x68, 0x08, 0x25,
62-
0x0c, 0x36, 0x7b, 0x19, 0x98, 0x19, 0x00, 0xf0, 0x5a, 0xfa, 0x79, 0x19,
63-
0x2a, 0x00, 0x88, 0x19, 0xff, 0xf7, 0x27, 0xff, 0x08, 0x23, 0xfb, 0x18,
64-
0x98, 0x19, 0xbd, 0x68, 0xff, 0xf7, 0x42, 0xff, 0x08, 0x38, 0x85, 0x42,
65-
0x06, 0xd0, 0x00, 0x23, 0x08, 0x22, 0xfb, 0x61, 0xba, 0x18, 0x14, 0x33,
66-
0xd0, 0x18, 0x49, 0xe0, 0x01, 0x25, 0x6d, 0x42, 0xba, 0x68, 0x13, 0x00,
67-
0x80, 0x3b, 0xa3, 0x42, 0x13, 0xd9, 0x08, 0x20, 0x20, 0x26, 0x3b, 0x18,
68-
0x99, 0x19, 0x14, 0x23, 0x38, 0x18, 0x80, 0x22, 0xc0, 0x18, 0xff, 0xf7,
69-
0x06, 0xff, 0x08, 0x20, 0x3b, 0x18, 0x80, 0x22, 0x28, 0x00, 0x99, 0x19,
70-
0xff, 0xf7, 0x3e, 0xff, 0x80, 0x34, 0x05, 0x00, 0xe6, 0xe7, 0x08, 0x20,
71-
0x20, 0x26, 0x3b, 0x18, 0x99, 0x19, 0x14, 0x23, 0x38, 0x18, 0x12, 0x1b,
72-
0xc0, 0x18, 0xff, 0xf7, 0xf2, 0xfe, 0x08, 0x20, 0xbb, 0x68, 0x1a, 0x1b,
73-
0x3b, 0x18, 0x99, 0x19, 0x28, 0x00, 0xff, 0xf7, 0x29, 0xff, 0xc0, 0x43,
74-
0xfb, 0x68, 0x83, 0x42, 0xc7, 0xd1, 0xe8, 0x22, 0xc0, 0x21, 0x08, 0x23,
75-
0x92, 0x02, 0xc9, 0x01, 0x3c, 0x48, 0x08, 0x25, 0xfb, 0x61, 0x14, 0x24,
76-
0x00, 0xf0, 0x3e, 0xfd, 0xc0, 0x21, 0x7b, 0x19, 0x18, 0x19, 0xc9, 0x01,
77-
0x00, 0xf0, 0x90, 0xf8, 0x00, 0xf0, 0x5a, 0xf9, 0x00, 0xf0, 0xb2, 0xf8,
78-
0x00, 0x23, 0xfb, 0x61, 0x7b, 0x19, 0x18, 0x19, 0xff, 0xf7, 0xf9, 0xfe,
79-
0xc0, 0x23, 0xdb, 0x01, 0x1a, 0x68, 0x82, 0xf3, 0x08, 0x88, 0x30, 0x4a,
80-
0x93, 0x60, 0x30, 0x4b, 0x1b, 0x68, 0x18, 0x47, 0x08, 0x23, 0xfa, 0x18,
81-
0xd0, 0x18, 0x03, 0xf0, 0xe9, 0xfb, 0x00, 0x20, 0xbd, 0x46, 0x2c, 0x4b,
82-
0x9d, 0x44, 0xf0, 0xbd, 0x2b, 0x4c, 0x20, 0x68, 0xff, 0xf7, 0xa6, 0xfe,
83-
0x00, 0x28, 0xe5, 0xd0, 0x08, 0x25, 0x21, 0x68, 0x14, 0x24, 0x7b, 0x19,
84-
0x18, 0x19, 0x00, 0xf0, 0xd8, 0xf9, 0x7b, 0x19, 0x18, 0x19, 0xff, 0xf7,
85-
0xc7, 0xfe, 0x80, 0x23, 0xdb, 0x01, 0x98, 0x42, 0xd6, 0xd9, 0xc0, 0x21,
86-
0xfb, 0x61, 0x21, 0x4b, 0xc9, 0x01, 0xc4, 0x18, 0x22, 0x00, 0x1a, 0x48,
87-
0xc0, 0x25, 0x00, 0xf0, 0xfb, 0xfc, 0x80, 0x26, 0xed, 0x01, 0x08, 0x21,
88-
0x20, 0x23, 0x78, 0x18, 0xc1, 0x18, 0x14, 0x20, 0x18, 0x3b, 0xfb, 0x18,
89-
0x32, 0x00, 0x18, 0x18, 0xff, 0xf7, 0x8b, 0xfe, 0x08, 0x21, 0x20, 0x22,
90-
0x79, 0x18, 0x33, 0x00, 0x8a, 0x18, 0x0f, 0x48, 0x29, 0x00, 0x00, 0xf0,
91-
0x95, 0xfc, 0x13, 0x4b, 0xeb, 0x18, 0x80, 0x35, 0x9c, 0x42, 0xe6, 0xd8,
92-
0x5d, 0xe7, 0xc0, 0x46, 0xd4, 0xfb, 0xff, 0xff, 0xb8, 0x16, 0x00, 0x20,
93-
0x29, 0x2e, 0x00, 0x00, 0x04, 0x22, 0x00, 0x20, 0x01, 0x00, 0x00, 0x02,
94-
0x02, 0x00, 0x00, 0x02, 0xf5, 0x64, 0x00, 0x00, 0xdc, 0x11, 0x00, 0x20,
95-
0xf0, 0x64, 0x00, 0x00, 0x08, 0x00, 0x00, 0x20, 0x14, 0x01, 0x00, 0x20,
96-
0x00, 0xed, 0x00, 0xe0, 0x04, 0x60, 0x00, 0x00, 0x2c, 0x04, 0x00, 0x00,
40+
0x00, 0x0a, 0x58, 0x40, 0xf4, 0xe7, 0x30, 0xbd, 0xfc, 0x60, 0x00, 0x00,
41+
0xf0, 0xb5, 0x9c, 0x4c, 0x02, 0x25, 0xa5, 0x44, 0x00, 0xaf, 0x02, 0xf0,
42+
0xf1, 0xfa, 0x03, 0xf0, 0x1d, 0xfe, 0x01, 0x20, 0x02, 0xf0, 0x14, 0xfa,
43+
0x01, 0x21, 0x97, 0x48, 0x01, 0xf0, 0xcc, 0xfc, 0x03, 0x22, 0x96, 0x49,
44+
0x21, 0x20, 0x02, 0xf0, 0xe1, 0xf8, 0xfa, 0x20, 0x80, 0x00, 0x02, 0xf0,
45+
0x07, 0xfa, 0x93, 0x4c, 0x93, 0x4e, 0x20, 0x00, 0x01, 0xf0, 0x5a, 0xf8,
46+
0x4a, 0x23, 0x08, 0x21, 0xfb, 0x63, 0x78, 0x18, 0x1a, 0x3b, 0xc1, 0x18,
47+
0x03, 0x22, 0x20, 0x00, 0xbe, 0x63, 0x3d, 0x64, 0x01, 0xf0, 0x6a, 0xf8,
48+
0x8c, 0x49, 0x30, 0x23, 0xb9, 0x63, 0x08, 0x21, 0x4a, 0x22, 0x78, 0x18,
49+
0xc0, 0x18, 0xfa, 0x63, 0x49, 0x3a, 0x01, 0x00, 0x3a, 0x64, 0x20, 0x00,
50+
0x52, 0x19, 0x01, 0xf0, 0x5b, 0xf8, 0x08, 0x23, 0xbe, 0x63, 0x40, 0x26,
51+
0x3d, 0x64, 0xf9, 0x18, 0x2e, 0x35, 0x4b, 0x19, 0x19, 0x00, 0x03, 0x22,
52+
0x20, 0x00, 0xfe, 0x63, 0x01, 0xf0, 0x4e, 0xf8, 0x01, 0x22, 0x20, 0x00,
53+
0x0c, 0x24, 0x7d, 0x49, 0xfe, 0x63, 0x38, 0x3e, 0xbb, 0x19, 0xb9, 0x63,
54+
0x3a, 0x64, 0x59, 0x19, 0x02, 0x32, 0x01, 0xf0, 0x41, 0xf8, 0x79, 0x49,
55+
0x38, 0x19, 0x03, 0xf0, 0xd3, 0xfc, 0x78, 0x48, 0x00, 0xf0, 0x36, 0xfa,
56+
0xff, 0x28, 0x00, 0xd1, 0x8b, 0xe0, 0x00, 0xf0, 0x2d, 0xfa, 0x01, 0x00,
57+
0x38, 0x19, 0x03, 0xf0, 0xe6, 0xfc, 0xbb, 0x19, 0x72, 0x49, 0x58, 0x19,
58+
0x03, 0xf0, 0xc2, 0xfc, 0xbb, 0x19, 0x59, 0x19, 0x38, 0x19, 0x03, 0xf0,
59+
0x04, 0xfd, 0xbb, 0x19, 0x04, 0x00, 0x58, 0x19, 0x03, 0xf0, 0x70, 0xfc,
60+
0x00, 0x2c, 0x74, 0xd1, 0x6b, 0x4d, 0x28, 0x68, 0xff, 0xf7, 0x2a, 0xff,
61+
0x00, 0x28, 0x00, 0xd1, 0x80, 0xe0, 0x29, 0x68, 0x10, 0x25, 0xbb, 0x19,
62+
0x58, 0x19, 0x00, 0xf0, 0x62, 0xfa, 0x30, 0x00, 0x1c, 0x23, 0xb9, 0x19,
63+
0xc9, 0x18, 0x3b, 0x18, 0x58, 0x19, 0x14, 0x22, 0xff, 0xf7, 0x25, 0xff,
64+
0x08, 0x20, 0x2e, 0x00, 0x3b, 0x18, 0x98, 0x19, 0x7d, 0x6a, 0xff, 0xf7,
65+
0x3f, 0xff, 0x08, 0x38, 0x85, 0x42, 0x06, 0xd0, 0x00, 0x23, 0xbb, 0x61,
66+
0x10, 0x33, 0x08, 0x22, 0xba, 0x18, 0xd0, 0x18, 0x4b, 0xe0, 0x08, 0x23,
67+
0x01, 0x25, 0xbb, 0x61, 0x6d, 0x42, 0x7a, 0x6a, 0x13, 0x00, 0x80, 0x3b,
68+
0xa3, 0x42, 0x13, 0xd9, 0x08, 0x20, 0x30, 0x26, 0x3b, 0x18, 0x99, 0x19,
69+
0x10, 0x23, 0x38, 0x18, 0x80, 0x22, 0xc0, 0x18, 0xff, 0xf7, 0x01, 0xff,
70+
0x08, 0x20, 0x3b, 0x18, 0x80, 0x22, 0x28, 0x00, 0x99, 0x19, 0xff, 0xf7,
71+
0x39, 0xff, 0x80, 0x34, 0x05, 0x00, 0xe6, 0xe7, 0x08, 0x20, 0x30, 0x26,
72+
0x3b, 0x18, 0x99, 0x19, 0x10, 0x23, 0x38, 0x18, 0x12, 0x1b, 0xc0, 0x18,
73+
0xff, 0xf7, 0xed, 0xfe, 0x08, 0x20, 0x7b, 0x6a, 0x1a, 0x1b, 0x3b, 0x18,
74+
0x99, 0x19, 0x28, 0x00, 0xff, 0xf7, 0x24, 0xff, 0xc0, 0x43, 0xbb, 0x6a,
75+
0x83, 0x42, 0xc5, 0xd1, 0xe8, 0x22, 0xc0, 0x21, 0x14, 0x23, 0x92, 0x02,
76+
0xc9, 0x01, 0x3d, 0x48, 0x08, 0x25, 0xbb, 0x61, 0x10, 0x24, 0x00, 0xf0,
77+
0x3f, 0xfd, 0xc0, 0x21, 0x7b, 0x19, 0x18, 0x19, 0xc9, 0x01, 0x00, 0xf0,
78+
0x91, 0xf8, 0x00, 0xf0, 0x5b, 0xf9, 0x00, 0xf0, 0xb3, 0xf8, 0x00, 0x23,
79+
0xbb, 0x61, 0x7b, 0x19, 0x18, 0x19, 0xff, 0xf7, 0xf4, 0xfe, 0xc0, 0x23,
80+
0xdb, 0x01, 0x1a, 0x68, 0x82, 0xf3, 0x08, 0x88, 0x30, 0x4a, 0x93, 0x60,
81+
0x30, 0x4b, 0x1b, 0x68, 0x18, 0x47, 0x0c, 0x23, 0xf8, 0x18, 0x03, 0xf0,
82+
0xeb, 0xfb, 0x00, 0x20, 0xbd, 0x46, 0x2d, 0x4b, 0x9d, 0x44, 0xf0, 0xbd,
83+
0x2c, 0x4c, 0x20, 0x68, 0xff, 0xf7, 0xa2, 0xfe, 0x00, 0x28, 0xe6, 0xd0,
84+
0x08, 0x25, 0x21, 0x68, 0x1c, 0x24, 0x7b, 0x19, 0x18, 0x19, 0x00, 0xf0,
85+
0xda, 0xf9, 0x7b, 0x19, 0x18, 0x19, 0xff, 0xf7, 0xc3, 0xfe, 0x80, 0x23,
86+
0xdb, 0x01, 0x98, 0x42, 0xd7, 0xd9, 0xc0, 0x21, 0x7b, 0x62, 0x22, 0x4b,
87+
0xc9, 0x01, 0xc4, 0x18, 0x22, 0x00, 0x1b, 0x48, 0xc0, 0x25, 0x00, 0xf0,
88+
0xfd, 0xfc, 0x80, 0x26, 0xed, 0x01, 0x08, 0x21, 0x30, 0x23, 0x78, 0x18,
89+
0xc1, 0x18, 0x1c, 0x20, 0x28, 0x3b, 0xfb, 0x18, 0x32, 0x00, 0x18, 0x18,
90+
0xff, 0xf7, 0x87, 0xfe, 0x08, 0x21, 0x30, 0x22, 0x79, 0x18, 0x33, 0x00,
91+
0x8a, 0x18, 0x10, 0x48, 0x29, 0x00, 0x00, 0xf0, 0x97, 0xfc, 0x14, 0x4b,
92+
0xeb, 0x18, 0x80, 0x35, 0x9c, 0x42, 0xe6, 0xd8, 0x00, 0x23, 0x7b, 0x62,
93+
0x1c, 0x33, 0x5c, 0xe7, 0xc4, 0xfb, 0xff, 0xff, 0xb8, 0x16, 0x00, 0x20,
94+
0x35, 0x2e, 0x00, 0x00, 0x04, 0x22, 0x00, 0x20, 0x01, 0x00, 0x00, 0x02,
95+
0x02, 0x00, 0x00, 0x02, 0x01, 0x65, 0x00, 0x00, 0xdc, 0x11, 0x00, 0x20,
96+
0xfc, 0x64, 0x00, 0x00, 0x08, 0x00, 0x00, 0x20, 0x14, 0x01, 0x00, 0x20,
97+
0x00, 0xed, 0x00, 0xe0, 0x04, 0x60, 0x00, 0x00, 0x3c, 0x04, 0x00, 0x00,
9798
0x04, 0x00, 0x00, 0x20, 0x00, 0xc0, 0xff, 0xff, 0x80, 0xa0, 0xff, 0xff,
9899
0x13, 0xb5, 0x00, 0x24, 0x06, 0x48, 0x23, 0x00, 0x22, 0x00, 0x21, 0x00,
99100
0x00, 0x94, 0x02, 0xf0, 0x37, 0xfb, 0x22, 0x00, 0x21, 0x00, 0x03, 0x48,
@@ -174,7 +175,7 @@
174175
0xff, 0xf7, 0xea, 0xff, 0x0a, 0x2c, 0xf8, 0xd1, 0x28, 0x00, 0x70, 0xbd,
175176
0x10, 0xb5, 0x05, 0x4c, 0x20, 0x00, 0xff, 0xf7, 0xd9, 0xff, 0x04, 0x4a,
176177
0x04, 0x49, 0x20, 0x00, 0x03, 0xf0, 0x46, 0xfa, 0x10, 0xbd, 0xc0, 0x46,
177-
0x10, 0x12, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x11, 0x28, 0x00, 0x00,
178+
0x10, 0x12, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x1d, 0x28, 0x00, 0x00,
178179
0x80, 0xb5, 0x0b, 0x4f, 0x0b, 0x4b, 0xbd, 0x44, 0x00, 0x93, 0x01, 0x90,
179180
0x00, 0x29, 0x04, 0xd0, 0x02, 0x23, 0x01, 0x29, 0x02, 0xd0, 0x02, 0x91,
180181
0x01, 0xe0, 0x01, 0x23, 0x02, 0x93, 0x03, 0x22, 0x69, 0x46, 0x05, 0x48,
@@ -201,7 +202,7 @@
201202
0x31, 0x78, 0x01, 0x26, 0x28, 0x78, 0x71, 0x40, 0xff, 0xf7, 0x8e, 0xff,
202203
0x0e, 0x48, 0x01, 0xf0, 0x51, 0xfe, 0x21, 0x00, 0x4a, 0x20, 0xff, 0xf7,
203204
0x87, 0xff, 0x21, 0x00, 0x4a, 0x20, 0xff, 0xf7, 0x65, 0xff, 0x0a, 0x4b,
204-
0x1e, 0x70, 0xf8, 0xbd, 0xb8, 0x16, 0x00, 0x20, 0x29, 0x2e, 0x00, 0x00,
205+
0x1e, 0x70, 0xf8, 0xbd, 0xb8, 0x16, 0x00, 0x20, 0x35, 0x2e, 0x00, 0x00,
205206
0x04, 0x22, 0x00, 0x20, 0x12, 0x00, 0x00, 0x20, 0x10, 0x00, 0x00, 0x20,
206207
0x11, 0x00, 0x00, 0x20, 0x88, 0x12, 0x00, 0x20, 0x08, 0x22, 0x00, 0x20,
207208
0xee, 0x02, 0x00, 0x00, 0x89, 0x12, 0x00, 0x20, 0x13, 0xb5, 0x00, 0x24,
@@ -398,7 +399,7 @@
398399
0x08, 0x33, 0x10, 0xb5, 0x03, 0x60, 0x01, 0x23, 0x05, 0x4a, 0x5b, 0x42,
399400
0x05, 0x49, 0x43, 0x61, 0x02, 0xf0, 0x0c, 0xfd, 0x10, 0xbd, 0xc0, 0x46,
400401
0x44, 0x6b, 0x00, 0x00, 0xe8, 0x21, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20,
401-
0xc3, 0x2f, 0x00, 0x00, 0x37, 0xb5, 0x0c, 0x4d, 0x00, 0x21, 0x28, 0x00,
402+
0xcf, 0x2f, 0x00, 0x00, 0x37, 0xb5, 0x0c, 0x4d, 0x00, 0x21, 0x28, 0x00,
402403
0xff, 0xf7, 0x38, 0xff, 0x00, 0x28, 0x10, 0xd0, 0x00, 0x24, 0x01, 0x23,
403404
0x01, 0xaa, 0x21, 0x00, 0x28, 0x00, 0x01, 0x94, 0xff, 0xf7, 0x75, 0xff,
404405
0x01, 0x21, 0x1f, 0x20, 0x01, 0xf0, 0x16, 0xfb, 0x1f, 0x20, 0x21, 0x00,
@@ -794,7 +795,7 @@
794795
0xfe, 0xe7, 0x00, 0x00, 0x03, 0x4b, 0x10, 0xb5, 0x1b, 0x68, 0x00, 0x2b,
795796
0x00, 0xd0, 0x98, 0x47, 0x10, 0xbd, 0xc0, 0x46, 0x90, 0x3a, 0x00, 0x20,
796797
0x70, 0xb5, 0x0f, 0x49, 0x0f, 0x4c, 0xa1, 0x42, 0x04, 0xd1, 0x00, 0xf0,
797-
0x89, 0xf8, 0xfd, 0xf7, 0x45, 0xfe, 0xfe, 0xe7, 0x0c, 0x4d, 0x00, 0x23,
798+
0x89, 0xf8, 0xfd, 0xf7, 0x3f, 0xfe, 0xfe, 0xe7, 0x0c, 0x4d, 0x00, 0x23,
798799
0x8d, 0x42, 0xf6, 0xd0, 0xca, 0x18, 0xe8, 0x18, 0xa2, 0x42, 0x05, 0xd3,
799800
0x09, 0x4b, 0x82, 0x42, 0xef, 0xd0, 0x09, 0x49, 0x00, 0x22, 0x04, 0xe0,
800801
0x00, 0x68, 0x04, 0x33, 0x10, 0x60, 0xf1, 0xe7, 0x04, 0xc3, 0x8b, 0x42,
@@ -1022,7 +1023,7 @@
10221023
0xff, 0xf7, 0xd5, 0xff, 0x20, 0x20, 0x10, 0xbd, 0x0c, 0xa0, 0x80, 0x00,
10231024
0x40, 0xa0, 0x80, 0x00, 0x44, 0xa0, 0x80, 0x00, 0x48, 0xa0, 0x80, 0x00,
10241025
0x08, 0xb4, 0x02, 0x4b, 0x9c, 0x46, 0x10, 0x38, 0x08, 0xbc, 0x60, 0x47,
1025-
0xb1, 0x4f, 0x00, 0x00, 0x70, 0x47, 0x3f, 0x20, 0x70, 0x47, 0x13, 0xb5,
1026+
0xbd, 0x4f, 0x00, 0x00, 0x70, 0x47, 0x3f, 0x20, 0x70, 0x47, 0x13, 0xb5,
10261027
0x6b, 0x46, 0x02, 0x68, 0xd9, 0x71, 0x07, 0x33, 0x54, 0x68, 0x19, 0x00,
10271028
0x01, 0x22, 0xa0, 0x47, 0x16, 0xbd, 0x00, 0x00, 0x70, 0xb5, 0x0a, 0x26,
10281029
0x0b, 0x78, 0x92, 0xb0, 0x6e, 0x44, 0x02, 0x33, 0x05, 0x00, 0x0b, 0x70,
@@ -1049,7 +1050,7 @@
10491050
0x10, 0x01, 0x04, 0x24, 0x02, 0x06, 0x05, 0x24, 0x09, 0x04, 0x00, 0x00,
10501051
0x01, 0x02, 0x00, 0x00, 0x08, 0x0b, 0x00, 0x00, 0x07, 0x05, 0x00, 0x00,
10511052
0x00, 0x3b, 0x00, 0x20, 0x08, 0xb4, 0x02, 0x4b, 0x9c, 0x46, 0x10, 0x38,
1052-
0x08, 0xbc, 0x60, 0x47, 0x21, 0x50, 0x00, 0x00, 0x70, 0xb5, 0x02, 0x7d,
1053+
0x08, 0xbc, 0x60, 0x47, 0x2d, 0x50, 0x00, 0x00, 0x70, 0xb5, 0x02, 0x7d,
10531054
0x0b, 0x79, 0x0c, 0x00, 0x00, 0x25, 0x9a, 0x42, 0x0b, 0xd1, 0x0b, 0x78,
10541055
0x4e, 0x78, 0xa1, 0x2b, 0x09, 0xd1, 0x21, 0x2e, 0x05, 0xd1, 0x07, 0x22,
10551056
0x1f, 0x49, 0x20, 0x48, 0x00, 0xf0, 0xae, 0xfa, 0x01, 0x35, 0x28, 0x00,
@@ -1064,7 +1065,7 @@
10641065
0xcd, 0xe7, 0x22, 0x2e, 0xef, 0xd1, 0x8a, 0x78, 0x02, 0x4b, 0xda, 0x71,
10651066
0xd2, 0xe7, 0xff, 0xf7, 0x0d, 0xfd, 0xe4, 0xe7, 0x24, 0x00, 0x00, 0x20,
10661067
0x00, 0x3b, 0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x08, 0xb4, 0x02, 0x4b,
1067-
0x9c, 0x46, 0x10, 0x38, 0x08, 0xbc, 0x60, 0x47, 0x4d, 0x51, 0x00, 0x00,
1068+
0x9c, 0x46, 0x10, 0x38, 0x08, 0xbc, 0x60, 0x47, 0x59, 0x51, 0x00, 0x00,
10681069
0x10, 0xb5, 0x41, 0x7d, 0x00, 0x6a, 0x01, 0x31, 0x00, 0xf0, 0xd8, 0xf8,
10691070
0x03, 0x4b, 0x1b, 0x68, 0x01, 0x33, 0x5a, 0x1e, 0x93, 0x41, 0x18, 0x18,
10701071
0x10, 0xbd, 0xc0, 0x46, 0x2c, 0x00, 0x00, 0x20, 0x10, 0xb5, 0x41, 0x7d,
@@ -1362,5 +1363,4 @@
13621363
0xc3, 0xe7, 0x03, 0x23, 0xc4, 0x1c, 0x9c, 0x43, 0xa0, 0x42, 0xe1, 0xd0,
13631364
0x21, 0x1a, 0x30, 0x00, 0x00, 0xf0, 0x12, 0xf8, 0x43, 0x1c, 0xdb, 0xd1,
13641365
0xc7, 0xe7, 0xc0, 0x46, 0xb4, 0x40, 0x00, 0x20, 0xb8, 0x40, 0x00, 0x20,
1365-
0x10, 0xb5, 0x03, 0x4b, 0x0a, 0x00, 0x01, 0x00, 0x18, 0x68, 0x00, 0xf0,
1366-
0x30, 0xf8, 0x10, 0xbd
1366+
0x10, 0xb5, 0x03, 0x4b

0 commit comments

Comments
 (0)