From fe4fc5663d17fb00fe20e04ac57dc45d64236e56 Mon Sep 17 00:00:00 2001 From: Brandon Ros Date: Tue, 22 Aug 2023 19:35:48 -0400 Subject: [PATCH] put the more flexible way of parsing firmware back --- cyw43-firmware/43439A0_btfw.bin | Bin 0 -> 6164 bytes cyw43-firmware/Cargo.toml | 8 - cyw43-firmware/README.md | 2 +- cyw43-firmware/src/lib.rs | 349 ------------------------ cyw43/src/bluetooth.rs | 103 ++++++- cyw43/src/bus.rs | 6 +- cyw43/src/consts.rs | 12 + cyw43/src/lib.rs | 7 +- cyw43/src/runner.rs | 16 +- examples/rp/Cargo.toml | 1 - examples/rp/src/bin/bluetooth_blinky.rs | 6 +- 11 files changed, 111 insertions(+), 399 deletions(-) create mode 100644 cyw43-firmware/43439A0_btfw.bin delete mode 100644 cyw43-firmware/Cargo.toml delete mode 100644 cyw43-firmware/src/lib.rs diff --git a/cyw43-firmware/43439A0_btfw.bin b/cyw43-firmware/43439A0_btfw.bin new file mode 100644 index 0000000000000000000000000000000000000000..290ce8ef0607f51f995e356808f8f05aab5fe4ba GIT binary patch literal 6164 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 X^C0l)rvY5Xo3-pBxXe^|a|7~sadC2< literal 0 HcmV?d00001 diff --git a/cyw43-firmware/Cargo.toml b/cyw43-firmware/Cargo.toml deleted file mode 100644 index 45f50405..00000000 --- a/cyw43-firmware/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "cyw43-firmware" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/cyw43-firmware/README.md b/cyw43-firmware/README.md index f28489bb..ccd38be2 100644 --- a/cyw43-firmware/README.md +++ b/cyw43-firmware/README.md @@ -6,5 +6,5 @@ Licensed under the [Infineon Permissive Binary License](./LICENSE-permissive-bin ## Changelog -* 2023-08-21: synced with `a1dc8859d09b8f547a4f4345fd0efb7300105e62` - Update 43439 fw + clm to come from `wb43439A0_7_95_49_00_combined.h` and add export of Bluetooth firmware +* 2023-08-21: synced with `a1dc885` - Update 43439 fw + clm to come from `wb43439A0_7_95_49_00_combined.h` + add Bluetooth firmware * 2023-07-28: synced with `ad3bad0` - Update 43439 fw from 7.95.55 to 7.95.62 diff --git a/cyw43-firmware/src/lib.rs b/cyw43-firmware/src/lib.rs deleted file mode 100644 index b4383cb6..00000000 --- a/cyw43-firmware/src/lib.rs +++ /dev/null @@ -1,349 +0,0 @@ -#![no_std] - -pub const BLUETOOTH_FIRMWARE_OFFSETS: [(u32, usize); 28] = [ - (0x1921e000, 66), - (0x1921f000, 251), - (0x1921f0fb, 251), - (0x1921f1f6, 251), - (0x1921f2f1, 251), - (0x1921f3ec, 251), - (0x1921f4e7, 251), - (0x1921f5e2, 251), - (0x1921f6dd, 251), - (0x1921f7d8, 251), - (0x1921f8d3, 251), - (0x1921f9ce, 251), - (0x1921fac9, 251), - (0x1921fbc4, 94), - (0x190d0200, 251), - (0x190d02fb, 251), - (0x190d03f6, 251), - (0x190d04f1, 251), - (0x190d05ec, 251), - (0x190d06e7, 251), - (0x190d07e2, 251), - (0x190d08dd, 251), - (0x190d09d8, 251), - (0x190d0ad3, 251), - (0x190d0bce, 251), - (0x190d0cc9, 11), - (0x192038d4, 4), - (0x19204164, 4), -]; - -pub const BLUETOOTH_FIRMWARE: [u8; 5952] = [ - 0x42, 0x52, 0x43, 0x4d, 0x63, 0x66, 0x67, 0x53, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x01, 0x01, 0x04, - 0x18, 0x92, 0x00, 0x00, 0x00, 0x03, 0x06, 0xac, 0x1f, 0x12, 0xa2, 0x43, 0x43, 0x00, 0x01, 0x1c, 0x00, 0xf0, 0x21, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x42, 0x52, 0x43, 0x4d, 0x63, 0x66, 0x67, 0x44, 0x00, 0x00, - 0x00, 0x00, 0xd2, 0x0b, 0x00, 0x00, 0x03, 0x03, 0x18, 0x53, 0x44, 0x49, 0x4f, 0x20, 0x33, 0x37, 0x5f, 0x34, 0x4d, - 0x20, 0x77, 0x6c, 0x62, 0x67, 0x61, 0x5f, 0x42, 0x55, 0x20, 0x52, 0x50, 0x49, 0x00, 0x16, 0x03, 0x02, 0x00, 0x00, - 0x02, 0x01, 0x90, 0x01, 0x08, 0x01, 0x32, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, - 0x00, 0xff, 0x0f, 0x00, 0x00, 0x62, 0x08, 0x00, 0x00, 0x70, 0x00, 0x64, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, - 0x00, 0x00, 0xac, 0x00, 0x32, 0x00, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x2f, 0x00, 0x64, 0x01, 0x60, 0x00, 0xff, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x01, 0x60, 0x00, 0xff, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x6c, 0x01, 0x60, 0x00, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x70, 0x01, 0x60, 0x00, 0xff, 0x00, 0x00, - 0x00, 0x11, 0x00, 0x00, 0x00, 0x74, 0x01, 0x60, 0x00, 0xff, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x78, 0x01, - 0x60, 0x00, 0xff, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x7c, 0x01, 0x60, 0x00, 0xff, 0x00, 0x00, 0x00, 0x1f, - 0x00, 0x00, 0x00, 0x84, 0x01, 0x60, 0x00, 0xff, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x04, 0x03, 0x0c, 0x20, - 0x01, 0x20, 0x00, 0x0f, 0x14, 0x1a, 0x66, 0x0a, 0x15, 0x00, 0x00, 0x05, 0x03, 0x15, 0x00, 0x1b, 0x78, 0x50, 0xff, - 0xff, 0x3f, 0x00, 0x05, 0x03, 0x1f, 0x64, 0xb0, 0xbd, 0x0a, 0x05, 0x00, 0xff, 0xff, 0x07, 0xbc, 0x09, 0x01, 0x04, - 0x02, 0x0f, 0x00, 0x00, 0x22, 0x03, 0x02, 0x01, 0x00, 0xf0, 0x01, 0x28, 0x04, 0x00, 0x00, 0x00, 0x20, 0x15, 0x32, - 0x00, 0xff, 0xff, 0xfa, 0xff, 0x01, 0x01, 0x06, 0x00, 0x28, 0x15, 0x32, 0x00, 0x00, 0x00, 0x7f, 0xfe, 0x34, 0x10, - 0x20, 0x02, 0x2c, 0x09, 0x64, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x28, 0x01, 0x00, - 0x00, 0x00, 0x20, 0x15, 0x32, 0x00, 0xff, 0xff, 0xfa, 0xff, 0x05, 0x01, 0x06, 0x06, 0x28, 0x15, 0x32, 0x00, 0x00, - 0x00, 0x7f, 0xfe, 0x34, 0x10, 0x20, 0x02, 0x2c, 0x09, 0x64, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0xf0, 0x01, 0x28, 0x02, 0x00, 0x00, 0x00, 0x20, 0x15, 0x32, 0x00, 0xff, 0xff, 0xfa, 0xff, 0x01, 0x01, 0x06, 0x00, - 0x28, 0x15, 0x32, 0x00, 0x00, 0x00, 0x7f, 0xfe, 0x34, 0x10, 0x20, 0x02, 0x2c, 0x09, 0x64, 0x00, 0x0e, 0x00, 0x00, - 0x00, 0x0e, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xa0, 0x01, 0x03, 0x00, 0x00, 0x00, 0x10, 0x15, 0x32, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0x00, 0x14, 0x15, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0x00, 0x18, - 0x15, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0x00, 0x1c, 0x15, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x4c, 0x4c, 0x00, 0x00, 0x20, 0x15, 0x32, 0x00, 0xff, 0xff, 0xfa, 0xff, 0x05, 0x01, 0x06, 0x06, 0x24, 0x15, 0x32, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x15, 0x32, 0x00, 0x00, 0x00, 0x7f, 0xfe, 0x34, 0x10, - 0x20, 0x02, 0x34, 0x15, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x15, 0x32, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x15, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0x06, 0x00, 0x00, - 0x2c, 0x09, 0x64, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x64, 0x00, 0x51, 0x00, 0x00, - 0x00, 0x10, 0x00, 0x00, 0x00, 0x78, 0x08, 0x64, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, - 0xb5, 0x03, 0x00, 0x06, 0x0a, 0x23, 0x3c, 0x5a, 0x6e, 0x7d, 0x05, 0x5c, 0x03, 0x3e, 0x03, 0x48, 0x03, 0x5c, 0x03, - 0x48, 0x03, 0x98, 0x03, 0x7a, 0x03, 0x84, 0x03, 0x98, 0x03, 0x84, 0x03, 0xd4, 0x03, 0xb6, 0x03, 0xc0, 0x03, 0xd4, - 0x03, 0xc0, 0x03, 0x1a, 0x04, 0xfc, 0x03, 0x06, 0x04, 0x1a, 0x04, 0x06, 0x04, 0x60, 0x04, 0x42, 0x04, 0x4c, 0x04, - 0x60, 0x04, 0x4c, 0x04, 0xa6, 0x04, 0x88, 0x04, 0x92, 0x04, 0xa6, 0x04, 0x92, 0x04, 0x14, 0xff, 0x14, 0xff, 0x14, - 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x44, 0x02, 0x30, 0x02, 0x26, 0x02, 0x12, 0x02, 0x1c, 0x02, 0x80, 0x02, - 0x6c, 0x02, 0x62, 0x02, 0x4e, 0x02, 0x58, 0x02, 0xbc, 0x02, 0xa8, 0x02, 0x9e, 0x02, 0x8a, 0x02, 0x94, 0x02, 0x02, - 0x03, 0xee, 0x02, 0xe4, 0x02, 0xd0, 0x02, 0xda, 0x02, 0x48, 0x03, 0x34, 0x03, 0x2a, 0x03, 0x16, 0x03, 0x20, 0x03, - 0x8e, 0x03, 0x7a, 0x03, 0x70, 0x03, 0x5c, 0x03, 0x66, 0x03, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, - 0xff, 0x14, 0xff, 0x06, 0x00, 0x00, 0x00, 0x60, 0x00, 0x05, 0x9c, 0x02, 0xff, 0xa0, 0x02, 0xff, 0xa4, 0x02, 0xff, - 0xa8, 0x02, 0xff, 0xac, 0x02, 0xff, 0x00, 0x00, 0x60, 0x00, 0x05, 0xc8, 0x02, 0xff, 0xcc, 0x02, 0xff, 0xd0, 0x02, - 0xff, 0xd4, 0x02, 0xff, 0xd8, 0x02, 0xff, 0x00, 0x00, 0x60, 0x00, 0x05, 0x88, 0x03, 0xff, 0x8c, 0x03, 0xff, 0x90, - 0x03, 0xff, 0x94, 0x03, 0xff, 0x98, 0x03, 0xff, 0x00, 0x00, 0x60, 0x00, 0x05, 0x9c, 0x03, 0xff, 0xa0, 0x03, 0xff, - 0xa4, 0x03, 0xff, 0xa8, 0x03, 0xff, 0xac, 0x03, 0xff, 0x00, 0x00, 0x60, 0x00, 0x05, 0x80, 0x03, 0xff, 0x84, 0x03, - 0xff, 0xa0, 0x06, 0xff, 0xb4, 0x02, 0xff, 0x38, 0x07, 0xff, 0x00, 0x00, 0x60, 0x00, 0x03, 0xa4, 0x06, 0xff, 0x5c, - 0x06, 0xff, 0x98, 0x06, 0xff, 0x45, 0x3d, 0x34, 0x2f, 0x2e, 0x38, 0x33, 0x2d, 0x2a, 0x27, 0x88, 0x86, 0x86, 0x86, - 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x18, 0x03, 0xfa, 0x65, 0x04, 0xcc, 0x4e, 0x4a, 0x3d, 0x39, 0x37, - 0x40, 0x3a, 0x33, 0x2e, 0x2d, 0x88, 0x86, 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x1a, 0x03, - 0xfa, 0x66, 0x04, 0xcc, 0x5f, 0x58, 0x4d, 0x47, 0x43, 0x4b, 0x45, 0x3d, 0x37, 0x35, 0x88, 0x86, 0x86, 0x86, 0x85, - 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x1f, 0x03, 0xfa, 0x66, 0x04, 0xcc, 0x6d, 0x6a, 0x59, 0x53, 0x52, 0x57, - 0x51, 0x47, 0x40, 0x3e, 0x88, 0x86, 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x1f, 0x03, 0xfa, - 0x66, 0x04, 0xcc, 0x80, 0x79, 0x68, 0x60, 0x5d, 0x61, 0x5a, 0x50, 0x48, 0x46, 0x88, 0x86, 0x86, 0x86, 0x85, 0xa8, - 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x1f, 0x03, 0xfa, 0x67, 0x04, 0xcc, 0x90, 0x8a, 0x78, 0x6f, 0x6b, 0x6f, 0x65, - 0x59, 0x51, 0x4f, 0x88, 0x86, 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x1f, 0x03, 0xfa, 0x67, - 0x24, 0xff, 0x01, 0x07, 0xb5, 0x03, 0x04, 0x06, 0x0a, 0x23, 0x3c, 0x5a, 0x6e, 0x7d, 0x05, 0x5c, 0x03, 0x3e, 0x03, - 0x48, 0x03, 0x5c, 0x03, 0x48, 0x03, 0x98, 0x03, 0x7a, 0x03, 0x84, 0x03, 0x98, 0x03, 0x84, 0x03, 0xd4, 0x03, 0xb6, - 0x03, 0xc0, 0x03, 0xd4, 0x03, 0xc0, 0x03, 0x1a, 0x04, 0xfc, 0x03, 0x06, 0x04, 0x1a, 0x04, 0x06, 0x04, 0x60, 0x04, - 0x42, 0x04, 0x4c, 0x04, 0x60, 0x04, 0x4c, 0x04, 0xa6, 0x04, 0x88, 0x04, 0x92, 0x04, 0xa6, 0x04, 0x92, 0x04, 0x14, - 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x44, 0x02, 0x30, 0x02, 0x26, 0x02, 0x12, 0x02, - 0x1c, 0x02, 0x80, 0x02, 0x6c, 0x02, 0x62, 0x02, 0x4e, 0x02, 0x58, 0x02, 0xbc, 0x02, 0xa8, 0x02, 0x9e, 0x02, 0x8a, - 0x02, 0x94, 0x02, 0x02, 0x03, 0xee, 0x02, 0xe4, 0x02, 0xd0, 0x02, 0xda, 0x02, 0x48, 0x03, 0x34, 0x03, 0x2a, 0x03, - 0x16, 0x03, 0x20, 0x03, 0x8e, 0x03, 0x7a, 0x03, 0x70, 0x03, 0x5c, 0x03, 0x66, 0x03, 0x14, 0xff, 0x14, 0xff, 0x14, - 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x06, 0x00, 0x00, 0x00, 0x60, 0x00, 0x05, 0x9c, 0x02, 0xff, 0xa0, 0x02, - 0xff, 0xa4, 0x02, 0xff, 0xa8, 0x02, 0xff, 0xac, 0x02, 0xff, 0x00, 0x00, 0x60, 0x00, 0x05, 0xc8, 0x02, 0xff, 0xcc, - 0x02, 0xff, 0xd0, 0x02, 0xff, 0xd4, 0x02, 0xff, 0xd8, 0x02, 0xff, 0x00, 0x00, 0x60, 0x00, 0x05, 0x88, 0x03, 0xff, - 0x8c, 0x03, 0xff, 0x90, 0x03, 0xff, 0x94, 0x03, 0xff, 0x98, 0x03, 0xff, 0x00, 0x00, 0x60, 0x00, 0x05, 0x9c, 0x03, - 0xff, 0xa0, 0x03, 0xff, 0xa4, 0x03, 0xff, 0xa8, 0x03, 0xff, 0xac, 0x03, 0xff, 0x00, 0x00, 0x60, 0x00, 0x05, 0x80, - 0x03, 0xff, 0x84, 0x03, 0xff, 0xa0, 0x06, 0xff, 0xb4, 0x02, 0xff, 0x38, 0x07, 0xff, 0x00, 0x00, 0x60, 0x00, 0x03, - 0xa4, 0x06, 0xff, 0x5c, 0x06, 0xff, 0x98, 0x06, 0xff, 0x45, 0x3d, 0x34, 0x2f, 0x2e, 0x38, 0x33, 0x2d, 0x2a, 0x27, - 0x88, 0x86, 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x18, 0x03, 0xfa, 0x65, 0x04, 0xcc, 0x4e, - 0x4a, 0x3d, 0x39, 0x37, 0x40, 0x3a, 0x33, 0x2e, 0x2d, 0x88, 0x86, 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, - 0xa4, 0xf4, 0x1a, 0x03, 0xfa, 0x66, 0x04, 0xcc, 0x5f, 0x58, 0x4d, 0x47, 0x43, 0x4b, 0x45, 0x3d, 0x37, 0x35, 0x88, - 0x86, 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x1f, 0x03, 0xfa, 0x66, 0x04, 0xcc, 0x6d, 0x6a, - 0x59, 0x53, 0x52, 0x57, 0x51, 0x47, 0x40, 0x3e, 0x88, 0x86, 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, - 0xf4, 0x1f, 0x03, 0xfa, 0x66, 0x04, 0xcc, 0x80, 0x79, 0x68, 0x60, 0x5d, 0x61, 0x5a, 0x50, 0x48, 0x46, 0x88, 0x86, - 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, 0x1f, 0x03, 0xfa, 0x67, 0x04, 0xcc, 0x90, 0x8a, 0x78, - 0x6f, 0x6b, 0x6f, 0x65, 0x59, 0x51, 0x4f, 0x88, 0x86, 0x86, 0x86, 0x85, 0xa8, 0xa6, 0xa6, 0xa6, 0xa4, 0xa4, 0xf4, - 0x1f, 0x03, 0xfa, 0x67, 0x24, 0xff, 0x02, 0x07, 0x7f, 0x00, 0x06, 0x05, 0x5c, 0x03, 0x3e, 0x03, 0x48, 0x03, 0x5c, - 0x03, 0x48, 0x03, 0x98, 0x03, 0x7a, 0x03, 0x84, 0x03, 0x98, 0x03, 0x84, 0x03, 0xd4, 0x03, 0xb6, 0x03, 0xc0, 0x03, - 0xd4, 0x03, 0xc0, 0x03, 0x1a, 0x04, 0xfc, 0x03, 0x06, 0x04, 0x1a, 0x04, 0x06, 0x04, 0x60, 0x04, 0x42, 0x04, 0x4c, - 0x04, 0x60, 0x04, 0x4c, 0x04, 0xa6, 0x04, 0x88, 0x04, 0x92, 0x04, 0xa6, 0x04, 0x92, 0x04, 0x14, 0xff, 0x14, 0xff, - 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x01, 0x00, 0x00, 0x00, 0x60, 0x00, 0x05, 0x9c, 0x02, 0xff, 0xa0, - 0x02, 0xff, 0xa4, 0x02, 0xff, 0xa8, 0x02, 0xff, 0xac, 0x02, 0xff, 0x45, 0x3d, 0x34, 0x2f, 0x2e, 0x4e, 0x4a, 0x3d, - 0x39, 0x37, 0x5f, 0x58, 0x4d, 0x47, 0x43, 0x6d, 0x6a, 0x59, 0x53, 0x52, 0x80, 0x79, 0x68, 0x60, 0x5d, 0x90, 0x8a, - 0x78, 0x6f, 0x6b, 0x02, 0x07, 0x7f, 0x04, 0x06, 0x05, 0x5c, 0x03, 0x3e, 0x03, 0x48, 0x03, 0x5c, 0x03, 0x48, 0x03, - 0x98, 0x03, 0x7a, 0x03, 0x84, 0x03, 0x98, 0x03, 0x84, 0x03, 0xd4, 0x03, 0xb6, 0x03, 0xc0, 0x03, 0xd4, 0x03, 0xc0, - 0x03, 0x1a, 0x04, 0xfc, 0x03, 0x06, 0x04, 0x1a, 0x04, 0x06, 0x04, 0x60, 0x04, 0x42, 0x04, 0x4c, 0x04, 0x60, 0x04, - 0x4c, 0x04, 0xa6, 0x04, 0x88, 0x04, 0x92, 0x04, 0xa6, 0x04, 0x92, 0x04, 0x14, 0xff, 0x14, 0xff, 0x14, 0xff, 0x14, - 0xff, 0x14, 0xff, 0x14, 0xff, 0x01, 0x00, 0x00, 0x00, 0x60, 0x00, 0x05, 0x9c, 0x02, 0xff, 0xa0, 0x02, 0xff, 0xa4, - 0x02, 0xff, 0xa8, 0x02, 0xff, 0xac, 0x02, 0xff, 0x45, 0x3d, 0x34, 0x2f, 0x2e, 0x4e, 0x4a, 0x3d, 0x39, 0x37, 0x5f, - 0x58, 0x4d, 0x47, 0x43, 0x6d, 0x6a, 0x59, 0x53, 0x52, 0x80, 0x79, 0x68, 0x60, 0x5d, 0x90, 0x8a, 0x78, 0x6f, 0x6b, - 0x00, 0x07, 0x04, 0x3f, 0x00, 0x00, 0x00, 0x04, 0x07, 0x98, 0x01, 0x00, 0x32, 0x1f, 0x00, 0x00, 0x1d, 0x00, 0x00, - 0x1c, 0x01, 0x00, 0x1a, 0x02, 0x00, 0x17, 0x02, 0x00, 0x15, 0x12, 0x00, 0x13, 0x55, 0x00, 0x11, 0x64, 0x00, 0x0f, - 0x11, 0x00, 0x0e, 0x03, 0x00, 0x0d, 0x14, 0x00, 0x0b, 0x50, 0x00, 0x0a, 0x64, 0x00, 0x09, 0x23, 0x00, 0x08, 0x23, - 0x00, 0x07, 0x03, 0x00, 0x07, 0x16, 0x00, 0x06, 0x15, 0x00, 0x05, 0x13, 0x00, 0x05, 0x16, 0x00, 0x04, 0x13, 0x00, - 0x04, 0x26, 0x00, 0x04, 0x19, 0x00, 0x03, 0x05, 0x00, 0x03, 0x08, 0x00, 0x03, 0x2a, 0x00, 0x02, 0x03, 0x00, 0x02, - 0x16, 0x00, 0x02, 0x09, 0x00, 0x02, 0x2b, 0x00, 0x02, 0x3d, 0x00, 0x02, 0x3f, 0x00, 0x01, 0x02, 0x00, 0x01, 0x15, - 0x00, 0x01, 0x18, 0x00, 0x01, 0x3a, 0x00, 0x01, 0x1d, 0x00, 0x01, 0x1f, 0x00, 0x01, 0x8f, 0x00, 0x01, 0xef, 0x00, - 0x01, 0x3f, 0x01, 0x01, 0x8f, 0x01, 0x01, 0xcf, 0x01, 0x01, 0x0f, 0x02, 0x01, 0x4f, 0x02, 0x01, 0x7f, 0x02, 0x01, - 0xaf, 0x02, 0x01, 0xcf, 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x07, 0x2a, 0x01, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x00, 0x00, 0x14, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x02, 0xfe, 0x0b, 0xe4, 0xfe, - 0x1c, 0x01, 0xe4, 0xfe, 0x1c, 0x01, 0x0a, 0x02, 0xfe, 0x0b, 0xf1, 0xff, 0x0f, 0x00, 0xf1, 0xff, 0x0f, 0x00, 0x05, - 0x07, 0x24, 0x00, 0x01, 0x08, 0x08, 0x0c, 0x00, 0x08, 0x01, 0x04, 0x02, 0x00, 0x03, 0xfc, 0x04, 0xf8, 0x05, 0xf4, - 0x06, 0xf0, 0x07, 0x0c, 0x00, 0x08, 0x01, 0x04, 0x02, 0x00, 0x03, 0xfc, 0x04, 0xf8, 0x05, 0xf4, 0x06, 0xf0, 0x07, - 0x0f, 0x03, 0x28, 0x02, 0x78, 0x14, 0x7f, 0x5a, 0x00, 0x14, 0x02, 0x14, 0x1e, 0x00, 0x02, 0x03, 0x00, 0x1e, 0xaa, - 0x33, 0x19, 0x05, 0xcf, 0x00, 0x80, 0x0a, 0x92, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x08, 0xd0, 0x38, 0x20, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x01, 0xb8, - 0x01, 0xac, 0x9b, 0x20, 0x00, 0x20, 0x15, 0x32, 0x00, 0xff, 0xff, 0xfa, 0xff, 0x01, 0x01, 0x06, 0x00, 0x28, 0x15, - 0x32, 0x00, 0x00, 0x00, 0x7f, 0xfe, 0x34, 0x10, 0x20, 0x02, 0x2c, 0x09, 0x64, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e, - 0x00, 0x00, 0x00, 0x20, 0x15, 0x32, 0x00, 0xff, 0xff, 0xfa, 0xff, 0x05, 0x01, 0x06, 0x06, 0xf8, 0x00, 0x64, 0x00, - 0x51, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x78, 0x08, 0x64, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x15, 0x32, 0x00, 0x00, 0x00, 0x7f, 0xfe, 0x34, 0x10, 0x20, 0x02, 0x2c, 0x09, 0x64, 0x00, 0x0e, 0x00, - 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x20, 0x15, 0x32, 0x00, 0xff, 0xff, 0xfa, 0xff, 0x01, 0x01, 0x06, 0x00, 0xf8, - 0x00, 0x64, 0x00, 0x51, 0x00, 0x00, 0x00, 0xd3, 0x00, 0x00, 0x00, 0x78, 0x08, 0x64, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x28, 0x15, 0x32, 0x00, 0x00, 0x00, 0x7f, 0xfe, 0x34, 0x10, 0x20, 0x02, 0x2c, 0x09, 0x64, - 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x07, 0x0a, 0x0d, 0x00, 0x07, 0x00, 0x0a, 0x00, 0x07, 0x0b, - 0x0d, 0x00, 0x04, 0x00, 0x08, 0x00, 0x2b, 0x0b, 0x0d, 0x00, 0x00, 0x00, 0x06, 0x00, 0x03, 0x01, 0x5c, 0xc4, 0x9c, - 0x20, 0x00, 0x70, 0xb5, 0x00, 0x24, 0x12, 0x4d, 0x20, 0xe0, 0x12, 0x48, 0x02, 0x19, 0x11, 0x68, 0x21, 0xf0, 0x7f, - 0x40, 0x09, 0x0e, 0x0a, 0xd0, 0x01, 0x29, 0x0b, 0xd0, 0x02, 0x29, 0x09, 0xd0, 0x03, 0x29, 0x0b, 0xd0, 0x04, 0x29, - 0x09, 0xd0, 0x05, 0x29, 0x0b, 0xd0, 0x0d, 0xe0, 0x51, 0x68, 0x01, 0x60, 0x0a, 0xe0, 0x51, 0x68, 0xfa, 0xf5, 0xbb, - 0xfe, 0x06, 0xe0, 0x51, 0x68, 0xfa, 0xf5, 0xcb, 0xfe, 0x02, 0xe0, 0x51, 0x68, 0xfa, 0xf5, 0xd1, 0xfe, 0x08, 0x34, - 0xac, 0x42, 0xdc, 0xd3, 0x70, 0xbd, 0x98, 0x00, 0x00, 0x00, 0x1c, 0x9d, 0x20, 0x00, 0x03, 0x01, 0x9c, 0x01, 0x1c, - 0x9d, 0x20, 0x00, 0x14, 0x8d, 0x00, 0x04, 0x5b, 0x49, 0x1f, 0x22, 0xec, 0x12, 0x07, 0x02, 0x01, 0x02, 0x0d, 0x00, - 0x79, 0x2d, 0x07, 0x01, 0xed, 0x03, 0x0d, 0x00, 0x8d, 0xb5, 0x04, 0x01, 0x19, 0x05, 0x0d, 0x00, 0xd5, 0x43, 0x04, - 0x02, 0x11, 0x02, 0x0d, 0x00, 0x2d, 0x65, 0x04, 0x02, 0x19, 0x02, 0x0d, 0x00, 0xed, 0xa2, 0x04, 0x02, 0x35, 0x02, - 0x0d, 0x00, 0xf1, 0x82, 0x06, 0x01, 0x1d, 0x06, 0x0d, 0x00, 0x95, 0x99, 0x06, 0x02, 0x49, 0x02, 0x0d, 0x00, 0xd1, - 0x6e, 0x03, 0x02, 0x69, 0x02, 0x0d, 0x00, 0xe5, 0x75, 0x03, 0x02, 0x8b, 0x02, 0x0d, 0x00, 0x11, 0x5b, 0x02, 0x02, - 0xa5, 0x02, 0x0d, 0x00, 0xb9, 0xe7, 0x00, 0x01, 0x81, 0x09, 0x0d, 0x00, 0x71, 0x20, 0x01, 0x01, 0xcd, 0x09, 0x0d, - 0x00, 0xd5, 0x7f, 0x03, 0x02, 0xb9, 0x02, 0x0d, 0x00, 0x19, 0x19, 0x05, 0x01, 0x11, 0x0c, 0x0d, 0x00, 0xb1, 0xb4, - 0x00, 0x02, 0xc5, 0x02, 0x0d, 0x00, 0xb5, 0xfc, 0x05, 0x02, 0xcd, 0x02, 0x0d, 0x00, 0xb9, 0x2f, 0x00, 0x02, 0xd9, - 0x02, 0x0d, 0x00, 0x33, 0x01, 0x28, 0xec, 0x05, 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, 0xf0, 0x51, 0x27, 0x79, 0x05, - 0xf3, 0xad, 0xc9, 0x9e, 0x95, 0x21, 0x49, 0x46, 0x91, 0xf1, 0x4b, 0x0c, 0xf3, 0x81, 0x88, 0xb3, 0x4a, 0x37, 0xf3, - 0x7a, 0xae, 0xba, 0x58, 0xe0, 0xd0, 0xe0, 0x37, 0x33, 0x01, 0x28, 0xd8, 0x09, 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, - 0x75, 0xa0, 0xe4, 0xf5, 0xa2, 0x38, 0x0e, 0x0e, 0xa1, 0x0c, 0x4e, 0x46, 0x3a, 0x2a, 0x1a, 0x33, 0xfa, 0xa6, 0x79, - 0x72, 0xe5, 0xf4, 0xd1, 0xf3, 0xe3, 0xe1, 0xfb, 0x91, 0x9f, 0x12, 0x0f, 0x34, 0x33, 0x01, 0x28, 0xd4, 0x38, 0x20, - 0x00, 0x04, 0x00, 0x00, 0x00, 0x39, 0x5b, 0xd0, 0x9e, 0xa6, 0xbc, 0x73, 0x55, 0x7c, 0x30, 0xf3, 0xe0, 0x4f, 0x2c, - 0x82, 0xca, 0x5e, 0x7b, 0xdf, 0xc7, 0x3e, 0x23, 0xec, 0xb1, 0xd2, 0x18, 0xe7, 0xf6, 0x80, 0x0f, 0x1b, 0xbb, 0x33, - 0x01, 0x28, 0xe7, 0x06, 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, 0x92, 0x75, 0x5a, 0xa1, 0x29, 0xac, 0x61, 0xb5, 0x71, - 0x8e, 0x3f, 0xf3, 0xb0, 0xd6, 0x11, 0x3e, 0x7d, 0xf6, 0x87, 0x34, 0xc4, 0x0a, 0xa3, 0x31, 0x2d, 0x72, 0x8f, 0xb9, - 0x45, 0xaf, 0x8c, 0xab, 0x33, 0x01, 0x28, 0xf1, 0x04, 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, 0xd8, 0xf9, 0x29, 0x36, - 0x16, 0xeb, 0x48, 0x9d, 0x58, 0x51, 0xce, 0xbd, 0x2b, 0x42, 0x74, 0x02, 0xfe, 0x62, 0x7d, 0xfe, 0x04, 0x46, 0x8d, - 0x7c, 0x59, 0x9b, 0xd5, 0xbc, 0x35, 0x5b, 0x0b, 0x0a, 0x33, 0x01, 0x28, 0xdd, 0x08, 0x0d, 0x00, 0xfb, 0x00, 0x00, - 0x00, 0x7f, 0xbf, 0xbe, 0xe3, 0x5c, 0x8f, 0xd5, 0x66, 0xa2, 0x17, 0x80, 0xa4, 0x35, 0x1a, 0x04, 0xb2, 0x80, 0xbd, - 0xda, 0x72, 0x5e, 0xff, 0x68, 0x68, 0xd7, 0x45, 0xf3, 0x14, 0xf4, 0x0d, 0x7b, 0xab, 0x33, 0x01, 0x28, 0xfb, 0x02, - 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, 0x96, 0x0b, 0xfc, 0x2b, 0xc2, 0xaf, 0x3b, 0xa0, 0x85, 0x51, 0x68, 0xfc, 0xb1, - 0xc2, 0x11, 0x29, 0x0a, 0xd5, 0x8d, 0x3b, 0xb2, 0x97, 0x3e, 0xc5, 0x06, 0x3f, 0xc6, 0xc1, 0xb0, 0xd4, 0xae, 0x2b, - 0x33, 0x01, 0x28, 0xf6, 0x03, 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, 0x32, 0xf8, 0xe5, 0x50, 0x49, 0x57, 0xf7, 0x31, - 0x4a, 0x66, 0x06, 0xf5, 0x93, 0x29, 0x96, 0x5e, 0x3e, 0x63, 0x1f, 0x49, 0xe3, 0x00, 0xe0, 0x14, 0xfd, 0xe6, 0x75, - 0xf2, 0x60, 0x73, 0x15, 0xa7, 0x33, 0x01, 0x28, 0xc9, 0x0c, 0x0d, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x54, 0xe1, 0x87, - 0x64, 0x1b, 0x57, 0xae, 0x79, 0x2a, 0x8b, 0x78, 0x49, 0x11, 0xea, 0x5a, 0x65, 0x22, 0x77, 0xcd, 0xd1, 0xf8, 0xc9, - 0x26, 0x89, 0xa6, 0x72, 0x47, 0x97, 0xbc, 0x01, 0x3a, 0x84, 0x33, 0x01, 0x28, 0xd3, 0x0a, 0x0d, 0x00, 0xfb, 0x00, - 0x00, 0x00, 0x25, 0xd5, 0xcc, 0x2e, 0x8c, 0x15, 0x52, 0x18, 0xd9, 0x28, 0x48, 0xc4, 0x7c, 0x13, 0x37, 0xc9, 0xce, - 0xb9, 0x48, 0xce, 0xa1, 0x13, 0x91, 0xb8, 0x2c, 0x48, 0xf4, 0x3f, 0x1c, 0xa5, 0xc7, 0x6a, 0x33, 0x01, 0x28, 0xe2, - 0x07, 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, 0xd2, 0x1f, 0xc7, 0xc1, 0xc8, 0xb0, 0xec, 0x89, 0x53, 0xf4, 0x00, 0xb0, - 0x2d, 0xb3, 0xde, 0x20, 0xec, 0x00, 0xb0, 0x5d, 0x31, 0x2d, 0xf2, 0x44, 0x60, 0x60, 0xbc, 0xb9, 0xcc, 0x56, 0x28, - 0xda, 0x33, 0x01, 0x28, 0xce, 0x0b, 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, 0x55, 0xd8, 0x9d, 0x78, 0x0d, 0x01, 0xf7, - 0xb8, 0x06, 0x17, 0xfb, 0x48, 0x10, 0x73, 0x1d, 0x3c, 0x11, 0x4e, 0xca, 0x7c, 0x1b, 0xf2, 0x6e, 0x7b, 0x19, 0xd2, - 0xac, 0x2b, 0x82, 0x6e, 0xdf, 0xdb, 0x33, 0x01, 0x28, 0x00, 0x02, 0x0d, 0x00, 0xfb, 0x00, 0x00, 0x00, 0xdb, 0xf7, - 0xd4, 0x05, 0xa2, 0x6d, 0xbb, 0xe6, 0x77, 0x99, 0xe8, 0x3c, 0x47, 0x5d, 0xa0, 0x92, 0xec, 0x5c, 0x79, 0x14, 0xc9, - 0x00, 0x63, 0x39, 0x0f, 0x7d, 0xce, 0x70, 0xe6, 0x72, 0xae, 0x32, 0x33, 0x01, 0x28, 0x64, 0x41, 0x20, 0x00, 0x04, - 0x00, 0x00, 0x00, 0x7e, 0x38, 0x53, 0x55, 0x65, 0x0e, 0x34, 0x52, 0x01, 0x7e, 0x2a, 0x8e, 0xe6, 0x00, 0x92, 0x2f, - 0x38, 0xde, 0x3a, 0xbc, 0x00, 0x96, 0xc7, 0x41, 0x4a, 0x04, 0x81, 0x57, 0x9a, 0x22, 0xa5, 0xee, 0x06, 0x01, 0x04, - 0x21, 0x03, 0x0d, 0x00, 0x13, 0x01, 0x01, 0x09, 0xfe, 0x00, 0x00, 0x91, 0xa9, 0x9e, 0xe2, 0xeb, 0x29, 0x32, 0xb3, - 0xeb, 0x6d, 0x6e, 0x60, 0x43, 0x73, 0xd1, 0xa8, 0x43, 0xda, 0x86, 0x44, 0x03, 0x3e, 0x85, 0x4a, 0x6f, 0xbf, 0x8c, - 0x0e, 0xcf, 0xbc, 0x23, 0xe5, 0xb7, 0x93, 0xbe, 0x83, 0x4f, 0x7b, 0xd9, 0x81, 0x65, 0x74, 0xdc, 0xfa, 0x97, 0x51, - 0x30, 0x45, 0x91, 0xde, 0xc2, 0xee, 0xd2, 0x0f, 0xd0, 0xfe, 0x98, 0x74, 0xe9, 0xaf, 0x85, 0x69, 0xce, 0x0c, 0x4a, - 0xf7, 0xf1, 0xff, 0x20, 0x46, 0x00, 0xf0, 0xdf, 0xf8, 0xa1, 0xf7, 0x67, 0xb8, 0x00, 0x00, 0xbd, 0xe8, 0x10, 0x40, - 0x00, 0xf0, 0xa2, 0xb9, 0x10, 0x28, 0x09, 0xd8, 0x04, 0xf1, 0x0c, 0x00, 0x00, 0xf0, 0xe4, 0xf9, 0x20, 0xb1, 0x94, - 0xf8, 0xe0, 0x00, 0x01, 0x21, 0x76, 0xf7, 0x86, 0xb9, 0x76, 0xf7, 0x7e, 0xb9, 0xc0, 0xb2, 0x8d, 0xf8, 0x03, 0x01, - 0x25, 0x28, 0x3a, 0xf6, 0x82, 0xa0, 0x0a, 0x30, 0x7a, 0xf7, 0x57, 0xb8, 0x00, 0x00, 0x08, 0xd0, 0x20, 0x46, 0x00, - 0xf0, 0x0e, 0xfb, 0x00, 0x28, 0x05, 0xd0, 0x03, 0x4d, 0x00, 0xbf, 0x99, 0xf7, 0x9e, 0xbb, 0x99, 0xf7, 0xea, 0xbb, - 0x99, 0xf7, 0xe3, 0xbb, 0xb8, 0x58, 0x20, 0x00, 0x81, 0x43, 0x0a, 0xd1, 0x03, 0xb4, 0x30, 0x46, 0x49, 0x46, 0x22, - 0x46, 0x00, 0xf0, 0x0a, 0xfb, 0x00, 0x28, 0x03, 0xbc, 0x03, 0xd0, 0x66, 0xf7, 0x98, 0xbe, 0x66, 0xf7, 0x27, 0xbe, - 0x66, 0xf7, 0x83, 0xbe, 0x28, 0x46, 0x31, 0x46, 0x00, 0xf0, 0x1e, 0xfb, 0x18, 0xb1, 0x02, 0x48, 0xc0, 0x7c, 0x67, - 0xf7, 0xa6, 0xb9, 0x67, 0xf7, 0xb7, 0xb9, 0x60, 0x44, 0x20, 0x00, 0x34, 0xb1, 0x00, 0xf0, 0x43, 0xfb, 0x18, 0xb1, - 0x97, 0xf8, 0xcb, 0x10, 0x55, 0xf7, 0x31, 0xbc, 0x55, 0xf7, 0x35, 0xbc, 0x00, 0x20, 0x02, 0x90, 0xa8, 0x68, 0x00, - 0x90, 0x67, 0xf7, 0x8a, 0xbe, 0xbd, 0xe8, 0x70, 0x40, 0x00, 0xf0, 0xbc, 0xbc, 0x06, 0x46, 0xe8, 0x19, 0x14, 0xf1, - 0x08, 0x02, 0x8f, 0xf7, 0xf1, 0xbc, 0x08, 0x60, 0x00, 0xf0, 0xf5, 0xfc, 0xbd, 0xe8, 0x10, 0x40, 0x35, 0xf7, 0x8b, - 0xbb, 0x00, 0x00, 0x01, 0x28, 0x02, 0xd0, 0x04, 0x28, 0x12, 0xd0, 0x14, 0xe0, 0x15, 0x48, 0x13, 0x49, 0x00, 0x68, - 0x40, 0xf8, 0x0c, 0x1f, 0x24, 0x31, 0x41, 0x60, 0x3c, 0x31, 0x81, 0x60, 0x09, 0x21, 0x01, 0x75, 0x0f, 0x21, 0x41, - 0x75, 0x81, 0x75, 0x41, 0xf2, 0x88, 0x30, 0x0e, 0x49, 0x01, 0xe0, 0x0e, 0x48, 0x0e, 0x49, 0x08, 0x60, 0x00, 0x20, - 0x70, 0x47, 0x10, 0xb5, 0x0d, 0x48, 0x0d, 0x49, 0xb1, 0xf7, 0x20, 0xff, 0x0e, 0x49, 0x0c, 0x48, 0x08, 0x60, 0x39, - 0xf1, 0xc8, 0xfc, 0xaf, 0xf2, 0x4f, 0x00, 0x0b, 0x49, 0x08, 0x60, 0x0b, 0x49, 0x0a, 0x20, 0x08, 0x70, 0x10, 0xbd, - 0xac, 0x9b, 0x20, 0x00, 0x20, 0x22, 0x20, 0x00, 0x48, 0x1f, 0x20, 0x00, 0x71, 0x03, 0x0d, 0x00, 0x34, 0x3a, 0x20, - 0x00, 0x60, 0x9c, 0x20, 0x00, 0x64, 0x00, 0x00, 0x00, 0xb4, 0x9d, 0x20, 0x00, 0x64, 0x05, 0x20, 0x00, 0x94, 0x3c, - 0x20, 0x00, 0x25, 0x2b, 0x20, 0x00, 0x30, 0xb4, 0x00, 0x24, 0x0c, 0x60, 0x05, 0x2b, 0x1e, 0xdd, 0x06, 0x2b, 0x1c, - 0xd0, 0x08, 0x2b, 0x1a, 0xd0, 0x3f, 0x2b, 0x18, 0xd1, 0x0f, 0x4c, 0x19, 0x2a, 0x06, 0xd0, 0x1a, 0x2a, 0x08, 0xd0, - 0xa2, 0xf5, 0x80, 0x75, 0x8b, 0x3d, 0x0f, 0xd1, 0x07, 0xe0, 0x25, 0x68, 0x0d, 0x60, 0x64, 0x68, 0x06, 0xe0, 0xa5, - 0x68, 0x0d, 0x60, 0xe4, 0x68, 0x02, 0xe0, 0x25, 0x69, 0x0d, 0x60, 0x64, 0x69, 0x4c, 0x60, 0x0c, 0x68, 0x00, 0x2c, - 0x02, 0xd1, 0x30, 0xbc, 0x9c, 0xf7, 0x64, 0xbe, 0x30, 0xbc, 0x70, 0x47, 0x00, 0x00, 0x48, 0x9c, 0x20, 0x00, 0x38, - 0xb5, 0x04, 0x46, 0xc0, 0x69, 0x00, 0x22, 0x41, 0x79, 0x00, 0x79, 0x74, 0xf7, 0x7f, 0xf8, 0x00, 0x21, 0x00, 0x91, - 0xe1, 0x69, 0x00, 0x23, 0x0a, 0x68, 0x01, 0x46, 0x18, 0x46, 0x74, 0xf7, 0x74, 0xfd, 0x38, 0xbd, 0x2d, 0xe9, 0xf0, - 0x41, 0x06, 0x46, 0x7d, 0xf7, 0xf0, 0xfa, 0x04, 0x00, 0x7d, 0xd0, 0x94, 0xf8, 0x3c, 0x00, 0xc0, 0x07, 0x7e, 0xd0, - 0x40, 0x48, 0x00, 0x68, 0x80, 0x02, 0x1a, 0xd5, 0x04, 0xf1, 0x5c, 0x00, 0x94, 0xf8, 0x62, 0x10, 0x00, 0x22, 0x05, - 0x46, 0xa6, 0xf7, 0x9d, 0xf8, 0xff, 0x28, 0x03, 0xd0, 0x00, 0x21, 0xa6, 0xf7, 0x72, 0xf8, 0x0c, 0xe0, 0x94, 0xf8, - 0x62, 0x10, 0x28, 0x46, 0x74, 0xf7, 0x45, 0xfa, 0x30, 0xb1, 0x28, 0x46, 0x80, 0xf7, 0x8d, 0xfa, 0x10, 0xb1, 0xc0, - 0x79, 0xff, 0x28, 0xee, 0xd1, 0x94, 0xf8, 0x62, 0x10, 0x22, 0x46, 0x04, 0xf1, 0x5c, 0x00, 0x7d, 0xf7, 0x0d, 0xfb, - 0x05, 0x00, 0x0e, 0xd0, 0x68, 0x8f, 0x60, 0xb1, 0x34, 0xf7, 0xca, 0xf8, 0x07, 0x46, 0x15, 0xf8, 0xe2, 0x0f, 0x78, - 0xf7, 0x37, 0xfb, 0x38, 0x46, 0x34, 0xf7, 0xc6, 0xf8, 0x28, 0x78, 0xa2, 0xf7, 0xa2, 0xfb, 0x30, 0x46, 0x7d, 0xf7, - 0xd0, 0xfc, 0x30, 0x46, 0xa1, 0xf7, 0x31, 0xfa, 0x01, 0x20, 0x60, 0x87, 0x21, 0x48, 0x00, 0x78, 0x28, 0xb1, 0x4f, - 0xf4, 0x46, 0x10, 0xc1, 0x69, 0x41, 0xf0, 0x80, 0x51, 0xc1, 0x61, 0x20, 0x46, 0x76, 0xf7, 0xf7, 0xfe, 0x1c, 0x48, - 0x44, 0xf2, 0x10, 0x01, 0x00, 0x68, 0x08, 0x42, 0x26, 0xd1, 0x94, 0xf8, 0xe1, 0x00, 0x38, 0xb1, 0x30, 0x46, 0x7b, - 0xf7, 0x29, 0xf9, 0x38, 0xb1, 0x00, 0x21, 0x7b, 0xf7, 0xd9, 0xf9, 0x07, 0xe0, 0x00, 0x20, 0xa2, 0xf7, 0x28, 0xfe, - 0x03, 0xe0, 0x20, 0x21, 0x04, 0x20, 0x3f, 0xf7, 0x5a, 0xfe, 0x00, 0x21, 0x30, 0x46, 0xa2, 0xf7, 0xf4, 0xf8, 0x94, - 0xf8, 0xe1, 0x00, 0x01, 0x28, 0x0b, 0xd1, 0x0d, 0x48, 0x00, 0x78, 0x01, 0x28, 0x07, 0xd1, 0x0c, 0x48, 0x00, 0x78, - 0x01, 0x28, 0x03, 0xd1, 0x00, 0x21, 0x30, 0x46, 0x72, 0xf7, 0xb2, 0xf9, 0x20, 0x46, 0x00, 0xe0, 0x03, 0xe0, 0xbd, - 0xe8, 0xf0, 0x41, 0xa2, 0xf7, 0x38, 0xbb, 0xbd, 0xe8, 0xf0, 0x81, 0xfc, 0x2f, 0x20, 0x00, 0x9f, 0x2f, 0x20, 0x00, - 0x48, 0x31, 0x20, 0x00, 0x2c, 0x30, 0x20, 0x00, 0x34, 0x30, 0x20, 0x00, 0x10, 0xb5, 0x0f, 0x4c, 0x20, 0x68, 0x7b, - 0xf7, 0x33, 0xf8, 0x02, 0x28, 0x11, 0xd0, 0x20, 0x68, 0x7b, 0xf7, 0x2e, 0xf8, 0x03, 0x28, 0x0c, 0xd0, 0x00, 0x20, - 0x21, 0x68, 0x48, 0x61, 0x4f, 0xf4, 0x46, 0x10, 0xc1, 0x69, 0x21, 0xf0, 0x80, 0x51, 0xc1, 0x61, 0xbd, 0xe8, 0x10, - 0x40, 0x75, 0xf7, 0x6a, 0xba, 0x21, 0x68, 0x88, 0x7b, 0x08, 0x31, 0x80, 0xf7, 0x3c, 0xfa, 0xed, 0xe7, 0x00, 0x00, - 0x30, 0x30, 0x20, 0x00, 0x10, 0xb5, 0x3a, 0xf7, 0xa6, 0xff, 0x1d, 0x48, 0x4f, 0xf4, 0x46, 0x14, 0x00, 0x68, 0xc4, - 0xf8, 0xa0, 0x00, 0x1b, 0x48, 0x00, 0x68, 0xc4, 0xf8, 0x94, 0x03, 0x1a, 0x48, 0x1a, 0x49, 0x00, 0x68, 0x08, 0x60, - 0x09, 0x1f, 0x40, 0xf2, 0xad, 0x20, 0x08, 0x60, 0xe0, 0x69, 0x40, 0xf4, 0x00, 0x40, 0xe0, 0x61, 0xe0, 0x69, 0x20, - 0xf0, 0x80, 0x50, 0xe0, 0x61, 0xe0, 0x69, 0x20, 0xf0, 0x01, 0x00, 0xe0, 0x61, 0x11, 0x49, 0x11, 0x48, 0x09, 0x1d, - 0x08, 0x60, 0x9f, 0xf7, 0x0b, 0xfc, 0xa0, 0xf7, 0x39, 0xfd, 0x75, 0xf7, 0xfd, 0xfa, 0x9e, 0xf7, 0x45, 0xfe, 0x76, - 0xf7, 0x34, 0xfd, 0xd4, 0xf8, 0x40, 0x03, 0x40, 0xf0, 0x20, 0x00, 0xc4, 0xf8, 0x40, 0x03, 0xa0, 0xf7, 0x0b, 0xfe, - 0x76, 0xf7, 0x33, 0xfc, 0xbd, 0xe8, 0x10, 0x40, 0x3a, 0xf7, 0x04, 0xbe, 0x00, 0x00, 0xec, 0x35, 0x20, 0x00, 0xf0, - 0x35, 0x20, 0x00, 0x04, 0x1f, 0x20, 0x00, 0xc0, 0x8b, 0x31, 0x00, 0x10, 0x32, 0x54, 0x76, 0x7c, 0xb5, 0x01, 0x68, - 0x00, 0x91, 0x00, 0x79, 0x00, 0x25, 0x20, 0xf0, 0xe0, 0x00, 0x8d, 0xf8, 0x04, 0x00, 0x2c, 0x46, 0x6e, 0x46, 0x30, - 0x5d, 0x46, 0xf7, 0x59, 0xfd, 0x05, 0x44, 0x02, 0x2d, 0x01, 0xd3, 0x01, 0x20, 0x7c, 0xbd, 0x64, 0x1c, 0x05, 0x2c, - 0xf4, 0xd3, 0x00, 0x20, 0x7c, 0xbd, 0x2d, 0xe9, 0xf0, 0x5f, 0x04, 0x46, 0x4f, 0xf0, 0x00, 0x0b, 0x97, 0xf7, 0x88, - 0xfa, 0x50, 0xb1, 0x17, 0x21, 0x20, 0x46, 0x93, 0xf7, 0x38, 0xf8, 0x20, 0x46, 0xbd, 0xe8, 0xf0, 0x5f, 0x02, 0x22, - 0x00, 0x21, 0x58, 0xf7, 0x66, 0xbf, 0x20, 0x46, 0x3f, 0xf7, 0xee, 0xfb, 0x09, 0x26, 0x8f, 0x4d, 0x00, 0x28, 0x7d, - 0xd0, 0x69, 0x68, 0xa0, 0x8b, 0x0a, 0x7b, 0xc0, 0xf3, 0xc0, 0x30, 0x02, 0xf0, 0x01, 0x02, 0x90, 0x42, 0x07, 0xd0, - 0x94, 0xf8, 0xa5, 0x00, 0x09, 0x28, 0x03, 0xd1, 0x94, 0xf8, 0xa3, 0x00, 0xc0, 0x07, 0x66, 0xd0, 0x10, 0x22, 0x04, - 0xf5, 0x80, 0x70, 0x0d, 0x31, 0xb1, 0xf7, 0x78, 0xfc, 0x94, 0xf8, 0xa5, 0x00, 0x1a, 0x27, 0x4f, 0xf0, 0x1d, 0x08, - 0x1c, 0x28, 0x11, 0xd0, 0x94, 0xf8, 0xa4, 0x00, 0x4f, 0xf0, 0x17, 0x0a, 0x4f, 0xf0, 0x18, 0x09, 0x98, 0xb1, 0x02, - 0x28, 0x0c, 0xd0, 0x01, 0x28, 0x0f, 0xd0, 0x05, 0x28, 0x08, 0xd0, 0x06, 0x28, 0x06, 0xd0, 0x1b, 0x28, 0x38, 0xd0, - 0xb4, 0xe0, 0x20, 0x68, 0x58, 0xf7, 0xf6, 0xfb, 0x0a, 0xe0, 0x68, 0x68, 0x00, 0x7b, 0x00, 0xf0, 0x01, 0x02, 0x95, - 0xe0, 0x94, 0xf8, 0xa3, 0x10, 0xc9, 0x07, 0x0e, 0xd0, 0x1b, 0x28, 0x14, 0xd0, 0x68, 0x68, 0x00, 0x7b, 0x00, 0xf0, - 0x01, 0x01, 0x20, 0x46, 0x97, 0xf7, 0x02, 0xfa, 0xa0, 0x8b, 0x00, 0x04, 0x1b, 0xd4, 0x84, 0xf8, 0xa5, 0x70, 0x98, - 0xe0, 0x01, 0x28, 0x02, 0xd0, 0x20, 0x46, 0x71, 0xf7, 0x40, 0xf9, 0x84, 0xf8, 0xa5, 0x60, 0x90, 0xe0, 0xa0, 0x8b, - 0x00, 0x04, 0x0a, 0xd5, 0x68, 0x68, 0x00, 0x21, 0x00, 0x7b, 0x00, 0xf0, 0x01, 0x02, 0x20, 0x46, 0x97, 0xf7, 0xc7, - 0xfa, 0x84, 0xf8, 0xa4, 0xa0, 0x82, 0xe0, 0x84, 0xf8, 0xa4, 0x90, 0x7f, 0xe0, 0x84, 0xf8, 0xa5, 0x80, 0x7c, 0xe0, - 0x20, 0x68, 0x58, 0xf7, 0xbe, 0xfb, 0xa0, 0x8b, 0x00, 0x04, 0x0c, 0xd5, 0x68, 0x68, 0x00, 0x21, 0x00, 0x7b, 0x00, - 0xf0, 0x01, 0x02, 0x20, 0x46, 0x97, 0xf7, 0xb0, 0xfa, 0x84, 0xf8, 0xa4, 0xa0, 0xbd, 0xe8, 0xf0, 0x9f, 0x02, 0xe0, - 0x84, 0xf8, 0xa4, 0x90, 0xf9, 0xe7, 0x69, 0x68, 0xe3, 0x69, 0x04, 0xf1, 0x78, 0x07, 0x0a, 0x7b, 0xc3, 0xf3, 0xc0, - 0x30, 0x02, 0xf0, 0x01, 0x02, 0x90, 0x42, 0x0b, 0xd0, 0x94, 0xf8, 0xa4, 0x00, 0x01, 0x28, 0x03, 0xd1, 0x94, 0xf8, - 0xa3, 0x00, 0xc0, 0x07, 0x08, 0xd0, 0x94, 0xf8, 0xa5, 0x00, 0x09, 0x28, 0x0c, 0xd0, 0x94, 0xf8, 0xa5, 0x00, 0x0c, - 0x28, 0x1e, 0xd0, 0x0b, 0xe0, 0x10, 0x22, 0x38, 0x46, 0x0d, 0x31, 0xb1, 0xf7, 0xf0, 0xfb, 0x84, 0xf8, 0xa5, 0x60, - 0xd5, 0xe7, 0x94, 0xf8, 0xa3, 0x00, 0xc0, 0x07, 0xd1, 0xd0, 0x94, 0xf8, 0xa4, 0x00, 0x60, 0xb3, 0x02, 0x28, 0x23, - 0xd0, 0x01, 0x28, 0x28, 0xd0, 0x04, 0x28, 0x26, 0xd0, 0x03, 0x28, 0x24, 0xd0, 0x05, 0x28, 0x1b, 0xd0, 0x06, 0x28, - 0x19, 0xd0, 0x07, 0x28, 0x49, 0xd0, 0x2c, 0xe0, 0x20, 0x68, 0x58, 0xf7, 0x6e, 0xfb, 0xa0, 0x8b, 0x69, 0x68, 0x40, - 0xf3, 0xc0, 0x32, 0x20, 0x46, 0x0d, 0x31, 0x52, 0x1c, 0x97, 0xf7, 0x62, 0xfa, 0xa0, 0x8b, 0x40, 0xf3, 0xc0, 0x31, - 0x20, 0x46, 0x49, 0x1c, 0x97, 0xf7, 0x7d, 0xf9, 0x0d, 0x20, 0x84, 0xf8, 0xa5, 0x00, 0x15, 0xe0, 0x20, 0x46, 0xbd, - 0xe8, 0xf0, 0x5f, 0x06, 0x23, 0x0b, 0x21, 0x56, 0xf7, 0x89, 0xba, 0x94, 0xf8, 0xa3, 0x20, 0xd2, 0x07, 0x1a, 0xd0, - 0x43, 0xf3, 0xc0, 0x32, 0x20, 0x46, 0x0d, 0x31, 0x52, 0x1c, 0x97, 0xf7, 0x45, 0xfa, 0x00, 0x21, 0x20, 0x46, 0x97, - 0xf7, 0xf4, 0xf9, 0x69, 0x68, 0xa0, 0x8b, 0x09, 0x7b, 0xc0, 0xf3, 0xc0, 0x30, 0x01, 0xf0, 0x01, 0x01, 0x48, 0x40, - 0x80, 0xf0, 0x01, 0x02, 0x59, 0x46, 0x20, 0x46, 0xbd, 0xe8, 0xf0, 0x5f, 0x97, 0xf7, 0x0b, 0xb9, 0x01, 0x28, 0x02, - 0xd0, 0x20, 0x46, 0x71, 0xf7, 0x97, 0xf8, 0x69, 0x68, 0x10, 0x22, 0x38, 0x46, 0x0d, 0x31, 0xb1, 0xf7, 0x8f, 0xfb, - 0x4f, 0xe7, 0x20, 0x68, 0x58, 0xf7, 0x25, 0xfb, 0xa0, 0x8b, 0x69, 0x68, 0xc0, 0xf3, 0xc0, 0x32, 0x20, 0x46, 0xbd, - 0xe8, 0xf0, 0x5f, 0x0d, 0x31, 0x97, 0xf7, 0x18, 0xba, 0x10, 0xb5, 0x90, 0xf8, 0x57, 0x10, 0x4a, 0x07, 0x01, 0xd5, - 0x09, 0x07, 0x03, 0xd4, 0x00, 0xf0, 0x71, 0xf8, 0x00, 0x20, 0x10, 0xbd, 0x01, 0x20, 0x10, 0xbd, 0x00, 0x00, 0xb8, - 0x58, 0x20, 0x00, 0x30, 0xb5, 0x11, 0xf8, 0x04, 0x4f, 0x00, 0x23, 0x7f, 0x25, 0xb5, 0xeb, 0x54, 0x0f, 0x02, 0xd1, - 0x49, 0x78, 0x01, 0x23, 0x00, 0xe0, 0x61, 0x08, 0x12, 0x78, 0x00, 0x7f, 0x02, 0xf0, 0x07, 0x04, 0x00, 0xf0, 0x07, - 0x00, 0x84, 0x42, 0x03, 0xd1, 0x05, 0x29, 0x08, 0xd1, 0x3b, 0xb1, 0x02, 0xe0, 0x1b, 0xb1, 0x05, 0x29, 0x01, 0xd1, - 0x50, 0x07, 0x01, 0xd0, 0x01, 0x20, 0x30, 0xbd, 0x00, 0x20, 0x30, 0xbd, 0x70, 0xb5, 0x04, 0x46, 0x80, 0x78, 0x0d, - 0x46, 0xc0, 0x43, 0x80, 0x07, 0x03, 0xd1, 0x20, 0x20, 0x47, 0xf7, 0x0b, 0xfa, 0x08, 0xb1, 0x01, 0x20, 0x70, 0xbd, - 0x60, 0x7a, 0x20, 0xf0, 0x01, 0x00, 0x60, 0x72, 0x28, 0x46, 0x50, 0xf7, 0x72, 0xfc, 0x00, 0x20, 0x70, 0xbd, 0x2d, - 0xe9, 0xf0, 0x41, 0x00, 0x26, 0x35, 0x46, 0x28, 0x46, 0x3f, 0xf7, 0x31, 0xfa, 0x04, 0x00, 0x0a, 0xd0, 0x04, 0xf1, - 0x0c, 0x00, 0xab, 0xf7, 0xac, 0xf8, 0x07, 0x46, 0x04, 0xf1, 0x08, 0x00, 0xab, 0xf7, 0xa7, 0xf8, 0x38, 0x44, 0x06, - 0x44, 0x6d, 0x1c, 0xed, 0xb2, 0x0d, 0x2d, 0xeb, 0xd3, 0x30, 0x46, 0xbd, 0xe8, 0xf0, 0x81, 0x10, 0xb5, 0xff, 0xf7, - 0xe2, 0xff, 0x04, 0x46, 0x20, 0x20, 0x47, 0xf7, 0xdd, 0xf9, 0x08, 0xb1, 0x0a, 0x2c, 0x09, 0xd9, 0x05, 0x4c, 0xe0, - 0x7a, 0x3f, 0xf7, 0x43, 0xf9, 0x3f, 0xf7, 0x6e, 0xf9, 0xff, 0x20, 0xe0, 0x72, 0x00, 0x20, 0x10, 0xbd, 0x01, 0x20, - 0x10, 0xbd, 0xb8, 0x56, 0x20, 0x00, 0x06, 0x49, 0x4b, 0x68, 0x1a, 0x7b, 0x51, 0x08, 0x7f, 0x29, 0x02, 0xd1, 0x59, - 0x7b, 0x41, 0xf0, 0x80, 0x01, 0x02, 0xf0, 0x01, 0x02, 0x24, 0x23, 0x56, 0xf7, 0xc9, 0xb9, 0xb8, 0x58, 0x20, 0x00, - 0x7f, 0xb5, 0x06, 0x46, 0x01, 0x46, 0x00, 0x20, 0x8d, 0xf7, 0x15, 0xf8, 0x0d, 0x4d, 0x04, 0x46, 0x95, 0xf9, 0x00, - 0x00, 0x03, 0x28, 0x11, 0xdc, 0x0b, 0x48, 0x08, 0x21, 0x80, 0x6a, 0x01, 0xeb, 0x80, 0x00, 0x47, 0xf7, 0xa9, 0xf9, - 0x48, 0xb1, 0x28, 0x78, 0x40, 0x1c, 0x28, 0x70, 0x0c, 0x20, 0xad, 0xf8, 0x00, 0x00, 0x68, 0x46, 0x01, 0x96, 0x55, - 0xf7, 0xa6, 0xfd, 0x94, 0xf9, 0x20, 0x00, 0x04, 0xb0, 0x70, 0xbd, 0xf0, 0x2f, 0x20, 0x00, 0x60, 0x58, 0x20, 0x00, - 0x10, 0xb5, 0x14, 0x46, 0x0c, 0x30, 0x31, 0xf7, 0x9e, 0xfa, 0x4f, 0xf4, 0x46, 0x10, 0xd0, 0xf8, 0x04, 0x03, 0x4f, - 0xf4, 0xc0, 0x01, 0xc1, 0xf8, 0x0c, 0x01, 0x00, 0x20, 0x60, 0x71, 0x10, 0xbd, 0x70, 0xb5, 0x05, 0x46, 0x00, 0x24, - 0x38, 0xf7, 0xed, 0xfa, 0x00, 0xb1, 0x80, 0x24, 0x44, 0xea, 0x05, 0x00, 0xbd, 0xe8, 0x70, 0x40, 0x00, 0xf0, 0xf7, - 0xb8, 0x2d, 0xe9, 0xf0, 0x5f, 0xb0, 0xf8, 0x0d, 0x40, 0x4f, 0xf0, 0x00, 0x0a, 0x06, 0x7b, 0xc7, 0x7b, 0x15, 0x46, - 0x04, 0xf0, 0x01, 0x09, 0xc4, 0xf3, 0x00, 0x2b, 0x51, 0x46, 0x50, 0x46, 0x4f, 0xf4, 0x00, 0x73, 0x03, 0xfa, 0x00, - 0xf2, 0x98, 0x46, 0x22, 0x42, 0x01, 0xd0, 0x49, 0x1c, 0xc9, 0xb2, 0x40, 0x1c, 0xc0, 0xb2, 0x05, 0x28, 0xf4, 0xd3, - 0x2c, 0x81, 0xae, 0x71, 0xef, 0x71, 0xa0, 0x07, 0x01, 0xd5, 0x60, 0x07, 0x08, 0xd4, 0xe0, 0x05, 0x01, 0xd5, 0xe0, - 0x07, 0x04, 0xd0, 0x29, 0xb1, 0xe0, 0x05, 0x01, 0xd5, 0x01, 0x29, 0x01, 0xd9, 0x12, 0x20, 0x4e, 0xe0, 0x30, 0x06, - 0x01, 0xd4, 0x05, 0x2e, 0x01, 0xd9, 0x11, 0x20, 0x48, 0xe0, 0x04, 0x2e, 0x01, 0xd2, 0x5c, 0x48, 0x01, 0xe0, 0x5b, - 0x48, 0x00, 0x1d, 0xb1, 0x07, 0x02, 0x68, 0xc9, 0x0e, 0xff, 0x23, 0x8b, 0x40, 0x9a, 0x43, 0xe3, 0xb2, 0x8b, 0x40, - 0x13, 0x43, 0x03, 0x60, 0x4f, 0xf4, 0x48, 0x10, 0x50, 0xf8, 0x88, 0x1f, 0xb3, 0x00, 0x0f, 0x22, 0x9a, 0x40, 0x91, - 0x43, 0x01, 0x60, 0x89, 0xf0, 0x01, 0x02, 0x00, 0x21, 0x30, 0x46, 0x38, 0xf7, 0xa8, 0xfa, 0xb9, 0xf1, 0x00, 0x0f, - 0x20, 0xd0, 0x30, 0x46, 0x38, 0xf7, 0x8c, 0xfa, 0xc7, 0xb2, 0xbb, 0xf1, 0x00, 0x0f, 0x14, 0xd0, 0x00, 0x20, 0x42, - 0x46, 0x02, 0xfa, 0x00, 0xf1, 0x21, 0x42, 0x01, 0xd0, 0x82, 0x46, 0x03, 0xe0, 0x40, 0x1c, 0xc0, 0xb2, 0x05, 0x28, - 0xf5, 0xd3, 0x51, 0x46, 0x30, 0x46, 0x38, 0xf7, 0xe2, 0xf9, 0xaf, 0xf2, 0xf7, 0x01, 0x30, 0x46, 0x38, 0xf7, 0x33, - 0xfa, 0x59, 0x46, 0x30, 0x46, 0x38, 0xf7, 0x33, 0xfa, 0x03, 0xe0, 0x39, 0x46, 0x30, 0x46, 0x38, 0xf7, 0x5c, 0xfa, - 0xef, 0x71, 0x00, 0x20, 0x68, 0x71, 0xbd, 0xe8, 0xf0, 0x9f, 0x70, 0xb5, 0x00, 0xf1, 0x09, 0x05, 0x00, 0x7b, 0x14, - 0x46, 0xc1, 0x08, 0x02, 0xd0, 0x30, 0x20, 0x50, 0x71, 0x70, 0xbd, 0x38, 0xf7, 0x59, 0xfa, 0xe0, 0x71, 0xe8, 0x78, - 0xa0, 0x71, 0x00, 0x20, 0x60, 0x71, 0x70, 0xbd, 0x10, 0xb5, 0x14, 0x46, 0x00, 0xf1, 0x0c, 0x01, 0x35, 0x22, 0x2c, - 0x48, 0xb1, 0xf7, 0x1a, 0xfa, 0x2b, 0x49, 0x48, 0x79, 0x6f, 0xea, 0x50, 0x12, 0x2a, 0x48, 0x43, 0x78, 0x62, 0xf3, - 0x04, 0x13, 0x43, 0x70, 0x08, 0x68, 0x4d, 0x28, 0x01, 0xd9, 0x30, 0x20, 0x20, 0x70, 0x0a, 0x68, 0x25, 0x48, 0x27, - 0x3a, 0x08, 0x2a, 0x0d, 0xd2, 0xdf, 0xe8, 0x02, 0xf0, 0x04, 0x08, 0x27, 0x2b, 0x2f, 0x33, 0x37, 0x3b, 0x02, 0x68, - 0x42, 0xf4, 0x00, 0x52, 0x02, 0xe0, 0x02, 0x68, 0x22, 0xf4, 0x00, 0x52, 0x02, 0x60, 0x08, 0x79, 0x40, 0x06, 0x2f, - 0xd5, 0x08, 0x89, 0x7c, 0xf7, 0x9f, 0xff, 0x04, 0x00, 0x2a, 0xd0, 0x01, 0x20, 0x7b, 0xf7, 0x6c, 0xf9, 0x00, 0x28, - 0x25, 0xd0, 0x94, 0xf8, 0xe2, 0x10, 0x41, 0x73, 0x01, 0x21, 0x01, 0x73, 0xee, 0x21, 0x01, 0x75, 0x00, 0x21, 0x41, - 0x60, 0x81, 0x60, 0xbd, 0xe8, 0x10, 0x40, 0xa0, 0xf7, 0x48, 0xbf, 0x02, 0x68, 0x42, 0xf4, 0x80, 0x42, 0xdf, 0xe7, - 0x02, 0x68, 0x22, 0xf4, 0x80, 0x42, 0xdb, 0xe7, 0x02, 0x68, 0x42, 0xf4, 0x80, 0x52, 0xd7, 0xe7, 0x02, 0x68, 0x22, - 0xf4, 0x80, 0x52, 0xd3, 0xe7, 0x02, 0x68, 0x42, 0xf0, 0x10, 0x02, 0xcf, 0xe7, 0x02, 0x68, 0x22, 0xf0, 0x10, 0x02, - 0xcb, 0xe7, 0x10, 0xbd, 0x68, 0x00, 0x32, 0x00, 0x8c, 0x9c, 0x20, 0x00, 0xd9, 0x25, 0x20, 0x00, 0xfc, 0x2f, 0x20, - 0x00, 0x10, 0xb5, 0x04, 0x46, 0x02, 0x22, 0xff, 0x21, 0x04, 0x20, 0x70, 0xf7, 0xf1, 0xfa, 0x8b, 0x22, 0x82, 0x72, - 0xc4, 0x72, 0xbd, 0xe8, 0x10, 0x40, 0x70, 0xf7, 0x21, 0xb9, 0x0b, 0x4a, 0x12, 0x68, 0x02, 0xf0, 0x03, 0x03, 0x11, - 0xb1, 0x1f, 0x21, 0x0a, 0x46, 0x01, 0xe0, 0x7f, 0x21, 0xff, 0x22, 0x1f, 0x28, 0x00, 0xd9, 0x2b, 0xb1, 0x88, 0x42, - 0x01, 0xd9, 0x03, 0x2b, 0x01, 0xd3, 0x90, 0x42, 0x01, 0xd9, 0x01, 0x20, 0x70, 0x47, 0x00, 0x20, 0x70, 0x47, 0x00, - 0x00, 0x14, 0x87, 0x31, 0x00, 0x10, 0xb5, 0x1b, 0x48, 0x33, 0xf7, 0x14, 0xfd, 0xb5, 0xf7, 0x84, 0xf9, 0x00, 0x28, - 0x24, 0xd1, 0x18, 0x48, 0x00, 0x78, 0x00, 0x28, 0x20, 0xd0, 0x33, 0xf7, 0xc7, 0xfc, 0x04, 0x46, 0x16, 0x48, 0x00, - 0x78, 0x3a, 0xf7, 0x19, 0xf9, 0x10, 0xb1, 0x01, 0x28, 0x07, 0xd0, 0x01, 0xe0, 0x3a, 0xf7, 0x4d, 0xfb, 0x20, 0x46, - 0xbd, 0xe8, 0x10, 0x40, 0x33, 0xf7, 0xbb, 0xbc, 0x01, 0x22, 0x00, 0x23, 0x11, 0x46, 0x0e, 0x48, 0x46, 0xf7, 0xb4, - 0xfb, 0x20, 0x46, 0x33, 0xf7, 0xb2, 0xfc, 0x33, 0xf7, 0xa9, 0xfc, 0x18, 0xb1, 0x0a, 0x49, 0x01, 0x20, 0x08, 0x60, - 0x10, 0xbd, 0x01, 0x22, 0xbd, 0xe8, 0x10, 0x40, 0x4f, 0xf0, 0xff, 0x33, 0x11, 0x46, 0x04, 0x48, 0x46, 0xf7, 0xa1, - 0xbb, 0x00, 0x00, 0x98, 0x42, 0x20, 0x00, 0xab, 0x26, 0x20, 0x00, 0xb9, 0x22, 0x20, 0x00, 0x74, 0x42, 0x20, 0x00, - 0xc8, 0x22, 0x20, 0x00, 0x2a, 0x21, 0x01, 0x48, 0x46, 0xf7, 0x66, 0xb9, 0x04, 0x01, 0x60, 0x00, 0x00, 0xe0, 0x21, - 0x00, 0xed, 0xf7, 0x05, 0x00, -]; diff --git a/cyw43/src/bluetooth.rs b/cyw43/src/bluetooth.rs index 2ffb5d96..d520af5e 100644 --- a/cyw43/src/bluetooth.rs +++ b/cyw43/src/bluetooth.rs @@ -5,6 +5,17 @@ use crate::bus::Bus; use crate::consts::*; use crate::{SpiBusCyw43, CHIP}; +struct CybtFwCb<'a> { + p_next_line_start: &'a [u8], +} + +struct HexFileData<'a> { + addr_mode: i32, + hi_addr: u16, + dest_addr: u32, + p_ds: &'a mut [u8], +} + fn is_aligned(a: u32, x: u32) -> bool { (a & (x - 1)) == 0 } @@ -13,19 +24,87 @@ fn round_down(x: u32, a: u32) -> u32 { x & !(a - 1) } +fn cybt_fw_get_data(p_btfw_cb: &mut CybtFwCb, hfd: &mut HexFileData) -> u32 { + let mut abs_base_addr32 = 0; + + loop { + let num_bytes = p_btfw_cb.p_next_line_start[0]; + p_btfw_cb.p_next_line_start = &p_btfw_cb.p_next_line_start[1..]; + + let addr = (p_btfw_cb.p_next_line_start[0] as u16) << 8 | p_btfw_cb.p_next_line_start[1] as u16; + p_btfw_cb.p_next_line_start = &p_btfw_cb.p_next_line_start[2..]; + + let line_type = p_btfw_cb.p_next_line_start[0]; + p_btfw_cb.p_next_line_start = &p_btfw_cb.p_next_line_start[1..]; + + if num_bytes == 0 { + break; + } + + hfd.p_ds[..num_bytes as usize].copy_from_slice(&p_btfw_cb.p_next_line_start[..num_bytes as usize]); + p_btfw_cb.p_next_line_start = &p_btfw_cb.p_next_line_start[num_bytes as usize..]; + + match line_type { + BTFW_HEX_LINE_TYPE_EXTENDED_ADDRESS => { + hfd.hi_addr = (hfd.p_ds[0] as u16) << 8 | hfd.p_ds[1] as u16; + hfd.addr_mode = BTFW_ADDR_MODE_EXTENDED; + } + BTFW_HEX_LINE_TYPE_EXTENDED_SEGMENT_ADDRESS => { + hfd.hi_addr = (hfd.p_ds[0] as u16) << 8 | hfd.p_ds[1] as u16; + hfd.addr_mode = BTFW_ADDR_MODE_SEGMENT; + } + BTFW_HEX_LINE_TYPE_ABSOLUTE_32BIT_ADDRESS => { + abs_base_addr32 = (hfd.p_ds[0] as u32) << 24 + | (hfd.p_ds[1] as u32) << 16 + | (hfd.p_ds[2] as u32) << 8 + | hfd.p_ds[3] as u32; + hfd.addr_mode = BTFW_ADDR_MODE_LINEAR32; + } + BTFW_HEX_LINE_TYPE_DATA => { + hfd.dest_addr = addr as u32; + match hfd.addr_mode { + BTFW_ADDR_MODE_EXTENDED => hfd.dest_addr += (hfd.hi_addr as u32) << 16, + BTFW_ADDR_MODE_SEGMENT => hfd.dest_addr += (hfd.hi_addr as u32) << 4, + BTFW_ADDR_MODE_LINEAR32 => hfd.dest_addr += abs_base_addr32, + _ => {} + } + return num_bytes as u32; + } + _ => {} + } + } + 0 +} + pub(crate) async fn upload_bluetooth_firmware( bus: &mut Bus, - firmware_offsets: &[(u32, usize)], firmware: &[u8], ) { - // buffer + // read version + let version_length = firmware[0]; + let _version = &firmware[1..=version_length as usize]; + // skip version + 1 extra byte as per cybt_shared_bus_driver.c + let firmware = &firmware[version_length as usize + 2..]; + // buffers + let mut data_buffer: [u8; 0x100] = [0; 0x100]; let mut aligned_data_buffer: [u8; 0x100] = [0; 0x100]; // structs - let mut fw_bytes_pointer = 0; - for &(dest_addr, num_fw_bytes) in firmware_offsets.iter() { - let fw_bytes = &firmware[(fw_bytes_pointer)..(fw_bytes_pointer + num_fw_bytes)]; - assert!(fw_bytes.len() == num_fw_bytes); - let mut dest_start_addr = dest_addr; + let mut btfw_cb = CybtFwCb { + p_next_line_start: firmware, + }; + let mut hfd = HexFileData { + addr_mode: BTFW_ADDR_MODE_EXTENDED, + hi_addr: 0, + dest_addr: 0, + p_ds: &mut data_buffer, + }; + loop { + let num_fw_bytes = cybt_fw_get_data(&mut btfw_cb, &mut hfd); + if num_fw_bytes == 0 { + break; + } + let fw_bytes = &hfd.p_ds[0..num_fw_bytes as usize]; + let mut dest_start_addr = hfd.dest_addr + CHIP.bluetooth_base_address; let mut aligned_data_buffer_index: usize = 0; // pad start if !is_aligned(dest_start_addr, 4) { @@ -78,8 +157,6 @@ pub(crate) async fn upload_bluetooth_firmware( let offset = i * chunk_size; bus.bp_write(dest_start_addr + (offset as u32), chunk).await; } - // increment fw_bytes_pointer - fw_bytes_pointer += num_fw_bytes; // sleep TODO: is this needed Timer::after(Duration::from_millis(1)).await; } @@ -152,18 +229,14 @@ pub(crate) async fn bt_set_intr(bus: &mut Bus< bus.bp_write32(HOST_CTRL_REG_ADDR, new_val).await; } -pub(crate) async fn init_bluetooth( - bus: &mut Bus, - firmware_offsets: &[(u32, usize)], - firmware: &[u8], -) { +pub(crate) async fn init_bluetooth(bus: &mut Bus, firmware: &[u8]) { Timer::after(Duration::from_millis(100)).await; debug!("init_bluetooth"); Timer::after(Duration::from_millis(100)).await; bus.bp_write32(CHIP.bluetooth_base_address + BT2WLAN_PWRUP_ADDR, BT2WLAN_PWRUP_WAKE) .await; Timer::after(Duration::from_millis(2)).await; - upload_bluetooth_firmware(bus, firmware_offsets, firmware).await; + upload_bluetooth_firmware(bus, firmware).await; wait_bt_ready(bus).await; // TODO: cybt_init_buffer(); wait_bt_awake(bus).await; diff --git a/cyw43/src/bus.rs b/cyw43/src/bus.rs index 1fa5451f..5749fa8e 100644 --- a/cyw43/src/bus.rs +++ b/cyw43/src/bus.rs @@ -244,7 +244,7 @@ where } async fn backplane_readn(&mut self, addr: u32, len: u32) -> u32 { - debug!("backplane_readn addr = {:08x} len = {}", addr, len); + trace!("backplane_readn addr = {:08x} len = {}", addr, len); self.backplane_set_window(addr).await; @@ -255,13 +255,13 @@ where let val = self.readn(FUNC_BACKPLANE, bus_addr, len).await; - debug!("backplane_readn addr = {:08x} len = {} val = {:08x}", addr, len, val); + trace!("backplane_readn addr = {:08x} len = {} val = {:08x}", addr, len, val); return val; } async fn backplane_writen(&mut self, addr: u32, val: u32, len: u32) { - debug!("backplane_writen addr = {:08x} len = {} val = {:08x}", addr, len, val); + trace!("backplane_writen addr = {:08x} len = {} val = {:08x}", addr, len, val); self.backplane_set_window(addr).await; diff --git a/cyw43/src/consts.rs b/cyw43/src/consts.rs index e0357a5c..f61d8b04 100644 --- a/cyw43/src/consts.rs +++ b/cyw43/src/consts.rs @@ -139,6 +139,18 @@ pub(crate) const WPA2_SECURITY: u32 = 0x00400000; pub(crate) const MIN_PSK_LEN: usize = 8; pub(crate) const MAX_PSK_LEN: usize = 64; +// Bluetooth firmware extraction constants. +pub(crate) const BTFW_ADDR_MODE_UNKNOWN: i32 = 0; +pub(crate) const BTFW_ADDR_MODE_EXTENDED: i32 = 1; +pub(crate) const BTFW_ADDR_MODE_SEGMENT: i32 = 2; +pub(crate) const BTFW_ADDR_MODE_LINEAR32: i32 = 3; + +pub(crate) const BTFW_HEX_LINE_TYPE_DATA: u8 = 0; +pub(crate) const BTFW_HEX_LINE_TYPE_END_OF_DATA: u8 = 1; +pub(crate) const BTFW_HEX_LINE_TYPE_EXTENDED_SEGMENT_ADDRESS: u8 = 2; +pub(crate) const BTFW_HEX_LINE_TYPE_EXTENDED_ADDRESS: u8 = 4; +pub(crate) const BTFW_HEX_LINE_TYPE_ABSOLUTE_32BIT_ADDRESS: u8 = 5; + // Bluetooth constants. pub(crate) const SPI_RESP_DELAY_F1: u32 = 0x001d; pub(crate) const WHD_BUS_SPI_BACKPLANE_READ_PADD_SIZE: u8 = 4; diff --git a/cyw43/src/lib.rs b/cyw43/src/lib.rs index 4b6b6149..597d1de5 100644 --- a/cyw43/src/lib.rs +++ b/cyw43/src/lib.rs @@ -224,7 +224,7 @@ where let mut runner = Runner::new(ch_runner, Bus::new(pwr, spi), &state.ioctl_state, &state.events); - runner.init(firmware, None, None).await; + runner.init(firmware, None).await; ( device, @@ -238,7 +238,6 @@ pub async fn new_with_bluetooth<'a, PWR, SPI>( pwr: PWR, spi: SPI, firmware: &[u8], - bluetooth_firmware_offsets: &[(u32, usize)], bluetooth_firmware: &[u8], ) -> (NetDriver<'a>, Control<'a>, Runner<'a, PWR, SPI>) where @@ -250,9 +249,7 @@ where let mut runner = Runner::new(ch_runner, Bus::new(pwr, spi), &state.ioctl_state, &state.events); - runner - .init(firmware, Some(bluetooth_firmware_offsets), Some(bluetooth_firmware)) - .await; + runner.init(firmware, Some(bluetooth_firmware)).await; ( device, diff --git a/cyw43/src/runner.rs b/cyw43/src/runner.rs index 7dc22870..86c7d7bb 100644 --- a/cyw43/src/runner.rs +++ b/cyw43/src/runner.rs @@ -73,12 +73,7 @@ where } } - pub(crate) async fn init( - &mut self, - firmware: &[u8], - bluetooth_firmware_offsets: Option<&[(u32, usize)]>, - bluetooth_firmware: Option<&[u8]>, - ) { + pub(crate) async fn init(&mut self, firmware: &[u8], bluetooth_firmware: Option<&[u8]>) { self.bus.init().await; // Init ALP (Active Low Power) clock @@ -122,14 +117,9 @@ where self.bus.bp_write(ram_addr, firmware).await; // Optionally load Bluetooth fimrware into RAM. - if bluetooth_firmware_offsets.is_some() && bluetooth_firmware.is_some() { + if bluetooth_firmware.is_some() { debug!("loading bluetooth fw"); - bluetooth::init_bluetooth( - &mut self.bus, - bluetooth_firmware_offsets.unwrap(), - bluetooth_firmware.unwrap(), - ) - .await; + bluetooth::init_bluetooth(&mut self.bus, bluetooth_firmware.unwrap()).await; } debug!("loading nvram"); diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml index 8b5d18e8..600b6de7 100644 --- a/examples/rp/Cargo.toml +++ b/examples/rp/Cargo.toml @@ -21,7 +21,6 @@ lora-phy = { version = "1" } lorawan-device = { version = "0.10.0", default-features = false, features = ["async", "external-lora-phy"] } lorawan = { version = "0.7.3", default-features = false, features = ["default-crypto"] } cyw43 = { path = "../../cyw43", features = ["defmt", "firmware-logs"] } -cyw43-firmware = { path = "../../cyw43-firmware" } cyw43-pio = { path = "../../cyw43-pio", features = ["defmt"] } defmt = "0.3" diff --git a/examples/rp/src/bin/bluetooth_blinky.rs b/examples/rp/src/bin/bluetooth_blinky.rs index aff4b505..6a861544 100644 --- a/examples/rp/src/bin/bluetooth_blinky.rs +++ b/examples/rp/src/bin/bluetooth_blinky.rs @@ -33,6 +33,7 @@ async fn main(spawner: Spawner) { let p = embassy_rp::init(Default::default()); let fw = include_bytes!("../../../../cyw43-firmware/43439A0.bin"); let clm = include_bytes!("../../../../cyw43-firmware/43439A0_clm.bin"); + let btfw = include_bytes!("../../../../cyw43-firmware/43439A0_btfw.bin"); // To make flashing faster for development, you may want to flash the firmwares independently // at hardcoded addresses, instead of baking them into the program with `include_bytes!`: @@ -47,10 +48,7 @@ async fn main(spawner: Spawner) { let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); let state = make_static!(cyw43::State::new()); - let bluetooth_firmware_offsets = &cyw43_firmware::BLUETOOTH_FIRMWARE_OFFSETS; - let bluetooth_firmware = &cyw43_firmware::BLUETOOTH_FIRMWARE; - let (_net_device, mut control, runner) = - cyw43::new_with_bluetooth(state, pwr, spi, fw, bluetooth_firmware_offsets, bluetooth_firmware).await; + let (_net_device, mut control, runner) = cyw43::new_with_bluetooth(state, pwr, spi, fw, btfw).await; unwrap!(spawner.spawn(cyw43_runner_task(runner))); control.init(clm).await;