Merge pull request #76 from NonPIayerCharacter/rda

RDA flasher

Author: openshwprojects

BK7231Flasher/BK7231Flasher.csproj

@@ -56,6 +56,7 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="RDAFlasher.cs" />
     <Compile Include="Xmodem.cs" />
     <Compile Include="WMFlasher.cs" />
     <Compile Include="ECR6600Flasher.cs" />

BK7231Flasher/BaseFlasher.cs

@@ -18,11 +18,14 @@ public enum BKType
         RTL8710B,
         RTL87X0C,
         RTL8720D,
+        RTL8721DA,
+        RTL8720E,
         LN882H,
         BL602,
         ECR6600,
         W600,
         W800,
+        RDA5981,
 
         BekenSPI,
         GenericSPI,
@@ -56,7 +59,7 @@ public override string ToString()
         }
     }
 
-    public class BaseFlasher
+    public class BaseFlasher : IDisposable
     {
         protected ILogListener logger;
         protected string backupName;
@@ -181,7 +184,11 @@ public virtual bool doErase(int startSector = 0x000, int sectors = 10, bool bAll
         }
         public virtual void closePort()
         {
-
+            if (serial != null)
+            {
+                serial.Close();
+                serial.Dispose();
+            }
         }
         public virtual void doTestReadWrite(int startSector = 0x000, int sectors = 10)
         {
@@ -194,6 +201,18 @@ public virtual bool saveReadResult(int startOffset)
         {
             return false;
         }
+
+        public virtual void Xm_PacketSent(int sentBytes, int total, int sequence, uint offset)
+        {
+            if((sequence % 4) == 1)
+            {
+                addLog($"Writing at 0x{offset:X}... ");
+            }
+
+            logger.setProgress(sentBytes, total);
+        }
+
+        public virtual void Dispose() { }
     }
 }
 

BK7231Flasher/FormMain.cs

@@ -198,11 +198,14 @@ private void Form1_Load(object sender, EventArgs e)
             comboBoxChipType.Items.Add(new ChipType(BKType.RTL8710B, "RTL8710B"));
             comboBoxChipType.Items.Add(new ChipType(BKType.RTL87X0C, "RTL87X0C"));
             comboBoxChipType.Items.Add(new ChipType(BKType.RTL8720D, "RTL8720DN"));
+            //comboBoxChipType.Items.Add(new ChipType(BKType.RTL8721DA, "RTL8721DA"));
+            //comboBoxChipType.Items.Add(new ChipType(BKType.RTL8720E, "RTL8720E"));
             comboBoxChipType.Items.Add(new ChipType(BKType.LN882H, "LN882H"));
             comboBoxChipType.Items.Add(new ChipType(BKType.BL602, "BL602"));
             comboBoxChipType.Items.Add(new ChipType(BKType.ECR6600, "ECR6600"));
             comboBoxChipType.Items.Add(new ChipType(BKType.W800, "W800"));
             comboBoxChipType.Items.Add(new ChipType(BKType.W600, "W600 (write)"));
+            comboBoxChipType.Items.Add(new ChipType(BKType.RDA5981, "RDA5981"));
             comboBoxChipType.Items.Add(new ChipType(BKType.BekenSPI, "Beken SPI CH341"));
             comboBoxChipType.Items.Add(new ChipType(BKType.GenericSPI, "Generic SPI CH341"));
 
@@ -480,10 +483,13 @@ void clearUp()
 
         void createFlasher()
         {
+            flasher?.Dispose();
             switch(curType)
             {
                 case BKType.RTL8710B:
                 case BKType.RTL8720D:
+                case BKType.RTL8721DA:
+                case BKType.RTL8720E:
                     flasher = new RTLFlasher();
                     break;
                 case BKType.RTL87X0C:
@@ -508,6 +514,9 @@ void createFlasher()
                 case BKType.W800:
                     flasher = new WMFlasher();
                     break;
+                case BKType.RDA5981:
+                    flasher = new RDAFlasher();
+                    break;
                 default:
                     flasher = new BK7231Flasher();
                     break;

BK7231Flasher/OBKConfig.cs

@@ -110,6 +110,7 @@ internal bool loadFrom(byte [] dat, BKType type, bool bApplyOffset)
                 case BKType.RTL8720D:
                 case BKType.BL602:
                 case BKType.ECR6600:
+                case BKType.RDA5981:
                     _ = OBKFlashLayout.getConfigLocation(type, out var sectors);
                     var sname = type == BKType.BL602 ? "mY0bcFg" : "ObkCfg";
                     dat = EasyFlash.LoadValueFromData(subArray, sname, sectors * BK7231Flasher.SECTOR_SIZE, type, out efdata);
@@ -577,6 +578,7 @@ public static bool isValid(byte [] raw, int extraOfs = 0, BKType type = BKType.I
                 case BKType.RTL8720D:
                 case BKType.LN882H:
                 case BKType.BL602:
+                case BKType.RDA5981:
                     crc = CRC.Tiny_CRC8_unsigned(raw, extraOfs + 4, useLen - 4);
                     break;
                 case BKType.W600:
@@ -616,6 +618,7 @@ public void saveConfig(BKType type = BKType.Invalid)
                 case BKType.RTL8720D:
                 case BKType.LN882H:
                 case BKType.BL602:
+                case BKType.RDA5981:
                     crc = CRC.Tiny_CRC8_unsigned(raw, 4, realLen - 4);
                     break;
                 case BKType.W600:

BK7231Flasher/OBKFlashLayout.cs

@@ -37,6 +37,9 @@ public static int getConfigLocation(BKType type, out int sectors)
                 case BKType.ECR6600:
                     sectors = 0x1C000 / BK7231Flasher.SECTOR_SIZE;
                     return 0x1B9000;
+                case BKType.RDA5981:
+                    sectors = 0xA000 / BK7231Flasher.SECTOR_SIZE;
+                    return 0xF4000;
                 //case BKType.XR809:
                 //    sectors = 0x10000 / BK7231Flasher.SECTOR_SIZE;
                 //    return 0x1E0000;