From 2900deb67bdbe8fcf36cb27abd623c3957f8cafc Mon Sep 17 00:00:00 2001
From: Serge Vakulenko <serge.vakulenko@gmail.com>
Date: Wed, 31 Oct 2018 21:12:49 -0700
Subject: [PATCH] D868UV: parse zones.

---
 d868uv.c | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/d868uv.c b/d868uv.c
index c0d94a5..47ebdbe 100644
--- a/d868uv.c
+++ b/d868uv.c
@@ -1848,14 +1848,43 @@ badtx:  fprintf(stderr, "Bad transmit frequency.\n");
     return 1;
 }
 
+//
+// Set name for a given zone.
+//
+static void setup_zone(int index, const char *name)
+{
+    uint8_t *zmap = GET_ZONEMAP();
+
+    zmap[index / 8] |= 1 << (index & 7);
+    ascii_decode(GET_ZONENAME(index), name, 16, 0);
+}
+
+//
+// Add channel to a zone.
+// Return 0 on failure.
+//
+static int zone_append(int index, int cnum)
+{
+    uint16_t *zlist = GET_ZONELIST(index);
+    int i;
+
+    for (i=0; i<250; i++) {
+        if (zlist[i] == cnum)
+            return 1;
+        if (zlist[i] == 0xffff) {
+            zlist[i] = cnum;
+            return 1;
+        }
+    }
+    return 0;
+}
+
 //
 // Parse one line of Zones table.
 // Return 0 on failure.
 //
 static int parse_zones(int first_row, char *line)
 {
-    //TODO
-#if 0
     char num_str[256], name_str[256], chan_str[256];
     int znum;
 
@@ -1899,7 +1928,7 @@ static int parse_zones(int first_row, char *line)
                 // Add range.
                 int c;
                 for (c=last+1; c<=cnum; c++) {
-                    if (!zone_append(znum-1, c)) {
+                    if (!zone_append(znum-1, c-1)) {
                         fprintf(stderr, "Zone %d: too many channels.\n", znum);
                         return 0;
                     }
@@ -1907,7 +1936,7 @@ static int parse_zones(int first_row, char *line)
                 }
             } else {
                 // Add single channel.
-                if (!zone_append(znum-1, cnum)) {
+                if (!zone_append(znum-1, cnum-1)) {
                     fprintf(stderr, "Zone %d: too many channels.\n", znum);
                     return 0;
                 }
@@ -1926,7 +1955,6 @@ static int parse_zones(int first_row, char *line)
             str = eptr + 1;
         }
     }
-#endif
     return 1;
 }