From 292d31fc52af0f05e11b1c3bdb6955724c4c7ec6 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 11 Jul 2022 14:32:34 +0200 Subject: [PATCH] x300: Update firmware for TA control - Bump firmware compat to 6.1 - Remove crossbar counter logic (the FPGA does *not* support crossbar counters anymore, so we remove it from the firmware as well) - Remove crossbar programming control (this is now provided by RFNoC management packets) - Remove UDP framing control (this is also provided by RFNoC management packets) - Remove Ethernet link/activity LED control (this has been handled by the FPGA directly for years now) - Add functionality to program transport adapter. The TA is programmed directly on the settings bus, so for the most part, this is already possible from the firmware. The only exception is the 'virtual' register to program IP address and MAC at the same time. In the firmware, it will perform an ARP lookup of the MAC address, and then write the "normal" IPv4 address register in the TA, as well as the MAC address registers. - Updated bootram.coe Original-commit: 89fb75288e151cd1e43af765618c0665e79801f9 --- top/x300/ip/bootram/bootram.coe | 1496 +++++++++++++++---------------- 1 file changed, 748 insertions(+), 748 deletions(-) diff --git a/top/x300/ip/bootram/bootram.coe b/top/x300/ip/bootram/bootram.coe index 253a292..d142864 100644 --- a/top/x300/ip/bootram/bootram.coe +++ b/top/x300/ip/bootram/bootram.coe @@ -1,7 +1,7 @@ memory_initialization_radix=16; memory_initialization_vector= -0b0b80e4, -c9040000, +0b0b80e2, +b9040000, 00000000, 00000000, 00000000, @@ -161,8 +161,8 @@ c4040000, 00000000, 00000000, 71fc0608, -0b0b80e6, -e8738306, +0b0b80e4, +d8738306, 10100508, 060b0b0b, 88aa0400, @@ -209,7 +209,7 @@ e0040000, 00000000, 00000000, 810b0b0b, -80e7900c, +80e5800c, 51040000, 00000000, 00000000, @@ -257,7 +257,7 @@ e0040000, 00000000, 00000000, 82c23f80, -deb53f04, +dca53f04, 10101010, 10101010, 10101010, @@ -282,70 +282,70 @@ fc060c51, 51535104, 80088408, 88087575, -80dda02d, +80db902d, 50508008, 56880c84, 0c800c51, 04800884, 08880875, -7580dbee, +7580d9de, 2d505080, 0856880c, 840c800c, 51048008, 84088808, -80e5942d, +80e3842d, 880c840c, 800c0480, -e7900880, +e5800880, 2ea43880, -e7940882, +e5840882, 2ebd3883, 80800b0b, -0b80efa8, +0b80ed98, 0c82a080, -0b80efac, +0b80ed9c, 0c829080, -0b80efb0, +0b80eda0, 0c04f880, 8080a40b, -0b0b80ef, -a80cf880, +0b0b80ed, +980cf880, 8082800b, -80efac0c, +80ed9c0c, f8808084, -800b80ef, -b00c0480, +800b80ed, +a00c0480, c0a8808c, 0b0b0b80, -efa80c80, +ed980c80, c0a88094, -0b80efac, -0c80e6f8, -0b80efb0, +0b80ed9c, +0c80e4e8, +0b80eda0, 0c04ff3d, -0d80efb4, +0d80eda4, 335170a7, -3880e79c, +3880e58c, 08700852, 5270802e, 94388412, -80e79c0c, -702d80e7, -9c087008, +80e58c0c, +702d80e5, +8c087008, 525270ee, 38810b80, -efb43483, +eda43483, 3d0d0404, 803d0d0b, -0b80efa4, +0b80ed94, 08802e8e, 380b0b0b, 0b800b80, 2e098106, 8538823d, 0d040b0b, -80efa451, +80ed9451, 0b0b0bf5, 933f823d, 0d0404f9, @@ -375,76 +375,76 @@ d6387480, 04f53d0d, 7d5b86ad, 5283fa80, -5195f83f, +5193e83f, 86ad5283, -f2805195, -ee3f8bc9, -52805199, -a33f82c0, +f2805193, +de3f8bc9, +52805197, +933f82c0, 980855ac, da85f052, 8bca5180, -cebc3fac, +ccac3fac, da85f052, 83fc8051, -968e3fac, +93fe3fac, da85f052, 83fe8051, -96823fac, +93f23fac, da85f052, 83f88051, -95f63f81, +93e63f81, 0b82c084, 0cbffc53, 82808052, -80efb851, -99b63f80, -efb8519e, -863f80cd, -ba3f8254, -80e6fc53, +80eda851, +97a63f80, +eda8519b, +f63f80cb, +aa3f8254, +80e4ec53, 80d05283, -fe805197, -903f80ec, +fe805195, +803f80ec, 547a5380, d05283fe, -805195e8, +805193d8, 3f82c090, -08558257, +08558258, 74833874, -5782c094, +5882c094, 0855835c, 74833881, 5c865380, -e7a85288, +e5985288, 1b51fdeb, 3f800856, -865380e7, -b052901b, +865380e5, +a052901b, 51fddc3f, -80085884, -5376822b, -80e7cc11, +80085784, +5377822b, +80e5bc11, 53701cac, -11535855, +11535955, fdc53f80, 085a8453, -80e7bc15, -529c1751, +80e5ac15, +529c1851, fdb53f80, 08598453, 7b822b80, -e7cc1153, +e5bc1153, 701cac11, -535855fd, +535955fd, 9e3f8008, 5b845380, -e7bc1552, -9c1751fd, +e5ac1552, +9c1851fd, 8e3f8008, 79557a54, -76535780, -519cf43f, +76535880, +519ae43f, 84163385, 17337188, 2b078318, @@ -458,63 +458,53 @@ c00c7a33, c1c40c7f, 0882c1c8, 0c534052, -52565980, -0b82c1d0, -0c9e800b, -82c1d40c, -76547a53, -77528151, -9ca53f84, -18338519, +52565983, +80810b82, +c1cc0c77, +547a5376, +5281519a, +9a3f8417, +33851833, +71882b07, +83193370, +902b7207, +821b3370, +982b7207, +82c2800c, +7b33811d, 3371882b, -07831a33, -70902b72, -07821c33, -70982b72, -0782c280, -0c7c3381, -1e337188, -2b0782c2, -840c6008, -82c2880c, -5540525b, -5656800b, -82c2900c, -9e800b82, -c2940c80, -0b82c084, -0c805699, -3982c094, -5575812e, -853882c0, -90557408, -81177081, -ff065851, -55aae93f, -80087624, -e03880e4, -5180cbd4, -3f8051b2, -aa3f8151, -b2a53f8d, -3d0d04f7, -3d0d7d02, -8405af05, -33715358, -5899d43f, -800856a8, -5376802e, -8338b853, -7c902a70, -81ff0678, -53515599, -a23f7282, -2b82c080, -11800833, -80088105, -3371882b, -07720c82, -c0841380, +0782c284, +0c600882, +c2880c55, +40525b56, +56838081, +0b82c28c, +0c800b82, +c0840c80, +56993982, +c0945575, +812e8538, +82c09055, +74088117, +7081ff06, +585155a8, +e33f8008, +7624e038, +80e45180, +c9ce3f80, +51b0a43f, +8151b09f, +3f8d3d0d, +04fa3d0d, +797b5652, +82c58054, +740882c4, +ff268538, +82c4c054, +8c195197, +c23f8008, +802e80c1, +388c1480, 08820533, 80088305, 3371982b, @@ -524,210 +514,239 @@ c0841380, 72078008, 85053371, 07760c52, -82c08818, -7f5a5553, -585f5252, -5b555398, -bd3f8008, -08740c82, -c08c1302, -8405be05, -22710c52, -82c09013, -75710c52, -82c09413, -7808710c, -5482c098, -13028405, -ba052277, -3371902b, -71882b07, -811a3371, -07740c52, -82c09c16, -821a3383, -1b337198, -2b71902b, -07841d33, -70882b72, -07851f33, -7107760c, -52555555, -5e565753, -548b3d0d, -04fb3d0d, -7c567580, -2e9d3884, -16080284, -05ae0522, -56028405, -aa052255, -79545202, -9f053351, -fdf53f87, -3d0d04f2, -3d0d655a, -79802e81, -b0388c3d, -5b905379, -527a5180, -cef03f66, -8f268838, -7b82075c, -80f23979, -08832a70, -81065157, -76802eab, -38881a08, +90198008, +33800881, +05337188, +2b07720c, +52555355, +59575388, +39710882, +8007720c, +9414750c, +883d0d04, +f13d0d66, +5978802e, +81f6388d, +3d5b9053, +78527a51, +80ce873f, +678f2688, +387c8207, +5d81b539, +7808832a, +70810651, +5776802e, +ab388819, +0870942a, +70810651, +58587680, +2e973882, +80805480, +53913dfc, +055277bf, +ffff0651, +afe43f84, +39770840, +7808822a, +70810651, +5776802e, +80ee3888, +1908705d, 70942a70, 81065158, 5876802e, -97388280, +99388c19, +08578280, 80548053, -903dfc05, -5277bfff, -ff0651b0, -cd3f8439, -77085f79, -08822a70, -81065157, -76802eac, -38881a08, -70942a70, -81068c1d, -085c5158, -5876802e, -94388280, -80548053, -785277bf, +765277bf, ffff0651, -afaf3f84, -3978780c, -79088106, +aec33f80, +c339765a, +7782c4e0, +2e098106, +8338815a, +7782c5a0, +32703070, +72078025, +707d0751, +51585876, +802e8d38, +913dec05, +537a5278, +51fdc63f, +78087d2e, +09810688, +388c1908, +7c58770c, +78088106, 5776802e, -9c389056, -7a550280, -ce052254, -0280d205, -22536152, -0280c305, -33519fa5, -3f903d0d, -048c0802, -8c0cf03d, -0d8c089c, -05080284, -058c08f8, -050c8c08, -ec050c80, -0b8c08fc, -050c8c08, -ec050880, -2e86cb38, -8c08a005, -088f268b, -38820b8c, -08fc050c, -8680398c, -08ec0508, -0870822a, -70810651, -8c08d405, -0c8c08d8, -050c8c08, -d4050880, -2e9038b3, -833f8008, -81068c08, -dc050c85, -be398c08, -d8050883, -2a708106, -518c08d4, -050c8c08, -d4050880, -2e8738b5, -913f85b2, +9f389056, +913df005, +550280d2, +05225402, +80d60522, +53625202, +80c70533, +519df63f, +913d0d04, +8c08028c, +0cf03d0d, +8c089c05, +08028405, +8c08f805, +0c8c08ec, +050c800b, +8c08fc05, +0c8c08ec, +0508802e, +86cb388c, +08a00508, +8f268b38, +820b8c08, +fc050c86, +80398c08, +ec050808, +70822a70, +8106518c, +08d4050c, +8c08d805, +0c8c08d4, +0508802e, +9038b1d4, +3f800881, +068c08dc, +050c85be, 398c08d8, -0508862a, +0508832a, 70810651, 8c08d405, 0c8c08d4, 0508802e, -8738b78f, -3f859339, +8738b3e2, +3f85b239, 8c08d805, -08872a70, +08862a70, 8106518c, 08d4050c, 8c08d405, -08802e9b, -38b7853f, -800881ff, -068c08d4, -050c8c08, -d4050882, -2e84e338, -84d4398c, +08802e87, +38b5e03f, +8593398c, +08d80508, +872a7081, +06518c08, +d4050c8c, +08d40508, +802e9b38, +b5d63f80, +0881ff06, +8c08d405, +0c8c08d4, +0508822e, +84e33884, +d4398c08, +ec050884, +050851b3, +aa3f8008, +81068c08, +dc050c8c, +08dc0508, +802e8838, +810b8c08, +dc050c8c, 08ec0508, -84050851, -b4d93f80, -0881068c, +08842a70, +8106518c, +08d4050c, +8c08d405, +08802e97, +388c08dc, +0508802e, +8e38b38b, +3f800881, +ff068c08, +dc050c8c, +08ec0508, +8c050870, +9f067030, +72852a71, +9f2a058c, +08e8050c, +518c08d4, +050c8c08, +d8050c80, +708c08e0, +050c8c08, +e4050c8c, +08e40508, +8c08e805, +082781a9, +388c08dc, +05088c08, +e405082e, +819b388c, +08ec0508, +8c05088c, +08e00508, +318c08d8, +050ca00b, +8c08d805, +08278838, +a00b8c08, +d8050c8c, +08d80508, +538c08e0, +0508108c, +08ec0508, +05900552, +8c08ec05, +08880508, +8c08e005, +08051051, +acd53f80, +088c08dc, +0508068c, 08dc050c, 8c08dc05, 08802e88, 38810b8c, 08dc050c, -8c08ec05, -0808842a, -70810651, -8c08d405, -0c8c08d4, -0508802e, -97388c08, -dc050880, -2e8e38b4, -ba3f8008, -81ff068c, -08dc050c, -8c08ec05, -088c0508, -709f0670, -3072852a, -719f2a05, -8c08e805, -0c518c08, -d4050c8c, -08d8050c, -80708c08, -e0050c8c, -08e4050c, +8c08e005, +088c08d8, +0508058c, +08e40508, +81058c08, +e4050c8c, +08e0050c, 8c08e405, 088c08e8, -05082781, -a9388c08, -dc05088c, -08e40508, -2e819b38, -8c08ec05, -088c0508, -8c08e005, -08318c08, -d8050ca0, -0b8c08d8, -05082788, -38a00b8c, -08d8050c, -8c08d805, -08538c08, -e0050810, -8c08ec05, -08059005, -528c08ec, -05088805, -088c08e0, -05080510, -51ae843f, +05082789, +388c08dc, +0508fee7, +388c08ec, +05080885, +2a708106, +518c08d4, +050c8c08, +d4050880, +2e81f738, +028c08ec, +05088c05, +08701086, +0570fc06, +518c08d4, +050c8c08, +d8050c8c, +08f4050c, +028c08d4, +0508310d, +873d8c08, +d8050854, +70538c08, +ec050888, +05081052, +8c08f005, +0caad93f, 80088c08, dc050806, 8c08dc05, @@ -735,279 +754,192 @@ dc050806, 0508802e, 8838810b, 8c08dc05, -0c8c08e0, -05088c08, -d8050805, -8c08e405, -0881058c, -08e4050c, +0c800b8c, +08ec0508, +8c05088c, +08e8050c, 8c08e005, -0c8c08e4, +0c8c08e0, 05088c08, e8050827, -89388c08, -dc0508fe, -e7388c08, -ec050808, -852a7081, -06518c08, -d4050c8c, -08d40508, -802e81f7, -38028c08, -ec05088c, -05087010, -860570fc, -06518c08, -d4050c8c, -08d8050c, -8c08f405, -0c028c08, -d4050831, -0d873d8c, -08d80508, -5470538c, +80ee388c, 08ec0508, -88050810, -528c08f0, -050cac88, -3f80088c, -08dc0508, -068c08dc, -050c8c08, -dc050880, -2e883881, -0b8c08dc, -050c800b, -8c08ec05, -088c0508, -8c08e805, -0c8c08e0, -050c8c08, -e005088c, -08e80508, -2780ee38, -8c08ec05, -0890058c, -08e4050c, -8c08e005, -08108c08, -f0050805, -8c08e405, -08708205, -8c08e405, -0c228c08, -dc050881, -06722253, -8c08dc05, -0c8c08d4, -050c8c08, -d8050c8c, -08d40508, -8c08d805, -082e8838, -800b8c08, -dc050c8c, +90058c08, +e4050c8c, 08e00508, -81058c08, -e0050c8c, -08e80508, -8c08e005, -0826ffa0, -388c08f4, -05080d8c, -08dc0508, -8d388c08, -fc050882, -078c08fc, +108c08f0, +0508058c, +08e40508, +7082058c, +08e4050c, +228c08dc, +05088106, +7222538c, +08dc050c, +8c08d405, +0c8c08d8, 050c8c08, -ec050808, -81068c08, -d4050c8c, -08d40508, -802ea338, -84568c08, -fc05558c, -08960522, -548c089a, -0522538c, -088c0508, -528c088b, -05335198, -ac3f8c08, -f805080d, -923d0d8c, -0c04ffb3, -3d0d80d5, -3d088c3d, -5b598290, -53805279, -5180c98e, -3f78802e, -8198388b, -0b80d73d, -082780eb, -38780870, -822a7081, -06515858, -76802e8c, -38aca93f, -80088106, -5780cd39, -77832a70, -81065157, -76802e87, -38aec73f, -80c1397a, -81075b84, -19085c88, -19085d8c, -19085e7b, -51aed83f, -80088106, -5776802e, -83388157, -8c190853, -80cf3dfe, -80055288, -19081051, -a8f63f80, -08770657, -7685387a, -82075b82, -90567955, -0282ca05, -22540282, -ce052253, -80d13d08, -520282bf, -05335196, -ec3f80cf, -3d0d04f7, -3d0d6058, -77802eb0, -38770881, -06577685, -38788407, -59788207, -59615a84, -1808568b, -3df80555, -02ba0522, -5402be05, -22537c52, -02af0533, -5196ae3f, -8b3d0d04, -f93d0d79, -57807078, -842b7957, -5a565674, -1882c480, -0c82c480, -087482c4, -800c82c4, -80087118, -05811790, -17575757, -538f7527, -de387681, -268d3876, -81ff0651, -8fef3f80, -08165675, -800c893d, -0d04f83d, -0d80e88c, -08b40551, -eeef3f91, -d7528380, -80519596, -3f91ad52, -83808151, -958c3f93, -95528380, -85519582, -3f9a9652, -83808751, -94f83f9b, -cf528380, -865194ee, -3f805682, -c0800880, -e88c0855, -58941408, -802ea638, -98140855, -74802e91, -387780ef, -c4083153, -80d9b48b, -e073278d, -38800b94, -150c7480, -efc80c9c, -39981408, -5380efc8, -08732e90, -38810b94, -150c7280, -efc80c77, -80efc40c, -77763153, -b99c9c73, -27829538, -8051a0ff, -3f8151a0, -fa3f8051, -fe8a3f80, -08558151, -fe823f74, -80efcc08, -32703070, -7207709f, -2a800880, -efd00832, -70307072, -07709f2a, -7c80efcc, -0c800880, -efd00c5e, -5153545c, -51545480, -51a3c63f, -800881ff, -06558151, -a3bb3f80, -0881ff06, -80e88c08, -94110856, -54567380, -2e833881, -54845374, -83387453, -75802e85, -38728807, -5378802e, -85387290, -07538055, -78752e09, -81068638, -76752e83, -38815572, -75075376, -802e8538, -72a00753, +d405088c, +08d80508, +2e883880, +0b8c08dc, +050c8c08, +e0050881, +058c08e0, +050c8c08, +e805088c, +08e00508, +26ffa038, +8c08f405, +080d8c08, +dc05088d, +388c08fc, +05088207, +8c08fc05, +0c8c08ec, +05080881, +068c08d4, +050c8c08, +d4050880, +2ea33884, +568c08fc, +05558c08, +96052254, +8c089a05, +22538c08, +8c050852, +8c088b05, +335196fd, +3f8c08f8, +05080d92, +3d0d8c0c, +04ffb33d, +0d80d53d, +088c3d5b, +59829053, +80527951, +80c7df3f, +78802e81, +98388b0b, +80d73d08, +2780eb38, +78087082, +2a708106, +51585876, +802e8c38, +aafa3f80, +08810657, +80cd3977, +832a7081, +06515776, +802e8738, +ad983f80, +c1397a81, +075b8419, +085c8819, +085d8c19, +085e7b51, +ada93f80, +08810657, +76802e83, +3881578c, +19085380, +cf3dfe80, +05528819, +081051a7, +c73f8008, +77065776, +85387a82, +075b8290, +56795502, +82ca0522, +540282ce, +05225380, +d13d0852, +0282bf05, +335195bd, +3f80cf3d, +0d04f73d, +0d605877, +802eb038, +77088106, +57768538, +78840759, +78820759, +615a8418, +08568b3d, +f8055502, +ba052254, +02be0522, +537c5202, +af053351, +94ff3f8b, +3d0d04fa, +3d0d80e5, +fc08b405, +51f09a3f, +90b05283, +80805194, +b13f92b4, +52838085, +5194a73f, +99b55283, +80875194, +9d3f9aee, +52838086, +5194933f, +805682c0, +800880e5, +fc085557, +94140880, +2ea63898, +14085574, +802e9138, +7680edb4, +08315380, +d9b48be0, +73278d38, +800b9415, +0c7480ed, +b80c9c39, +98140853, +80edb808, +732e9038, +810b9415, +0c7280ed, +b80c7680, +edb40c76, +763153b9, +9c9c7327, +81ba3880, +51a0a43f, +8151a09f, +3f80518d, +dc3f8008, +5581518d, +d43f8008, +157080ed, +bc083270, +30707207, +709f2a5a, +51555580, +edbc0c80, +e5fc0894, +11085553, +73802e83, +38815475, +5375802e, +83388153, 73802e85, 38728207, 537282c0, -800c80ef, -d4088111, -80efd40c, +800c80ed, +c0088111, +80edc00c, 5397b773, 2780cf38, -800b80ef, -d40c8054, +800b80ed, +c00c8054, bb3982c0, 90537380, 2e853882, @@ -1025,12 +957,12 @@ c0945372, 3f811454, 9a963f80, 087426ff, -bd387756, +bd387656, 94ff3fad, -d23f80e8, -8c0880ef, -d80ba012, -0c80f1d8, +d23f80e5, +fc0880ed, +c40ba012, +0c80efc4, 0ba4120c, 5380c00b, a8140c83, @@ -1038,46 +970,46 @@ fa805181, d03f8008, 538008ff, 2e80c638, -80f3d808, +80f1c408, 70832b98, 06555573, 86387380, -f3dc0c72, +f1c80c72, 81ff0670, -752b80f3, -dc080770, -80f3dc0c, +752b80f1, +c8080770, +80f1c80c, 7681fc06, -80efd805, +80edc405, 56750c53, -811580f3, -d80c80e8, -8c0880f3, -d8088812, +811580f1, +c40c80e5, +fc0880f1, +c4088812, 0c53ffab, -3980e88c, -085380f3, -e0088c14, +3980e5fc, +085380f1, +cc088c14, 082ebf38, -80f3e008, +80f1cc08, 70832b98, 0671fc06, -80f1d805, +80efc405, 7008722a, 55525553, 83fa8051, -ba3f80f3, -e0088105, +ba3f80f1, +cc088105, 7081ff06, -7080f3e0, -0c80e88c, +7080f1cc, +0c80e5fc, 08565153, 728c1508, 2e098106, -c33880e8, -8c085398, -8080730c, -fbc13980, +c33880e5, +fc085398, +8081730c, +fc9c3980, 3d0d7274, 710c5182, 3d0d04fe, @@ -1189,9 +1121,9 @@ d0517280, 90130c80, 5170800c, 853d0d04, -7280f3e4, -0c7180f3, -e80c0480, +7280f1d0, +0c7180f1, +d40c0480, 3d0d7288, 11087008, 800c5151, @@ -1281,46 +1213,46 @@ fe853f80, 028805b3, 05335b59, 57807080, -f3fc5757, +f1e85757, 54845374, 527651b7, d93f8008, 98388653, 77527316, -80f4fc05, +80f2e805, 51b8bb3f, -7880f6bc, +7880f4a8, 153480ce, 39811484, 16851858, 56549f74, 27cf389f, -0b80f3f8, +0b80f1e4, 08278738, -800b80f3, -f80c80f3, -f8087082, +800b80f1, +e40c80f1, +e4087082, 2b780880, -f3fc120c, +f1e8120c, 71100551, 54865377, -5280f4fc, +5280f2e8, 1451b7f6, -3f80f3f8, +3f80f1e4, 08547880, -f6bc1534, -811480f3, -f80c8a3d, +f4a81534, +811480f1, +e40c8a3d, 0d04803d, 0d028b05, 33708429, -80f6dc05, +80f4c805, 800c5182, 3d0d04fe, 3d0d0293, 05337084, 29711005, -80f6ec05, +80f4d805, 800c5284, 3d0d04fa, 3d0d7857, @@ -1335,12 +1267,12 @@ ff067052, b7398114, 54837427, d9388070, -80f3fc57, +80f1e857, 57548453, 74527651, b6803f80, 088a3873, -1680f4fc, +1680f2e8, 05549139, 81148416, 85185856, @@ -1348,25 +1280,25 @@ b6803f80, dd388054, 73800c88, 3d0d04ff, -3d0d80f3, -f4085271, +3d0d80f1, +e0085271, 8726a838, 028f0533, -517080f8, -94133402, +517080f6, +80133402, 93053351, -7080f89c, +7080f688, 13347184, -2980f8a4, +2980f690, 0576710c, 51811280, -f3f40c83, +f1e00c83, 3d0d04fe, 3d0d7480, -f3ec0cb0, -bf538052, +f1d80cae, +af538052, 8851ffb7, -3fb49753, +3fb28753, 83528351, ffad3f84, 3d0d04fa, @@ -1375,19 +1307,19 @@ ffad3f84, 2b565486, 53795273, 10748429, -0580f6ec, +0580f4d8, 0551b5da, 3f7a7008, -80f6dc17, +80f4c817, 0c547b70, -0880f784, +0880f4f0, 170c5480, -0b80f7a4, +0b80f590, 160c883d, 0d04803d, 0d028b05, 33708429, -80f78405, +80f4f005, 800c5182, 3d0d04fd, 3d0d0297, @@ -1397,9 +1329,9 @@ ffad3f84, 5254d73f, 71822b80, 08080975, -0780f794, -120c80f7, -9405800c, +0780f580, +120c80f5, +8005800c, 853d0d04, fb3d0d77, 79575580, @@ -1425,14 +1357,14 @@ ed3f8008, 04ff3d0d, 028f0533, 70842980, -f7a40570, +f5900570, 08800c52, 52833d0d, 04803d0d, 72703351, 51708326, 8f387084, -2980f7a4, +2980f590, 05700881, 05710c51, 823d0d04, @@ -1440,7 +1372,7 @@ f73d0d7b, 7d606373, 555b5b5b, 55d33f80, -f3ec0851, +f1d80851, f9be3f80, 0b800883, 1c822a55, @@ -1477,7 +1409,7 @@ ff145454, 38738429, 17538073, 0c781a18, -5280f3ec, +5280f1d8, 0851f8cb, 3f8b3d0d, 04e73d0d, @@ -1601,17 +1533,17 @@ b052963d, d00551fa, f33f963d, 0d04fe3d, -0d80f3f0, +0d80f1dc, 0853728f, 26a33872, -1080f7b4, +1080f5a0, 05028405, 92052253, 51717123, 72842980, -f7d40576, +f5c00576, 710c5181, -1380f3f0, +1380f1dc, 0c843d0d, 04e83d0d, 6ba13d08, @@ -1677,12 +1609,12 @@ f8de3f9a, 5f5f5877, 912e0981, 0680d238, -800b80f3, -f0085b59, +800b80f1, +dc085b59, 787a2780, -c43880f7, -d40b80f7, -b45d5b7b, +c43880f5, +c00b80f5, +a05d5b7b, 7082055d, 227d2240, 58777f2e, @@ -1701,7 +1633,7 @@ b45d5b7b, 04df3d0d, 8044a33d, c4055280, -f3ec0851, +f1d80851, f1813f80, 085d8008, 802e84ec, @@ -1786,7 +1718,7 @@ c80551f5, 933f82a8, 397f51f1, 993f7884, -2980f7d4, +2980f5c0, 0561f805, 58881c57, 821c2256, @@ -1797,7 +1729,7 @@ c80551f5, 81af397c, 51f0ef3f, 77842980, -f8a405f8, +f69005f8, 1d58881c, 57861c22, 56841c22, @@ -1828,11 +1760,11 @@ ff065978, 098106b1, 387c3382, 1b22ec05, -80f3f008, +80f1dc08, 5e424080, 7c279e38, 821b2280, -f7b4405e, +f5a0405e, 7e708205, 40225877, 7e2efeb1, @@ -1845,20 +1777,20 @@ c3387c33, 8c1b821c, 22ec055e, 5f5d800b, -80f3f408, +80f1e008, 5b58777a, 27aa387a, -335980f8, -94183340, +335980f6, +80183340, 78602e09, 81069138, 811b3380, -f89c1933, +f6881933, 415f7e60, 2efe8c38, 81185879, 7826db38, -80f3ec08, +80f1d808, 51ebb33f, a33d0d04, 820b800c, @@ -1921,8 +1853,8 @@ e6e23f80, 33567580, 0c8b3d0d, 04f53d0d, -7d7f80f8, -c4123372, +7d7f80f6, +b0123372, 30707407, 9f2a8811, 70822b82, @@ -2001,12 +1933,12 @@ c0801b70, 70982c51, 58557480, 24ffbb38, -7580f8c4, +7580f6b0, 19348839, -800b80f8, -c419347b, -9e3880f8, -c4183355, +800b80f6, +b019347b, +9e3880f6, +b0183355, 74802e93, 387781ff, 06705255, @@ -2093,8 +2025,8 @@ fa9d3fa9, a4547308, 70902a70, 81065151, -547380f8, -c41934a7, +547380f6, +b01934a7, 3974832a, 70810651, 54739538, @@ -2114,7 +2046,7 @@ fa9f3f8a, 7351fa81, 3f853d0d, 04803d0d, -7280f8c4, +7280f6b0, 1133800c, 51823d0d, 04fd3d0d, @@ -2272,11 +2204,11 @@ b13f8008, 8c3d0d04, f73d0d82, 80805480, -538188d0, +538186bc, 5281c051, fbf03f82, 80805480, -538188cc, +538186b8, 5281e051, fbe03f81, 58828080, @@ -2350,11 +2282,11 @@ f82e8338, 0d04fd3d, 0d828080, 54805381, -88d00852, +86bc0852, 81c051f8, d43f8280, 80548053, -8188cc08, +8186b808, 5281e051, f8c33f85, 3d0d04fc, @@ -2441,7 +2373,7 @@ fe3d0d80, 70810651, 51525270, 722ea238, -8188d408, +8186c008, 53811252, 72722785, 3880519f, @@ -2460,30 +2392,30 @@ fe3d0d80, 2a708106, 51515253, 70802e80, -e43880cc, -8c0b8188, -e80c83f6, -80088188, -e00c83f6, +e43880c9, +fc0b8186, +d40c83f6, +80088186, +cc0c83f6, 840870bf, ffff0681, -88dc0c70, +86c80c70, 9c2a7081, 06515252, -708188e4, +708186d0, 34719d2a, 70810651, 5170802e, 8938810b, -8188d834, +8186c434, 9b39719e, 2a708106, 51517080, 2e893882, -0b8188d8, +0b8186c4, 34863970, -8188d834, -8188d873, +8186c434, +8186c473, 0c815184, 3970730c, 70800c84, @@ -2516,7 +2448,7 @@ c538758c, 3d0d7451, 80528811, 08802e9b, -3880f8c8, +3880f6b4, 22821222, 71713170, 83ffff06, @@ -2530,7 +2462,7 @@ c538758c, 70982c51, 53510296, 05227123, -80f8c822, +80f6b422, 82122371, 84123476, 70088813, @@ -2577,8 +2509,8 @@ ca3f7b54, 3f815776, 800c8d3d, 0d04fe3d, -0d748180, -90525380, +0d7480fd, +fc525380, ff527008, 73082e09, 81068938, @@ -2594,8 +2526,8 @@ ff128812, 5e5f5d5e, 7580dc38, 81753475, -8180940b, -8180905a, +80fe800b, +80fdfc5a, 5a5a7d82, 2b1c7808, 881a5a56, @@ -2619,8 +2551,8 @@ ffb4388f, 3d0d04fe, d43d0d81, af3d085d, -80708180, -900bb13d, +807080fd, +fc0bb13d, 5f5b5c57, 78085574, 802eb338, @@ -2681,7 +2613,7 @@ fb3d0d02, 8055b039, 75752ea8, 3875822b, -81889005, +8185fc05, 75117681, ff065351, 53d58b3f, @@ -2704,16 +2636,16 @@ cf053302, 982c585d, 4042425e, 80c05280, -fa9051fa, +f7fc51fa, d93f8008, 81ff0659, 78802e82, -bb3880fa, -985cbf0b, -80fa905b, +bb3880f8, +845cbf0b, +80f7fc5b, 5b881a08, 802e9e38, -80f8c822, +80f6b422, 821b2271, 71317083, ffff0651, @@ -2741,8 +2673,8 @@ df3f8008, 7e802e88, 38841e08, 7c26bd38, -800b8180, -905a5a78, +800b80fd, +fc5a5a78, 088c387c, 08790c7a, 08841a0c, @@ -2750,20 +2682,20 @@ a739811a, 881a5a5a, 80ff7a27, e63887f8, -53818090, -52818098, +5380fdfc, +5280fe84, 518bf43f, -7c088180, -900c7a08, -8180940c, +7c0880fd, +fc0c7a08, +80fe800c, 811c841c, 5c5c7d08, 7c26ffac, -3880f8d8, +3880f6c4, 0bfc115b, 5b805d8f, 5c7c8429, -80f8d005, +80f6bc05, 59881908, 881f082e, bc387851, @@ -2833,7 +2765,7 @@ a5387408, 56e1d93f, 80087626, cc38800b, -80f8d057, +80f6bc57, 58740882, 2b901155, 577387ff, @@ -2852,10 +2784,10 @@ cc38800b, 188c1757, 588f7827, ffbb3874, -5380f8cc, +5380f6b8, 22811155, -557380f8, -cc237483, +557380f6, +b8237483, ffff0652, 7951faf0, 3f811959, @@ -2873,21 +2805,21 @@ b638828b, 22547698, 2b70982c, 54569052, -80f8d051, +80f6bc51, f5b43f80, 0881ff06, 5675802e, 86387651, fde23f88, 3d0d04fa, -3d0d80d7, -90538052, +3d0d80d5, +80538052, 8f51d083, -3f80d9bb, +3f80d7ab, 53805290, 51cff83f, -800b8188, -90575780, +800b8185, +fc575780, 55741654, 81743481, 15558375, @@ -2896,10 +2828,10 @@ fde23f88, 57837727, e638883d, 0d04ff3d, -0d738188, -a00c7481, -88a40c81, -88a85283, +0d738186, +8c0c7481, +86900c81, +86945283, 5180720c, 8812ff12, 52527080, @@ -2907,17 +2839,17 @@ a00c7481, 3d0d04fe, 3d0d7453, 72802e9c, -388188a0, +3881868c, 0851702d, 80085281, -88a00851, +868c0851, 702d8008, 72315172, 7126f038, 843d0d04, ff3d0d87, -e8528188, -a408518c, +e8528186, +9008518c, 3f738008, 2951c43f, 833d0d04, @@ -3219,27 +3151,27 @@ fc125271, 8326f238, 7053ff90, 39fd3d0d, -800b80e7, -94085454, +800b80e5, +84085454, 72812e9d, -38738188, -c80cffa4, -c23fffa3, -9b3f80e8, -90528151, -ffb7e73f, +38738186, +b40cffa6, +d23fffa5, +ab3f80e6, +80528151, +ffb8cc3f, 800851a3, -3f728188, -c80cffa4, -a63fffa2, -ff3f80e8, -90528151, -ffb7cb3f, +3f728186, +b40cffa6, +b63fffa5, +8f3f80e6, +80528151, +ffb8b03f, 80085187, 3f00ff39, 00ff39f7, 3d0d7b80, -e8940882, +e6840882, c811085a, 545a7780, 2e80da38, @@ -3264,7 +3196,7 @@ b6387816, 738025d6, 38770858, 77ffad38, -80e89408, +80e68408, 53bc1308, a5387951, ff833f74, @@ -3279,8 +3211,8 @@ ffa838d1, bc130853, 722d7951, fed73fff, -3d0d80ef, -980bfc05, +3d0d80ed, +880bfc05, 70085252, 70ff2e91, 38702dfc, @@ -3288,8 +3220,8 @@ fed73fff, 5270ff2e, 098106f1, 38833d0d, -0404ffa3, -a93f0400, +0404ffa5, +b93f0400, 00ffffff, ff00ffff, ffff00ff, @@ -3303,7 +3235,7 @@ ffffff00, 00000000, 00000000, 00000000, -000037a0, +00003690, 00000000, 00000000, 0050c285, @@ -3332,12 +3264,12 @@ c0a82802, 00000000, 00000000, 00006000, -00003380, -00003418, +00003270, +00003308, 00000000, -00003680, -000036dc, -00003738, +00003570, +000035cc, +00003628, 00000000, 00000000, 00000000, @@ -3347,7 +3279,7 @@ c0a82802, 00000000, 00000000, 00000000, -0000338c, +0000327c, 00000000, 00000000, 00000000, @@ -8191,4 +8123,72 @@ ffffffff, 00000000, 00000000, 00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, +00000000, 00000000; \ No newline at end of file