feat: enhance signature display and add config area CRC

Extended signature display now shows TYP code alongside device group name
and interprets NOA value (4=linear, >4=dual bank mode). Config area CRC
command now enforces exact area boundaries per spec section 6.21, warning
if -a/-s options are provided.

Signed-off-by: Vincent Jardin <vjardin@free.fr>

Author: vjardin

src/main.c

@@ -446,6 +446,7 @@ main(int argc, char *argv[]) {
   bool bnd_srs1_set = false, bnd_srs2_set = false;
   const char *boundary_file = NULL;
   int8_t area_koa = -1; /* -1 = not set, 0/1/2 = code/data/config */
+  bool addr_explicit = false, size_explicit = false;
   write_entry_t write_entries[MAX_WRITE_FILES];
   int write_count = 0;
   enum command cmd = CMD_NONE;
@@ -458,9 +459,11 @@ main(int argc, char *argv[]) {
       break;
     case 'a':
       address = parse_hex(optarg);
+      addr_explicit = true;
       break;
     case 's':
       size = parse_hex(optarg);
+      size_explicit = true;
       break;
     case 'b':
       baudrate = (uint32_t)strtoul(optarg, NULL, 10);
@@ -734,11 +737,19 @@ main(int argc, char *argv[]) {
       ra_close(&dev);
       errx(EXIT_FAILURE, "area not found");
     }
-    /* --area sets defaults, -a/-s can still override */
-    if (address == 0)
+    /* Config area CRC requires exact boundaries per spec 6.21 */
+    if (cmd == CMD_CRC && area_koa == KOA_TYPE_CONFIG) {
+      if (addr_explicit || size_explicit)
+        warnx("config area CRC requires exact boundaries, -a/-s ignored");
       address = area_sad;
-    if (size == 0)
       size = area_ead - area_sad + 1;
+    } else {
+      /* --area sets defaults, -a/-s can still override */
+      if (address == 0)
+        address = area_sad;
+      if (size == 0)
+        size = area_ead - area_sad + 1;
+    }
   }
 
   /* Note: IDA with all-0xFF fails with 0xC1 on unlocked devices

src/radfu.c

@@ -342,19 +342,47 @@ get_area_type_koa(uint8_t koa) {
 }
 
 /*
- * Get device group name from TYP field per spec 6.15.2.2
+ * Print device group info from TYP field per spec 6.15.2.2
  */
-STATIC const char *
-get_device_group(uint8_t typ) {
+STATIC void
+print_device_group(uint8_t typ) {
+  const char *name;
+  const char *devices;
   switch (typ) {
   case TYP_GRP_AB:
-    return "GrpA/GrpB (RA4M2/3, RA6M4/5, RA4E1, RA6E1)";
+    name = "GrpA/GrpB";
+    devices = "RA4M2/3, RA6M4/5, RA4E1, RA6E1";
+    break;
   case TYP_GRP_C:
-    return "GrpC (RA6T2)";
+    name = "GrpC";
+    devices = "RA6T2";
+    break;
   case TYP_GRP_D:
-    return "GrpD (RA4E2, RA6E2, RA4T1, RA6T3)";
+    name = "GrpD";
+    devices = "RA4E2, RA6E2, RA4T1, RA6T3";
+    break;
   default:
-    return "Unknown";
+    printf("Device Group:       Unknown (TYP=0x%02X)\n", typ);
+    return;
+  }
+  printf("Device Group:       %s (TYP=0x%02X)\n", name, typ);
+  printf("  Devices:          %s\n", devices);
+}
+
+/*
+ * Print NOA (Number of Areas) with mode interpretation
+ * Standard: 4 areas (User, Data, Config, + reserved)
+ * Dual bank: 5+ areas (User0, User1, Data, Config, etc.)
+ */
+STATIC void
+print_noa_info(uint8_t noa) {
+  printf("Number of Areas:    %d", noa);
+  if (noa == 4) {
+    printf(" (linear mode)\n");
+  } else if (noa > 4) {
+    printf(" (dual bank mode)\n");
+  } else {
+    printf("\n");
   }
 }
 
@@ -526,15 +554,15 @@ ra_get_dev_info(ra_device_t *dev) {
     uint8_t bfv_minor = data[7];
     uint8_t bfv_build = data[8];
 
-    printf("Device Group:       %s\n", get_device_group(typ));
+    print_device_group(typ);
     printf("Boot Firmware:      v%d.%d.%d\n", bfv_major, bfv_minor, bfv_build);
     if (rmb >= 1000000)
       printf("Max UART Baudrate:  %u bps (%.1f Mbps)\n", rmb, rmb / 1000000.0);
     else if (rmb >= 1000)
       printf("Max UART Baudrate:  %u bps (%.1f Kbps)\n", rmb, rmb / 1000.0);
     else
       printf("Max UART Baudrate:  %u bps\n", rmb);
-    printf("Number of Areas:    %d\n", noa);
+    print_noa_info(noa);
 
     /* Parse Device ID if available (16 bytes starting at offset 9) */
     if (data_len >= 25) {

tests/test_radfu.c

@@ -147,25 +147,6 @@ test_get_area_type_koa(void **state) {
   assert_string_equal(get_area_type_koa(0xFF), "Unknown");
 }
 
-/*
- * Device group tests
- */
-
-static void
-test_get_device_group(void **state) {
-  (void)state;
-
-  /* Test known device groups per spec 6.15.2.2 */
-  assert_string_equal(get_device_group(TYP_GRP_AB), "GrpA/GrpB (RA4M2/3, RA6M4/5, RA4E1, RA6E1)");
-  assert_string_equal(get_device_group(TYP_GRP_C), "GrpC (RA6T2)");
-  assert_string_equal(get_device_group(TYP_GRP_D), "GrpD (RA4E2, RA6E2, RA4T1, RA6T3)");
-
-  /* Unknown types */
-  assert_string_equal(get_device_group(0x00), "Unknown");
-  assert_string_equal(get_device_group(0x03), "Unknown");
-  assert_string_equal(get_device_group(0xFF), "Unknown");
-}
-
 /*
  * Area lookup tests
  */
@@ -424,9 +405,6 @@ main(void) {
     cmocka_unit_test(test_get_area_type),
     cmocka_unit_test(test_get_area_type_koa),
 
-    /* Device group tests */
-    cmocka_unit_test(test_get_device_group),
-
     /* Area lookup tests */
     cmocka_unit_test(test_find_area_for_address),