From cccbee30a86b03ef2c40f7cfb13591743ce7462d Mon Sep 17 00:00:00 2001
From: Greg Shuflin <greg.shuflin@protonmail.com>
Date: Mon, 1 Mar 2021 00:28:25 -0800
Subject: [PATCH] Remove global radio_progress

Change to function-specific counters
---
 dm1801.c | 2 ++
 gd77.c   | 2 ++
 md380.c  | 2 ++
 radio.c  | 3 ---
 radio.h  | 5 -----
 rd5r.c   | 2 ++
 uv380.c  | 4 +++-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dm1801.c b/dm1801.c
index ec2fd75..f426b4a 100644
--- a/dm1801.c
+++ b/dm1801.c
@@ -348,6 +348,7 @@ static void dm1801_print_version(radio_device_t *radio, FILE *out)
 static void download(radio_device_t *radio)
 {
     int bno;
+    int radio_progress = 0;
 
     // Read range 0x80...0x1ee5f.
 #define NBLK 989
@@ -390,6 +391,7 @@ static void dm1801_download(radio_device_t *radio)
 static void dm1801_upload(radio_device_t *radio, int cont_flag)
 {
     int bno;
+    int radio_progress = 0;
 
     // Write range 0x80...0x1ee5f.
     for (bno = 1; bno < NBLK; bno++) {
diff --git a/gd77.c b/gd77.c
index 9132c44..741c0b4 100644
--- a/gd77.c
+++ b/gd77.c
@@ -348,6 +348,7 @@ static void gd77_print_version(radio_device_t *radio, FILE *out)
 static void download(radio_device_t *radio)
 {
     int bno;
+    int radio_progress = 0;
 
     // Read range 0x80...0x1e29f.
     for (bno=1; bno<966; bno++) {
@@ -388,6 +389,7 @@ static void gd77_download(radio_device_t *radio)
 static void gd77_upload(radio_device_t *radio, int cont_flag)
 {
     int bno;
+    int radio_progress = 0;
 
     // Write range 0x80...0x1e29f.
     for (bno=1; bno<966; bno++) {
diff --git a/md380.c b/md380.c
index c5a6c77..9921509 100644
--- a/md380.c
+++ b/md380.c
@@ -365,6 +365,7 @@ static void md380_print_version(radio_device_t *radio, FILE *out)
 static void md380_download(radio_device_t *radio)
 {
     int bno;
+    int radio_progress = 0;
 
     for (bno=0; bno<MEMSZ/1024; bno++) {
         dfu_read_block(bno, &radio_mem[bno*1024], 1024);
@@ -383,6 +384,7 @@ static void md380_download(radio_device_t *radio)
 static void md380_upload(radio_device_t *radio, int cont_flag)
 {
     int bno;
+    int radio_progress = 0;
 
     dfu_erase(0, MEMSZ);
 
diff --git a/radio.c b/radio.c
index bd24792..f54ece7 100644
--- a/radio.c
+++ b/radio.c
@@ -72,7 +72,6 @@ void set_active_device(radio_device_t* d) {
 }
 
 unsigned char radio_mem [1024*1024*2];  // Radio memory contents, up to 2 Mbytes
-int radio_progress;                     // Read/write progress counter
 
 //
 // Print a generic information about the device.
@@ -87,7 +86,6 @@ void radio_print_version(radio_device_t* dev, FILE *out)
 //
 void radio_download(radio_device_t* dev)
 {
-    radio_progress = 0;
     if (! trace_flag) {
         fprintf(stderr, "Read device: ");
         fflush(stderr);
@@ -109,7 +107,6 @@ void radio_upload(radio_device_t* dev, int cont_flag)
         fprintf(stderr, "Incompatible image - cannot upload.\n");
         exit(-1);
     }
-    radio_progress = 0;
     if (! trace_flag) {
         fprintf(stderr, "Write device: ");
         fflush(stderr);
diff --git a/radio.h b/radio.h
index aea93a2..ee3994f 100644
--- a/radio.h
+++ b/radio.h
@@ -81,8 +81,3 @@ extern unsigned char radio_mem[];
 // File descriptor of serial port with programming cable attached.
 //
 extern int radio_port;
-
-//
-// Read/write progress counter.
-//
-extern int radio_progress;
diff --git a/rd5r.c b/rd5r.c
index 901e07c..469e7c0 100644
--- a/rd5r.c
+++ b/rd5r.c
@@ -345,6 +345,7 @@ static void rd5r_print_version(radio_device_t *radio, FILE *out)
 static void download(radio_device_t *radio)
 {
     int bno;
+    int radio_progress = 0;
 
     // Read range 0x80...0x1e29f.
     for (bno=1; bno<966; bno++) {
@@ -385,6 +386,7 @@ static void rd5r_download(radio_device_t *radio)
 static void rd5r_upload(radio_device_t *radio, int cont_flag)
 {
     int bno;
+    int radio_progress = 0;
 
     // Write range 0x80...0x1e29f.
     for (bno=1; bno<966; bno++) {
diff --git a/uv380.c b/uv380.c
index a68f40a..78bd851 100644
--- a/uv380.c
+++ b/uv380.c
@@ -400,6 +400,7 @@ static void uv380_print_version(radio_device_t *radio, FILE *out)
 static void uv380_download(radio_device_t *radio)
 {
     int bno;
+    int radio_progress = 0;
 
     for (bno=0; bno<MEMSZ/1024; bno++) {
         dfu_read_block(bno, &radio_mem[bno*1024], 1024);
@@ -418,6 +419,7 @@ static void uv380_download(radio_device_t *radio)
 static void uv380_upload(radio_device_t *radio, int cont_flag)
 {
     int bno;
+    int radio_progress = 0;
 
     dfu_erase(0, MEMSZ);
 
@@ -2490,7 +2492,7 @@ static void uv380_write_csv(radio_device_t *radio, FILE *csv)
     // Erase whole region.
     // Align finish to 64kbytes.
     //
-    radio_progress = 0;
+    int radio_progress = 0;
     if (! trace_flag) {
         fprintf(stderr, "Erase: ");
         fflush(stderr);