aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenĂ© van Dorst <[email protected]>2023-08-20 22:20:47 +0200
committerRenĂ© van Dorst <[email protected]>2023-08-24 00:52:21 +0200
commit0a7c061ddcd8db08449546a1121add8e37c6ddbb (patch)
tree04e73a75fb8e8eca816721a4b63f8d51d8462a08
parent1ded213ae904b90b20e15615f08873da4b4ef077 (diff)
rustfmt
-rw-r--r--embassy-net-adin1110/src/crc32.rs297
-rw-r--r--embassy-net-adin1110/src/phy.rs15
2 files changed, 274 insertions, 38 deletions
diff --git a/embassy-net-adin1110/src/crc32.rs b/embassy-net-adin1110/src/crc32.rs
index 906c9aad7..a41fedca7 100644
--- a/embassy-net-adin1110/src/crc32.rs
+++ b/embassy-net-adin1110/src/crc32.rs
@@ -1,33 +1,260 @@
1pub const CRC32R_LOOKUP_TABLE: [u32; 256] = [ 1pub const CRC32R_LOOKUP_TABLE: [u32; 256] = [
2 0x0000_0000, 0x7707_3096, 0xEE0E_612C, 0x9909_51BA, 0x076D_C419, 0x706A_F48F, 0xE963_A535, 0x9E64_95A3, 0x0EDB_8832, 2 0x0000_0000,
3 0x79DC_B8A4, 0xE0D5_E91E, 0x97D2_D988, 0x09B6_4C2B, 0x7EB1_7CBD, 0xE7B8_2D07, 0x90BF_1D91, 0x1DB7_1064, 0x6AB0_20F2, 3 0x7707_3096,
4 0xF3B9_7148, 0x84BE_41DE, 0x1ADA_D47D, 0x6DDD_E4EB, 0xF4D4_B551, 0x83D3_85C7, 0x136C_9856, 0x646B_A8C0, 0xFD62_F97A, 4 0xEE0E_612C,
5 0x8A65_C9EC, 0x1401_5C4F, 0x6306_6CD9, 0xFA0F_3D63, 0x8D08_0DF5, 0x3B6E_20C8, 0x4C69_105E, 0xD560_41E4, 0xA267_7172, 5 0x9909_51BA,
6 0x3C03_E4D1, 0x4B04_D447, 0xD20D_85FD, 0xA50A_B56B, 0x35B5_A8FA, 0x42B2_986C, 0xDBBB_C9D6, 0xACBC_F940, 0x32D8_6CE3, 6 0x076D_C419,
7 0x45DF_5C75, 0xDCD6_0DCF, 0xABD1_3D59, 0x26D9_30AC, 0x51DE_003A, 0xC8D7_5180, 0xBFD0_6116, 0x21B4_F4B5, 0x56B3_C423, 7 0x706A_F48F,
8 0xCFBA_9599, 0xB8BD_A50F, 0x2802_B89E, 0x5F05_8808, 0xC60C_D9B2, 0xB10B_E924, 0x2F6F_7C87, 0x5868_4C11, 0xC161_1DAB, 8 0xE963_A535,
9 0xB666_2D3D, 0x76DC_4190, 0x01DB_7106, 0x98D2_20BC, 0xEFD5_102A, 0x71B1_8589, 0x06B6_B51F, 0x9FBF_E4A5, 0xE8B8_D433, 9 0x9E64_95A3,
10 0x7807_C9A2, 0x0F00_F934, 0x9609_A88E, 0xE10E_9818, 0x7F6A_0DBB, 0x086D_3D2D, 0x9164_6C97, 0xE663_5C01, 0x6B6B_51F4, 10 0x0EDB_8832,
11 0x1C6C_6162, 0x8565_30D8, 0xF262_004E, 0x6C06_95ED, 0x1B01_A57B, 0x8208_F4C1, 0xF50F_C457, 0x65B0_D9C6, 0x12B7_E950, 11 0x79DC_B8A4,
12 0x8BBE_B8EA, 0xFCB9_887C, 0x62DD_1DDF, 0x15DA_2D49, 0x8CD3_7CF3, 0xFBD4_4C65, 0x4DB2_6158, 0x3AB5_51CE, 0xA3BC_0074, 12 0xE0D5_E91E,
13 0xD4BB_30E2, 0x4ADF_A541, 0x3DD8_95D7, 0xA4D1_C46D, 0xD3D6_F4FB, 0x4369_E96A, 0x346E_D9FC, 0xAD67_8846, 0xDA60_B8D0, 13 0x97D2_D988,
14 0x4404_2D73, 0x3303_1DE5, 0xAA0A_4C5F, 0xDD0D_7CC9, 0x5005_713C, 0x2702_41AA, 0xBE0B_1010, 0xC90C_2086, 0x5768_B525, 14 0x09B6_4C2B,
15 0x206F_85B3, 0xB966_D409, 0xCE61_E49F, 0x5EDE_F90E, 0x29D9_C998, 0xB0D0_9822, 0xC7D7_A8B4, 0x59B3_3D17, 0x2EB4_0D81, 15 0x7EB1_7CBD,
16 0xB7BD_5C3B, 0xC0BA_6CAD, 0xEDB8_8320, 0x9ABF_B3B6, 0x03B6_E20C, 0x74B1_D29A, 0xEAD5_4739, 0x9DD2_77AF, 0x04DB_2615, 16 0xE7B8_2D07,
17 0x73DC_1683, 0xE363_0B12, 0x9464_3B84, 0x0D6D_6A3E, 0x7A6A_5AA8, 0xE40E_CF0B, 0x9309_FF9D, 0x0A00_AE27, 0x7D07_9EB1, 17 0x90BF_1D91,
18 0xF00F_9344, 0x8708_A3D2, 0x1E01_F268, 0x6906_C2FE, 0xF762_575D, 0x8065_67CB, 0x196C_3671, 0x6E6B_06E7, 0xFED4_1B76, 18 0x1DB7_1064,
19 0x89D3_2BE0, 0x10DA_7A5A, 0x67DD_4ACC, 0xF9B9_DF6F, 0x8EBE_EFF9, 0x17B7_BE43, 0x60B0_8ED5, 0xD6D6_A3E8, 0xA1D1_937E, 19 0x6AB0_20F2,
20 0x38D8_C2C4, 0x4FDF_F252, 0xD1BB_67F1, 0xA6BC_5767, 0x3FB5_06DD, 0x48B2_364B, 0xD80D_2BDA, 0xAF0A_1B4C, 0x3603_4AF6, 20 0xF3B9_7148,
21 0x4104_7A60, 0xDF60_EFC3, 0xA867_DF55, 0x316E_8EEF, 0x4669_BE79, 0xCB61_B38C, 0xBC66_831A, 0x256F_D2A0, 0x5268_E236, 21 0x84BE_41DE,
22 0xCC0C_7795, 0xBB0B_4703, 0x2202_16B9, 0x5505_262F, 0xC5BA_3BBE, 0xB2BD_0B28, 0x2BB4_5A92, 0x5CB3_6A04, 0xC2D7_FFA7, 22 0x1ADA_D47D,
23 0xB5D0_CF31, 0x2CD9_9E8B, 0x5BDE_AE1D, 0x9B64_C2B0, 0xEC63_F226, 0x756A_A39C, 0x026D_930A, 0x9C09_06A9, 0xEB0E_363F, 23 0x6DDD_E4EB,
24 0x7207_6785, 0x0500_5713, 0x95BF_4A82, 0xE2B8_7A14, 0x7BB1_2BAE, 0x0CB6_1B38, 0x92D2_8E9B, 0xE5D5_BE0D, 0x7CDC_EFB7, 24 0xF4D4_B551,
25 0x0BDB_DF21, 0x86D3_D2D4, 0xF1D4_E242, 0x68DD_B3F8, 0x1FDA_836E, 0x81BE_16CD, 0xF6B9_265B, 0x6FB0_77E1, 0x18B7_4777, 25 0x83D3_85C7,
26 0x8808_5AE6, 0xFF0F_6A70, 0x6606_3BCA, 0x1101_0B5C, 0x8F65_9EFF, 0xF862_AE69, 0x616B_FFD3, 0x166C_CF45, 0xA00A_E278, 26 0x136C_9856,
27 0xD70D_D2EE, 0x4E04_8354, 0x3903_B3C2, 0xA767_2661, 0xD060_16F7, 0x4969_474D, 0x3E6E_77DB, 0xAED1_6A4A, 0xD9D6_5ADC, 27 0x646B_A8C0,
28 0x40DF_0B66, 0x37D8_3BF0, 0xA9BC_AE53, 0xDEBB_9EC5, 0x47B2_CF7F, 0x30B5_FFE9, 0xBDBD_F21C, 0xCABA_C28A, 0x53B3_9330, 28 0xFD62_F97A,
29 0x24B4_A3A6, 0xBAD0_3605, 0xCDD7_0693, 0x54DE_5729, 0x23D9_67BF, 0xB366_7A2E, 0xC461_4AB8, 0x5D68_1B02, 0x2A6F_2B94, 29 0x8A65_C9EC,
30 0xB40B_BE37, 0xC30C_8EA1, 0x5A05_DF1B, 0x2D02_EF8D, 30 0x1401_5C4F,
31 0x6306_6CD9,
32 0xFA0F_3D63,
33 0x8D08_0DF5,
34 0x3B6E_20C8,
35 0x4C69_105E,
36 0xD560_41E4,
37 0xA267_7172,
38 0x3C03_E4D1,
39 0x4B04_D447,
40 0xD20D_85FD,
41 0xA50A_B56B,
42 0x35B5_A8FA,
43 0x42B2_986C,
44 0xDBBB_C9D6,
45 0xACBC_F940,
46 0x32D8_6CE3,
47 0x45DF_5C75,
48 0xDCD6_0DCF,
49 0xABD1_3D59,
50 0x26D9_30AC,
51 0x51DE_003A,
52 0xC8D7_5180,
53 0xBFD0_6116,
54 0x21B4_F4B5,
55 0x56B3_C423,
56 0xCFBA_9599,
57 0xB8BD_A50F,
58 0x2802_B89E,
59 0x5F05_8808,
60 0xC60C_D9B2,
61 0xB10B_E924,
62 0x2F6F_7C87,
63 0x5868_4C11,
64 0xC161_1DAB,
65 0xB666_2D3D,
66 0x76DC_4190,
67 0x01DB_7106,
68 0x98D2_20BC,
69 0xEFD5_102A,
70 0x71B1_8589,
71 0x06B6_B51F,
72 0x9FBF_E4A5,
73 0xE8B8_D433,
74 0x7807_C9A2,
75 0x0F00_F934,
76 0x9609_A88E,
77 0xE10E_9818,
78 0x7F6A_0DBB,
79 0x086D_3D2D,
80 0x9164_6C97,
81 0xE663_5C01,
82 0x6B6B_51F4,
83 0x1C6C_6162,
84 0x8565_30D8,
85 0xF262_004E,
86 0x6C06_95ED,
87 0x1B01_A57B,
88 0x8208_F4C1,
89 0xF50F_C457,
90 0x65B0_D9C6,
91 0x12B7_E950,
92 0x8BBE_B8EA,
93 0xFCB9_887C,
94 0x62DD_1DDF,
95 0x15DA_2D49,
96 0x8CD3_7CF3,
97 0xFBD4_4C65,
98 0x4DB2_6158,
99 0x3AB5_51CE,
100 0xA3BC_0074,
101 0xD4BB_30E2,
102 0x4ADF_A541,
103 0x3DD8_95D7,
104 0xA4D1_C46D,
105 0xD3D6_F4FB,
106 0x4369_E96A,
107 0x346E_D9FC,
108 0xAD67_8846,
109 0xDA60_B8D0,
110 0x4404_2D73,
111 0x3303_1DE5,
112 0xAA0A_4C5F,
113 0xDD0D_7CC9,
114 0x5005_713C,
115 0x2702_41AA,
116 0xBE0B_1010,
117 0xC90C_2086,
118 0x5768_B525,
119 0x206F_85B3,
120 0xB966_D409,
121 0xCE61_E49F,
122 0x5EDE_F90E,
123 0x29D9_C998,
124 0xB0D0_9822,
125 0xC7D7_A8B4,
126 0x59B3_3D17,
127 0x2EB4_0D81,
128 0xB7BD_5C3B,
129 0xC0BA_6CAD,
130 0xEDB8_8320,
131 0x9ABF_B3B6,
132 0x03B6_E20C,
133 0x74B1_D29A,
134 0xEAD5_4739,
135 0x9DD2_77AF,
136 0x04DB_2615,
137 0x73DC_1683,
138 0xE363_0B12,
139 0x9464_3B84,
140 0x0D6D_6A3E,
141 0x7A6A_5AA8,
142 0xE40E_CF0B,
143 0x9309_FF9D,
144 0x0A00_AE27,
145 0x7D07_9EB1,
146 0xF00F_9344,
147 0x8708_A3D2,
148 0x1E01_F268,
149 0x6906_C2FE,
150 0xF762_575D,
151 0x8065_67CB,
152 0x196C_3671,
153 0x6E6B_06E7,
154 0xFED4_1B76,
155 0x89D3_2BE0,
156 0x10DA_7A5A,
157 0x67DD_4ACC,
158 0xF9B9_DF6F,
159 0x8EBE_EFF9,
160 0x17B7_BE43,
161 0x60B0_8ED5,
162 0xD6D6_A3E8,
163 0xA1D1_937E,
164 0x38D8_C2C4,
165 0x4FDF_F252,
166 0xD1BB_67F1,
167 0xA6BC_5767,
168 0x3FB5_06DD,
169 0x48B2_364B,
170 0xD80D_2BDA,
171 0xAF0A_1B4C,
172 0x3603_4AF6,
173 0x4104_7A60,
174 0xDF60_EFC3,
175 0xA867_DF55,
176 0x316E_8EEF,
177 0x4669_BE79,
178 0xCB61_B38C,
179 0xBC66_831A,
180 0x256F_D2A0,
181 0x5268_E236,
182 0xCC0C_7795,
183 0xBB0B_4703,
184 0x2202_16B9,
185 0x5505_262F,
186 0xC5BA_3BBE,
187 0xB2BD_0B28,
188 0x2BB4_5A92,
189 0x5CB3_6A04,
190 0xC2D7_FFA7,
191 0xB5D0_CF31,
192 0x2CD9_9E8B,
193 0x5BDE_AE1D,
194 0x9B64_C2B0,
195 0xEC63_F226,
196 0x756A_A39C,
197 0x026D_930A,
198 0x9C09_06A9,
199 0xEB0E_363F,
200 0x7207_6785,
201 0x0500_5713,
202 0x95BF_4A82,
203 0xE2B8_7A14,
204 0x7BB1_2BAE,
205 0x0CB6_1B38,
206 0x92D2_8E9B,
207 0xE5D5_BE0D,
208 0x7CDC_EFB7,
209 0x0BDB_DF21,
210 0x86D3_D2D4,
211 0xF1D4_E242,
212 0x68DD_B3F8,
213 0x1FDA_836E,
214 0x81BE_16CD,
215 0xF6B9_265B,
216 0x6FB0_77E1,
217 0x18B7_4777,
218 0x8808_5AE6,
219 0xFF0F_6A70,
220 0x6606_3BCA,
221 0x1101_0B5C,
222 0x8F65_9EFF,
223 0xF862_AE69,
224 0x616B_FFD3,
225 0x166C_CF45,
226 0xA00A_E278,
227 0xD70D_D2EE,
228 0x4E04_8354,
229 0x3903_B3C2,
230 0xA767_2661,
231 0xD060_16F7,
232 0x4969_474D,
233 0x3E6E_77DB,
234 0xAED1_6A4A,
235 0xD9D6_5ADC,
236 0x40DF_0B66,
237 0x37D8_3BF0,
238 0xA9BC_AE53,
239 0xDEBB_9EC5,
240 0x47B2_CF7F,
241 0x30B5_FFE9,
242 0xBDBD_F21C,
243 0xCABA_C28A,
244 0x53B3_9330,
245 0x24B4_A3A6,
246 0xBAD0_3605,
247 0xCDD7_0693,
248 0x54DE_5729,
249 0x23D9_67BF,
250 0xB366_7A2E,
251 0xC461_4AB8,
252 0x5D68_1B02,
253 0x2A6F_2B94,
254 0xB40B_BE37,
255 0xC30C_8EA1,
256 0x5A05_DF1B,
257 0x2D02_EF8D,
31]; 258];
32 259
33#[allow(non_camel_case_types)] 260#[allow(non_camel_case_types)]
@@ -37,7 +264,8 @@ pub struct ETH_FSC(pub u32);
37impl ETH_FSC { 264impl ETH_FSC {
38 pub const CRC32_OK: u32 = 0x2144_df1c; 265 pub const CRC32_OK: u32 = 0x2144_df1c;
39 266
40 #[must_use] pub fn new(data: &[u8]) -> Self { 267 #[must_use]
268 pub fn new(data: &[u8]) -> Self {
41 let fsc = data.iter().fold(u32::MAX, |crc, byte| { 269 let fsc = data.iter().fold(u32::MAX, |crc, byte| {
42 let idx = u8::try_from(crc & 0xFF).unwrap() ^ byte; 270 let idx = u8::try_from(crc & 0xFF).unwrap() ^ byte;
43 CRC32R_LOOKUP_TABLE[usize::from(idx)] ^ (crc >> 8) 271 CRC32R_LOOKUP_TABLE[usize::from(idx)] ^ (crc >> 8)
@@ -45,15 +273,18 @@ impl ETH_FSC {
45 Self(fsc) 273 Self(fsc)
46 } 274 }
47 275
48 #[must_use] pub fn crc_ok(&self) -> bool { 276 #[must_use]
277 pub fn crc_ok(&self) -> bool {
49 self.0 == Self::CRC32_OK 278 self.0 == Self::CRC32_OK
50 } 279 }
51 280
52 #[must_use] pub fn hton_bytes(&self) -> [u8; 4] { 281 #[must_use]
282 pub fn hton_bytes(&self) -> [u8; 4] {
53 self.0.to_le_bytes() 283 self.0.to_le_bytes()
54 } 284 }
55 285
56 #[must_use] pub fn hton(&self) -> u32 { 286 #[must_use]
287 pub fn hton(&self) -> u32 {
57 self.0.to_le() 288 self.0.to_le()
58 } 289 }
59} 290}
diff --git a/embassy-net-adin1110/src/phy.rs b/embassy-net-adin1110/src/phy.rs
index 70060a0c3..176ad019b 100644
--- a/embassy-net-adin1110/src/phy.rs
+++ b/embassy-net-adin1110/src/phy.rs
@@ -30,7 +30,8 @@ pub mod RegsC45 {
30 } 30 }
31 31
32 impl DA1 { 32 impl DA1 {
33 #[must_use] pub fn into(self) -> (u8, u16) { 33 #[must_use]
34 pub fn into(self) -> (u8, u16) {
34 (0x01, self as u16) 35 (0x01, self as u16)
35 } 36 }
36 } 37 }
@@ -48,7 +49,8 @@ pub mod RegsC45 {
48 } 49 }
49 50
50 impl DA3 { 51 impl DA3 {
51 #[must_use] pub fn into(self) -> (u8, u16) { 52 #[must_use]
53 pub fn into(self) -> (u8, u16) {
52 (0x03, self as u16) 54 (0x03, self as u16)
53 } 55 }
54 } 56 }
@@ -62,7 +64,8 @@ pub mod RegsC45 {
62 } 64 }
63 65
64 impl DA7 { 66 impl DA7 {
65 #[must_use] pub fn into(self) -> (u8, u16) { 67 #[must_use]
68 pub fn into(self) -> (u8, u16) {
66 (0x07, self as u16) 69 (0x07, self as u16)
67 } 70 }
68 } 71 }
@@ -84,7 +87,8 @@ pub mod RegsC45 {
84 } 87 }
85 88
86 impl DA1E { 89 impl DA1E {
87 #[must_use] pub fn into(self) -> (u8, u16) { 90 #[must_use]
91 pub fn into(self) -> (u8, u16) {
88 (0x1e, self as u16) 92 (0x1e, self as u16)
89 } 93 }
90 } 94 }
@@ -100,7 +104,8 @@ pub mod RegsC45 {
100 } 104 }
101 105
102 impl DA1F { 106 impl DA1F {
103 #[must_use] pub fn into(self) -> (u8, u16) { 107 #[must_use]
108 pub fn into(self) -> (u8, u16) {
104 (0x1f, self as u16) 109 (0x1f, self as u16)
105 } 110 }
106 } 111 }