diff --git a/Cargo.lock b/Cargo.lock index 1301172ff..a38851bad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,17 +41,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ahash" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "0.7.15" @@ -124,7 +113,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "utralib", "xous", @@ -140,7 +129,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "utralib", "xous", "xous-ipc", @@ -182,7 +171,7 @@ version = "0.5.0" source = "git+https://github.com/betrusted-io/blitstr.git?rev=89675bf468fa51baaf0de94e806b85c92466ae64#89675bf468fa51baaf0de94e806b85c92466ae64" dependencies = [ "log", - "rkyv 0.4.3", + "rkyv", ] [[package]] @@ -236,27 +225,6 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" -[[package]] -name = "bytecheck" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb738a1e65989ecdcd5bba16079641bd7209688fa546e1064832fd6e012fd32a" -dependencies = [ - "bytecheck_derive", - "ptr_meta", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b4dff26fdc9f847dab475c9fec16f2cba82d5aa1f09981b87c44520721e10a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "byteorder" version = "1.4.2" @@ -293,7 +261,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "utralib", "xous", @@ -310,7 +278,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "utralib", "xous", @@ -327,7 +295,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "utralib", "xous", @@ -428,7 +396,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "trng", @@ -447,7 +415,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "trng", @@ -485,7 +453,7 @@ version = "0.1.0" dependencies = [ "graphics-server", "log", - "rkyv 0.3.1", + "rkyv", "xous", "xous-names", ] @@ -654,7 +622,7 @@ dependencies = [ "net", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "trng", "utralib", @@ -710,7 +678,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "utralib", @@ -837,7 +805,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "trng", @@ -891,7 +859,7 @@ dependencies = [ "minifb", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "trng", @@ -901,15 +869,6 @@ dependencies = [ "xous-names", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - [[package]] name = "hermit-abi" version = "0.1.18" @@ -985,7 +944,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "utralib", "xous", @@ -1001,7 +960,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "xous", "xous-ipc", "xous-names", @@ -1016,7 +975,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "utralib", "xous", @@ -1053,7 +1012,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "utralib", @@ -1082,7 +1041,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "utralib", @@ -1145,7 +1104,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "utralib", @@ -1264,7 +1223,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "smoltcp", "susres", "ticktimer-server", @@ -1423,7 +1382,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.7.18", + "rkyv", "susres", "ticktimer-server", "utralib", @@ -1659,15 +1618,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rend" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0351a2e529ee30d571ef31faa5a4e0b9addaad087697b77efb20d2809e41c7" -dependencies = [ - "bytecheck", -] - [[package]] name = "ring" version = "0.16.20" @@ -1683,16 +1633,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rkyv" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba0dea2b9efaa468bc76d09a06741839d84c70a746edb1793d9653828532666" -dependencies = [ - "memoffset", - "rkyv_derive 0.3.1", -] - [[package]] name = "rkyv" version = "0.4.3" @@ -1701,20 +1641,7 @@ checksum = "70de01b38fe7baba4ecdd33b777096d2b326993d8ea99bc5b6ede691883d3010" dependencies = [ "memoffset", "ptr_meta", - "rkyv_derive 0.4.0", -] - -[[package]] -name = "rkyv" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f371763528cb5a45ff01879d08355c39d49b849e2e6e665989abe3262997bde0" -dependencies = [ - "bytecheck", - "hashbrown", - "ptr_meta", - "rend", - "rkyv_derive 0.7.18", + "rkyv_derive", "seahash", ] @@ -1741,24 +1668,13 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "xous", "xous-ipc", "xous-names", ] -[[package]] -name = "rkyv_derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf04e93b51e6cfcc0eeee3bbf121d978303b83fbf2dc49085cff7855478fd4b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "rkyv_derive" version = "0.4.0" @@ -1770,17 +1686,6 @@ dependencies = [ "syn", ] -[[package]] -name = "rkyv_derive" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fc962ad6ffbcc218212c465318c7c151221474350b281b4912f4890ea590b5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "root-keys" version = "0.1.0" @@ -1804,7 +1709,7 @@ dependencies = [ "num-derive", "num-traits", "rand_core 0.5.1", - "rkyv 0.4.3", + "rkyv", "rtc", "sha2", "spinor", @@ -1832,7 +1737,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "utralib", "xous", @@ -1995,7 +1900,7 @@ dependencies = [ "num-derive", "num-traits", "opaque-debug", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "trng", @@ -2035,7 +1940,7 @@ dependencies = [ "num-traits", "oqc-test", "rand_core 0.5.1", - "rkyv 0.4.3", + "rkyv", "root-keys", "rtc", "sha2", @@ -2121,7 +2026,7 @@ dependencies = [ "num-derive", "num-traits", "rand 0.8.3", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "trng", @@ -2153,7 +2058,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "root-keys", "rtc", "susres", @@ -2191,7 +2096,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "utralib", "xous", "xous-ipc", @@ -2298,7 +2203,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "ticktimer-server", "utralib", "xous", @@ -2392,7 +2297,7 @@ dependencies = [ "num-derive", "num-traits", "rand_core 0.5.1", - "rkyv 0.4.3", + "rkyv", "susres", "ticktimer-server", "utralib", @@ -2774,7 +2679,7 @@ name = "xous-ipc" version = "0.8.0" dependencies = [ "bitflags", - "rkyv 0.4.3", + "rkyv", "xous", ] @@ -2796,7 +2701,7 @@ dependencies = [ "log-server", "num-derive", "num-traits", - "rkyv 0.4.3", + "rkyv", "utralib", "xous", "xous-ipc", diff --git a/precursors/rom.db b/precursors/rom.db index a03129a4b..f1e79f305 100755 --- a/precursors/rom.db +++ b/precursors/rom.db @@ -1,128 +1,128 @@ -KEYROM 0 A SLICE_X36Y50 b'ca79a66c144b8254' -KEYROM 0 B SLICE_X36Y50 b'3086bc7024999392' -KEYROM 0 C SLICE_X36Y50 b'ef3d59727abd43bb' -KEYROM 0 D SLICE_X36Y50 b'888ba2c461664d97' -KEYROM 1 A SLICE_X37Y50 b'486b28c4c7c1b02d' -KEYROM 1 B SLICE_X37Y50 b'c14e40f1af431ab7' -KEYROM 1 C SLICE_X37Y50 b'57a13593f2311f86' -KEYROM 1 D SLICE_X37Y50 b'9bdf99b848b42362' -KEYROM 2 A SLICE_X36Y51 b'50eddc60d6eea4cf' -KEYROM 2 B SLICE_X36Y51 b'443c650c8fd4e7de' -KEYROM 2 C SLICE_X36Y51 b'b96f78ced0305bbf' -KEYROM 2 D SLICE_X36Y51 b'8c5059b28a729f13' -KEYROM 3 A SLICE_X37Y51 b'ef0f80b3446a919f' -KEYROM 3 B SLICE_X37Y51 b'b0fabc53aa7fbd36' -KEYROM 3 C SLICE_X37Y51 b'd9ec8d726965413e' -KEYROM 3 D SLICE_X37Y51 b'10f6657dc91459f4' -KEYROM 4 A SLICE_X36Y52 b'b71b794c7fcab698' -KEYROM 4 B SLICE_X36Y52 b'ac96122432264513' -KEYROM 4 C SLICE_X36Y52 b'27079000131cc01a' -KEYROM 4 D SLICE_X36Y52 b'0275a8e457e89c8b' -KEYROM 5 A SLICE_X37Y52 b'8e5d3a3307533d74' -KEYROM 5 B SLICE_X37Y52 b'206f453a5e73da69' -KEYROM 5 C SLICE_X37Y52 b'620c7340be8dded9' -KEYROM 5 D SLICE_X37Y52 b'120928284ec1bbb7' -KEYROM 6 A SLICE_X36Y53 b'231a131a6b84db69' -KEYROM 6 B SLICE_X36Y53 b'f82f3f28948df950' -KEYROM 6 C SLICE_X36Y53 b'8515284a1b257ba7' -KEYROM 6 D SLICE_X36Y53 b'127986194d20c029' -KEYROM 7 A SLICE_X37Y53 b'b8210d4e527e8a59' -KEYROM 7 B SLICE_X37Y53 b'4b626436704f56f0' -KEYROM 7 C SLICE_X37Y53 b'5eadfb3761435d44' -KEYROM 7 D SLICE_X37Y53 b'bf1f890fb7b56aa0' -KEYROM 8 A SLICE_X36Y54 b'108dce0cd49e3c7c' -KEYROM 8 B SLICE_X36Y54 b'e4effb40ac3e823e' -KEYROM 8 C SLICE_X36Y54 b'48396c9a24a94c33' -KEYROM 8 D SLICE_X36Y54 b'bc5d6f2e78ed5369' -KEYROM 9 A SLICE_X37Y54 b'dc0a9dd81c211883' -KEYROM 9 B SLICE_X37Y54 b'638b2d9989b6a4e2' -KEYROM 9 C SLICE_X37Y54 b'fef7d2d44cfca76b' -KEYROM 9 D SLICE_X37Y54 b'b3026a8ab7e16ac6' -KEYROM 10 A SLICE_X36Y55 b'f73d32d75551d8e6' -KEYROM 10 B SLICE_X36Y55 b'bca7458625e05dbc' -KEYROM 10 C SLICE_X36Y55 b'7543e2fe72fb3156' -KEYROM 10 D SLICE_X36Y55 b'c2fd4ff1a3bb6079' -KEYROM 11 A SLICE_X37Y55 b'5f113d41bdb49adc' -KEYROM 11 B SLICE_X37Y55 b'7ca565fada2dc48a' -KEYROM 11 C SLICE_X37Y55 b'c1bd857c56fc3a31' -KEYROM 11 D SLICE_X37Y55 b'cb7e10f161ac720c' -KEYROM 12 A SLICE_X36Y56 b'a8c952625885ae9d' -KEYROM 12 B SLICE_X36Y56 b'10e8465514ad084d' -KEYROM 12 C SLICE_X36Y56 b'1ff49fb254cfa0b0' -KEYROM 12 D SLICE_X36Y56 b'84d04a84146b59b3' -KEYROM 13 A SLICE_X37Y56 b'd2340bb888c5eb33' -KEYROM 13 B SLICE_X37Y56 b'7e312381a4f4b2e5' -KEYROM 13 C SLICE_X37Y56 b'f76af7a7cfbdc327' -KEYROM 13 D SLICE_X37Y56 b'51d598213e8c7c68' -KEYROM 14 A SLICE_X36Y57 b'179a416f10bf8759' -KEYROM 14 B SLICE_X36Y57 b'960915a3da7f4680' -KEYROM 14 C SLICE_X36Y57 b'6349f997bc4975c5' -KEYROM 14 D SLICE_X36Y57 b'f03d7a7d9905fcd1' -KEYROM 15 A SLICE_X37Y57 b'72d39323c3fe6e39' -KEYROM 15 B SLICE_X37Y57 b'468df321f93baa7d' -KEYROM 15 C SLICE_X37Y57 b'04245a9ac3fe2e5b' -KEYROM 15 D SLICE_X37Y57 b'718ade195d8a780f' -KEYROM 16 A SLICE_X36Y58 b'043d757c42dc33a6' -KEYROM 16 B SLICE_X36Y58 b'581cc48ba2dcae78' -KEYROM 16 C SLICE_X36Y58 b'001bf1d7e4520e76' -KEYROM 16 D SLICE_X36Y58 b'ea4ead09595d8300' -KEYROM 17 A SLICE_X37Y58 b'b6e81ad407368591' -KEYROM 17 B SLICE_X37Y58 b'5e946395b2d9a95a' -KEYROM 17 C SLICE_X37Y58 b'bff673aebe297598' -KEYROM 17 D SLICE_X37Y58 b'91e0118a2b0638eb' -KEYROM 18 A SLICE_X36Y59 b'6edfddd252c84a26' -KEYROM 18 B SLICE_X36Y59 b'8b9a0fe7f2fcd4a5' -KEYROM 18 C SLICE_X36Y59 b'aa416371dd472cbd' -KEYROM 18 D SLICE_X36Y59 b'9ce22347f0314c9a' -KEYROM 19 A SLICE_X37Y59 b'ce401def70bbc5aa' -KEYROM 19 B SLICE_X37Y59 b'7e2812a0d84cdd6c' -KEYROM 19 C SLICE_X37Y59 b'8e8e09f2a1c01bd4' -KEYROM 19 D SLICE_X37Y59 b'2c0c603b622db963' -KEYROM 20 A SLICE_X36Y60 b'7a524c3d2e91c213' -KEYROM 20 B SLICE_X36Y60 b'8b7452c13bf04c3b' -KEYROM 20 C SLICE_X36Y60 b'96c258fed3ffe9b7' -KEYROM 20 D SLICE_X36Y60 b'81d91906503c9ab1' -KEYROM 21 A SLICE_X37Y60 b'600c447158927a6a' -KEYROM 21 B SLICE_X37Y60 b'd7a903e7730adf61' -KEYROM 21 C SLICE_X37Y60 b'0325d3908d34469d' -KEYROM 21 D SLICE_X37Y60 b'aa8b8caa1fb3bf5a' -KEYROM 22 A SLICE_X36Y61 b'167a2ae752701050' -KEYROM 22 B SLICE_X36Y61 b'0a1f59b0fc19a077' -KEYROM 22 C SLICE_X36Y61 b'22d214fce15e7c2a' -KEYROM 22 D SLICE_X36Y61 b'd3eb3d4c8d06c03c' -KEYROM 23 A SLICE_X37Y61 b'77b791af804200ba' -KEYROM 23 B SLICE_X37Y61 b'92603613c56ec63b' -KEYROM 23 C SLICE_X37Y61 b'81387e1c2f5c60c1' -KEYROM 23 D SLICE_X37Y61 b'abf2ed65e97377c9' -KEYROM 24 A SLICE_X36Y62 b'd4e99d9a4ee37c7e' -KEYROM 24 B SLICE_X36Y62 b'b5c7f63743f69de3' -KEYROM 24 C SLICE_X36Y62 b'075eb0e4a78e6c8c' -KEYROM 24 D SLICE_X36Y62 b'f4e50e8bcecd846c' -KEYROM 25 A SLICE_X37Y62 b'73182a4398220fb7' -KEYROM 25 B SLICE_X37Y62 b'2dbf420fe70a1526' -KEYROM 25 C SLICE_X37Y62 b'7155fb4bfe98bc77' -KEYROM 25 D SLICE_X37Y62 b'eb7bbec343bed200' -KEYROM 26 A SLICE_X36Y63 b'ed582fdd296dc83c' -KEYROM 26 B SLICE_X36Y63 b'15ad3059cc89e0e6' -KEYROM 26 C SLICE_X36Y63 b'43bae3bd152bd108' -KEYROM 26 D SLICE_X36Y63 b'ac3d54b67d99ae79' -KEYROM 27 A SLICE_X37Y63 b'2cef155170bb3540' -KEYROM 27 B SLICE_X37Y63 b'1934bca89986318a' -KEYROM 27 C SLICE_X37Y63 b'6a85de43aababda6' -KEYROM 27 D SLICE_X37Y63 b'a7705a57ca7bcf77' -KEYROM 28 A SLICE_X36Y64 b'aa2827b1761dfc53' -KEYROM 28 B SLICE_X36Y64 b'3f7d770d94bd4c36' -KEYROM 28 C SLICE_X36Y64 b'0d5759ffc5a1aac2' -KEYROM 28 D SLICE_X36Y64 b'0d2cdc1cac80492c' -KEYROM 29 A SLICE_X37Y64 b'4d6d89c284e8c236' -KEYROM 29 B SLICE_X37Y64 b'24bde939b4606f0a' -KEYROM 29 C SLICE_X37Y64 b'621e01f2ff36b58f' -KEYROM 29 D SLICE_X37Y64 b'837861e2492b1a6e' -KEYROM 30 A SLICE_X36Y65 b'3197487b3d51a62d' -KEYROM 30 B SLICE_X36Y65 b'1da3a1c9c3dce847' -KEYROM 30 C SLICE_X36Y65 b'f3b8d7d7c1d1a38c' -KEYROM 30 D SLICE_X36Y65 b'61469a8aefc03868' -KEYROM 31 A SLICE_X37Y65 b'd9c7d2748687b25f' -KEYROM 31 B SLICE_X37Y65 b'f7dc9ca0940a85a8' -KEYROM 31 C SLICE_X37Y65 b'c9a4239b4c62e47a' -KEYROM 31 D SLICE_X37Y65 b'6094e91aa22a1f9c' +KEYROM 0 A SLICE_X36Y50 b'cef5073bb48cef83' +KEYROM 0 B SLICE_X36Y50 b'72025cccee4accd1' +KEYROM 0 C SLICE_X36Y50 b'ecb5c43125d469d4' +KEYROM 0 D SLICE_X36Y50 b'a02d4d58132d88c3' +KEYROM 1 A SLICE_X37Y50 b'adc8315a7c4c2b6a' +KEYROM 1 B SLICE_X37Y50 b'4d2e516fa2487309' +KEYROM 1 C SLICE_X37Y50 b'a0813503c5d495c6' +KEYROM 1 D SLICE_X37Y50 b'c5ef0f354b923e99' +KEYROM 2 A SLICE_X36Y51 b'e2d7d38d0e6b5764' +KEYROM 2 B SLICE_X36Y51 b'f31568025709c404' +KEYROM 2 C SLICE_X36Y51 b'0cae602370382dd1' +KEYROM 2 D SLICE_X36Y51 b'13ebcd9697b17cc1' +KEYROM 3 A SLICE_X37Y51 b'3e7a7a7bb6242aad' +KEYROM 3 B SLICE_X37Y51 b'0ed5a6afe7d92c1b' +KEYROM 3 C SLICE_X37Y51 b'eec241b38c786eb8' +KEYROM 3 D SLICE_X37Y51 b'deec3587fe2df768' +KEYROM 4 A SLICE_X36Y52 b'1a2d59f3ea3d57af' +KEYROM 4 B SLICE_X36Y52 b'2f688a617b951f71' +KEYROM 4 C SLICE_X36Y52 b'ddba453ee4aff684' +KEYROM 4 D SLICE_X36Y52 b'3457aa10fc5966f4' +KEYROM 5 A SLICE_X37Y52 b'a0902c290ac6d8e3' +KEYROM 5 B SLICE_X37Y52 b'daaedcf2890c4e7c' +KEYROM 5 C SLICE_X37Y52 b'c4dc424ea113d164' +KEYROM 5 D SLICE_X37Y52 b'7b145d67ffd6f375' +KEYROM 6 A SLICE_X36Y53 b'6414f4dbfb1289a1' +KEYROM 6 B SLICE_X36Y53 b'8c02837df1f0c512' +KEYROM 6 C SLICE_X36Y53 b'98b828a4c330dcba' +KEYROM 6 D SLICE_X36Y53 b'7aeb5f480b465712' +KEYROM 7 A SLICE_X37Y53 b'd27f62438af712c1' +KEYROM 7 B SLICE_X37Y53 b'73b479da5dfb9241' +KEYROM 7 C SLICE_X37Y53 b'66a0e6dee2091578' +KEYROM 7 D SLICE_X37Y53 b'4f0eb837e451d714' +KEYROM 8 A SLICE_X36Y54 b'b4e8dc1509f3e6a4' +KEYROM 8 B SLICE_X36Y54 b'a5bab3c51397c037' +KEYROM 8 C SLICE_X36Y54 b'8136440816b8c709' +KEYROM 8 D SLICE_X36Y54 b'9f191a665600cd49' +KEYROM 9 A SLICE_X37Y54 b'3917fe52ccd52f47' +KEYROM 9 B SLICE_X37Y54 b'8114dcd6db585bc3' +KEYROM 9 C SLICE_X37Y54 b'29e564db463d49d1' +KEYROM 9 D SLICE_X37Y54 b'a7fb65a7265edf02' +KEYROM 10 A SLICE_X36Y55 b'a456d567f2679328' +KEYROM 10 B SLICE_X36Y55 b'70fd849a80158175' +KEYROM 10 C SLICE_X36Y55 b'f13a47c90740449e' +KEYROM 10 D SLICE_X36Y55 b'd8d69df1d4eb49f2' +KEYROM 11 A SLICE_X37Y55 b'644874a791f9c6a9' +KEYROM 11 B SLICE_X37Y55 b'c526ed61f0de2403' +KEYROM 11 C SLICE_X37Y55 b'5ff632b6d7fa22ff' +KEYROM 11 D SLICE_X37Y55 b'396521c84ccd806b' +KEYROM 12 A SLICE_X36Y56 b'94f07a02314fc9e5' +KEYROM 12 B SLICE_X36Y56 b'1b12f570999d854f' +KEYROM 12 C SLICE_X36Y56 b'fb11a2379309b7ca' +KEYROM 12 D SLICE_X36Y56 b'13b3615d19529d27' +KEYROM 13 A SLICE_X37Y56 b'3ba1a03a351b6d8b' +KEYROM 13 B SLICE_X37Y56 b'37cc73b578e1a4af' +KEYROM 13 C SLICE_X37Y56 b'85df794c66f77fce' +KEYROM 13 D SLICE_X37Y56 b'dd6a63637a7ad120' +KEYROM 14 A SLICE_X36Y57 b'48fa7937ed52eb9d' +KEYROM 14 B SLICE_X36Y57 b'a2071e5ec9757c9a' +KEYROM 14 C SLICE_X36Y57 b'66dd07a19810c61f' +KEYROM 14 D SLICE_X36Y57 b'7b1827a10c49b7ed' +KEYROM 15 A SLICE_X37Y57 b'77e2401e84b9c996' +KEYROM 15 B SLICE_X37Y57 b'971d44513925d905' +KEYROM 15 C SLICE_X37Y57 b'192806b62dee8d8f' +KEYROM 15 D SLICE_X37Y57 b'15d8e4d3806ef7bc' +KEYROM 16 A SLICE_X36Y58 b'd15dfc19a526888e' +KEYROM 16 B SLICE_X36Y58 b'5682f37efbf0dd19' +KEYROM 16 C SLICE_X36Y58 b'c1b03e07d312a297' +KEYROM 16 D SLICE_X36Y58 b'2b91d0c0af107399' +KEYROM 17 A SLICE_X37Y58 b'c8115ee76677419b' +KEYROM 17 B SLICE_X37Y58 b'f7a19710e489d5c0' +KEYROM 17 C SLICE_X37Y58 b'cd25a942e2c578cd' +KEYROM 17 D SLICE_X37Y58 b'ed5e9a10a586f483' +KEYROM 18 A SLICE_X36Y59 b'bdb1bf471f7f2328' +KEYROM 18 B SLICE_X36Y59 b'87ba4a70b2d6a60c' +KEYROM 18 C SLICE_X36Y59 b'8273f0333107898f' +KEYROM 18 D SLICE_X36Y59 b'b31fa7c9036ab620' +KEYROM 19 A SLICE_X37Y59 b'8ea988fd99c39af0' +KEYROM 19 B SLICE_X37Y59 b'0f3029a81428d67b' +KEYROM 19 C SLICE_X37Y59 b'9c0cfb42f4a980d7' +KEYROM 19 D SLICE_X37Y59 b'079d26e747786c61' +KEYROM 20 A SLICE_X36Y60 b'6d3a92af2df94f82' +KEYROM 20 B SLICE_X36Y60 b'60872af854e521a9' +KEYROM 20 C SLICE_X36Y60 b'54c315c8ea0160c5' +KEYROM 20 D SLICE_X36Y60 b'61631902e373aa1b' +KEYROM 21 A SLICE_X37Y60 b'fd898e63954a576f' +KEYROM 21 B SLICE_X37Y60 b'c6e7256505ba2fb5' +KEYROM 21 C SLICE_X37Y60 b'9abb934be9248839' +KEYROM 21 D SLICE_X37Y60 b'0dc4481c5c0f6010' +KEYROM 22 A SLICE_X36Y61 b'1467623607f1dced' +KEYROM 22 B SLICE_X36Y61 b'deacbd6829160e38' +KEYROM 22 C SLICE_X36Y61 b'364557d428118d3b' +KEYROM 22 D SLICE_X36Y61 b'2bea294ebf0f0c1d' +KEYROM 23 A SLICE_X37Y61 b'f924c5855b23873e' +KEYROM 23 B SLICE_X37Y61 b'ad2607e984dcd017' +KEYROM 23 C SLICE_X37Y61 b'14e56ba39eb28020' +KEYROM 23 D SLICE_X37Y61 b'cbcfa0e013d96b2b' +KEYROM 24 A SLICE_X36Y62 b'3f02fef718a489bc' +KEYROM 24 B SLICE_X36Y62 b'5b908e86512874e6' +KEYROM 24 C SLICE_X36Y62 b'9aba355f7b999945' +KEYROM 24 D SLICE_X36Y62 b'79a3410989c06135' +KEYROM 25 A SLICE_X37Y62 b'c9b5436158e5245e' +KEYROM 25 B SLICE_X37Y62 b'ce85090ae2f59d92' +KEYROM 25 C SLICE_X37Y62 b'95a1ec420b03a8ff' +KEYROM 25 D SLICE_X37Y62 b'944b74947dc684ed' +KEYROM 26 A SLICE_X36Y63 b'aad2f0e3bc5080ff' +KEYROM 26 B SLICE_X36Y63 b'5fb3da0143b45486' +KEYROM 26 C SLICE_X36Y63 b'6a58f32481646759' +KEYROM 26 D SLICE_X36Y63 b'1945497fa394c977' +KEYROM 27 A SLICE_X37Y63 b'ef8d85582aa0eb91' +KEYROM 27 B SLICE_X37Y63 b'3e65b90cf9095100' +KEYROM 27 C SLICE_X37Y63 b'a3a3d315f4552ea8' +KEYROM 27 D SLICE_X37Y63 b'9c2f931edad4528e' +KEYROM 28 A SLICE_X36Y64 b'8939650d63e1c74f' +KEYROM 28 B SLICE_X36Y64 b'1a23a8469f28c4c5' +KEYROM 28 C SLICE_X36Y64 b'c6ecb84b4c06884a' +KEYROM 28 D SLICE_X36Y64 b'7ae489833f2272c0' +KEYROM 29 A SLICE_X37Y64 b'1c720c8ce2449224' +KEYROM 29 B SLICE_X37Y64 b'b58c8675ee2fa2a9' +KEYROM 29 C SLICE_X37Y64 b'36462b1c1226c045' +KEYROM 29 D SLICE_X37Y64 b'71fc27218d058653' +KEYROM 30 A SLICE_X36Y65 b'ce21984efbe849a3' +KEYROM 30 B SLICE_X36Y65 b'39f1b4f67e4c4492' +KEYROM 30 C SLICE_X36Y65 b'8c3596bae2d810f5' +KEYROM 30 D SLICE_X36Y65 b'31358226a647cadd' +KEYROM 31 A SLICE_X37Y65 b'dc3fb1991418da41' +KEYROM 31 B SLICE_X37Y65 b'141eeac378aa72eb' +KEYROM 31 C SLICE_X37Y65 b'5d582119964441c1' +KEYROM 31 D SLICE_X37Y65 b'9f62166a48fd27ee' diff --git a/precursors/soc.svd b/precursors/soc.svd index bc67a99c4..cbbf53f6d 100755 --- a/precursors/soc.svd +++ b/precursors/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1238,10 +1238,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x68e25f9b + 0xb6dd1f78 32 @@ -1258,7 +1258,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x02 + 0x03 32 @@ -3585,7 +3585,7 @@ inject too fast.]]> SEED1 0x0000 - 0x4e4ec1fd + 0x44342108 32 @@ -3600,7 +3600,7 @@ inject too fast.]]> SEED0 0x0004 - 0x16f6308b + 0x4d3933b 32 diff --git a/precursors/soc_csr.bin b/precursors/soc_csr.bin index 9ca90203f..dc0fcdc95 100755 Binary files a/precursors/soc_csr.bin and b/precursors/soc_csr.bin differ diff --git a/services/content-plugin-api/Cargo.toml b/services/content-plugin-api/Cargo.toml index 7f7380a25..e40ac5e0a 100644 --- a/services/content-plugin-api/Cargo.toml +++ b/services/content-plugin-api/Cargo.toml @@ -7,7 +7,7 @@ description = "Content Canvas Plugin Common APIs" [dependencies] xous = { path = "../../xous-rs" } -rkyv = { version = "0.3.1", default_features = false } +rkyv = { version = "0.4.3", default_features = false } graphics-server = { path="../graphics-server"} # this is used by the IMEF portion of the API xous-names = {path="../xous-names"} # used by the IMEF for registering listeners log = "0.4" diff --git a/services/llio/src/api.rs b/services/llio/src/api.rs index 9e613ff9f..81230d185 100644 --- a/services/llio/src/api.rs +++ b/services/llio/src/api.rs @@ -1,3 +1,5 @@ +use rkyv::{Archive, Deserialize, Serialize}; + /////////////////////// UART TYPE #[allow(dead_code)] // we actually use this constant, but clippy insists that we don't pub(crate) const BOOT_UART: u32 = UartType::Log as u32; @@ -74,7 +76,7 @@ pub(crate) enum I2cCallback { // maybe once things stabilize, it's probably a good idea to make this structure private to the crate, // and create a "public" version for return values via callbacks. But for now, it's pretty // convenient to reach into the state of the I2C machine to debug problems in the callbacks. -#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] +#[derive(Debug, Copy, Clone, Archive, Serialize, Deserialize)] pub struct I2cTransaction { pub bus_addr: u8, // write address and read address are encoded in the packet field below diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index 8d018f395..9ed0089f8 100644 --- a/services/pddb/Cargo.toml +++ b/services/pddb/Cargo.toml @@ -14,7 +14,7 @@ log = "0.4" num-derive = {version = "0.3", default-features = false} num-traits = {version = "0.2", default-features = false} susres = {path = "../susres"} -rkyv = "0.7.18" +rkyv = "0.4.3" [target.'cfg(not(any(windows,unix)))'.dependencies] utralib = { path = "../../utralib"}