diff --git a/server.test/CommonTest.cs b/server.test/CommonTest.cs
index 5d6061f..1f36b90 100644
--- a/server.test/CommonTest.cs
+++ b/server.test/CommonTest.cs
@@ -41,21 +41,21 @@ public class CommonTest
[Fact]
public void ToBitTest()
{
- Assert.Equal(Number.ToBit(0xFF, 3).Value, true);
- Assert.Equal(Number.ToBit(0x00, 3).Value, false);
- Assert.Equal(Number.ToBit(0xAA, 3).Value, true);
- Assert.Equal(Number.ToBit(0xAA, 2).Value, false);
+ Assert.Equal(true, Number.ToBit(0xFF, 3).Value);
+ Assert.Equal(false, Number.ToBit(0x00, 3).Value);
+ Assert.Equal(true, Number.ToBit(0xAA, 3).Value);
+ Assert.Equal(false, Number.ToBit(0xAA, 2).Value);
}
[Fact]
public void ReverseBits()
{
- Assert.Equal(BinaryPrimitives.ReverseEndianness((byte)0xA0), (byte)0x50);
+ Assert.Equal((byte)0x05, Common.Number.ReverseBits((byte)0xA0));
var bytesSrc = new byte[] { 0xAB, 0x00, 0x00, 0x01 };
var bytes = new byte[4];
for (int i = 0; i < 4; i++)
- bytes[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
- Assert.Equal(bytesSrc, new byte[] { 0xD5, 0x00, 0x00, 0x80 });
+ bytes[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ Assert.Equal(new byte[] { 0xD5, 0x00, 0x00, 0x80 }, bytes);
}
}
diff --git a/server.test/UDPServerTest.cs b/server.test/UDPServerTest.cs
index 5ec27ce..3274507 100644
--- a/server.test/UDPServerTest.cs
+++ b/server.test/UDPServerTest.cs
@@ -132,7 +132,7 @@ public class UDPServerTest
Assert.True(ret.IsSuccessful);
var data = ret.Value;
Assert.True(data.IsSuccessful);
- Assert.Equal(number, Number.BytesToUInt32(data.ToBytes()).Value);
+ Assert.Equal((UInt64)number, Number.BytesToUInt64(data.ToBytes()).Value);
}
}
}
diff --git a/server/src/Common.cs b/server/src/Common.cs
index 46c0fcc..5639ef7 100644
--- a/server/src/Common.cs
+++ b/server/src/Common.cs
@@ -7,6 +7,40 @@ namespace Common
///
public class Number
{
+ private static readonly byte[] BitReverseTable = new byte[] {
+ 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+ 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+ 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+ 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+ 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+ 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+ 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+ 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+ 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+ 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+ 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+ 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+ 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+ 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+ 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+ 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+ 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+ 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+ 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+ 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+ 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+ 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+ 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+ 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+ 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+ 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+ 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+ 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+ 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+ 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+ 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+ 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
+ };
///
/// 整数转成二进制字节数组
///
@@ -256,7 +290,7 @@ namespace Common
"Distance is larger than bytesArray", nameof(distance)));
if (srcBytesLen % distance != 0)
return new(new ArgumentException(
- "The length of bytes can't be divided by 2 without reminder", nameof(distance)));
+ "The length of bytes can't be divided by distance without reminder", nameof(distance)));
var dstBytes = new byte[srcBytesLen];
var buffer = new byte[distance];
@@ -272,7 +306,31 @@ namespace Common
return dstBytes;
}
+ ///
+ /// 反转字节内比特顺序（使用查找表的方法）
+ ///
+ /// 字节
+ /// 反转后的字节
+ public static byte ReverseBits(byte srcByte)
+ {
+ return BitReverseTable[srcByte];
+ }
+ ///
+ /// 反转字节数组的字节内比特顺序（使用查找表的方法）
+ ///
+ /// 字节数组
+ /// 反转后的字节字节数组
+ public static byte[] ReverseBits(byte[] srcBytes)
+ {
+ var bytesLen = srcBytes.Length;
+ var dstBytes = new byte[bytesLen];
+ for (int i = 0; i < bytesLen; i++)
+ {
+ dstBytes[i] = BitReverseTable[srcBytes[i]];
+ }
+ return dstBytes;
+ }
}
///
diff --git a/server/src/Controllers.cs b/server/src/Controllers.cs
index 6124b2c..80365ed 100644
--- a/server/src/Controllers.cs
+++ b/server/src/Controllers.cs
@@ -306,10 +306,10 @@ public class JtagController : ControllerBase
if (!retBuffer.IsSuccessful)
return TypedResults.InternalServerError(retBuffer.Error);
revBuffer = retBuffer.Value;
- for (int i = 0; i < buffer.Length; i++)
- {
- revBuffer[i] = BinaryPrimitives.ReverseEndianness(revBuffer[i]);
- }
+ // for (int i = 0; i < buffer.Length; i++)
+ // {
+ // revBuffer[i] = Common.Number.ReverseBits(revBuffer[i]);
+ // }
await memoryStream.WriteAsync(revBuffer, 0, bytesRead);
totalBytesRead += bytesRead;
@@ -435,10 +435,10 @@ public class RemoteUpdater : ControllerBase
if (!retBuffer.IsSuccessful)
return TypedResults.InternalServerError(retBuffer.Error);
revBuffer = retBuffer.Value;
- for (int i = 0; i < buffer.Length; i++)
- {
- revBuffer[i] = BinaryPrimitives.ReverseEndianness(revBuffer[i]);
- }
+ // for (int i = 0; i < buffer.Length; i++)
+ // {
+ // revBuffer[i] = Common.Number.ReverseBits(revBuffer[i]);
+ // }
await memoryStream.WriteAsync(revBuffer, 0, bytesRead);
totalBytesRead += bytesRead;
diff --git a/server/src/RemoteUpdate.cs b/server/src/RemoteUpdate.cs
index 72ba3c0..330f33c 100644
--- a/server/src/RemoteUpdate.cs
+++ b/server/src/RemoteUpdate.cs
@@ -187,10 +187,15 @@ public class RemoteUpdateClient
var bytesData = new byte[FLASH_SECTOR_LENGTH];
Array.Fill(bytesData, 0xFF);
- bytesData[FLASH_SECTOR_LENGTH - 4] = 0x80; // 0b10000000
- bytesData[FLASH_SECTOR_LENGTH - 3] = 0xCC; // 0b11001100
- bytesData[FLASH_SECTOR_LENGTH - 2] = 0xB4; // 0b10110100
- bytesData[FLASH_SECTOR_LENGTH - 1] = 0x29; // 0b00101001
+ // bytesData[FLASH_SECTOR_LENGTH - 4] = 0x80; // 0b10000000
+ // bytesData[FLASH_SECTOR_LENGTH - 3] = 0xCC; // 0b11001100
+ // bytesData[FLASH_SECTOR_LENGTH - 2] = 0xB4; // 0b10110100
+ // bytesData[FLASH_SECTOR_LENGTH - 1] = 0x29; // 0b00101001
+ bytesData[FLASH_SECTOR_LENGTH - 1] = 0x01;
+ bytesData[FLASH_SECTOR_LENGTH - 2] = 0x33;
+ bytesData[FLASH_SECTOR_LENGTH - 3] = 0x2D;
+ bytesData[FLASH_SECTOR_LENGTH - 4] = 0x94;
+
var ret = await WriteFlash(FlashAddr.Switch[bitstreamNum], 1, bytesData);
if (!ret.IsSuccessful) return new(ret.Error);
@@ -232,57 +237,90 @@ public class RemoteUpdateClient
// Init data
var bytesData = new byte[FLASH_SECTOR_LENGTH];
- for (int i = 0; i < FLASH_SECTOR_LENGTH; i += 4)
- bytesData[i] = BinaryPrimitives.ReverseEndianness((byte)0xA0);
+ for (int i = 3; i < FLASH_SECTOR_LENGTH; i += 4)
+ // bytesData[i] = Common.Number.ReverseBits((byte)0xA0);
+ bytesData[i] = (byte)0xA0;
{
- var bytesSrc = new byte[] { 0xAB, 0x00, 0x00, 0x01 };
- for (int i = 0; i < 4; i++)
- bytesSrc[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
+ var bytesSrc = new byte[] { 0x01, 0x00, 0x00, 0xAB };
Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x04, 4);
}
{
- var bytesSrc = new byte[] { 0x00, 0x00, 0x00, 0x0B };
- for (int i = 0; i < 4; i++)
- bytesSrc[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
+ var bytesSrc = new byte[] { 0x0B, 0x00, 0x00, 0x00 };
Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x08, 4);
}
{
- var bytesSrc = new byte[] { 0xAB, 0xC0, 0x00, 0x01 };
- for (int i = 0; i < 4; i++)
- bytesSrc[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
+ var bytesSrc = new byte[] { 0x01, 0x00, 0xC0, 0xAB };
Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x34, 4);
}
{
var bytesSrc = new byte[] { 0x00, 0x00, 0x00, 0x00 };
- for (int i = 0; i < 4; i++)
- bytesSrc[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x38, 4);
}
{
- var bytesSrc = new byte[] { 0xAC, 0x00, 0x00, 0x01 };
- for (int i = 0; i < 4; i++)
- bytesSrc[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
+ var bytesSrc = new byte[] { 0x01, 0x00, 0x00, 0xAC };
Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x3C, 4);
}
{
var bytesSrc = Common.Number.NumberToBytes(FlashAddr.Bitstream[bitstreamNum], 4).Value;
- for (int i = 0; i < 4; i++)
- bytesSrc[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
- Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x40, 4);
+ Buffer.BlockCopy(Common.Number.ReverseBytes(bytesSrc, 4).Value, 0, bytesData, 0x40, 4);
}
{
- var bytesSrc = new byte[] { 0xA8, 0x80, 0x00, 0x01 };
- for (int i = 0; i < 4; i++)
- bytesSrc[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
+ var bytesSrc = new byte[] { 0x01, 0x00, 0x80, 0xA8 };
Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x44, 4);
}
{
- var bytesSrc = new byte[] { 0x00, 0x00, 0x00, 0x0F };
- for (int i = 0; i < 4; i++)
- bytesSrc[i] = BinaryPrimitives.ReverseEndianness(bytesSrc[i]);
+ var bytesSrc = new byte[] { 0x0F, 0x00, 0x00, 0x00 };
Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x48, 4);
}
+ // {
+ // var bytesSrc = new byte[] { 0xAB, 0x00, 0x00, 0x01 };
+ // for (int i = 0; i < 4; i++)
+ // bytesSrc[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ // Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x04, 4);
+ // }
+ // {
+ // var bytesSrc = new byte[] { 0x00, 0x00, 0x00, 0x0B };
+ // for (int i = 0; i < 4; i++)
+ // bytesSrc[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ // Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x08, 4);
+ // }
+ // {
+ // var bytesSrc = new byte[] { 0xAB, 0xC0, 0x00, 0x01 };
+ // for (int i = 0; i < 4; i++)
+ // bytesSrc[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ // Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x34, 4);
+ // }
+ // {
+ // var bytesSrc = new byte[] { 0x00, 0x00, 0x00, 0x00 };
+ // for (int i = 0; i < 4; i++)
+ // bytesSrc[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ // Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x38, 4);
+ // }
+ // {
+ // var bytesSrc = new byte[] { 0xAC, 0x00, 0x00, 0x01 };
+ // for (int i = 0; i < 4; i++)
+ // bytesSrc[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ // Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x3C, 4);
+ // }
+ // {
+ // var bytesSrc = Common.Number.NumberToBytes(FlashAddr.Bitstream[bitstreamNum], 4).Value;
+ // for (int i = 0; i < 4; i++)
+ // bytesSrc[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ // Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x40, 4);
+ // }
+ // {
+ // var bytesSrc = new byte[] { 0xA8, 0x80, 0x00, 0x01 };
+ // for (int i = 0; i < 4; i++)
+ // bytesSrc[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ // Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x44, 4);
+ // }
+ // {
+ // var bytesSrc = new byte[] { 0x00, 0x00, 0x00, 0x0F };
+ // for (int i = 0; i < 4; i++)
+ // bytesSrc[i] = Common.Number.ReverseBits(bytesSrc[i]);
+ // Buffer.BlockCopy(bytesSrc, 0, bytesData, 0x48, 4);
+ // }
var ret = await WriteFlash(FlashAddr.Jump[bitstreamNum], 1, bytesData);
if (!ret.IsSuccessful) return new(ret.Error);